@webbers/pay-payments-medusa 1.0.14 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.medusa/server/package.json +36 -32
- package/.medusa/server/src/admin/index.js +1 -1
- package/.medusa/server/src/admin/index.mjs +1 -1
- package/.medusa/server/src/api/store/carts/[id]/duplicate/route.js +17 -0
- package/.medusa/server/src/providers/pay/core/pay-base.js +22 -22
- package/.medusa/server/src/providers/pay/services/pay-direct-debit.js +21 -0
- package/.medusa/server/src/providers/pay/types/index.js +2 -1
- package/.medusa/server/src/workflows/cart/duplicate-cart.js +138 -0
- package/.medusa/server/src/workflows/cart/steps/validate-cart-completed.js +12 -0
- package/README.md +182 -59
- package/package.json +36 -32
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@webbers/pay-payments-medusa",
|
|
3
3
|
"displayName": "Medusa v2 Pay. Plugin",
|
|
4
|
-
"version": "
|
|
4
|
+
"version": "2.0.0",
|
|
5
5
|
"description": "The Pay.nl payment provider plugin for Medusa v2",
|
|
6
6
|
"author": "Webbers B.V. <development@webbers.com>",
|
|
7
7
|
"license": "MIT",
|
|
8
|
+
"repository": {
|
|
9
|
+
"type": "git",
|
|
10
|
+
"url": "https://github.com/webbersagency/pay-payments-medusa"
|
|
11
|
+
},
|
|
8
12
|
"files": [
|
|
9
13
|
".medusa/server"
|
|
10
14
|
],
|
|
@@ -23,11 +27,11 @@
|
|
|
23
27
|
"./constants.js": "./constants.js"
|
|
24
28
|
},
|
|
25
29
|
"keywords": [
|
|
26
|
-
"medusa",
|
|
27
|
-
"plugin",
|
|
28
|
-
"medusa-plugin-
|
|
29
|
-
"
|
|
30
|
-
"medusa-
|
|
30
|
+
"medusa-v2",
|
|
31
|
+
"medusa-plugin-integration",
|
|
32
|
+
"medusa-plugin-payment",
|
|
33
|
+
"pay.",
|
|
34
|
+
"medusa-webbers"
|
|
31
35
|
],
|
|
32
36
|
"scripts": {
|
|
33
37
|
"build": "medusa plugin:build",
|
|
@@ -35,43 +39,43 @@
|
|
|
35
39
|
"prepublishOnly": "medusa plugin:build"
|
|
36
40
|
},
|
|
37
41
|
"devDependencies": {
|
|
38
|
-
"@medusajs/admin-sdk": "^2.
|
|
39
|
-
"@medusajs/cli": "^2.
|
|
40
|
-
"@medusajs/framework": "^2.
|
|
41
|
-
"@medusajs/icons": "^2.
|
|
42
|
-
"@medusajs/medusa": "^2.
|
|
43
|
-
"@medusajs/test-utils": "^2.
|
|
44
|
-
"@medusajs/types": "^2.
|
|
45
|
-
"@medusajs/ui": "^4.0.
|
|
46
|
-
"@mikro-orm/cli": "
|
|
47
|
-
"@mikro-orm/core": "
|
|
48
|
-
"@mikro-orm/knex": "
|
|
49
|
-
"@mikro-orm/migrations": "
|
|
50
|
-
"@mikro-orm/postgresql": "
|
|
42
|
+
"@medusajs/admin-sdk": "^2.10.1",
|
|
43
|
+
"@medusajs/cli": "^2.10.1",
|
|
44
|
+
"@medusajs/framework": "^2.10.1",
|
|
45
|
+
"@medusajs/icons": "^2.10.1",
|
|
46
|
+
"@medusajs/medusa": "^2.10.1",
|
|
47
|
+
"@medusajs/test-utils": "^2.10.1",
|
|
48
|
+
"@medusajs/types": "^2.10.1",
|
|
49
|
+
"@medusajs/ui": "^4.0.21",
|
|
50
|
+
"@mikro-orm/cli": "6.4.3",
|
|
51
|
+
"@mikro-orm/core": "6.4.3",
|
|
52
|
+
"@mikro-orm/knex": "6.4.3",
|
|
53
|
+
"@mikro-orm/migrations": "6.4.3",
|
|
54
|
+
"@mikro-orm/postgresql": "6.4.3",
|
|
51
55
|
"@swc/core": "1.5.7",
|
|
52
|
-
"@types/node": "^20.19.
|
|
53
|
-
"@types/react": "^18.3.
|
|
56
|
+
"@types/node": "^20.19.11",
|
|
57
|
+
"@types/react": "^18.3.24",
|
|
54
58
|
"@types/react-dom": "^18.3.7",
|
|
55
59
|
"awilix": "^8.0.1",
|
|
56
|
-
"pg": "^8.16.
|
|
57
|
-
"prettier": "^3.6.
|
|
60
|
+
"pg": "^8.16.3",
|
|
61
|
+
"prettier": "^3.6.2",
|
|
58
62
|
"prop-types": "^15.8.1",
|
|
59
63
|
"react": "^18.2.0",
|
|
60
64
|
"react-dom": "^18.2.0",
|
|
61
65
|
"ts-node": "^10.9.2",
|
|
62
|
-
"typescript": "^5.
|
|
66
|
+
"typescript": "^5.9.2",
|
|
63
67
|
"vite": "^5.4.19",
|
|
64
68
|
"yalc": "^1.0.0-pre.53"
|
|
65
69
|
},
|
|
66
70
|
"peerDependencies": {
|
|
67
|
-
"@medusajs/admin-sdk": "^2.
|
|
68
|
-
"@medusajs/cli": "^2.
|
|
69
|
-
"@medusajs/core-flows": "^2.
|
|
70
|
-
"@medusajs/framework": "^2.
|
|
71
|
-
"@medusajs/icons": "^2.
|
|
72
|
-
"@medusajs/js-sdk": "^2.
|
|
73
|
-
"@medusajs/medusa": "^2.
|
|
74
|
-
"@medusajs/test-utils": "^2.
|
|
71
|
+
"@medusajs/admin-sdk": "^2.10.1",
|
|
72
|
+
"@medusajs/cli": "^2.10.1",
|
|
73
|
+
"@medusajs/core-flows": "^2.10.1",
|
|
74
|
+
"@medusajs/framework": "^2.10.1",
|
|
75
|
+
"@medusajs/icons": "^2.10.1",
|
|
76
|
+
"@medusajs/js-sdk": "^2.10.1",
|
|
77
|
+
"@medusajs/medusa": "^2.10.1",
|
|
78
|
+
"@medusajs/test-utils": "^2.10.1",
|
|
75
79
|
"@medusajs/ui": "^4.0.3",
|
|
76
80
|
"@mikro-orm/cli": "6.4.3",
|
|
77
81
|
"@mikro-orm/core": "6.4.3",
|
|
@@ -57,7 +57,7 @@ const sdk = new Medusa__default.default({
|
|
|
57
57
|
}
|
|
58
58
|
});
|
|
59
59
|
const displayName = "Medusa v2 Pay. Plugin";
|
|
60
|
-
const version = "
|
|
60
|
+
const version = "2.0.0";
|
|
61
61
|
function getSortedPaymentMethods(data) {
|
|
62
62
|
const { checkoutOptions, checkoutSequence } = data;
|
|
63
63
|
const { primary } = checkoutSequence.default;
|
|
@@ -54,7 +54,7 @@ const sdk = new Medusa({
|
|
|
54
54
|
}
|
|
55
55
|
});
|
|
56
56
|
const displayName = "Medusa v2 Pay. Plugin";
|
|
57
|
-
const version = "
|
|
57
|
+
const version = "2.0.0";
|
|
58
58
|
function getSortedPaymentMethods(data) {
|
|
59
59
|
const { checkoutOptions, checkoutSequence } = data;
|
|
60
60
|
const { primary } = checkoutSequence.default;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.GET = void 0;
|
|
4
|
+
const utils_1 = require("@medusajs/framework/utils");
|
|
5
|
+
const duplicate_cart_1 = require("../../../../../workflows/cart/duplicate-cart");
|
|
6
|
+
const GET = async (req, res) => {
|
|
7
|
+
const we = req.scope.resolve(utils_1.Modules.WORKFLOW_ENGINE);
|
|
8
|
+
const response = await we.run(duplicate_cart_1.duplicateCartWorkflowId, {
|
|
9
|
+
input: {
|
|
10
|
+
id: req.params.id,
|
|
11
|
+
},
|
|
12
|
+
transactionId: "cart-duplicate-" + req.params.id,
|
|
13
|
+
});
|
|
14
|
+
res.status(200).json({ cart: response.result });
|
|
15
|
+
};
|
|
16
|
+
exports.GET = GET;
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL2NhcnRzL1tpZF0vZHVwbGljYXRlL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHFEQUFpRDtBQUNqRCxpRkFBb0Y7QUFFN0UsTUFBTSxHQUFHLEdBQUcsS0FBSyxFQUFFLEdBQWtCLEVBQUUsR0FBbUIsRUFBRSxFQUFFO0lBQ25FLE1BQU0sRUFBRSxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLGVBQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQTtJQUVyRCxNQUFNLFFBQVEsR0FBRyxNQUFNLEVBQUUsQ0FBQyxHQUFHLENBQUMsd0NBQXVCLEVBQUU7UUFDckQsS0FBSyxFQUFFO1lBQ0wsRUFBRSxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRTtTQUNsQjtRQUNELGFBQWEsRUFBRSxpQkFBaUIsR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUU7S0FDakQsQ0FBQyxDQUFBO0lBRUYsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLE1BQU0sRUFBQyxDQUFDLENBQUE7QUFDL0MsQ0FBQyxDQUFBO0FBWFksUUFBQSxHQUFHLE9BV2YifQ==
|
|
@@ -62,8 +62,6 @@ class PayBase extends utils_1.AbstractPaymentProvider {
|
|
|
62
62
|
}
|
|
63
63
|
createPayOrderPayload(order, paymentSession) {
|
|
64
64
|
const session_id = paymentSession.data?.session_id;
|
|
65
|
-
const paymentMethodInput = paymentSession.data
|
|
66
|
-
?.paymentMethodInput;
|
|
67
65
|
const currency = order.currency_code.toUpperCase();
|
|
68
66
|
const products = order.items.map((item) => ({
|
|
69
67
|
id: item.variant_sku || item.variant_id || item.id,
|
|
@@ -103,13 +101,16 @@ class PayBase extends utils_1.AbstractPaymentProvider {
|
|
|
103
101
|
});
|
|
104
102
|
}
|
|
105
103
|
let paymentMethod;
|
|
106
|
-
|
|
104
|
+
const methodId = this.paymentCreateOptions.methodId;
|
|
105
|
+
if (typeof methodId !== "undefined") {
|
|
106
|
+
const paymentMethodInput = paymentSession.data?.paymentMethodInput;
|
|
107
107
|
paymentMethod = {
|
|
108
|
-
id:
|
|
108
|
+
id: methodId,
|
|
109
109
|
input: paymentMethodInput,
|
|
110
110
|
};
|
|
111
111
|
}
|
|
112
|
-
const baseReturnUrl =
|
|
112
|
+
const baseReturnUrl = order?.sales_channel?.metadata?.pay_return_url ??
|
|
113
|
+
this.options_.returnUrl;
|
|
113
114
|
const payload = {
|
|
114
115
|
reference: order.display_id.toString(),
|
|
115
116
|
description: this.getPaymentDescription(order),
|
|
@@ -134,6 +135,15 @@ class PayBase extends utils_1.AbstractPaymentProvider {
|
|
|
134
135
|
email: order.email,
|
|
135
136
|
locale: order.metadata?.locale?.toString()?.toUpperCase() ?? "EN",
|
|
136
137
|
reference: order.customer?.id,
|
|
138
|
+
...(!!order.billing_address?.company
|
|
139
|
+
? {
|
|
140
|
+
company: {
|
|
141
|
+
name: order.billing_address.company,
|
|
142
|
+
vatNumber: order.metadata?.vat_number?.toString(),
|
|
143
|
+
country: order.billing_address?.country_code?.toUpperCase(),
|
|
144
|
+
},
|
|
145
|
+
}
|
|
146
|
+
: {}),
|
|
137
147
|
},
|
|
138
148
|
order: {
|
|
139
149
|
countryCode: order.billing_address?.country_code?.toUpperCase(),
|
|
@@ -244,14 +254,9 @@ class PayBase extends utils_1.AbstractPaymentProvider {
|
|
|
244
254
|
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "Payment ID is required");
|
|
245
255
|
}
|
|
246
256
|
try {
|
|
247
|
-
const payment = await this.
|
|
248
|
-
data: {
|
|
249
|
-
id,
|
|
250
|
-
},
|
|
251
|
-
});
|
|
257
|
+
const payment = await this.client_.getTransaction(id);
|
|
252
258
|
const value = (input.data?.amount).value;
|
|
253
|
-
const currency = payment.
|
|
254
|
-
?.currency;
|
|
259
|
+
const currency = payment.amount.currency;
|
|
255
260
|
if (!currency) {
|
|
256
261
|
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "Currency information is missing from payment data");
|
|
257
262
|
}
|
|
@@ -372,7 +377,9 @@ class PayBase extends utils_1.AbstractPaymentProvider {
|
|
|
372
377
|
}
|
|
373
378
|
}
|
|
374
379
|
/**
|
|
375
|
-
* Retrieves payment details
|
|
380
|
+
* Retrieves payment details, for payment data within 35 days.
|
|
381
|
+
* Pay. Orders that are already PAID, will be on the GMS for 13 months.
|
|
382
|
+
* Otherwise, it is available for 35 days on the TGU.
|
|
376
383
|
* @param input - The payment retrieval input
|
|
377
384
|
* @returns The payment details
|
|
378
385
|
*/
|
|
@@ -382,14 +389,7 @@ class PayBase extends utils_1.AbstractPaymentProvider {
|
|
|
382
389
|
throw new utils_1.MedusaError(utils_1.MedusaErrorTypes.INVALID_DATA, "Payment id not present");
|
|
383
390
|
}
|
|
384
391
|
try {
|
|
385
|
-
|
|
386
|
-
// Check if the order ID starts with a 2, in that case we will need to use the legacy Pay API.
|
|
387
|
-
if (id.startsWith("2")) {
|
|
388
|
-
data = await this.client_.getTransaction(id);
|
|
389
|
-
}
|
|
390
|
-
else {
|
|
391
|
-
data = await this.client_.getOrder(id);
|
|
392
|
-
}
|
|
392
|
+
const data = await this.client_.getOrder(id);
|
|
393
393
|
return {
|
|
394
394
|
data: data,
|
|
395
395
|
};
|
|
@@ -575,4 +575,4 @@ class PayBase extends utils_1.AbstractPaymentProvider {
|
|
|
575
575
|
}
|
|
576
576
|
}
|
|
577
577
|
exports.default = PayBase;
|
|
578
|
-
//# 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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"}
|
|
578
|
+
//# 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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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const pay_base_1 = __importDefault(require("../core/pay-base"));
|
|
7
|
+
const types_1 = require("../types");
|
|
8
|
+
class PayCreditcardService extends pay_base_1.default {
|
|
9
|
+
get paymentCreateOptions() {
|
|
10
|
+
return {
|
|
11
|
+
methodId: 137,
|
|
12
|
+
webhookUrl: this.options_.medusaUrl +
|
|
13
|
+
"/hooks/payment/" +
|
|
14
|
+
types_1.PaymentProviderKeys.DIRECTDEBIT +
|
|
15
|
+
"_pay",
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
PayCreditcardService.identifier = types_1.PaymentProviderKeys.DIRECTDEBIT;
|
|
20
|
+
exports.default = PayCreditcardService;
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF5LWRpcmVjdC1kZWJpdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9wcm92aWRlcnMvcGF5L3NlcnZpY2VzL3BheS1kaXJlY3QtZGViaXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxnRUFBc0M7QUFDdEMsb0NBQTREO0FBRTVELE1BQU0sb0JBQXFCLFNBQVEsa0JBQU87SUFHeEMsSUFBSSxvQkFBb0I7UUFDdEIsT0FBTztZQUNMLFFBQVEsRUFBRSxHQUFHO1lBQ2IsVUFBVSxFQUNSLElBQUksQ0FBQyxRQUFRLENBQUMsU0FBUztnQkFDdkIsaUJBQWlCO2dCQUNqQiwyQkFBbUIsQ0FBQyxXQUFXO2dCQUMvQixNQUFNO1NBQ1QsQ0FBQTtJQUNILENBQUM7O0FBWE0sK0JBQVUsR0FBRywyQkFBbUIsQ0FBQyxXQUFXLENBQUE7QUFjckQsa0JBQWUsb0JBQW9CLENBQUEifQ==
|
|
@@ -39,8 +39,9 @@ exports.PaymentProviderKeys = {
|
|
|
39
39
|
PAYBYBANK: "pay-paybybank",
|
|
40
40
|
MOBILEPAY: "pay-mobilepay",
|
|
41
41
|
WECHATPAY: "pay-wechatpay",
|
|
42
|
+
DIRECTDEBIT: "pay-direct-debit",
|
|
42
43
|
};
|
|
43
44
|
__exportStar(require("./common"), exports);
|
|
44
45
|
__exportStar(require("./order"), exports);
|
|
45
46
|
__exportStar(require("./transaction"), exports);
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvcHJvdmlkZXJzL3BheS90eXBlcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7OztBQXdCYSxRQUFBLG1CQUFtQixHQUFHO0lBQ2pDLG1CQUFtQixFQUFFLHFCQUFxQjtJQUMxQyxPQUFPLEVBQUUsYUFBYTtJQUN0QixXQUFXLEVBQUUsZ0JBQWdCO0lBQzdCLFVBQVUsRUFBRSxzQkFBc0I7SUFDbEMsS0FBSyxFQUFFLFdBQVc7SUFDbEIsU0FBUyxFQUFFLGVBQWU7SUFDMUIsVUFBVSxFQUFFLGdCQUFnQjtJQUM1QixNQUFNLEVBQUUsWUFBWTtJQUNwQixTQUFTLEVBQUUsZUFBZTtJQUMxQixPQUFPLEVBQUUsYUFBYTtJQUN0QixRQUFRLEVBQUUsY0FBYztJQUN4QixPQUFPLEVBQUUsYUFBYTtJQUN0QixLQUFLLEVBQUUsV0FBVztJQUNsQixPQUFPLEVBQUUsYUFBYTtJQUN0QixNQUFNLEVBQUUsWUFBWTtJQUNwQixRQUFRLEVBQUUsY0FBYztJQUN4QixJQUFJLEVBQUUsVUFBVTtJQUNoQixLQUFLLEVBQUUsV0FBVztJQUNsQixHQUFHLEVBQUUsU0FBUztJQUNkLFVBQVUsRUFBRSxnQkFBZ0I7SUFDNUIsU0FBUyxFQUFFLGVBQWU7SUFDMUIsU0FBUyxFQUFFLGVBQWU7SUFDMUIsU0FBUyxFQUFFLGVBQWU7SUFDMUIsV0FBVyxFQUFFLGtCQUFrQjtDQUNoQyxDQUFBO0FBS0QsMkNBQXdCO0FBQ3hCLDBDQUF1QjtBQUN2QixnREFBNkIifQ==
|
|
@@ -0,0 +1,138 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.duplicateCartWorkflow = exports.duplicateCartWorkflowId = void 0;
|
|
4
|
+
const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
|
|
5
|
+
const utils_1 = require("@medusajs/framework/utils");
|
|
6
|
+
const core_flows_1 = require("@medusajs/medusa/core-flows");
|
|
7
|
+
const validate_cart_completed_1 = require("./steps/validate-cart-completed");
|
|
8
|
+
const query_config_1 = require("@medusajs/medusa/api/store/carts/query-config");
|
|
9
|
+
exports.duplicateCartWorkflowId = "duplicate-cart";
|
|
10
|
+
const THREE_DAYS = 60 * 60 * 24 * 3;
|
|
11
|
+
exports.duplicateCartWorkflow = (0, workflows_sdk_1.createWorkflow)({
|
|
12
|
+
name: exports.duplicateCartWorkflowId,
|
|
13
|
+
idempotent: true,
|
|
14
|
+
store: true,
|
|
15
|
+
retentionTime: THREE_DAYS,
|
|
16
|
+
}, (input) => {
|
|
17
|
+
const { data: carts } = (0, core_flows_1.useQueryGraphStep)({
|
|
18
|
+
entity: utils_1.Modules.CART,
|
|
19
|
+
filters: {
|
|
20
|
+
id: input.id,
|
|
21
|
+
},
|
|
22
|
+
fields: [
|
|
23
|
+
"id",
|
|
24
|
+
"email",
|
|
25
|
+
"customer.id",
|
|
26
|
+
"type",
|
|
27
|
+
"metadata",
|
|
28
|
+
"sales_channel_id",
|
|
29
|
+
"completed_at",
|
|
30
|
+
"billing_address.*",
|
|
31
|
+
"shipping_address.*",
|
|
32
|
+
"items.*",
|
|
33
|
+
"items.adjustments.promotion.*",
|
|
34
|
+
"promotions.*",
|
|
35
|
+
"region.id",
|
|
36
|
+
"shipping_methods.*",
|
|
37
|
+
],
|
|
38
|
+
});
|
|
39
|
+
const cart = (0, workflows_sdk_1.transform)({ carts }, (data) => {
|
|
40
|
+
return data.carts?.[0];
|
|
41
|
+
});
|
|
42
|
+
(0, validate_cart_completed_1.validateCartCompletedStep)({
|
|
43
|
+
cart: cart,
|
|
44
|
+
});
|
|
45
|
+
const billing_address = (0, workflows_sdk_1.transform)({ cart }, (data) => {
|
|
46
|
+
return data.cart?.billing_address;
|
|
47
|
+
});
|
|
48
|
+
const shipping_address = (0, workflows_sdk_1.transform)({ cart }, (data) => {
|
|
49
|
+
return data.cart?.shipping_address;
|
|
50
|
+
});
|
|
51
|
+
const newCart = core_flows_1.createCartWorkflow.runAsStep({
|
|
52
|
+
input: {
|
|
53
|
+
region_id: cart?.region_id ?? "",
|
|
54
|
+
email: cart?.email ?? "",
|
|
55
|
+
billing_address: {
|
|
56
|
+
first_name: billing_address?.first_name ?? undefined,
|
|
57
|
+
last_name: billing_address?.last_name ?? undefined,
|
|
58
|
+
phone: billing_address?.phone ?? undefined,
|
|
59
|
+
company: billing_address?.company ?? undefined,
|
|
60
|
+
address_1: billing_address?.address_1 ?? undefined,
|
|
61
|
+
address_2: billing_address?.address_2 ?? undefined,
|
|
62
|
+
city: billing_address?.city ?? undefined,
|
|
63
|
+
country_code: billing_address?.country_code ?? undefined,
|
|
64
|
+
province: billing_address?.province ?? undefined,
|
|
65
|
+
postal_code: billing_address?.postal_code ?? undefined,
|
|
66
|
+
metadata: billing_address?.metadata ?? undefined,
|
|
67
|
+
},
|
|
68
|
+
shipping_address: {
|
|
69
|
+
first_name: shipping_address?.first_name ?? undefined,
|
|
70
|
+
last_name: shipping_address?.last_name ?? undefined,
|
|
71
|
+
phone: shipping_address?.phone ?? undefined,
|
|
72
|
+
company: shipping_address?.company ?? undefined,
|
|
73
|
+
address_1: shipping_address?.address_1 ?? undefined,
|
|
74
|
+
address_2: shipping_address?.address_2 ?? undefined,
|
|
75
|
+
city: shipping_address?.city ?? undefined,
|
|
76
|
+
country_code: shipping_address?.country_code ?? undefined,
|
|
77
|
+
province: shipping_address?.province ?? undefined,
|
|
78
|
+
postal_code: shipping_address?.postal_code ?? undefined,
|
|
79
|
+
metadata: shipping_address?.metadata ?? undefined,
|
|
80
|
+
},
|
|
81
|
+
customer_id: cart?.customer_id ?? undefined,
|
|
82
|
+
metadata: cart?.metadata ?? undefined,
|
|
83
|
+
sales_channel_id: cart.sales_channel_id ?? undefined,
|
|
84
|
+
},
|
|
85
|
+
});
|
|
86
|
+
const options = (0, workflows_sdk_1.transform)({ cart }, (data) => {
|
|
87
|
+
return data.cart?.shipping_methods?.map((sm) => ({
|
|
88
|
+
id: sm?.shipping_option_id ?? "",
|
|
89
|
+
data: {
|
|
90
|
+
...sm?.data,
|
|
91
|
+
},
|
|
92
|
+
}));
|
|
93
|
+
});
|
|
94
|
+
core_flows_1.addShippingMethodToCartWorkflow.runAsStep({
|
|
95
|
+
input: {
|
|
96
|
+
cart_id: newCart.id,
|
|
97
|
+
options,
|
|
98
|
+
},
|
|
99
|
+
});
|
|
100
|
+
const promoCodes = (0, workflows_sdk_1.transform)({ cart }, (data) => {
|
|
101
|
+
return data.cart?.promotions?.map((promotion) => promotion?.code ?? "");
|
|
102
|
+
});
|
|
103
|
+
const items = (0, workflows_sdk_1.transform)({ cart }, (data) => {
|
|
104
|
+
return data.cart?.items?.map((item) => ({
|
|
105
|
+
variant_id: item?.variant_id ?? undefined,
|
|
106
|
+
quantity: item?.quantity ?? 0,
|
|
107
|
+
}));
|
|
108
|
+
});
|
|
109
|
+
// Add the line items
|
|
110
|
+
core_flows_1.addToCartWorkflow.runAsStep({
|
|
111
|
+
input: {
|
|
112
|
+
cart_id: newCart.id,
|
|
113
|
+
items,
|
|
114
|
+
},
|
|
115
|
+
});
|
|
116
|
+
core_flows_1.updateCartWorkflow.runAsStep({
|
|
117
|
+
input: {
|
|
118
|
+
id: newCart.id,
|
|
119
|
+
region_id: cart?.region_id ?? "",
|
|
120
|
+
},
|
|
121
|
+
});
|
|
122
|
+
core_flows_1.updateCartPromotionsWorkflow.runAsStep({
|
|
123
|
+
input: {
|
|
124
|
+
cart_id: newCart.id,
|
|
125
|
+
promo_codes: promoCodes,
|
|
126
|
+
action: utils_1.PromotionActions.ADD,
|
|
127
|
+
},
|
|
128
|
+
});
|
|
129
|
+
const { data: duplicatedCart } = (0, core_flows_1.useQueryGraphStep)({
|
|
130
|
+
entity: utils_1.Modules.CART,
|
|
131
|
+
filters: {
|
|
132
|
+
id: newCart.id,
|
|
133
|
+
},
|
|
134
|
+
fields: query_config_1.defaultStoreCartFields,
|
|
135
|
+
}).config({ name: "retrieve-duplicated-cart" });
|
|
136
|
+
return new workflows_sdk_1.WorkflowResponse(duplicatedCart?.[0]);
|
|
137
|
+
});
|
|
138
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZHVwbGljYXRlLWNhcnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvd29ya2Zsb3dzL2NhcnQvZHVwbGljYXRlLWNhcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEscUVBTTBDO0FBQzFDLHFEQUFnRjtBQUNoRiw0REFPb0M7QUFDcEMsNkVBQXlFO0FBRXpFLGdGQUFvRjtBQUV2RSxRQUFBLHVCQUF1QixHQUFHLGdCQUFnQixDQUFBO0FBRXZELE1BQU0sVUFBVSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQTtBQVN0QixRQUFBLHFCQUFxQixHQUFHLElBQUEsOEJBQWMsRUFDakQ7SUFDRSxJQUFJLEVBQUUsK0JBQXVCO0lBQzdCLFVBQVUsRUFBRSxJQUFJO0lBQ2hCLEtBQUssRUFBRSxJQUFJO0lBQ1gsYUFBYSxFQUFFLFVBQVU7Q0FDMUIsRUFDRCxDQUFDLEtBQStDLEVBQUUsRUFBRTtJQUNsRCxNQUFNLEVBQUMsSUFBSSxFQUFFLEtBQUssRUFBQyxHQUFHLElBQUEsOEJBQWlCLEVBQUM7UUFDdEMsTUFBTSxFQUFFLGVBQU8sQ0FBQyxJQUFJO1FBQ3BCLE9BQU8sRUFBRTtZQUNQLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRTtTQUNiO1FBQ0QsTUFBTSxFQUFFO1lBQ04sSUFBSTtZQUNKLE9BQU87WUFDUCxhQUFhO1lBQ2IsTUFBTTtZQUNOLFVBQVU7WUFDVixrQkFBa0I7WUFDbEIsY0FBYztZQUNkLG1CQUFtQjtZQUNuQixvQkFBb0I7WUFDcEIsU0FBUztZQUNULCtCQUErQjtZQUMvQixjQUFjO1lBQ2QsV0FBVztZQUNYLG9CQUFvQjtTQUNyQjtLQUNGLENBQUMsQ0FBQTtJQUVGLE1BQU0sSUFBSSxHQUFHLElBQUEseUJBQVMsRUFBQyxFQUFDLEtBQUssRUFBQyxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQUU7UUFDdkMsT0FBTyxJQUFJLENBQUMsS0FBSyxFQUFF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
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.validateCartCompletedStep = void 0;
|
|
4
|
+
const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
|
|
5
|
+
const utils_1 = require("@medusajs/framework/utils");
|
|
6
|
+
exports.validateCartCompletedStep = (0, workflows_sdk_1.createStep)("validate-cart-completed", async (data) => {
|
|
7
|
+
const { cart } = data;
|
|
8
|
+
if (!cart.completed_at) {
|
|
9
|
+
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "Cannot duplicate uncompleted cart.");
|
|
10
|
+
}
|
|
11
|
+
});
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGUtY2FydC1jb21wbGV0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvd29ya2Zsb3dzL2NhcnQvc3RlcHMvdmFsaWRhdGUtY2FydC1jb21wbGV0ZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEscUVBQTBFO0FBQzFFLHFEQUFxRDtBQU94QyxRQUFBLHlCQUF5QixHQUFHLElBQUEsMEJBQVUsRUFDakQseUJBQXlCLEVBQ3pCLEtBQUssRUFBRSxJQUFvQyxFQUFFLEVBQUU7SUFDN0MsTUFBTSxFQUFDLElBQUksRUFBQyxHQUFHLElBQUksQ0FBQTtJQUVuQixJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQ3ZCLE1BQU0sSUFBSSxtQkFBVyxDQUNuQixtQkFBVyxDQUFDLEtBQUssQ0FBQyxZQUFZLEVBQzlCLG9DQUFvQyxDQUNyQyxDQUFBO0lBQ0gsQ0FBQztBQUNILENBQUMsQ0FDRixDQUFBIn0=
|
package/README.md
CHANGED
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
<p align="center">
|
|
18
18
|
<a href="#">
|
|
19
|
-
<img src="https://img.shields.io/badge/license-
|
|
19
|
+
<img src="https://img.shields.io/badge/license-MIT-blue.svg" />
|
|
20
20
|
</a>
|
|
21
21
|
<a href="#">
|
|
22
22
|
<img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat" alt="PRs welcome!" />
|
|
@@ -30,13 +30,25 @@
|
|
|
30
30
|
</a>
|
|
31
31
|
</p>
|
|
32
32
|
|
|
33
|
+
## Getting Started
|
|
33
34
|
|
|
34
|
-
|
|
35
|
+
Don’t have an account with Pay. yet? [Register now!](https://signup.pay.nl/welcome?id=M-1030-9252)
|
|
35
36
|
|
|
36
|
-
|
|
37
|
+
> [!CAUTION] If you have subscribers listening to the `order.placed` event, update them to listen to the
|
|
38
|
+
> `payment.captured` event instead. See below.
|
|
39
|
+
|
|
40
|
+
> [!WARNING]
|
|
41
|
+
> This plugin creates orders in Medusa **immediately**, even if the payment has not yet been captured. If a payment
|
|
42
|
+
> expires,
|
|
43
|
+
> the associated order will be automatically canceled.
|
|
44
|
+
>
|
|
45
|
+
> This change in flow is required to support asynchronous payment methods (e.g., SprayPay), where payment confirmation
|
|
46
|
+
> can take hours depending on customer input.
|
|
37
47
|
|
|
38
48
|
## Table of Contents
|
|
39
49
|
|
|
50
|
+
- [Demo store](#demo-store)
|
|
51
|
+
- [Pay. Payment Methods](#pay-payment-methods)
|
|
40
52
|
- [Features](#features)
|
|
41
53
|
- [Prerequisites](#prerequisites)
|
|
42
54
|
- [Installation](#installation)
|
|
@@ -44,37 +56,104 @@ TBD from here
|
|
|
44
56
|
- [Configuration Options](#configuration-options)
|
|
45
57
|
- [Environment Variables](#environment-variables)
|
|
46
58
|
- [Usage](#usage)
|
|
47
|
-
- [Client-Side Integration](#client-side-integration)
|
|
48
59
|
- [Supported Payment Methods](#supported-payment-methods)
|
|
60
|
+
- [Client-Side Integration](#client-side-integration)
|
|
61
|
+
- [Duplicate cart endpoint](#duplicate-cart-endpoint)
|
|
62
|
+
- [Adding payment method icons](#adding-payment-method-icons)
|
|
49
63
|
- [Extending the Plugin](#extending-the-plugin)
|
|
50
|
-
- [
|
|
51
|
-
- [License](#license)
|
|
64
|
+
- [Medusa v1 Support](#medusa-v1-support)
|
|
52
65
|
|
|
53
|
-
##
|
|
66
|
+
## Demo store
|
|
54
67
|
|
|
55
|
-
|
|
68
|
+
Visit the demo store here: https://pay-demo.webbers.com
|
|
56
69
|
|
|
57
|
-
|
|
58
|
-
- Bancontact
|
|
59
|
-
- Credit Card
|
|
60
|
-
- PayPal
|
|
61
|
-
- Apple Pay
|
|
62
|
-
- Gift Card
|
|
70
|
+
## Pay. payment methods
|
|
63
71
|
|
|
64
|
-
|
|
72
|
+
### Card payment methods
|
|
65
73
|
|
|
66
|
-
-
|
|
74
|
+
- Mastercard
|
|
75
|
+
- VISA
|
|
76
|
+
- American Express
|
|
77
|
+
- Carte Bancaire
|
|
78
|
+
- Maestro
|
|
79
|
+
- PostePay
|
|
80
|
+
- DanKort
|
|
81
|
+
- Nexi
|
|
82
|
+
- Visa Mastercard
|
|
83
|
+
|
|
84
|
+
### Digital wallets
|
|
85
|
+
|
|
86
|
+
- Apple Pay
|
|
87
|
+
- Google Pay
|
|
88
|
+
|
|
89
|
+
### Afterpay methods / Buy now pay later
|
|
90
|
+
|
|
91
|
+
- iDEAL IN3
|
|
92
|
+
- Billink
|
|
93
|
+
- SprayPay
|
|
94
|
+
- Riverty
|
|
95
|
+
- Mondu
|
|
96
|
+
- AlmaPAY
|
|
97
|
+
- Klarna
|
|
98
|
+
|
|
99
|
+
### Other
|
|
100
|
+
|
|
101
|
+
- PayPal
|
|
102
|
+
|
|
103
|
+
### Recurring payments
|
|
104
|
+
|
|
105
|
+
- SEPA Direct Debit
|
|
106
|
+
- Card-on-file / recurring card payments (tokenisation) [Coming soon]
|
|
107
|
+
|
|
108
|
+
### Region specific payment methods
|
|
109
|
+
|
|
110
|
+
<div style="display: flex; gap: 30px;">
|
|
111
|
+
<div>
|
|
112
|
+
|
|
113
|
+
| <div style="width:200px">Payment Method</div> | <div style="width:200px">Region(s)</div> |
|
|
114
|
+
|-----------------------------------------------|-------------------------------------------------------------------------------------------------|
|
|
115
|
+
| iDEAL | 🇳🇱 Netherlands |
|
|
116
|
+
| Bancontact | 🇧🇪 Belgium |
|
|
117
|
+
| Vipps | 🇳🇴 Norway<br>🇸🇪 Sweden |
|
|
118
|
+
| Bizum | 🇪🇸 Spain |
|
|
119
|
+
| Payconiq | 🇧🇪 Belgium<br>🇱🇺 Luxembourg |
|
|
120
|
+
| Twint | 🇨🇭 Switzerland |
|
|
121
|
+
| MB Way | 🇵🇹 Portugal |
|
|
122
|
+
| Pay By Bank | 🇧🇪 Belgium<br>🇩🇪 Germany<br>🇮🇹 Italy<br>🇱🇺 Luxembourg<br>🇳🇱 Netherlands<br>🇪🇸 Spain |
|
|
123
|
+
| WeChat Pay | 🇨🇳 China |
|
|
124
|
+
|
|
125
|
+
</div>
|
|
126
|
+
<div>
|
|
127
|
+
|
|
128
|
+
| <div style="width:200px">Payment Method</div> | <div style="width:200px">Region(s)</div> |
|
|
129
|
+
|-----------------------------------------------|------------------------------------------|
|
|
130
|
+
| Alipay Plus | 🇨🇳 China<br>🇭🇰 Hong Kong |
|
|
131
|
+
| MultiBanco | 🇵🇹 Portugal |
|
|
132
|
+
| Swish | 🇸🇪 Sweden |
|
|
133
|
+
| Satispay | 🇮🇹 Italy |
|
|
134
|
+
| Blik | 🇵🇱 Poland |
|
|
135
|
+
| EPS | 🇦🇹 Austria |
|
|
136
|
+
| Przelewy24 | 🇵🇱 Poland |
|
|
137
|
+
| MobilePay | 🇩🇰 Denmark<br>🇫🇮 Finland |
|
|
138
|
+
|
|
139
|
+
</div>
|
|
140
|
+
</div>
|
|
141
|
+
|
|
142
|
+
### InStore / SoftPOS payments
|
|
143
|
+
|
|
144
|
+
Would you like to integrate Pay. (Soft)P0S? [Get in touch!](mailto:hi@webbers.com)
|
|
145
|
+
|
|
146
|
+
## Features
|
|
67
147
|
|
|
148
|
+
- **Easily Extendable**: The modular architecture makes it easy to add support for additional Pay payment methods.
|
|
149
|
+
- **Webhook Support**: Full support for Pay webhooks for real-time payment status updates.
|
|
68
150
|
- **Automatic Capture**: Configurable automatic capture of payments.
|
|
69
151
|
|
|
70
152
|
## Prerequisites
|
|
71
153
|
|
|
72
|
-
- Medusa server v2.
|
|
154
|
+
- Medusa server v2.20.1 or later
|
|
73
155
|
- Node.js v20 or later
|
|
74
|
-
- A [Pay](https://
|
|
75
|
-
|
|
76
|
-
> [!NOTE]
|
|
77
|
-
> _You can get the API token & secret from your Pay dashboard: click Settings > Click sales channel > Copy api tokens_
|
|
156
|
+
- A [Pay](https://signup.pay.nl/welcome?id=M-1030-9252) account and token & secret with payment methods enabled.
|
|
78
157
|
|
|
79
158
|
## Installation
|
|
80
159
|
|
|
@@ -123,21 +202,24 @@ module.exports = defineConfig({
|
|
|
123
202
|
})
|
|
124
203
|
```
|
|
125
204
|
|
|
126
|
-
|
|
205
|
+
### Configuration Options
|
|
127
206
|
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
|
132
|
-
|
|
133
|
-
| `
|
|
134
|
-
| `
|
|
135
|
-
| `
|
|
136
|
-
| `
|
|
137
|
-
| `
|
|
138
|
-
| `
|
|
207
|
+
> [!NOTE]
|
|
208
|
+
> _You can get the API token & secret from your Pay dashboard: click Settings > Click sales channel > Copy api tokens_
|
|
209
|
+
|
|
210
|
+
| Option | Description | Default |
|
|
211
|
+
|----------------|-----------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
|
|
212
|
+
| `atCode` | Your Pay AT code | Required |
|
|
213
|
+
| `apiToken` | Your Pay API token | Required |
|
|
214
|
+
| `slCode` | Your Pay sales channel code | Required |
|
|
215
|
+
| `slSecret` | Your Pay sales channel secret | Required |
|
|
216
|
+
| `returnUrl` | The URL to return to after payment | Required |
|
|
217
|
+
| `medusaUrl` | The URL of your Medusa server | Required |
|
|
218
|
+
| `testMode` | Whether to enable test payments | Optional |
|
|
219
|
+
| `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). |
|
|
220
|
+
| `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"}'` |
|
|
139
221
|
|
|
140
|
-
|
|
222
|
+
### Environment Variables
|
|
141
223
|
|
|
142
224
|
Create or update your `.env` file with the following variables:
|
|
143
225
|
|
|
@@ -160,7 +242,47 @@ dropdown.
|
|
|
160
242
|
|
|
161
243
|
Make sure that the selected payment methods are enabled in your Pay origanization settings as well.
|
|
162
244
|
|
|
163
|
-
|
|
245
|
+
## Supported Payment Methods
|
|
246
|
+
|
|
247
|
+
The plugin currently supports the following Pay payment methods:
|
|
248
|
+
|
|
249
|
+
| <div style="width: 400px">Payment Method</div> | Provider ID |
|
|
250
|
+
|--------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------|
|
|
251
|
+
| **Pay. hosted checkout** | `pp_pay-hosted-checkout_pay` |
|
|
252
|
+
| **Creditcards**<br>Mastercard / VISA / American Express/ Carte Bancaire / <br> Maestro / PostePay / DanKort / Nexi / Visa Mastercard | `pp_pay-creditcard-group_pay` |
|
|
253
|
+
| **Card-on-file / recurring card payments (tokenisation)** | Coming soon |
|
|
254
|
+
| **Apple Pay** | `pp_pay-apple-pay_pay` |
|
|
255
|
+
| **Google Pay** | `pp_pay-google-pay_pay` |
|
|
256
|
+
| **iDEAL IN3** | `pp_pay-ideal-in3_pay` |
|
|
257
|
+
| **Billink** | `pp_pay-billink_pay` |
|
|
258
|
+
| **SprayPay** | `pp_pay-spraypay_pay` |
|
|
259
|
+
| **Riverty** | `pp_pay-riverty_pay` |
|
|
260
|
+
| **Mondu** | `pp_pay-mondu_pay` |
|
|
261
|
+
| **AlmaPAY** | `pp_pay-almapay_pay` |
|
|
262
|
+
| **Klarna** | `pp_pay-klarna_pay` |
|
|
263
|
+
| **PayPal** | `pp_pay-paypal_pay` |
|
|
264
|
+
| **SEPA Direct Debit** | `pp_pay-direct-debit_pay` |
|
|
265
|
+
| **iDEAL** | `pp_pay-ideal_pay` |
|
|
266
|
+
| **Bancontact** | `pp_pay-bancontact_pay` |
|
|
267
|
+
| **Vipps** | [Get in touch](mailto:hi@webbers.com) |
|
|
268
|
+
| **Bizum** | [Get in touch](mailto:hi@webbers.com) |
|
|
269
|
+
| **Payconiq** | `pp_pay-payconiq_pay` |
|
|
270
|
+
| **Twint** | `pp_pay-twint_pay` |
|
|
271
|
+
| **MB Way** | [Get in touch](mailto:hi@webbers.com) |
|
|
272
|
+
| **Pay by Bank** | `pp_pay-paybybank_pay` |
|
|
273
|
+
| **WeChat Pay** | `pay-wechatpay` |
|
|
274
|
+
| **AliPay Plus** | [Get in touch](mailto:hi@webbers.com) |
|
|
275
|
+
| **MultiBanco** | [Get in touch](mailto:hi@webbers.com) |
|
|
276
|
+
| **Swish** | [Get in touch](mailto:hi@webbers.com) |
|
|
277
|
+
| **Satispay** | [Get in touch](mailto:hi@webbers.com) |
|
|
278
|
+
| **Blik** | `pp_pay-blik_pay` |
|
|
279
|
+
| **EPS** | `pp_pay-eps_pay` |
|
|
280
|
+
| **Przelewy24** | `pp_przelewy24_pay` |
|
|
281
|
+
| **MobilePAY** | `pp_pay-mobilepay_pay` |
|
|
282
|
+
| **SoftPOS** | `pp_pay-softpos_pay` |
|
|
283
|
+
| **Gift Card** | `pp_pay-giftcard_pay` |
|
|
284
|
+
|
|
285
|
+
## Client-Side Integration
|
|
164
286
|
|
|
165
287
|
To integrate with your storefront, you'll need to implement the payment flow according to Pay's and Medusa's
|
|
166
288
|
documentation. Here's a basic example:
|
|
@@ -173,22 +295,33 @@ _Example integration using the [Medusa Next.js Starter](https://github.com/medus
|
|
|
173
295
|
|
|
174
296
|
https://github.com/user-attachments/assets/742ee261-5e41-4e33-9a72-faf1a424fc52
|
|
175
297
|
|
|
176
|
-
###
|
|
298
|
+
### Duplicate cart endpoint
|
|
177
299
|
|
|
178
|
-
|
|
300
|
+
> [!TIP]
|
|
301
|
+
> Use the duplicate cart endpoint in your storefront
|
|
302
|
+
>
|
|
303
|
+
> When a customer cancels a payment or returns to the storefront without completing the Pay. checkout, a new duplicate
|
|
304
|
+
> cart should automatically be created. This allows the customer to easily start a new transaction without losing the
|
|
305
|
+
> items they had selected.
|
|
179
306
|
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
307
|
+
**API Route**: `GET /store/carts/:id/duplicate`
|
|
308
|
+
|
|
309
|
+
Alter your storefront retrieve cart function(s) and check if the returned cart.completed_at value is set. If so request
|
|
310
|
+
a new cart with the duplicate cart endpoint and update cart id in cookies accordingly.
|
|
311
|
+
|
|
312
|
+
The duplicate cart endpoint is idempotent, so it can be called multiple times with the same cart id.
|
|
313
|
+
|
|
314
|
+
## Adding payment method icons
|
|
315
|
+
|
|
316
|
+
1. Download the latest payment images from here: https://github.com/paynl/payment-images
|
|
317
|
+
2. Add these to your storefront public assets
|
|
318
|
+
3. In your checkout, create the mapping from the provider id to the icon.
|
|
319
|
+
1. You can also utilize the exported `payPaymentMethods` from this plugin to find the corresponding ID.
|
|
320
|
+
2. I.e. ```const paymentMethodData = payPaymentMethods.find(method => `pp_${method.value}_pay` === provider_id)```
|
|
188
321
|
|
|
189
322
|
## Extending the Plugin
|
|
190
323
|
|
|
191
|
-
To add
|
|
324
|
+
To add one of the missing Pay payment methods, create a new service in `src/providers/Pay/services` that extends the
|
|
192
325
|
`PayBase` class:
|
|
193
326
|
|
|
194
327
|
```typescript
|
|
@@ -214,18 +347,8 @@ Make sure to replace `new method` with the actual Pay payment method ID.
|
|
|
214
347
|
Export your new service from `src/providers/Pay/services/index.ts`. Then add your new service to the list of services in
|
|
215
348
|
`src/providers/Pay/index.ts`.
|
|
216
349
|
|
|
217
|
-
|
|
218
|
-
1. Download the latest payment images from here: https://github.com/paynl/payment-images
|
|
219
|
-
2. Add these to your storefront public assets
|
|
220
|
-
3. In your checkout, create the mapping from the provider id to the icon.
|
|
221
|
-
1. You can also utilize the exported `payPaymentMethods` from this plugin to find the corresponding ID.
|
|
222
|
-
2. I.e. ```const paymentMethodData = payPaymentMethods.find(method => `pp_${method.value}_pay` === provider_id)```
|
|
223
|
-
|
|
224
|
-
## Local development and customization
|
|
225
|
-
|
|
226
|
-
In case you want to customize and test the plugin locally, refer to
|
|
227
|
-
the [Medusa Plugin docs](https://docs.medusajs.com/learn/fundamentals/plugins/create#3-publish-plugin-locally-for-development-and-testing).
|
|
350
|
+
We will be working on providing all the available Pay. options in the near future.
|
|
228
351
|
|
|
229
|
-
##
|
|
352
|
+
## Medusa v1 Support
|
|
230
353
|
|
|
231
|
-
|
|
354
|
+
Searching for support for Medusa v1, we have a legacy plugin available. [Get in touch](mailto:hi@webbers.com)
|
package/package.json
CHANGED
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@webbers/pay-payments-medusa",
|
|
3
3
|
"displayName": "Medusa v2 Pay. Plugin",
|
|
4
|
-
"version": "
|
|
4
|
+
"version": "2.0.0",
|
|
5
5
|
"description": "The Pay.nl payment provider plugin for Medusa v2",
|
|
6
6
|
"author": "Webbers B.V. <development@webbers.com>",
|
|
7
7
|
"license": "MIT",
|
|
8
|
+
"repository": {
|
|
9
|
+
"type": "git",
|
|
10
|
+
"url": "https://github.com/webbersagency/pay-payments-medusa"
|
|
11
|
+
},
|
|
8
12
|
"files": [
|
|
9
13
|
".medusa/server"
|
|
10
14
|
],
|
|
@@ -23,11 +27,11 @@
|
|
|
23
27
|
"./constants.js": "./constants.js"
|
|
24
28
|
},
|
|
25
29
|
"keywords": [
|
|
26
|
-
"medusa",
|
|
27
|
-
"plugin",
|
|
28
|
-
"medusa-plugin-
|
|
29
|
-
"
|
|
30
|
-
"medusa-
|
|
30
|
+
"medusa-v2",
|
|
31
|
+
"medusa-plugin-integration",
|
|
32
|
+
"medusa-plugin-payment",
|
|
33
|
+
"pay.",
|
|
34
|
+
"medusa-webbers"
|
|
31
35
|
],
|
|
32
36
|
"scripts": {
|
|
33
37
|
"build": "medusa plugin:build",
|
|
@@ -35,43 +39,43 @@
|
|
|
35
39
|
"prepublishOnly": "medusa plugin:build"
|
|
36
40
|
},
|
|
37
41
|
"devDependencies": {
|
|
38
|
-
"@medusajs/admin-sdk": "^2.
|
|
39
|
-
"@medusajs/cli": "^2.
|
|
40
|
-
"@medusajs/framework": "^2.
|
|
41
|
-
"@medusajs/icons": "^2.
|
|
42
|
-
"@medusajs/medusa": "^2.
|
|
43
|
-
"@medusajs/test-utils": "^2.
|
|
44
|
-
"@medusajs/types": "^2.
|
|
45
|
-
"@medusajs/ui": "^4.0.
|
|
46
|
-
"@mikro-orm/cli": "
|
|
47
|
-
"@mikro-orm/core": "
|
|
48
|
-
"@mikro-orm/knex": "
|
|
49
|
-
"@mikro-orm/migrations": "
|
|
50
|
-
"@mikro-orm/postgresql": "
|
|
42
|
+
"@medusajs/admin-sdk": "^2.10.1",
|
|
43
|
+
"@medusajs/cli": "^2.10.1",
|
|
44
|
+
"@medusajs/framework": "^2.10.1",
|
|
45
|
+
"@medusajs/icons": "^2.10.1",
|
|
46
|
+
"@medusajs/medusa": "^2.10.1",
|
|
47
|
+
"@medusajs/test-utils": "^2.10.1",
|
|
48
|
+
"@medusajs/types": "^2.10.1",
|
|
49
|
+
"@medusajs/ui": "^4.0.21",
|
|
50
|
+
"@mikro-orm/cli": "6.4.3",
|
|
51
|
+
"@mikro-orm/core": "6.4.3",
|
|
52
|
+
"@mikro-orm/knex": "6.4.3",
|
|
53
|
+
"@mikro-orm/migrations": "6.4.3",
|
|
54
|
+
"@mikro-orm/postgresql": "6.4.3",
|
|
51
55
|
"@swc/core": "1.5.7",
|
|
52
|
-
"@types/node": "^20.19.
|
|
53
|
-
"@types/react": "^18.3.
|
|
56
|
+
"@types/node": "^20.19.11",
|
|
57
|
+
"@types/react": "^18.3.24",
|
|
54
58
|
"@types/react-dom": "^18.3.7",
|
|
55
59
|
"awilix": "^8.0.1",
|
|
56
|
-
"pg": "^8.16.
|
|
57
|
-
"prettier": "^3.6.
|
|
60
|
+
"pg": "^8.16.3",
|
|
61
|
+
"prettier": "^3.6.2",
|
|
58
62
|
"prop-types": "^15.8.1",
|
|
59
63
|
"react": "^18.2.0",
|
|
60
64
|
"react-dom": "^18.2.0",
|
|
61
65
|
"ts-node": "^10.9.2",
|
|
62
|
-
"typescript": "^5.
|
|
66
|
+
"typescript": "^5.9.2",
|
|
63
67
|
"vite": "^5.4.19",
|
|
64
68
|
"yalc": "^1.0.0-pre.53"
|
|
65
69
|
},
|
|
66
70
|
"peerDependencies": {
|
|
67
|
-
"@medusajs/admin-sdk": "^2.
|
|
68
|
-
"@medusajs/cli": "^2.
|
|
69
|
-
"@medusajs/core-flows": "^2.
|
|
70
|
-
"@medusajs/framework": "^2.
|
|
71
|
-
"@medusajs/icons": "^2.
|
|
72
|
-
"@medusajs/js-sdk": "^2.
|
|
73
|
-
"@medusajs/medusa": "^2.
|
|
74
|
-
"@medusajs/test-utils": "^2.
|
|
71
|
+
"@medusajs/admin-sdk": "^2.10.1",
|
|
72
|
+
"@medusajs/cli": "^2.10.1",
|
|
73
|
+
"@medusajs/core-flows": "^2.10.1",
|
|
74
|
+
"@medusajs/framework": "^2.10.1",
|
|
75
|
+
"@medusajs/icons": "^2.10.1",
|
|
76
|
+
"@medusajs/js-sdk": "^2.10.1",
|
|
77
|
+
"@medusajs/medusa": "^2.10.1",
|
|
78
|
+
"@medusajs/test-utils": "^2.10.1",
|
|
75
79
|
"@medusajs/ui": "^4.0.3",
|
|
76
80
|
"@mikro-orm/cli": "6.4.3",
|
|
77
81
|
"@mikro-orm/core": "6.4.3",
|