@unchainedshop/plugins 3.0.0-alpha7 → 3.0.0-rc10

package/lib/payment/datatrans-v2/index.js

@@ -1,9 +1,8 @@
-import { PaymentAdapter, PaymentError, PaymentDirector } from '@unchainedshop/core-payment';
 import { createLogger } from '@unchainedshop/logger';
-import { PaymentPricingRowCategory } from '@unchainedshop/core-payment';
 import createDatatransAPI from './api/index.js';
 import parseRegistrationData from './parseRegistrationData.js';
 import roundedAmountFromOrder from './roundedAmountFromOrder.js';
+import { PaymentAdapter, PaymentDirector, PaymentError, PaymentPricingRowCategory, PaymentPricingSheet, OrderPricingSheet, } from '@unchainedshop/core';
 export * from './middleware.js';
 const logger = createLogger('unchained:core-payment:datatrans');
 // v2
@@ -33,10 +32,9 @@ const Datatrans = {
     typeSupported(type) {
         return type === 'GENERIC';
     },
-    actions: (params) => {
-        const { modules } = params.context;
+    actions: (config, context) => {
         const getMerchantId = () => {
-            return params.config.find((item) => item.key === 'merchantId')?.value || DATATRANS_MERCHANT_ID;
+            return config.find((item) => item.key === 'merchantId')?.value || DATATRANS_MERCHANT_ID;
         };
         const api = () => {
             if (!DATATRANS_SECRET)
@@ -44,18 +42,24 @@ const Datatrans = {
             return createDatatransAPI(DATATRANS_API_ENDPOINT, getMerchantId(), DATATRANS_SECRET);
         };
         const shouldSettleInUnchained = () => {
-            return params.config.reduce((current, item) => {
+            return config.reduce((current, item) => {
                 if (item.key === 'settleInUnchained')
                     return Boolean(item.value);
                 return current;
             }, true);
         };
         const getMarketplaceSplits = async () => {
-            const { order, orderPayment } = params.paymentContext;
-            const pricingForOrderPayment = modules.orders.payments.pricingSheet(orderPayment, order.currency, params.context);
-            const pricing = modules.orders.pricingSheet(order);
+            const { order, orderPayment } = context;
+            const pricingForOrderPayment = PaymentPricingSheet({
+                calculation: orderPayment.calculation,
+                currency: order.currency,
+            });
+            const pricing = OrderPricingSheet({
+                calculation: order.calculation,
+                currency: order.currency,
+            });
             const { amount: total } = pricing.total({ useNetPrice: false });
-            return Promise.all(params.config
+            return Promise.all(config
                 .filter((item) => item.key === 'marketplaceSplit')
                 .map((item) => {
                 const [subMerchantId, staticDiscountId, sharePercentage] = item.value
@@ -76,11 +80,11 @@ const Datatrans = {
             }));
         };
         const authorize = async ({ paymentCredentials, ...arbitraryFields }) => {
-            const { order, orderPayment } = params.paymentContext;
+            const { order, orderPayment } = context;
             const refno = Buffer.from(orderPayment._id, 'hex').toString('base64');
-            const userId = order?.userId || params.paymentContext?.userId;
+            const userId = order?.userId || context?.userId;
             const refno2 = userId;
-            const { currency, amount } = roundedAmountFromOrder(order, params.context);
+            const { currency, amount } = roundedAmountFromOrder(order);
             const splits = await getMarketplaceSplits();
             const result = await api().authorize({
                 ...arbitraryFields,
@@ -103,8 +107,8 @@ const Datatrans = {
             return result.transactionId;
         };
         const authorizeAuth = async ({ transactionId, refno, refno2, ...arbitraryFields }) => {
-            const { order } = params.paymentContext;
-            const { currency, amount } = roundedAmountFromOrder(order, params.context);
+            const { order } = context;
+            const { currency, amount } = roundedAmountFromOrder(order);
             const result = await api().authorizeAuthenticated({
                 ...arbitraryFields,
                 transactionId,
@@ -118,11 +122,11 @@ const Datatrans = {
             return result.acquirerAuthorizationCode;
         };
         const isTransactionAmountValid = (transaction) => {
-            const { order } = params.paymentContext;
-            const { currency, amount } = roundedAmountFromOrder(order, params.context);
+            const { order } = context;
+            const { currency, amount } = roundedAmountFromOrder(order);
             if (transaction.currency !== currency ||
                 transaction.detail.authorize?.amount !== amount) {
-                logger.verbose(`currency: ${transaction.currency} === ${currency} => ${transaction.currency === currency}, amount: ${transaction.detail.authorize?.amount} === ${amount} => ${transaction.detail.authorize?.amount === amount}`);
+                logger.info(`currency: ${transaction.currency} === ${currency} => ${transaction.currency === currency}, amount: ${transaction.detail.authorize?.amount} === ${amount} => ${transaction.detail.authorize?.amount === amount}`);
                 return false;
             }
             return true;
@@ -137,8 +141,8 @@ const Datatrans = {
             }
         };
         const settle = async ({ transactionId, refno, refno2, extensions }) => {
-            const { order } = params.paymentContext;
-            const { currency, amount } = roundedAmountFromOrder(order, params.context);
+            const { order } = context;
+            const { currency, amount } = roundedAmountFromOrder(order);
             const splits = await getMarketplaceSplits();
             const result = await api().settle({
                 transactionId,
@@ -165,7 +169,7 @@ const Datatrans = {
             return result;
         };
         const adapterActions = {
-            ...PaymentAdapter.actions(params),
+            ...PaymentAdapter.actions(config, context),
             configurationError() {
                 if (!getMerchantId() || !DATATRANS_SECRET || !DATATRANS_SIGN_KEY) {
                     return PaymentError.INCOMPLETE_CONFIGURATION;
@@ -182,13 +186,11 @@ const Datatrans = {
             },
             async sign(transactionContext = {}) {
                 const { useSecureFields = false, ...arbitraryFields } = transactionContext || {};
-                const { orderPayment, paymentProviderId, order } = params.paymentContext;
+                const { orderPayment, paymentProviderId, order } = context;
                 const refno = Buffer.from(orderPayment ? orderPayment._id : paymentProviderId, 'hex').toString('base64');
-                const userId = order?.userId || params.paymentContext?.userId;
+                const userId = order?.userId || context?.userId;
                 const refno2 = userId;
-                const price = order
-                    ? roundedAmountFromOrder(order, params.context)
-                    : {};
+                const price = order ? roundedAmountFromOrder(order) : {};
                 if (useSecureFields) {
                     const result = await api().secureFields({
                         ...arbitraryFields,
@@ -240,7 +242,7 @@ const Datatrans = {
             async confirm() {
                 if (!shouldSettleInUnchained())
                     return false;
-                const { orderPayment, transactionContext } = params.paymentContext;
+                const { orderPayment, transactionContext } = context;
                 const { transactionId } = orderPayment;
                 const { extensions } = transactionContext || {};
                 if (!transactionId) {
@@ -267,7 +269,7 @@ const Datatrans = {
             async cancel() {
                 if (!shouldSettleInUnchained())
                     return false;
-                const { orderPayment } = params.paymentContext;
+                const { orderPayment } = context;
                 const { transactionId } = orderPayment;
                 if (!transactionId) {
                     return false;
@@ -343,7 +345,7 @@ const Datatrans = {
                     // at the dumbest possible moment
                     try {
                         checkIfTransactionAmountValid(transactionId, settledTransaction);
-                        credentials = parseRegistrationData(settledTransaction);
+                        credentials = await parseRegistrationData(settledTransaction);
                         const result = await api().status({
                             transactionId,
                         });

package/lib/payment/datatrans-v2/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/index.ts"],"names":[],"mappings":"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"}

package/lib/payment/datatrans-v2/middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/middleware.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,gBAAgB,uCA2E5B,CAAC"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/middleware.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,gBAAgB,uCAwE5B,CAAC"}

package/lib/payment/datatrans-v2/middleware.js

@@ -4,13 +4,13 @@ const { DATATRANS_SIGN_KEY, DATATRANS_SIGN2_KEY, DATATRANS_SECURITY = Security.D
 const logger = createLogger('unchained:core-payment:datatrans:webhook');
 export const datatransHandler = async (req, res) => {
     const resolvedContext = req.unchainedContext;
-    const { modules } = resolvedContext;
+    const { modules, services } = resolvedContext;
     const signature = req.headers['datatrans-signature'];
     if (req.method === 'POST' && signature) {
         const [rawTimestamp, rawHash] = signature.split(',');
         const [, hash] = rawHash.split('=');
         const [, timestamp] = rawTimestamp.split('=');
-        const comparableSignature = generateSignature({
+        const comparableSignature = await generateSignature({
             security: DATATRANS_SECURITY,
             signKey: DATATRANS_SIGN2_KEY || DATATRANS_SIGN_KEY,
         })(timestamp, req.body);
@@ -21,7 +21,7 @@ export const datatransHandler = async (req, res) => {
             return;
         }
         const transaction = JSON.parse(req.body);
-        logger.verbose(`received request`, {
+        logger.info(`received request`, {
             type: transaction.type,
         });
         if (transaction.status === 'authorized') {
@@ -30,7 +30,7 @@ export const datatransHandler = async (req, res) => {
             try {
                 if (transaction.type === 'card_check') {
                     const paymentProviderId = referenceId;
-                    const paymentCredentials = await modules.payment.registerCredentials(paymentProviderId, { userId, transactionContext: { transactionId: transaction.transactionId } }, resolvedContext);
+                    const paymentCredentials = await services.orders.registerPaymentCredentials(paymentProviderId, { userId, transactionContext: { transactionId: transaction.transactionId } });
                     logger.info(`registered payment credentials for ${userId}`, {
                         userId,
                     });
@@ -45,7 +45,9 @@ export const datatransHandler = async (req, res) => {
                     });
                     if (!orderPayment)
                         throw new Error(`Order Payment with id ${orderPaymentId} not found`);
-                    const order = await modules.orders.checkout(orderPayment.orderId, { paymentContext: { userId, transactionId: transaction.transactionId } }, resolvedContext);
+                    const order = await services.orders.checkoutOrder(orderPayment.orderId, {
+                        paymentContext: { userId, transactionId: transaction.transactionId },
+                    });
                     res.writeHead(200);
                     logger.info(`confirmed checkout for order ${order.orderNumber}`, {
                         orderId: order._id,

package/lib/payment/datatrans-v2/middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,iBAAiB,EAAE,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAIrE,MAAM,EACJ,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,GAAG,QAAQ,CAAC,YAAY,GAC3C,GAAG,OAAO,CAAC,GAAG,CAAC;AAEhB,MAAM,MAAM,GAAG,YAAY,CAAC,0CAA0C,CAAC,CAAC;AAExE,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACjD,MAAM,eAAe,GAAG,GAAG,CAAC,gBAA2B,CAAC;IACxD,MAAM,EAAE,OAAO,EAAE,GAAG,eAAe,CAAC;IACpC,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACrD,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,IAAI,SAAS,EAAE,CAAC;QACvC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrD,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpC,MAAM,CAAC,EAAE,SAAS,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE9C,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;YAC5C,QAAQ,EAAE,kBAAyB;YACnC,OAAO,EAAE,mBAAmB,IAAI,kBAAkB;SACnD,CAAC,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAExB,IAAI,IAAI,KAAK,mBAAmB,EAAE,CAAC;YACjC,MAAM,CAAC,KAAK,CAAC,kBAAkB,SAAS,MAAM,mBAAmB,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;YAC/E,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACnB,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YACzB,OAAO;QACT,CAAC;QAED,MAAM,WAAW,GAA0B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAA0B,CAAC;QAEzF,MAAM,CAAC,OAAO,CAAC,kBAAkB,EAAE;YACjC,IAAI,EAAE,WAAW,CAAC,IAAI;SACvB,CAAC,CAAC;QAEH,IAAI,WAAW,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;YACxC,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;YAClC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAE7E,IAAI,CAAC;gBACH,IAAI,WAAW,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBACtC,MAAM,iBAAiB,GAAG,WAAW,CAAC;oBACtC,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAClE,iBAAiB,EACjB,EAAE,MAAM,EAAE,kBAAkB,EAAE,EAAE,aAAa,EAAE,WAAW,CAAC,aAAa,EAAE,EAAE,EAC5E,eAAe,CAChB,CAAC;oBACF,MAAM,CAAC,IAAI,CAAC,sCAAsC,MAAM,EAAE,EAAE;wBAC1D,MAAM;qBACP,CAAC,CAAC;oBACH,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;oBACnB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,CAAC;oBAC5C,OAAO;gBACT,CAAC;gBACD,IAAI,WAAW,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBACnC,MAAM,cAAc,GAAG,WAAW,CAAC;oBACnC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;wBAClE,cAAc;qBACf,CAAC,CAAC;oBACH,IAAI,CAAC,YAAY;wBAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,cAAc,YAAY,CAAC,CAAC;oBAExF,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CACzC,YAAY,CAAC,OAAO,EACpB,EAAE,cAAc,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,CAAC,aAAa,EAAE,EAAE,EACxE,eAAe,CAChB,CAAC;oBACF,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;oBACnB,MAAM,CAAC,IAAI,CAAC,gCAAgC,KAAK,CAAC,WAAW,EAAE,EAAE;wBAC/D,OAAO,EAAE,KAAK,CAAC,GAAG;qBACnB,CAAC,CAAC;oBACH,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;oBAC/B,OAAO;gBACT,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAC;gBACrD,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;gBAC5E,OAAO;YACT,CAAC;QACH,CAAC;IACH,CAAC;IACD,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACnB,GAAG,CAAC,GAAG,EAAE,CAAC;AACZ,CAAC,CAAC"}
+{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/middleware.ts"],"names":[],"mappings":"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"}

package/lib/payment/datatrans-v2/parseRegistrationData.d.ts

@@ -1,12 +1,12 @@
-import type { StatusResponseSuccess } from './api/types.js';
-export default function parseRegistrationData(transaction: StatusResponseSuccess): {
+import { StatusResponseSuccess } from './api/types.js';
+export default function parseRegistrationData(transaction: StatusResponseSuccess): Promise<{
+    _id: string;
     paymentMethod: import("./api/types.js").PaymentMethod;
     currency: string;
     language: import("./api/types.js").SupportedLanguage;
     type: import("./api/types.js").TransactionType;
-    _id?: string;
     token?: Record<string, unknown>;
     info?: Record<string, unknown>;
     objectKey?: string;
-};
+}>;
 //# sourceMappingURL=parseRegistrationData.d.ts.map

package/lib/payment/datatrans-v2/parseRegistrationData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseRegistrationData.d.ts","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/parseRegistrationData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAE5D,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAAC,WAAW,EAAE,qBAAqB;;;;;UAatE,MAAM;YACJ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;WACxB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;gBAClB,MAAM;EAYrB"}
+{"version":3,"file":"parseRegistrationData.d.ts","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/parseRegistrationData.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAGvD,wBAA8B,qBAAqB,CAAC,WAAW,EAAE,qBAAqB;;;;;;YAY1E,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;WACxB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;gBAClB,MAAM;GAerB"}

package/lib/payment/datatrans-v2/parseRegistrationData.js

@@ -1,10 +1,10 @@
 import splitProperties from './splitProperties.js';
-export default function parseRegistrationData(transaction) {
+import { sha256 } from '@unchainedshop/utils';
+export default async function parseRegistrationData(transaction) {
     const parsed = Object.entries(transaction).reduce((acc, [objectKey, payload]) => {
-        const { token, info, _id } = splitProperties({ objectKey, payload });
+        const { token, info } = splitProperties({ objectKey, payload });
         if (token) {
             return {
-                _id,
                 token,
                 info,
                 objectKey,
@@ -13,8 +13,10 @@ export default function parseRegistrationData(transaction) {
         return acc;
     }, {});
     if (parsed.objectKey) {
+        const _id = await sha256(parsed.token);
         return {
             ...parsed,
+            _id,
             paymentMethod: transaction.paymentMethod,
             currency: transaction.currency,
             language: transaction.language,

package/lib/payment/datatrans-v2/parseRegistrationData.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseRegistrationData.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/parseRegistrationData.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,sBAAsB,CAAC;AAGnD,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAAC,WAAkC;IAC9E,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE;QAC9E,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,eAAe,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;QACrE,IAAI,KAAK,EAAE,CAAC;YACV,OAAO;gBACL,GAAG;gBACH,KAAK;gBACL,IAAI;gBACJ,SAAS;aACV,CAAC;QACJ,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAKJ,CAAC;IACF,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,OAAO;YACL,GAAG,MAAM;YACT,aAAa,EAAE,WAAW,CAAC,aAAa;YACxC,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,IAAI,EAAE,WAAW,CAAC,IAAI;SACvB,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"parseRegistrationData.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/parseRegistrationData.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,qBAAqB,CAAC,WAAkC;IACpF,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE;QAC9E,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,eAAe,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;QAChE,IAAI,KAAK,EAAE,CAAC;YACV,OAAO;gBACL,KAAK;gBACL,IAAI;gBACJ,SAAS;aACV,CAAC;QACJ,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAIJ,CAAC;IACF,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAEvC,OAAO;YACL,GAAG,MAAM;YACT,GAAG;YACH,aAAa,EAAE,WAAW,CAAC,aAAa;YACxC,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,IAAI,EAAE,WAAW,CAAC,IAAI;SACvB,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/lib/payment/datatrans-v2/roundedAmountFromOrder.d.ts

@@ -1,6 +1,5 @@
-import { UnchainedCore } from '@unchainedshop/core';
 import { Order } from '@unchainedshop/core-orders';
-declare const roundedAmountFromOrder: (order: Order, context: UnchainedCore) => {
+declare const roundedAmountFromOrder: (order: Order) => {
     currency: string;
     amount: number;
 };

package/lib/payment/datatrans-v2/roundedAmountFromOrder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"roundedAmountFromOrder.d.ts","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/roundedAmountFromOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAEnD,QAAA,MAAM,sBAAsB,UACnB,KAAK,WACH,aAAa,KACrB;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAOpC,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"roundedAmountFromOrder.d.ts","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/roundedAmountFromOrder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAEnD,QAAA,MAAM,sBAAsB,UAAW,KAAK,KAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAUhF,CAAC;AAEF,eAAe,sBAAsB,CAAC"}

package/lib/payment/datatrans-v2/roundedAmountFromOrder.js

@@ -1,5 +1,9 @@
-const roundedAmountFromOrder = (order, context) => {
-    const pricing = context.modules.orders.pricingSheet(order);
+import { OrderPricingSheet } from '@unchainedshop/core';
+const roundedAmountFromOrder = (order) => {
+    const pricing = OrderPricingSheet({
+        calculation: order.calculation,
+        currency: order.currency,
+    });
     const { currency, amount } = pricing.total({ useNetPrice: false });
     return {
         currency,

package/lib/payment/datatrans-v2/roundedAmountFromOrder.js.map

@@ -1 +1 @@
-{"version":3,"file":"roundedAmountFromOrder.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/roundedAmountFromOrder.ts"],"names":[],"mappings":"AAGA,MAAM,sBAAsB,GAAG,CAC7B,KAAY,EACZ,OAAsB,EACgB,EAAE;IACxC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAC3D,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;IACnE,OAAO;QACL,QAAQ;QACR,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;KAC3B,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"roundedAmountFromOrder.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/roundedAmountFromOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGxD,MAAM,sBAAsB,GAAG,CAAC,KAAY,EAAwC,EAAE;IACpF,MAAM,OAAO,GAAG,iBAAiB,CAAC;QAChC,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,QAAQ,EAAE,KAAK,CAAC,QAAQ;KACzB,CAAC,CAAC;IACH,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;IACnE,OAAO;QACL,QAAQ;QACR,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;KAC3B,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,sBAAsB,CAAC"}

package/lib/payment/datatrans-v2/splitProperties.d.ts

@@ -4,6 +4,5 @@ export default function splitProperties({ objectKey, payload }: {
 }): {
     token?: string;
     info: any;
-    _id?: string;
 };
 //# sourceMappingURL=splitProperties.d.ts.map

package/lib/payment/datatrans-v2/splitProperties.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"splitProperties.d.ts","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/splitProperties.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,GAAG;IACrG,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,GAAG,CAAC;IACV,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAuDA"}
+{"version":3,"file":"splitProperties.d.ts","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/splitProperties.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,GAAG;IACrG,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,GAAG,CAAC;CACX,CAoDA"}

package/lib/payment/datatrans-v2/splitProperties.js

@@ -1,5 +1,4 @@
 // This method splits the return data of alias registration to the important properties needed for validation and the additional data
-import crypto from 'crypto';
 export default function splitProperties({ objectKey, payload }) {
     if (!payload || !objectKey)
         return { info: {} };
@@ -17,11 +16,9 @@ export default function splitProperties({ objectKey, payload }) {
             expiryYear,
             '3D': is3DActive ? payload['3D'] : undefined,
         });
-        const _id = crypto.createHash('sha256').update(token).digest('hex');
         return {
             token,
             info,
-            _id,
         };
     }
     if (objectKey === 'PAY') {

package/lib/payment/datatrans-v2/splitProperties.js.map

@@ -1 +1 @@
-{"version":3,"file":"splitProperties.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/splitProperties.ts"],"names":[],"mappings":"AAAA,qIAAqI;AACrI,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EAAE,SAAS,EAAE,OAAO,EAAwC;IAKlG,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;IAEhD,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;QACzB,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QAC5D,IAAI,CAAC,KAAK;YAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC5B,MAAM,UAAU,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC;QACxC,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC;YAC3B,KAAK;YACL,WAAW;YACX,UAAU;YACV,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;SAC7C,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAEpE,OAAO;YACL,KAAK;YACL,IAAI;YACJ,GAAG;SACJ,CAAC;IACJ,CAAC;IAED,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;QACxB,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,aAAa,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QACvE,IAAI,CAAC,aAAa;YAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QACpC,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;gBACpB,SAAS;gBACT,eAAe;gBACf,aAAa;aACd,CAAC;YACF,IAAI;SACL,CAAC;IACJ,CAAC;IAED,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;QACxB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QAC9D,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC;QAClB,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;gBACpB,IAAI;gBACJ,MAAM;gBACN,SAAS;gBACT,OAAO;aACR,CAAC;YACF,IAAI;SACL,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IACnC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;AACxE,CAAC"}
+{"version":3,"file":"splitProperties.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/splitProperties.ts"],"names":[],"mappings":"AAAA,qIAAqI;AAErI,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EAAE,SAAS,EAAE,OAAO,EAAwC;IAIlG,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;IAEhD,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;QACzB,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QAC5D,IAAI,CAAC,KAAK;YAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC5B,MAAM,UAAU,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC;QACxC,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC;YAC3B,KAAK;YACL,WAAW;YACX,UAAU;YACV,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;SAC7C,CAAC,CAAC;QACH,OAAO;YACL,KAAK;YACL,IAAI;SACL,CAAC;IACJ,CAAC;IAED,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;QACxB,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,aAAa,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QACvE,IAAI,CAAC,aAAa;YAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QACpC,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;gBACpB,SAAS;gBACT,eAAe;gBACf,aAAa;aACd,CAAC;YACF,IAAI;SACL,CAAC;IACJ,CAAC;IAED,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;QACxB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QAC9D,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC;QAClB,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;gBACpB,IAAI;gBACJ,MAAM;gBACN,SAAS;gBACT,OAAO;aACR,CAAC;YACF,IAAI;SACL,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IACnC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;AACxE,CAAC"}

package/lib/payment/invoice-prepaid.js

@@ -1,4 +1,5 @@
-import { PaymentDirector, PaymentAdapter, PaymentProviderType } from '@unchainedshop/core-payment';
+import { PaymentAdapter, PaymentDirector } from '@unchainedshop/core';
+import { PaymentProviderType } from '@unchainedshop/core-payment';
 const InvoicePrepaid = {
     ...PaymentAdapter,
     key: 'shop.unchained.invoice-prepaid',
@@ -8,9 +9,9 @@ const InvoicePrepaid = {
     typeSupported: (type) => {
         return type === PaymentProviderType.INVOICE;
     },
-    actions: (params) => {
+    actions: (config, context) => {
         return {
-            ...PaymentAdapter.actions(params),
+            ...PaymentAdapter.actions(config, context),
             configurationError: () => {
                 return null;
             },

package/lib/payment/invoice-prepaid.js.map

@@ -1 +1 @@
-{"version":3,"file":"invoice-prepaid.js","sourceRoot":"","sources":["../../src/payment/invoice-prepaid.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAEnG,MAAM,cAAc,GAAoB;IACtC,GAAG,cAAc;IAEjB,GAAG,EAAE,gCAAgC;IACrC,KAAK,EAAE,kBAAkB;IACzB,OAAO,EAAE,OAAO;IAEhB,oBAAoB,EAAE,EAAE;IAExB,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACtB,OAAO,IAAI,KAAK,mBAAmB,CAAC,OAAO,CAAC;IAC9C,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,OAAO;YACL,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC;YAEjC,kBAAkB,EAAE,GAAG,EAAE;gBACvB,OAAO,IAAI,CAAC;YACd,CAAC;YAED,QAAQ,EAAE,GAAG,EAAE;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;YAED,iBAAiB,EAAE,GAAG,EAAE;gBACtB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,MAAM,EAAE,KAAK,IAAI,EAAE;gBACjB,OAAO,KAAK,CAAC;YACf,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,eAAe,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC"}
+{"version":3,"file":"invoice-prepaid.js","sourceRoot":"","sources":["../../src/payment/invoice-prepaid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,cAAc,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,MAAM,cAAc,GAAoB;IACtC,GAAG,cAAc;IAEjB,GAAG,EAAE,gCAAgC;IACrC,KAAK,EAAE,kBAAkB;IACzB,OAAO,EAAE,OAAO;IAEhB,oBAAoB,EAAE,EAAE;IAExB,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACtB,OAAO,IAAI,KAAK,mBAAmB,CAAC,OAAO,CAAC;IAC9C,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;QAC3B,OAAO;YACL,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;YAE1C,kBAAkB,EAAE,GAAG,EAAE;gBACvB,OAAO,IAAI,CAAC;YACd,CAAC;YAED,QAAQ,EAAE,GAAG,EAAE;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;YAED,iBAAiB,EAAE,GAAG,EAAE;gBACtB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,MAAM,EAAE,KAAK,IAAI,EAAE;gBACjB,OAAO,KAAK,CAAC;YACf,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,eAAe,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC"}

package/lib/payment/invoice.js

@@ -1,4 +1,5 @@
-import { PaymentDirector, PaymentAdapter, PaymentProviderType } from '@unchainedshop/core-payment';
+import { PaymentAdapter, PaymentDirector } from '@unchainedshop/core';
+import { PaymentProviderType } from '@unchainedshop/core-payment';
 const Invoice = {
     ...PaymentAdapter,
     key: 'shop.unchained.invoice',
@@ -8,9 +9,9 @@ const Invoice = {
     typeSupported: (type) => {
         return type === PaymentProviderType.INVOICE;
     },
-    actions: (params) => {
+    actions: (config, context) => {
         return {
-            ...PaymentAdapter.actions(params),
+            ...PaymentAdapter.actions(config, context),
             configurationError: () => {
                 return null;
             },

package/lib/payment/invoice.js.map

@@ -1 +1 @@
-{"version":3,"file":"invoice.js","sourceRoot":"","sources":["../../src/payment/invoice.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAEnG,MAAM,OAAO,GAAoB;IAC/B,GAAG,cAAc;IAEjB,GAAG,EAAE,wBAAwB;IAC7B,KAAK,EAAE,SAAS;IAChB,OAAO,EAAE,OAAO;IAEhB,oBAAoB,EAAE,EAAE;IAExB,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACtB,OAAO,IAAI,KAAK,mBAAmB,CAAC,OAAO,CAAC;IAC9C,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,OAAO;YACL,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC;YAEjC,kBAAkB,EAAE,GAAG,EAAE;gBACvB,OAAO,IAAI,CAAC;YACd,CAAC;YAED,QAAQ,EAAE,GAAG,EAAE;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;YAED,iBAAiB,EAAE,GAAG,EAAE;gBACtB,OAAO,IAAI,CAAC;YACd,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,eAAe,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"invoice.js","sourceRoot":"","sources":["../../src/payment/invoice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,cAAc,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,MAAM,OAAO,GAAoB;IAC/B,GAAG,cAAc;IAEjB,GAAG,EAAE,wBAAwB;IAC7B,KAAK,EAAE,SAAS;IAChB,OAAO,EAAE,OAAO;IAEhB,oBAAoB,EAAE,EAAE;IAExB,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACtB,OAAO,IAAI,KAAK,mBAAmB,CAAC,OAAO,CAAC;IAC9C,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;QAC3B,OAAO;YACL,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;YAE1C,kBAAkB,EAAE,GAAG,EAAE;gBACvB,OAAO,IAAI,CAAC;YACd,CAAC;YAED,QAAQ,EAAE,GAAG,EAAE;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;YAED,iBAAiB,EAAE,GAAG,EAAE;gBACtB,OAAO,IAAI,CAAC;YACd,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,eAAe,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC"}

package/lib/payment/paypal-checkout.js

@@ -1,7 +1,9 @@
-import { PaymentDirector, PaymentAdapter, PaymentError } from '@unchainedshop/core-payment';
+import { OrderPricingSheet, PaymentAdapter, PaymentDirector, PaymentError, } from '@unchainedshop/core';
 import { createLogger } from '@unchainedshop/logger';
 let checkoutNodeJssdk;
 try {
+    // eslint-disable-next-line
+    // @ts-ignore
     checkoutNodeJssdk = await import('@paypal/checkout-server-sdk');
 }
 catch {
@@ -31,9 +33,9 @@ const PaypalCheckout = {
     typeSupported: (type) => {
         return type === 'GENERIC';
     },
-    actions: (params) => {
+    actions: (config, context) => {
         const adapter = {
-            ...PaymentAdapter.actions(params),
+            ...PaymentAdapter.actions(config, context),
             configurationError: () => {
                 const publicCredentialsValid = PAYPAL_CLIENT_ID && PAYPAL_SECRET;
                 if (!publicCredentialsValid) {
@@ -53,8 +55,7 @@ const PaypalCheckout = {
                 return PAYPAL_CLIENT_ID;
             },
             charge: async ({ orderID }) => {
-                const { modules } = params.context;
-                const { order } = params.paymentContext;
+                const { order } = context;
                 if (!orderID) {
                     logger.warn('Paypal Native Plugin: PRICE MATCH');
                     throw new Error('You have to provide orderID in paymentContext');
@@ -63,7 +64,10 @@ const PaypalCheckout = {
                     const request = new checkoutNodeJssdk.orders.OrdersGetRequest(orderID);
                     const client = new checkoutNodeJssdk.core.PayPalHttpClient(environment());
                     const paypalOrder = await client.execute(request);
-                    const pricing = modules.orders.pricingSheet(order);
+                    const pricing = OrderPricingSheet({
+                        calculation: order.calculation,
+                        currency: order.currency,
+                    });
                     const ourTotal = (pricing.total({ useNetPrice: false }).amount / 100).toFixed(2);
                     const paypalTotal = paypalOrder.result.purchase_units[0].amount.value;
                     if (ourTotal === paypalTotal) {

package/lib/payment/paypal-checkout.js.map

@@ -1 +1 @@
-{"version":3,"file":"paypal-checkout.js","sourceRoot":"","sources":["../../src/payment/paypal-checkout.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"paypal-checkout.js","sourceRoot":"","sources":["../../src/payment/paypal-checkout.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAEjB,cAAc,EACd,eAAe,EACf,YAAY,GACb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,IAAI,iBAAiB,CAAC;AACtB,IAAI,CAAC;IACH,2BAA2B;IAC3B,aAAa;IACb,iBAAiB,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;AAClE,CAAC;AAAC,MAAM,CAAC;IACP,KAAK;AACP,CAAC;AAED,MAAM,MAAM,GAAG,YAAY,CAAC,wBAAwB,CAAC,CAAC;AAEtD,MAAM,EAAE,gBAAgB,EAAE,aAAa,EAAE,kBAAkB,GAAG,SAAS,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAExF;;;;;GAKG;AACH,MAAM,WAAW,GAAG,GAAG,EAAE;IACvB,MAAM,QAAQ,GAAG,gBAAgB,CAAC;IAClC,MAAM,YAAY,GAAG,aAAa,CAAC;IAEnC,OAAO,kBAAkB,KAAK,MAAM;QAClC,CAAC,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,YAAY,CAAC;QACvE,CAAC,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;AACzE,CAAC,CAAC;AAEF,MAAM,cAAc,GAAoB;IACtC,GAAG,cAAc;IAEjB,GAAG,EAAE,qBAAqB;IAC1B,KAAK,EAAE,QAAQ;IACf,OAAO,EAAE,OAAO;IAEhB,oBAAoB,EAAE,EAAE;IAExB,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACtB,OAAO,IAAI,KAAK,SAAS,CAAC;IAC5B,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;QAC3B,MAAM,OAAO,GAAG;YACd,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;YAE1C,kBAAkB,EAAE,GAAG,EAAE;gBACvB,MAAM,sBAAsB,GAAG,gBAAgB,IAAI,aAAa,CAAC;gBAEjE,IAAI,CAAC,sBAAsB,EAAE,CAAC;oBAC5B,OAAO,YAAY,CAAC,iBAAiB,CAAC;gBACxC,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,QAAQ,EAAE,GAAG,EAAE;gBACb,IAAI,OAAO,CAAC,kBAAkB,EAAE,KAAK,IAAI;oBAAE,OAAO,IAAI,CAAC;gBACvD,OAAO,KAAK,CAAC;YACf,CAAC;YAED,iBAAiB,EAAE,GAAG,EAAE;gBACtB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,IAAI,EAAE,KAAK,IAAI,EAAE;gBACf,OAAO,gBAAgB,CAAC;YAC1B,CAAC;YAED,MAAM,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;gBAC5B,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;gBAE1B,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;oBACjD,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;gBACnE,CAAC;gBAED,IAAI,CAAC;oBACH,MAAM,OAAO,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;oBACvE,MAAM,MAAM,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,CAAC;oBAC1E,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAElD,MAAM,OAAO,GAAG,iBAAiB,CAAC;wBAChC,WAAW,EAAE,KAAK,CAAC,WAAW;wBAC9B,QAAQ,EAAE,KAAK,CAAC,QAAQ;qBACzB,CAAC,CAAC;oBACH,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;oBACjF,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;oBAEtE,IAAI,QAAQ,KAAK,WAAW,EAAE,CAAC;wBAC7B,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;wBACjD,OAAO,KAAK,CAAC;oBACf,CAAC;oBAED,MAAM,CAAC,IAAI,CACT,8CAA8C,EAC9C,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAC5C,CAAC;oBAEF,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,KAAK,CAAC,CAAC;oBACvD,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,OAAO,CAAC,CAAC;oBAEzD,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;gBACtC,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,CAAC,CAAC,CAAC;oBAC/C,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;gBACrB,CAAC;YACH,CAAC;SACF,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;CACF,CAAC;AAEF,eAAe,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC"}

package/lib/payment/payrexx/api/makeFetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeFetcher.d.ts","sourceRoot":"","sources":["../../../../src/payment/payrexx/api/makeFetcher.ts"],"names":[],"mappings":"mCAaW,MAAM,aACL,MAAM,WACR,MAAM,KACb,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,GAAG,QAAQ,GAAG,KAAK,GAAG,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAJ/F,wBA0EE"}
+{"version":3,"file":"makeFetcher.d.ts","sourceRoot":"","sources":["../../../../src/payment/payrexx/api/makeFetcher.ts"],"names":[],"mappings":"mCAOW,MAAM,aACL,MAAM,WACR,MAAM,KACb,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,GAAG,QAAQ,GAAG,KAAK,GAAG,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAJ/F,wBA4EE"}

package/lib/payment/payrexx/api/makeFetcher.js

@@ -1,23 +1,17 @@
-/// <reference lib="dom" />
-import fs from 'fs';
-import util from 'util';
-import { resolve } from 'path';
 import { createLogger } from '@unchainedshop/logger';
-const readFile = util.promisify(fs.readFile);
-const { PAYREXX_API_MOCKS_PATH } = process.env;
+const { MOCK_APIS } = process.env;
 const logger = createLogger('unchained:payrexx');
 export default (baseUrl = 'https://api.payrexx.com/v1.0/', instance = null, secret = null) => {
-    if (PAYREXX_API_MOCKS_PATH) {
+    if (MOCK_APIS) {
         return async (path) => {
             try {
-                const filePath = resolve(process.env.PWD, PAYREXX_API_MOCKS_PATH, `${path}.json`);
-                const content = await readFile(filePath);
-                const textData = content.toString();
-                const jsonData = JSON.parse(textData);
+                const { default: jsonData } = await import(`${import.meta.dirname}/../../../../tests/mock/payrexx/${path}.json`, {
+                    with: { type: 'json' },
+                });
                 return {
                     json: async () => jsonData,
-                    text: async () => textData,
-                    ok: !jsonData?.error,
+                    text: async () => JSON.stringify(jsonData?.error),
+                    ok: true,
                     status: jsonData?.error ? 500 : 204,
                 };
             }
@@ -35,7 +29,7 @@ export default (baseUrl = 'https://api.payrexx.com/v1.0/', instance = null, secr
         };
     }
     const buildSignature = async (query = '') => {
-        const key = await crypto.subtle.importKey('raw', new TextEncoder().encode(secret), { name: 'HMAC', hash: 'SHA-256' }, false, ['sign', 'verify']);
+        const key = await crypto.subtle.importKey('raw', new TextEncoder().encode(secret), { name: 'HMAC', hash: 'SHA-256' }, false, ['sign']);
         const signature = await crypto.subtle.sign('HMAC', key, new TextEncoder().encode(query));
         return btoa(String.fromCharCode(...new Uint8Array(signature)));
     };
@@ -45,7 +39,7 @@ export default (baseUrl = 'https://api.payrexx.com/v1.0/', instance = null, secr
         return url.href;
     };
     return async (path, method, data) => {
-        logger.verbose(`${method} ${path}`);
+        logger.info(`${method} ${path}`);
         if (method === 'POST') {
             const queryParams = { ...data };
             const signature = await buildSignature(new URLSearchParams(queryParams).toString());

package/lib/payment/payrexx/api/makeFetcher.js.map

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