@vendure/payments-plugin 1.9.3 → 1.9.5
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/package/braintree/braintree.plugin.js +4 -4
- package/package/mollie/mollie.handler.js +4 -3
- package/package/mollie/mollie.handler.js.map +1 -1
- package/package/mollie/mollie.helpers.d.ts +5 -1
- package/package/mollie/mollie.helpers.js +22 -2
- package/package/mollie/mollie.helpers.js.map +1 -1
- package/package/mollie/mollie.plugin.d.ts +1 -1
- package/package/mollie/mollie.plugin.js +1 -1
- package/package/mollie/mollie.service.d.ts +4 -2
- package/package/mollie/mollie.service.js +25 -5
- package/package/mollie/mollie.service.js.map +1 -1
- package/package.json +10 -5
|
@@ -276,10 +276,10 @@ BraintreePlugin = BraintreePlugin_1 = __decorate([
|
|
|
276
276
|
return config;
|
|
277
277
|
},
|
|
278
278
|
shopApiExtensions: {
|
|
279
|
-
schema: apollo_server_core_1.gql `
|
|
280
|
-
extend type Query {
|
|
281
|
-
generateBraintreeClientToken(orderId: ID, includeCustomerId: Boolean): String!
|
|
282
|
-
}
|
|
279
|
+
schema: apollo_server_core_1.gql `
|
|
280
|
+
extend type Query {
|
|
281
|
+
generateBraintreeClientToken(orderId: ID, includeCustomerId: Boolean): String!
|
|
282
|
+
}
|
|
283
283
|
`,
|
|
284
284
|
resolvers: [braintree_resolver_1.BraintreeResolver],
|
|
285
285
|
},
|
|
@@ -59,7 +59,8 @@ exports.molliePaymentHandler = new core_1.PaymentMethodHandler({
|
|
|
59
59
|
init(injector) {
|
|
60
60
|
mollieService = injector.get(mollie_service_1.MollieService);
|
|
61
61
|
},
|
|
62
|
-
createPayment: async (ctx, order,
|
|
62
|
+
createPayment: async (ctx, order, _amount, // Don't use this amount, but the amount from the metadata
|
|
63
|
+
args, metadata) => {
|
|
63
64
|
// Only Admins and internal calls should be allowed to settle and authorize payments
|
|
64
65
|
if (ctx.apiType !== 'admin') {
|
|
65
66
|
throw Error(`CreatePayment is not allowed for apiType '${ctx.apiType}'`);
|
|
@@ -67,9 +68,9 @@ exports.molliePaymentHandler = new core_1.PaymentMethodHandler({
|
|
|
67
68
|
if (metadata.status !== 'Authorized' && metadata.status !== 'Settled') {
|
|
68
69
|
throw Error(`Cannot create payment for status ${metadata.status} for order ${order.code}. Only Authorized or Settled are allowed.`);
|
|
69
70
|
}
|
|
70
|
-
core_1.Logger.info(`Payment for order ${order.code} created with state '${metadata.status}'`, constants_1.loggerCtx);
|
|
71
|
+
core_1.Logger.info(`Payment for order ${order.code} with amount ${metadata.amount} created with state '${metadata.status}'`, constants_1.loggerCtx);
|
|
71
72
|
return {
|
|
72
|
-
amount,
|
|
73
|
+
amount: metadata.amount,
|
|
73
74
|
state: metadata.status,
|
|
74
75
|
transactionId: metadata.orderId,
|
|
75
76
|
metadata, // Store all given metadata on a payment
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mollie.handler.js","sourceRoot":"","sources":["../../src/mollie/mollie.handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAiG;AACjG,yEAAmE;AACnE,wCAOuB;AAEvB,2CAAwC;AACxC,qDAA4C;AAC5C,qDAAiD;AAEjD,IAAI,aAA4B,CAAC;AACpB,QAAA,oBAAoB,GAAG,IAAI,2BAAoB,CAAC;IACzD,IAAI,EAAE,wBAAwB;IAC9B,WAAW,EAAE;QACT;YACI,YAAY,EAAE,8BAAY,CAAC,EAAE;YAC7B,KAAK,EAAE,gBAAgB;SAC1B;KACJ;IACD,IAAI,EAAE;QACF,MAAM,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,CAAC,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;SAC/D;QACD,WAAW,EAAE;YACT,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,CAAC,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;YACjE,WAAW,EAAE;gBACT,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,+CAA+C,EAAE;aAC5F;SACJ;QACD,WAAW,EAAE;YACT,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,CAAC,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC;YAC1E,YAAY,EAAE,KAAK;YACnB,WAAW,EAAE;gBACT,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,0OAA0O,EAAE;aACvR;SACJ;KACJ;IACD,IAAI,CAAC,QAAQ;QACT,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,8BAAa,CAAC,CAAC;IAChD,CAAC;IACD,aAAa,EAAE,KAAK,EAChB,GAAG,EACH,KAAK,EACL,
|
|
1
|
+
{"version":3,"file":"mollie.handler.js","sourceRoot":"","sources":["../../src/mollie/mollie.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,11 +11,15 @@ export declare function toMollieAddress(address: OrderAddress, customer: Custome
|
|
|
11
11
|
/**
|
|
12
12
|
* Map all order and shipping lines to a single array of Mollie order lines
|
|
13
13
|
*/
|
|
14
|
-
export declare function toMollieOrderLines(order: Order): CreateParameters['lines'];
|
|
14
|
+
export declare function toMollieOrderLines(order: Order, alreadyPaid: number): CreateParameters['lines'];
|
|
15
15
|
/**
|
|
16
16
|
* Stringify and fixed decimals
|
|
17
17
|
*/
|
|
18
18
|
export declare function toAmount(value: number, orderCurrency: string): Amount;
|
|
19
|
+
/**
|
|
20
|
+
* Return to number of cents
|
|
21
|
+
*/
|
|
22
|
+
export declare function amountToCents(amount: Amount): number;
|
|
19
23
|
/**
|
|
20
24
|
* Recalculate tax amount per order line instead of per unit for Mollie.
|
|
21
25
|
* Vendure calculates tax per unit, but Mollie expects the tax to be calculated per order line (the total of the quantities).
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getLocale = exports.calculateLineTaxAmount = exports.toAmount = exports.toMollieOrderLines = exports.toMollieAddress = void 0;
|
|
6
|
+
exports.getLocale = exports.calculateLineTaxAmount = exports.amountToCents = exports.toAmount = exports.toMollieOrderLines = exports.toMollieAddress = void 0;
|
|
7
|
+
const currency_js_1 = __importDefault(require("currency.js"));
|
|
4
8
|
/**
|
|
5
9
|
* Check if given address has mandatory fields for Mollie Order and map to a MollieOrderAddress.
|
|
6
10
|
* Returns undefined if address doesn't have all mandatory fields
|
|
@@ -22,7 +26,7 @@ exports.toMollieAddress = toMollieAddress;
|
|
|
22
26
|
/**
|
|
23
27
|
* Map all order and shipping lines to a single array of Mollie order lines
|
|
24
28
|
*/
|
|
25
|
-
function toMollieOrderLines(order) {
|
|
29
|
+
function toMollieOrderLines(order, alreadyPaid) {
|
|
26
30
|
// Add order lines
|
|
27
31
|
const lines = order.lines.map(line => ({
|
|
28
32
|
name: line.productVariant.name,
|
|
@@ -53,6 +57,15 @@ function toMollieOrderLines(order) {
|
|
|
53
57
|
vatRate: String(surcharge.taxRate),
|
|
54
58
|
vatAmount: toAmount(surcharge.priceWithTax - surcharge.price, order.currencyCode),
|
|
55
59
|
})));
|
|
60
|
+
// Deduct amount already paid
|
|
61
|
+
lines.push({
|
|
62
|
+
name: 'Already paid',
|
|
63
|
+
quantity: 1,
|
|
64
|
+
unitPrice: toAmount(-alreadyPaid, order.currencyCode),
|
|
65
|
+
totalAmount: toAmount(-alreadyPaid, order.currencyCode),
|
|
66
|
+
vatRate: String(0),
|
|
67
|
+
vatAmount: toAmount(0, order.currencyCode),
|
|
68
|
+
});
|
|
56
69
|
return lines;
|
|
57
70
|
}
|
|
58
71
|
exports.toMollieOrderLines = toMollieOrderLines;
|
|
@@ -66,6 +79,13 @@ function toAmount(value, orderCurrency) {
|
|
|
66
79
|
};
|
|
67
80
|
}
|
|
68
81
|
exports.toAmount = toAmount;
|
|
82
|
+
/**
|
|
83
|
+
* Return to number of cents
|
|
84
|
+
*/
|
|
85
|
+
function amountToCents(amount) {
|
|
86
|
+
return currency_js_1.default(amount.value).intValue;
|
|
87
|
+
}
|
|
88
|
+
exports.amountToCents = amountToCents;
|
|
69
89
|
/**
|
|
70
90
|
* Recalculate tax amount per order line instead of per unit for Mollie.
|
|
71
91
|
* Vendure calculates tax per unit, but Mollie expects the tax to be calculated per order line (the total of the quantities).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mollie.helpers.js","sourceRoot":"","sources":["../../src/mollie/mollie.helpers.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"mollie.helpers.js","sourceRoot":"","sources":["../../src/mollie/mollie.helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ export interface MolliePluginOptions {
|
|
|
16
16
|
/**
|
|
17
17
|
* @description
|
|
18
18
|
* Plugin to enable payments through the [Mollie platform](https://docs.mollie.com/).
|
|
19
|
-
* This plugin uses the
|
|
19
|
+
* This plugin uses the Order API from Mollie, not the Payments API.
|
|
20
20
|
*
|
|
21
21
|
* ## Requirements
|
|
22
22
|
*
|
|
@@ -18,7 +18,7 @@ const mollie_service_1 = require("./mollie.service");
|
|
|
18
18
|
/**
|
|
19
19
|
* @description
|
|
20
20
|
* Plugin to enable payments through the [Mollie platform](https://docs.mollie.com/).
|
|
21
|
-
* This plugin uses the
|
|
21
|
+
* This plugin uses the Order API from Mollie, not the Payments API.
|
|
22
22
|
*
|
|
23
23
|
* ## Requirements
|
|
24
24
|
*
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Order as MollieOrder } from '@mollie/api-client';
|
|
2
|
-
import { ActiveOrderService, ChannelService, EntityHydrator, Order, OrderService, PaymentMethodService, RequestContext } from '@vendure/core';
|
|
2
|
+
import { ActiveOrderService, ChannelService, EntityHydrator, Order, OrderService, PaymentMethodService, ProductVariant, ProductVariantService, RequestContext } from '@vendure/core';
|
|
3
3
|
import { MolliePaymentIntentInput, MolliePaymentIntentResult, MolliePaymentMethod } from './graphql/generated-shop-types';
|
|
4
4
|
import { MolliePluginOptions } from './mollie.plugin';
|
|
5
5
|
interface OrderStatusInput {
|
|
@@ -14,7 +14,8 @@ export declare class MollieService {
|
|
|
14
14
|
private orderService;
|
|
15
15
|
private channelService;
|
|
16
16
|
private entityHydrator;
|
|
17
|
-
|
|
17
|
+
private variantService;
|
|
18
|
+
constructor(paymentMethodService: PaymentMethodService, options: MolliePluginOptions, activeOrderService: ActiveOrderService, orderService: OrderService, channelService: ChannelService, entityHydrator: EntityHydrator, variantService: ProductVariantService);
|
|
18
19
|
/**
|
|
19
20
|
* Creates a redirectUrl to Mollie for the given paymentMethod and current activeOrder
|
|
20
21
|
*/
|
|
@@ -32,6 +33,7 @@ export declare class MollieService {
|
|
|
32
33
|
*/
|
|
33
34
|
settleExistingPayment(ctx: RequestContext, order: Order, mollieOrderId: string): Promise<void>;
|
|
34
35
|
getEnabledPaymentMethods(ctx: RequestContext, paymentMethodCode: string): Promise<MolliePaymentMethod[]>;
|
|
36
|
+
getVariantsWithInsufficientStock(ctx: RequestContext, order: Order): Promise<ProductVariant[]>;
|
|
35
37
|
private getPaymentMethod;
|
|
36
38
|
private createContext;
|
|
37
39
|
}
|
|
@@ -35,6 +35,7 @@ exports.MollieService = void 0;
|
|
|
35
35
|
const api_client_1 = __importStar(require("@mollie/api-client"));
|
|
36
36
|
const common_1 = require("@nestjs/common");
|
|
37
37
|
const core_1 = require("@vendure/core");
|
|
38
|
+
const order_utils_1 = require("@vendure/core/dist/service/helpers/utils/order-utils");
|
|
38
39
|
const constants_1 = require("./constants");
|
|
39
40
|
const generated_shop_types_1 = require("./graphql/generated-shop-types");
|
|
40
41
|
const mollie_helpers_1 = require("./mollie.helpers");
|
|
@@ -51,13 +52,14 @@ class InvalidInputError {
|
|
|
51
52
|
}
|
|
52
53
|
}
|
|
53
54
|
let MollieService = class MollieService {
|
|
54
|
-
constructor(paymentMethodService, options, activeOrderService, orderService, channelService, entityHydrator) {
|
|
55
|
+
constructor(paymentMethodService, options, activeOrderService, orderService, channelService, entityHydrator, variantService) {
|
|
55
56
|
this.paymentMethodService = paymentMethodService;
|
|
56
57
|
this.options = options;
|
|
57
58
|
this.activeOrderService = activeOrderService;
|
|
58
59
|
this.orderService = orderService;
|
|
59
60
|
this.channelService = channelService;
|
|
60
61
|
this.entityHydrator = entityHydrator;
|
|
62
|
+
this.variantService = variantService;
|
|
61
63
|
}
|
|
62
64
|
/**
|
|
63
65
|
* Creates a redirectUrl to Mollie for the given paymentMethod and current activeOrder
|
|
@@ -75,7 +77,7 @@ let MollieService = class MollieService {
|
|
|
75
77
|
if (!order) {
|
|
76
78
|
return new PaymentIntentError('No active order found for session');
|
|
77
79
|
}
|
|
78
|
-
await this.entityHydrator.hydrate(ctx, order, { relations: ['customer', 'surcharges', 'lines.productVariant', 'shippingLines.shippingMethod'] });
|
|
80
|
+
await this.entityHydrator.hydrate(ctx, order, { relations: ['customer', 'surcharges', 'lines.productVariant', 'shippingLines.shippingMethod', 'payments'] });
|
|
79
81
|
if (!((_a = order.lines) === null || _a === void 0 ? void 0 : _a.length)) {
|
|
80
82
|
return new PaymentIntentError('Cannot create payment intent for empty order');
|
|
81
83
|
}
|
|
@@ -88,6 +90,10 @@ let MollieService = class MollieService {
|
|
|
88
90
|
if (!paymentMethod) {
|
|
89
91
|
return new PaymentIntentError(`No paymentMethod found with code ${paymentMethodCode}`);
|
|
90
92
|
}
|
|
93
|
+
const variantsWithInsufficientSaleableStock = await this.getVariantsWithInsufficientStock(ctx, order);
|
|
94
|
+
if (variantsWithInsufficientSaleableStock.length) {
|
|
95
|
+
return new PaymentIntentError(`The following variants are out of stock: ${variantsWithInsufficientSaleableStock.map(v => v.name).join(', ')}`);
|
|
96
|
+
}
|
|
91
97
|
const apiKey = (_c = paymentMethod.handler.args.find(arg => arg.name === 'apiKey')) === null || _c === void 0 ? void 0 : _c.value;
|
|
92
98
|
let redirectUrl = (_d = paymentMethod.handler.args.find(arg => arg.name === 'redirectUrl')) === null || _d === void 0 ? void 0 : _d.value;
|
|
93
99
|
if (!apiKey || !redirectUrl) {
|
|
@@ -103,14 +109,16 @@ let MollieService = class MollieService {
|
|
|
103
109
|
if (!billingAddress) {
|
|
104
110
|
return new InvalidInputError(`Order doesn't have a complete shipping address or billing address. At least city, streetline1 and country are needed to create a payment intent.`);
|
|
105
111
|
}
|
|
112
|
+
const alreadyPaid = order_utils_1.totalCoveredByPayments(order);
|
|
113
|
+
const amountToPay = order.totalWithTax - alreadyPaid;
|
|
106
114
|
const orderInput = {
|
|
107
115
|
orderNumber: order.code,
|
|
108
|
-
amount: mollie_helpers_1.toAmount(
|
|
116
|
+
amount: mollie_helpers_1.toAmount(amountToPay, order.currencyCode),
|
|
109
117
|
redirectUrl: `${redirectUrl}/${order.code}`,
|
|
110
118
|
webhookUrl: `${vendureHost}/payments/mollie/${ctx.channel.token}/${paymentMethod.id}`,
|
|
111
119
|
billingAddress,
|
|
112
120
|
locale: mollie_helpers_1.getLocale(billingAddress.country, ctx.languageCode),
|
|
113
|
-
lines: mollie_helpers_1.toMollieOrderLines(order),
|
|
121
|
+
lines: mollie_helpers_1.toMollieOrderLines(order, alreadyPaid),
|
|
114
122
|
};
|
|
115
123
|
if (molliePaymentMethodCode) {
|
|
116
124
|
orderInput.method = molliePaymentMethodCode;
|
|
@@ -186,6 +194,7 @@ let MollieService = class MollieService {
|
|
|
186
194
|
const addPaymentToOrderResult = await this.orderService.addPaymentToOrder(ctx, order.id, {
|
|
187
195
|
method: paymentMethodCode,
|
|
188
196
|
metadata: {
|
|
197
|
+
amount: mollie_helpers_1.amountToCents(mollieOrder.amount),
|
|
189
198
|
status,
|
|
190
199
|
orderId: mollieOrder.id,
|
|
191
200
|
mode: mollieOrder.mode,
|
|
@@ -225,6 +234,16 @@ let MollieService = class MollieService {
|
|
|
225
234
|
const methods = await client.methods.list();
|
|
226
235
|
return methods.map(m => (Object.assign(Object.assign({}, m), { code: m.id })));
|
|
227
236
|
}
|
|
237
|
+
async getVariantsWithInsufficientStock(ctx, order) {
|
|
238
|
+
const variantsWithInsufficientSaleableStock = [];
|
|
239
|
+
for (const line of order.lines) {
|
|
240
|
+
const availableStock = await this.variantService.getSaleableStockLevel(ctx, line.productVariant);
|
|
241
|
+
if (line.quantity > availableStock) {
|
|
242
|
+
variantsWithInsufficientSaleableStock.push(line.productVariant);
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
return variantsWithInsufficientSaleableStock;
|
|
246
|
+
}
|
|
228
247
|
async getPaymentMethod(ctx, paymentMethodCode) {
|
|
229
248
|
const paymentMethods = await this.paymentMethodService.findAll(ctx);
|
|
230
249
|
return paymentMethods.items.find(pm => pm.code === paymentMethodCode);
|
|
@@ -246,7 +265,8 @@ MollieService = __decorate([
|
|
|
246
265
|
__metadata("design:paramtypes", [core_1.PaymentMethodService, Object, core_1.ActiveOrderService,
|
|
247
266
|
core_1.OrderService,
|
|
248
267
|
core_1.ChannelService,
|
|
249
|
-
core_1.EntityHydrator
|
|
268
|
+
core_1.EntityHydrator,
|
|
269
|
+
core_1.ProductVariantService])
|
|
250
270
|
], MollieService);
|
|
251
271
|
exports.MollieService = MollieService;
|
|
252
272
|
//# sourceMappingURL=mollie.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mollie.service.js","sourceRoot":"","sources":["../../src/mollie/mollie.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAI4B;AAE5B,2CAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"mollie.service.js","sourceRoot":"","sources":["../../src/mollie/mollie.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vendure/payments-plugin",
|
|
3
|
-
"version": "1.9.
|
|
3
|
+
"version": "1.9.5",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "package/index.js",
|
|
6
6
|
"types": "package/index.d.ts",
|
|
@@ -26,17 +26,22 @@
|
|
|
26
26
|
"braintree": "3.x",
|
|
27
27
|
"stripe": "8.x"
|
|
28
28
|
},
|
|
29
|
+
"dependencies": {
|
|
30
|
+
"currency.js": "2.0.4"
|
|
31
|
+
},
|
|
29
32
|
"devDependencies": {
|
|
30
33
|
"@mollie/api-client": "^3.6.0",
|
|
31
34
|
"@types/braintree": "^2.22.15",
|
|
32
|
-
"@
|
|
33
|
-
"@vendure/
|
|
34
|
-
"@vendure/
|
|
35
|
+
"@types/localtunnel": "2.0.1",
|
|
36
|
+
"@vendure/common": "^1.9.5",
|
|
37
|
+
"@vendure/core": "^1.9.5",
|
|
38
|
+
"@vendure/testing": "^1.9.5",
|
|
35
39
|
"braintree": "^3.0.0",
|
|
40
|
+
"localtunnel": "2.0.1",
|
|
36
41
|
"nock": "^13.1.4",
|
|
37
42
|
"rimraf": "^3.0.2",
|
|
38
43
|
"stripe": "^8.197.0",
|
|
39
44
|
"typescript": "4.3.5"
|
|
40
45
|
},
|
|
41
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "09ae64ec5050d81b500ab7bcff27a92a322098da"
|
|
42
47
|
}
|