@unchainedshop/plugins 3.0.0-alpha7 → 3.0.0-rc2

package/src/payment/postfinance-checkout/index.ts

@@ -1,12 +1,15 @@
+import { createLogger } from '@unchainedshop/logger';
 import {
+  OrderPricingSheet,
   IPaymentActions,
   IPaymentAdapter,
+  PaymentAdapter,
   PaymentChargeActionResult,
-} from '@unchainedshop/core-payment';
-import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core-payment';
-import { createLogger } from '@unchainedshop/logger';
-
+  PaymentDirector,
+  PaymentError,
+} from '@unchainedshop/core';
 import * as pf from 'postfinancecheckout';
+
 import {
   confirmDeferredTransaction,
   createTransaction,
@@ -52,17 +55,15 @@ const PostfinanceCheckout: IPaymentAdapter = {
     return type === 'GENERIC';
   },
 
-  actions: (params) => {
-    const { modules } = params.context;
-
+  actions: (config, context) => {
     const adapter: IPaymentActions & {
       getCompletionMode: () => CompletionModes;
     } = {
-      ...PaymentAdapter.actions(params),
+      ...PaymentAdapter.actions(config, context),
 
       getCompletionMode() {
         return (
-          (params.config.find((item) => item.key === 'completionMode')?.value as CompletionModes) ||
+          (config.find((item) => item.key === 'completionMode')?.value as CompletionModes) ||
           CompletionModes.Deferred
         );
       },
@@ -99,15 +100,19 @@ const PostfinanceCheckout: IPaymentAdapter = {
       },
 
       sign: async (transactionContext: any = {}) => {
-        const { orderPayment, order } = params.paymentContext;
+        const { orderPayment, order } = context;
 
         const { integrationMode = IntegrationModes.PaymentPage }: { integrationMode: IntegrationModes } =
           transactionContext;
         const completionMode = adapter.getCompletionMode();
-        const pricing = modules.orders.pricingSheet(order);
+        const pricing = OrderPricingSheet({
+          calculation: order.calculation,
+          currency: order.currency,
+        });
+
         const totalAmount = pricing?.total({ useNetPrice: false }).amount;
         const transaction = new PostFinanceCheckout.model.TransactionCreate();
-        const userId = order?.userId || params.paymentContext?.userId;
+        const userId = order?.userId || context?.userId;
         transaction.currency = order.currency;
         transaction.metaData = {
           orderPaymentId: orderPayment._id,
@@ -177,7 +182,7 @@ const PostfinanceCheckout: IPaymentAdapter = {
           });
         }
 
-        const isPaid = await orderIsPaid(params.paymentContext.order, transaction, modules.orders);
+        const isPaid = await orderIsPaid(context.order, transaction);
         if (!isPaid) {
           logger.error(`Transaction #${transactionId}: Invalid state / Amount incorrect`);
           throw newError({
@@ -186,7 +191,7 @@ const PostfinanceCheckout: IPaymentAdapter = {
           });
         }
 
-        if (transaction.metaData.orderPaymentId !== params.paymentContext.orderPayment._id) {
+        if (transaction.metaData.orderPaymentId !== context.orderPayment._id) {
           logger.error(`Transaction #${transactionId}: Invalid state / Amount incorrect`);
           throw newError({
             code: `TRANSACTION_ALREADY_USED`,
@@ -207,14 +212,18 @@ const PostfinanceCheckout: IPaymentAdapter = {
       },
 
       cancel: async () => {
-        const { orderPayment, order } = params.paymentContext;
+        const { orderPayment, order } = context;
         const { transactionId } = orderPayment;
         if (!transactionId) {
           return false;
         }
         const transaction = await getTransaction(transactionId);
         const refund = transaction.state === PostFinanceCheckout.model.TransactionState.FULFILL;
-        const pricing = modules.orders.pricingSheet(order);
+        const pricing = OrderPricingSheet({
+          calculation: order.calculation,
+          currency: order.currency,
+        });
+
         const totalAmount = pricing?.total({ useNetPrice: false }).amount;
         // For immediate settlements, try refunding. For deferred settlements, void the transaction.
         return (
@@ -224,7 +233,7 @@ const PostfinanceCheckout: IPaymentAdapter = {
       },
 
       confirm: async () => {
-        const { orderPayment } = params.paymentContext;
+        const { orderPayment } = context;
         const { transactionId } = orderPayment;
         if (!transactionId) {
           return false;

package/src/payment/postfinance-checkout/middleware.ts

@@ -7,6 +7,7 @@ const logger = createLogger('unchained:core-payment:postfinance-checkout');
 
 export const postfinanceCheckoutHandler = async (req, res) => {
   const context = req.unchainedContext as Context;
+  const { services, modules } = context;
   const data = req.body as WebhookData;
   if (data.listenerEntityTechnicalName === 'TransactionCompletion') {
     try {
@@ -15,20 +16,16 @@ export const postfinanceCheckoutHandler = async (req, res) => {
         transactionCompletion.linkedTransaction as unknown as string,
       );
       const { orderPaymentId } = transaction.metaData as { orderPaymentId: string };
-      const orderPayment = await context.modules.orders.payments.findOrderPayment({
+      const orderPayment = await modules.orders.payments.findOrderPayment({
         orderPaymentId,
       });
       if (!orderPayment) throw new Error('Order Payment not found');
 
-      const order = await context.modules.orders.checkout(
-        orderPayment.orderId,
-        {
-          paymentContext: {
-            transactionId: transactionCompletion.linkedTransaction,
-          },
+      const order = await services.orders.checkoutOrder(orderPayment.orderId, {
+        paymentContext: {
+          transactionId: transactionCompletion.linkedTransaction,
         },
-        context,
-      );
+      });
       logger.info(
         `PostFinance Checkout Webhook: Transaction ${transactionCompletion.linkedTransaction} marked order payment ID ${transaction.metaData.orderPaymentId} as paid`,
       );

package/src/payment/postfinance-checkout/utils.ts

@@ -1,4 +1,5 @@
-import { Order, OrdersModule } from '@unchainedshop/core-orders';
+import { OrderPricingSheet } from '@unchainedshop/core';
+import { Order } from '@unchainedshop/core-orders';
 import * as pf from 'postfinancecheckout';
 
 const { PostFinanceCheckout } = pf;
@@ -28,9 +29,11 @@ export const transactionIsPaid = async (
 export const orderIsPaid = async (
   order: Order,
   transaction: pf.PostFinanceCheckout.model.Transaction,
-  orderModule: OrdersModule,
 ): Promise<boolean> => {
-  const pricing = orderModule.pricingSheet(order);
+  const pricing = OrderPricingSheet({
+    calculation: order.calculation,
+    currency: order.currency,
+  });
   const totalAmount = pricing.total({ useNetPrice: false }).amount / 100;
   return transactionIsPaid(transaction, order.currency, totalAmount);
 };

package/src/payment/saferpay/adapter.ts

@@ -1,10 +1,14 @@
-import { IPaymentAdapter } from '@unchainedshop/core-payment';
-import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core-payment';
-import { UnchainedCore } from '@unchainedshop/core';
 import { mongodb } from '@unchainedshop/mongodb';
 import { PaymentPageInitializeInput, SaferpayClient } from './api/index.js';
 import { buildSignature } from './buildSignature.js';
 import { SaferpayTransactionsModule } from './module/configureSaferpayTransactionsModule.js';
+import {
+  OrderPricingSheet,
+  IPaymentAdapter,
+  PaymentAdapter,
+  PaymentDirector,
+  PaymentError,
+} from '@unchainedshop/core';
 
 export * from './middleware.js';
 
@@ -42,8 +46,8 @@ export const WordlineSaferpay: IPaymentAdapter = {
     return type === 'GENERIC';
   },
 
-  actions: (params) => {
-    const { modules } = params.context as UnchainedCore & {
+  actions: (config, context) => {
+    const { modules } = context as typeof context & {
       modules: { saferpayTransactions: SaferpayTransactionsModule };
     };
 
@@ -60,10 +64,10 @@ export const WordlineSaferpay: IPaymentAdapter = {
     };
 
     const adapter = {
-      ...PaymentAdapter.actions(params),
+      ...PaymentAdapter.actions(config, context),
 
       getTerminalId() {
-        return params.config.find((item) => item.key === 'terminalId')?.value;
+        return config.find((item) => item.key === 'terminalId')?.value;
       },
 
       // eslint-disable-next-line
@@ -91,12 +95,15 @@ export const WordlineSaferpay: IPaymentAdapter = {
       },
 
       sign: async (transactionContext: any = {}) => {
-        const { orderPayment, order } = params.paymentContext;
+        const { orderPayment, order } = context;
 
         if (!orderPayment || !order) {
           throw new Error('orderPayment or order not found');
         }
-        const pricing = modules.orders.pricingSheet(order);
+        const pricing = OrderPricingSheet({
+          calculation: order.calculation,
+          currency: order.currency,
+        });
         const totalAmount = pricing?.total({ useNetPrice: false }).amount;
 
         const saferpayTransactionId = await modules.saferpayTransactions.createTransaction(
@@ -148,12 +155,15 @@ export const WordlineSaferpay: IPaymentAdapter = {
       },
 
       charge: async ({ transactionId }: { transactionId: string }) => {
-        const { orderPayment, order } = params.paymentContext;
+        const { orderPayment, order } = context;
 
         if (!orderPayment || !order) {
           throw new Error('orderPayment or order not found');
         }
-        const pricing = modules.orders.pricingSheet(order);
+        const pricing = OrderPricingSheet({
+          calculation: order.calculation,
+          currency: order.currency,
+        });
         const totalAmount = pricing.total({ useNetPrice: false }).amount;
 
         const saferpayTransaction = await modules.saferpayTransactions.findTransactionById(
@@ -187,7 +197,7 @@ export const WordlineSaferpay: IPaymentAdapter = {
       },
 
       async confirm() {
-        const { orderPayment } = params.paymentContext;
+        const { orderPayment } = context;
 
         if (!orderPayment) {
           throw new Error('orderPayment not found');
@@ -217,7 +227,7 @@ export const WordlineSaferpay: IPaymentAdapter = {
       },
 
       cancel: async () => {
-        const { orderPayment } = params.paymentContext;
+        const { orderPayment } = context;
 
         if (!orderPayment) {
           throw new Error('orderPayment not found');

package/src/payment/saferpay/api/api/SaferpayConnection.ts

@@ -1,4 +1,3 @@
-/// <reference lib="dom" />
 export class SaferpayConnection {
   private baseUrl: string;
 

package/src/payment/saferpay/api/models/TransactionCapture.ts

@@ -1,6 +1,6 @@
 import { Response } from './Response.js';
 import { Request } from './Request.js';
-import type { TransactionAmount } from './Transaction.js';
+import { TransactionAmount } from './Transaction.js';
 
 export interface TransactionCaptureInput extends Request {
   TransactionReference: {

package/src/payment/saferpay/db/SaferpayTransactionsCollection.ts

@@ -1,5 +1,5 @@
 import { mongodb } from '@unchainedshop/mongodb';
-import type { TimestampFields } from '@unchainedshop/mongodb';
+import { TimestampFields } from '@unchainedshop/mongodb';
 
 export type SaferpayTransaction = {
   orderPaymentId: any;

package/src/payment/saferpay/middleware.ts

@@ -9,7 +9,7 @@ export const saferpayHandler = async (request, response) => {
   const resolvedContext = request.unchainedContext as Context & {
     modules: { saferpayTransactions: SaferpayTransactionsModule };
   };
-  const { modules } = resolvedContext;
+  const { modules, services } = resolvedContext;
 
   const { orderPaymentId, signature, transactionId } = request.query;
   const isValidRequest =
@@ -28,7 +28,7 @@ export const saferpayHandler = async (request, response) => {
   }
 
   try {
-    logger.verbose(`checkout with orderPaymentId: ${orderPaymentId}`);
+    logger.info(`checkout with orderPaymentId: ${orderPaymentId}`);
     const orderPayment = await modules.orders.payments.findOrderPayment({
       orderPaymentId,
     });
@@ -42,15 +42,11 @@ export const saferpayHandler = async (request, response) => {
       throw new Error('Invalid signature');
     }
 
-    const order = await modules.orders.checkout(
-      orderPayment.orderId,
-      {
-        paymentContext: {
-          transactionId,
-        },
+    const order = await services.orders.checkoutOrder(orderPayment.orderId, {
+      paymentContext: {
+        transactionId,
       },
-      resolvedContext,
-    );
+    });
     logger.info(`checkout successful`, {
       orderPaymentId,
       orderId: order._id,

package/src/payment/stripe/index.ts

@@ -1,7 +1,12 @@
-import { IPaymentAdapter } from '@unchainedshop/core-payment';
-import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core-payment';
 import { createLogger } from '@unchainedshop/logger';
 import stripeClient, { createOrderPaymentIntent, createRegistrationIntent } from './stripe.js';
+import {
+  OrderPricingSheet,
+  IPaymentAdapter,
+  PaymentAdapter,
+  PaymentDirector,
+  PaymentError,
+} from '@unchainedshop/core';
 
 export * from './middleware.js';
 
@@ -18,13 +23,13 @@ const Stripe: IPaymentAdapter = {
     return type === 'GENERIC';
   },
 
-  actions: (params) => {
-    const { modules } = params.context;
+  actions: (config, context) => {
+    const { modules } = context;
 
-    const descriptorPrefix = params.config.find(({ key }) => key === 'descriptorPrefix')?.value;
+    const descriptorPrefix = config.find(({ key }) => key === 'descriptorPrefix')?.value;
 
     const getUserData = async (forcedUserId) => {
-      const userId = forcedUserId || params.paymentContext?.userId;
+      const userId = forcedUserId || context?.userId;
       const user = await modules.users.findUserById(userId);
       const email = modules.users.primaryEmail(user)?.address;
       const name = user.profile.displayName || user.username || email;
@@ -35,7 +40,7 @@ const Stripe: IPaymentAdapter = {
       };
     };
     const adapterActions = {
-      ...PaymentAdapter.actions(params),
+      ...PaymentAdapter.actions(config, context),
 
       configurationError() {
         const stripe = stripeClient();
@@ -82,10 +87,13 @@ const Stripe: IPaymentAdapter = {
       },
 
       sign: async (transactionContext = {}) => {
-        const { orderPayment, order, paymentProviderId } = params.paymentContext;
+        const { orderPayment, order, paymentProviderId } = context;
 
         if (orderPayment) {
-          const pricing = await modules.orders.pricingSheet(order);
+          const pricing = OrderPricingSheet({
+            calculation: order.calculation,
+            currency: order.currency,
+          });
           const { userId, name, email } = await getUserData(order?.userId);
           const paymentIntent = await createOrderPaymentIntent(
             { userId, name, email, order, orderPayment, pricing, descriptorPrefix },
@@ -108,12 +116,15 @@ const Stripe: IPaymentAdapter = {
           throw new Error('You have to provide paymentIntentId or paymentCredentials');
         }
 
-        const { order } = params.paymentContext;
+        const { order } = context;
         const orderPayment = await modules.orders.payments.findOrderPayment({
           orderPaymentId: order.paymentId,
         });
         const { userId, name, email } = await getUserData(order?.userId);
-        const pricing = await modules.orders.pricingSheet(order);
+        const pricing = OrderPricingSheet({
+          calculation: order.calculation,
+          currency: order.currency,
+        });
 
         const paymentIntentObject = paymentIntentId
           ? await stripe.paymentIntents.retrieve(paymentIntentId)
@@ -144,7 +155,7 @@ const Stripe: IPaymentAdapter = {
           return paymentIntentObject;
         }
 
-        logger.verbose('Charge postponed because paymentIntent has wrong status', {
+        logger.info('Charge postponed because paymentIntent has wrong status', {
           orderPaymentId: paymentIntentObject.id,
         });
 

package/src/payment/stripe/middleware.ts

@@ -11,7 +11,7 @@ export const WebhookEventTypes = {
 
 export const stripeHandler = async (request, response) => {
   const resolvedContext = request.unchainedContext as Context;
-  const { modules } = resolvedContext;
+  const { modules, services } = resolvedContext;
 
   let event;
 
@@ -27,7 +27,7 @@ export const stripeHandler = async (request, response) => {
   }
 
   if (!Object.values(WebhookEventTypes).includes(event.type)) {
-    logger.verbose(`unhandled event type`, {
+    logger.info(`unhandled event type`, {
       type: event.type,
     });
     response.writeHead(200);
@@ -43,7 +43,7 @@ export const stripeHandler = async (request, response) => {
   const environmentInMetadata = event.data?.object?.metadata?.environment || '';
   const environmentInEnv = process.env.STRIPE_WEBHOOK_ENVIRONMENT || '';
   if (environmentInMetadata !== environmentInEnv) {
-    logger.verbose(`unhandled event environment`, {
+    logger.info(`unhandled event environment`, {
       type: event.type,
       environment: environmentInMetadata,
     });
@@ -57,7 +57,7 @@ export const stripeHandler = async (request, response) => {
     return;
   }
 
-  logger.verbose(`Processing event`, {
+  logger.info(`Processing event`, {
     type: event.type,
   });
   try {
@@ -65,7 +65,7 @@ export const stripeHandler = async (request, response) => {
       const paymentIntent = event.data.object;
       const { orderPaymentId } = paymentIntent.metadata || {};
 
-      logger.verbose(`checkout with orderPaymentId: ${orderPaymentId}`, {
+      logger.info(`checkout with orderPaymentId: ${orderPaymentId}`, {
         type: event.type,
       });
 
@@ -78,15 +78,11 @@ export const stripeHandler = async (request, response) => {
         throw new Error(`order payment not found with orderPaymentId: ${orderPaymentId}`);
       }
 
-      const order = await modules.orders.checkout(
-        orderPayment.orderId,
-        {
-          paymentContext: {
-            paymentIntentId: paymentIntent.id,
-          },
+      const order = await services.orders.checkoutOrder(orderPayment.orderId, {
+        paymentContext: {
+          paymentIntentId: paymentIntent.id,
         },
-        resolvedContext,
-      );
+      });
 
       logger.info(`checkout successful`, {
         orderPaymentId,
@@ -104,21 +100,17 @@ export const stripeHandler = async (request, response) => {
       const setupIntent = event.data.object;
       const { paymentProviderId, userId } = setupIntent.metadata || {};
 
-      logger.verbose(`registered payment credential with paymentProviderId: ${paymentProviderId}`, {
+      logger.info(`registered payment credential with paymentProviderId: ${paymentProviderId}`, {
         type: event.type,
         userId,
       });
 
-      const paymentCredentials = await modules.payment.registerCredentials(
-        paymentProviderId,
-        {
-          transactionContext: {
-            setupIntentId: setupIntent.id,
-          },
-          userId,
+      const paymentCredentials = await services.orders.registerPaymentCredentials(paymentProviderId, {
+        transactionContext: {
+          setupIntentId: setupIntent.id,
         },
-        resolvedContext,
-      );
+        userId,
+      });
 
       logger.info(`payment credentials registration successful`, {
         userId,

package/src/payment/stripe/stripe.ts

@@ -1,8 +1,7 @@
-import { Order } from '@unchainedshop/core-orders';
-import { OrderPayment } from '@unchainedshop/core-orders';
-import { IOrderPricingSheet } from '@unchainedshop/core-orders';
+import { IOrderPricingSheet } from '@unchainedshop/core';
+import { Order, OrderPayment } from '@unchainedshop/core-orders';
 import { createLogger } from '@unchainedshop/logger';
-import type { Stripe as StripeType } from 'stripe';
+import { Stripe as StripeType } from 'stripe';
 
 const logger = createLogger('unchained:plugins:payment:stripe');
 
@@ -15,9 +14,11 @@ export const initStripeClient = async (): Promise<StripeType> => {
     logger.warn('STRIPE_SECRET is not set, skipping initialization');
     return null;
   }
+  // eslint-disable-next-line
+  // @ts-ignore
   const { default: Stripe } = await import('stripe');
   stripe = new Stripe(STRIPE_SECRET, {
-    apiVersion: '2024-09-30.acacia',
+    apiVersion: '2024-11-20.acacia',
   });
   return stripe;
 };

package/src/pricing/delivery-swiss-tax.ts

@@ -1,5 +1,9 @@
-import { DeliveryPricingAdapter, DeliveryPricingDirector } from '@unchainedshop/core-delivery';
-import { DeliveryPricingRowCategory, IDeliveryPricingAdapter } from '@unchainedshop/core-delivery';
+import {
+  DeliveryPricingRowCategory,
+  IDeliveryPricingAdapter,
+  DeliveryPricingAdapter,
+  DeliveryPricingDirector,
+} from '@unchainedshop/core';
 
 import { Order } from '@unchainedshop/core-orders';
 import { DeliveryProvider } from '@unchainedshop/core-delivery';

package/src/pricing/discount-100-off.ts

@@ -1,11 +1,12 @@
-import { IDiscountAdapter } from '@unchainedshop/utils';
 import {
   OrderDiscountDirector,
   OrderDiscountAdapter,
   OrderDiscountConfiguration,
-} from '@unchainedshop/core-orders';
+  UnchainedCore,
+  IDiscountAdapter,
+} from '@unchainedshop/core';
 
-export const HundredOff: IDiscountAdapter<OrderDiscountConfiguration> = {
+export const HundredOff: IDiscountAdapter<OrderDiscountConfiguration, UnchainedCore> = {
   ...OrderDiscountAdapter,
 
   key: 'shop.unchained.discount.100-off',

package/src/pricing/discount-half-price-manual.ts

@@ -1,8 +1,12 @@
-import { IDiscountAdapter } from '@unchainedshop/utils';
-import { OrderDiscountDirector, OrderDiscountAdapter } from '@unchainedshop/core-orders';
-import { ProductDiscountConfiguration } from '@unchainedshop/core-products';
-
-export const HalfPriceManual: IDiscountAdapter<ProductDiscountConfiguration> = {
+import {
+  OrderDiscountDirector,
+  OrderDiscountAdapter,
+  ProductDiscountConfiguration,
+  UnchainedCore,
+  IDiscountAdapter,
+} from '@unchainedshop/core';
+
+export const HalfPriceManual: IDiscountAdapter<ProductDiscountConfiguration, UnchainedCore> = {
   ...OrderDiscountAdapter,
 
   key: 'shop.unchained.discount.half-price-manual',

package/src/pricing/discount-half-price.ts

@@ -1,8 +1,12 @@
-import { IDiscountAdapter } from '@unchainedshop/utils';
-import { OrderDiscountDirector, OrderDiscountAdapter } from '@unchainedshop/core-orders';
-import { ProductDiscountConfiguration } from '@unchainedshop/core-products';
-
-export const HalfPrice: IDiscountAdapter<ProductDiscountConfiguration> = {
+import {
+  OrderDiscountDirector,
+  OrderDiscountAdapter,
+  ProductDiscountConfiguration,
+  IDiscountAdapter,
+  UnchainedCore,
+} from '@unchainedshop/core';
+
+export const HalfPrice: IDiscountAdapter<ProductDiscountConfiguration, UnchainedCore> = {
   ...OrderDiscountAdapter,
 
   key: 'shop.unchained.discount.half-price',

package/src/pricing/free-delivery.ts

@@ -2,7 +2,7 @@ import {
   DeliveryPricingAdapter,
   DeliveryPricingDirector,
   IDeliveryPricingAdapter,
-} from '@unchainedshop/core-delivery';
+} from '@unchainedshop/core';
 
 export const DeliveryFreePrice: IDeliveryPricingAdapter = {
   ...DeliveryPricingAdapter,

package/src/pricing/free-payment.ts

@@ -2,7 +2,7 @@ import {
   PaymentPricingAdapter,
   PaymentPricingDirector,
   IPaymentPricingAdapter,
-} from '@unchainedshop/core-payment';
+} from '@unchainedshop/core';
 
 export const PaymentFreePrice: IPaymentPricingAdapter = {
   ...PaymentPricingAdapter,

package/src/pricing/order-delivery.ts

@@ -1,5 +1,9 @@
-import { IOrderPricingAdapter } from '@unchainedshop/core-orders';
-import { OrderPricingDirector, OrderPricingAdapter } from '@unchainedshop/core-orders';
+import {
+  IOrderPricingAdapter,
+  OrderPricingDirector,
+  OrderPricingAdapter,
+  DeliveryPricingSheet,
+} from '@unchainedshop/core';
 
 export const OrderDelivery: IOrderPricingAdapter = {
   ...OrderPricingAdapter,
@@ -15,7 +19,7 @@ export const OrderDelivery: IOrderPricingAdapter = {
 
   actions: (params) => {
     const pricingAdapter = OrderPricingAdapter.actions(params);
-    const { order, orderDelivery, modules } = params.context;
+    const { order, orderDelivery } = params.context;
 
     return {
       ...pricingAdapter,
@@ -23,11 +27,10 @@ export const OrderDelivery: IOrderPricingAdapter = {
       calculate: async () => {
         // just add tax + net price to order pricing
         if (!orderDelivery) return null;
-        const pricing = modules.orders.deliveries.pricingSheet(
-          orderDelivery,
-          order.currency,
-          params.context,
-        );
+        const pricing = DeliveryPricingSheet({
+          calculation: orderDelivery.calculation,
+          currency: order.currency,
+        });
         const tax = pricing.taxSum();
         const shipping = pricing.gross();