@unchainedshop/plugins 3.1.14 → 4.0.0-rc.10

package/src/payment/postfinance-checkout/handler-express.ts

@@ -3,7 +3,7 @@ import { createLogger } from '@unchainedshop/logger';
 import { WebhookData } from './types.js';
 import { getTransaction, getTransactionCompletion } from './api.js';
 
-const logger = createLogger('unchained:core-payment:postfinance-checkout');
+const logger = createLogger('unchained:core-payment:postfinance-checkout:handler');
 
 export const postfinanceCheckoutHandler = async (req, res) => {
   const context = req.unchainedContext as Context;
@@ -13,7 +13,7 @@ export const postfinanceCheckoutHandler = async (req, res) => {
     try {
       const transactionCompletion = await getTransactionCompletion(data.entityId as unknown as string);
       const transaction = await getTransaction(
-        transactionCompletion.linkedTransaction as unknown as string,
+        transactionCompletion ? (transactionCompletion as any).linkedTransaction : data.entityId,
       );
       const { orderPaymentId } = transaction.metaData as { orderPaymentId: string };
       const orderPayment = await modules.orders.payments.findOrderPayment({
@@ -27,19 +27,17 @@ export const postfinanceCheckoutHandler = async (req, res) => {
         },
       });
       logger.info(
-        `PostFinance Checkout Webhook: Transaction ${transactionCompletion.linkedTransaction} marked order payment ID ${transaction.metaData.orderPaymentId} as paid`,
+        `Transaction ${transactionCompletion.linkedTransaction} marked order payment ID ${transaction.metaData.orderPaymentId} as paid`,
       );
       res.writeHead(200);
       res.end(`Order marked as paid: ${order.orderNumber}`);
     } catch (e) {
-      logger.error(`PostFinance Checkout Webhook: Unchained rejected to checkout with message`, e);
+      logger.error(e);
       res.writeHead(500);
       res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
     }
   } else {
-    logger.error(
-      `PostFinance Checkout Webhook: Received unknown listenerEntityTechnicalName ${data.listenerEntityTechnicalName}`,
-    );
+    logger.error(`Received unknown listenerEntityTechnicalName ${data.listenerEntityTechnicalName}`);
     res.writeHead(404);
     res.end();
   }

package/src/payment/postfinance-checkout/handler-fastify.ts

@@ -4,7 +4,7 @@ import { WebhookData } from './types.js';
 import { getTransaction, getTransactionCompletion } from './api.js';
 import { FastifyRequest, RouteHandlerMethod } from 'fastify';
 
-const logger = createLogger('unchained:core-payment:postfinance-checkout');
+const logger = createLogger('unchained:core-payment:postfinance-checkout:handler');
 
 export const postfinanceCheckoutHandler: RouteHandlerMethod = async (
   req: FastifyRequest & {
@@ -19,7 +19,7 @@ export const postfinanceCheckoutHandler: RouteHandlerMethod = async (
     try {
       const transactionCompletion = await getTransactionCompletion(data.entityId as unknown as string);
       const transaction = await getTransaction(
-        transactionCompletion.linkedTransaction as unknown as string,
+        transactionCompletion ? (transactionCompletion as any).linkedTransaction : data.entityId,
       );
       const { orderPaymentId } = transaction.metaData as { orderPaymentId: string };
       const orderPayment = await modules.orders.payments.findOrderPayment({
@@ -29,23 +29,21 @@ export const postfinanceCheckoutHandler: RouteHandlerMethod = async (
 
       const order = await services.orders.checkoutOrder(orderPayment.orderId, {
         paymentContext: {
-          transactionId: transactionCompletion.linkedTransaction,
+          transactionId: transaction.id,
         },
       });
       logger.info(
-        `PostFinance Checkout Webhook: Transaction ${transactionCompletion.linkedTransaction} marked order payment ID ${transaction.metaData.orderPaymentId} as paid`,
+        `Transaction ${transaction.id} marked order payment ID ${transaction.metaData.orderPaymentId} as paid`,
       );
       reply.status(200);
       return reply.send(`Order marked as paid: ${order.orderNumber}`);
     } catch (e) {
-      logger.error(`PostFinance Checkout Webhook: Unchained rejected to checkout with message`, e);
+      logger.error(e);
       reply.status(500);
       return reply.send({ name: e.name, code: e.code, message: e.message });
     }
   } else {
-    logger.error(
-      `PostFinance Checkout Webhook: Received unknown listenerEntityTechnicalName ${data.listenerEntityTechnicalName}`,
-    );
+    logger.error(`Received unknown listenerEntityTechnicalName ${data.listenerEntityTechnicalName}`);
     reply.status(404);
     return reply.send();
   }

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

@@ -8,7 +8,6 @@ import {
   PaymentDirector,
   PaymentError,
 } from '@unchainedshop/core';
-import * as pf from 'postfinancecheckout';
 
 import {
   confirmDeferredTransaction,
@@ -23,8 +22,15 @@ import {
 } from './api.js';
 import { orderIsPaid } from './utils.js';
 import { CompletionModes, IntegrationModes, SignResponse } from './types.js';
-
-const { PostFinanceCheckout } = pf;
+import {
+  TransactionCreate,
+  LineItem,
+  LineItemType,
+  TokenizationMode,
+  TransactionCompletionBehavior,
+  TransactionState,
+  CreationEntityState,
+} from './api-types.js';
 
 const {
   PFCHECKOUT_SPACE_ID,
@@ -34,7 +40,7 @@ const {
   PFCHECKOUT_FAILED_URL,
 } = process.env;
 
-const logger = createLogger('unchained:core-payment:postfinance');
+const logger = createLogger('unchained:core-payment:postfinance-checkout');
 
 const newError = ({ code, message }: { code: string; message: string }) => {
   const error = new Error(message);
@@ -66,9 +72,7 @@ const PostfinanceCheckout: IPaymentAdapter = {
         );
       },
 
-      // eslint-disable-next-line
       configurationError() {
-        // eslint-disable-line
         if (
           !PFCHECKOUT_SPACE_ID ||
           !PFCHECKOUT_USER_ID ||
@@ -94,7 +98,7 @@ const PostfinanceCheckout: IPaymentAdapter = {
         if (!credentials.meta) return false;
         const { linkedSpaceId } = credentials.meta;
         const tokenData = await getToken(linkedSpaceId, credentials.token);
-        return tokenData.state === PostFinanceCheckout.model.CreationEntityState.ACTIVE;
+        return tokenData.state === CreationEntityState.ACTIVE;
       },
 
       sign: async (transactionContext: any = {}) => {
@@ -105,41 +109,42 @@ const PostfinanceCheckout: IPaymentAdapter = {
         const completionMode = adapter.getCompletionMode();
         const pricing = OrderPricingSheet({
           calculation: order.calculation,
-          currency: order.currency,
+          currencyCode: order.currencyCode,
         });
 
         const totalAmount = pricing?.total({ useNetPrice: false }).amount;
-        const transaction = new PostFinanceCheckout.model.TransactionCreate();
-        const userId = order?.userId || context?.userId;
-        transaction.currency = order.currency;
-        transaction.metaData = {
-          orderPaymentId: orderPayment._id,
+        const transaction: TransactionCreate = {
+          currency: order.currencyCode,
+          metaData: {
+            orderPaymentId: orderPayment._id,
+          },
+          successUrl: `${transactionContext?.successUrl || PFCHECKOUT_SUCCESS_URL}?order_id=${
+            orderPayment.orderId
+          }`,
+          failedUrl: `${transactionContext?.failedUrl || PFCHECKOUT_FAILED_URL}?order_id=${
+            orderPayment.orderId
+          }`,
+          customerId: order?.userId || context?.userId,
+          tokenizationMode: TokenizationMode.ALLOW_ONE_CLICK_PAYMENT,
         };
-        transaction.successUrl = `${transactionContext?.successUrl || PFCHECKOUT_SUCCESS_URL}?order_id=${
-          orderPayment.orderId
-        }`;
-        transaction.failedUrl = `${transactionContext?.failedUrl || PFCHECKOUT_FAILED_URL}?order_id=${
-          orderPayment.orderId
-        }`;
-        transaction.customerId = userId;
-        transaction.tokenizationMode =
-          PostFinanceCheckout.model.TokenizationMode.ALLOW_ONE_CLICK_PAYMENT;
+
         if (completionMode === CompletionModes.Immediate) {
-          transaction.completionBehavior =
-            PostFinanceCheckout.model.TransactionCompletionBehavior.COMPLETE_IMMEDIATELY;
+          transaction.completionBehavior = TransactionCompletionBehavior.COMPLETE_IMMEDIATELY;
         } else if (completionMode === CompletionModes.Deferred) {
-          transaction.completionBehavior =
-            PostFinanceCheckout.model.TransactionCompletionBehavior.COMPLETE_DEFERRED;
+          transaction.completionBehavior = TransactionCompletionBehavior.COMPLETE_DEFERRED;
         }
+
         if (totalAmount) {
-          const lineItemSum = new PostFinanceCheckout.model.LineItemCreate();
-          lineItemSum.name = `Bestellung ${orderPayment.orderId}`;
-          lineItemSum.type = PostFinanceCheckout.model.LineItemType.FEE;
-          lineItemSum.quantity = 1;
-          lineItemSum.uniqueId = orderPayment.orderId;
-          lineItemSum.amountIncludingTax = totalAmount / 100;
+          const lineItemSum: LineItem = {
+            name: `Bestellung ${orderPayment.orderId}`,
+            type: LineItemType.FEE,
+            quantity: 1,
+            uniqueId: orderPayment.orderId,
+            amountIncludingTax: totalAmount / 100,
+          };
           transaction.lineItems = [lineItemSum];
         }
+
         const transactionId = await createTransaction(transaction);
         let location = null;
         if (integrationMode === IntegrationModes.PaymentPage) {
@@ -216,10 +221,10 @@ const PostfinanceCheckout: IPaymentAdapter = {
           return false;
         }
         const transaction = await getTransaction(transactionId);
-        const refund = transaction.state === PostFinanceCheckout.model.TransactionState.FULFILL;
+        const refund = transaction.state === TransactionState.FULFILL;
         const pricing = OrderPricingSheet({
           calculation: order.calculation,
-          currency: order.currency,
+          currencyCode: order.currencyCode,
         });
 
         const totalAmount = pricing?.total({ useNetPrice: false }).amount;
@@ -237,7 +242,7 @@ const PostfinanceCheckout: IPaymentAdapter = {
           return false;
         }
         const transaction = await getTransaction(transactionId);
-        if (transaction.state === PostFinanceCheckout.model.TransactionState.AUTHORIZED) {
+        if (transaction.state === TransactionState.AUTHORIZED) {
           return confirmDeferredTransaction(transactionId);
         }
         return false;
@@ -249,3 +254,6 @@ const PostfinanceCheckout: IPaymentAdapter = {
 };
 
 PaymentDirector.registerAdapter(PostfinanceCheckout);
+
+export * from './types.js';
+export * from './api-types.js';

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

@@ -1,22 +1,22 @@
-export enum IntegrationModes { // eslint-disable-line
+export enum IntegrationModes {
   PaymentPage = 'PaymentPage',
   Lightbox = 'Lightbox',
   iFrame = 'iFrame',
 }
 
-export enum CompletionModes { // eslint-disable-line
+export enum CompletionModes {
   Immediate = 'Immediate',
   Deferred = 'Deferred',
 }
 
-export type SignResponse = {
+export interface SignResponse {
   transactionId: number;
   location: string | null;
-};
+}
 
 export type listenerEntityTechnicalNames = 'TransactionCompletion';
 
-export type WebhookData = {
+export interface WebhookData {
   eventId: number;
   entityId: number;
   listenerEntityId: number;
@@ -24,4 +24,4 @@ export type WebhookData = {
   spaceId: number;
   webhookListenerId: number;
   timestamp: string; // "YYYY-MM-DDTHH:MM:ss+0000", e.g. "2022-02-18T12:40:42+0000"
-};
+}

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

@@ -1,22 +1,20 @@
 import { OrderPricingSheet } from '@unchainedshop/core';
 import { Order } from '@unchainedshop/core-orders';
-import * as pf from 'postfinancecheckout';
-
-const { PostFinanceCheckout } = pf;
+import { Transaction, TransactionState } from './api-types.js';
 
 export const transactionIsPaid = async (
-  transaction: pf.PostFinanceCheckout.model.Transaction,
+  transaction: Transaction,
   expectedCurrency: string,
   expectedAmount: number,
 ): Promise<boolean> => {
-  if (transaction.state === PostFinanceCheckout.model.TransactionState.FULFILL) {
+  if (transaction.state === TransactionState.FULFILL) {
     return (
       transaction.completedAmount !== undefined &&
       transaction.completedAmount.toFixed(2) === expectedAmount.toFixed(2) &&
       transaction.currency === expectedCurrency
     );
   }
-  if (transaction.state === PostFinanceCheckout.model.TransactionState.AUTHORIZED) {
+  if (transaction.state === TransactionState.AUTHORIZED) {
     return (
       transaction.authorizationAmount !== undefined &&
       transaction.authorizationAmount.toFixed(2) === expectedAmount.toFixed(2) &&
@@ -26,14 +24,11 @@ export const transactionIsPaid = async (
   return false;
 };
 
-export const orderIsPaid = async (
-  order: Order,
-  transaction: pf.PostFinanceCheckout.model.Transaction,
-): Promise<boolean> => {
+export const orderIsPaid = async (order: Order, transaction: Transaction): Promise<boolean> => {
   const pricing = OrderPricingSheet({
     calculation: order.calculation,
-    currency: order.currency,
+    currencyCode: order.currencyCode,
   });
   const totalAmount = pricing.total({ useNetPrice: false }).amount / 100;
-  return transactionIsPaid(transaction, order.currency, totalAmount);
+  return transactionIsPaid(transaction, order.currencyCode, totalAmount);
 };

package/src/payment/saferpay/adapter.ts

@@ -68,9 +68,7 @@ export const WordlineSaferpay: IPaymentAdapter = {
         return config.find((item) => item.key === 'terminalId')?.value;
       },
 
-      // eslint-disable-next-line
       configurationError() {
-        // eslint-disable-line
         if (
           !SAFERPAY_BASE_URL ||
           !SAFERPAY_CUSTOMER_ID ||
@@ -100,7 +98,7 @@ export const WordlineSaferpay: IPaymentAdapter = {
         }
         const pricing = OrderPricingSheet({
           calculation: order.calculation,
-          currency: order.currency,
+          currencyCode: order.currencyCode,
         });
         const totalAmount = pricing?.total({ useNetPrice: false }).amount;
 
@@ -115,7 +113,7 @@ export const WordlineSaferpay: IPaymentAdapter = {
           Payment: {
             Amount: {
               Value: totalAmount.toString(),
-              CurrencyCode: order.currency,
+              CurrencyCode: order.currencyCode,
             },
             OrderId: order._id,
             Description: transactionContext.description || 'Bestellung',
@@ -160,7 +158,7 @@ export const WordlineSaferpay: IPaymentAdapter = {
         }
         const pricing = OrderPricingSheet({
           calculation: order.calculation,
-          currency: order.currency,
+          currencyCode: order.currencyCode,
         });
         const totalAmount = pricing.total({ useNetPrice: false }).amount;
 
@@ -176,7 +174,7 @@ export const WordlineSaferpay: IPaymentAdapter = {
         const success =
           !paymentPageAssert.ErrorMessage &&
           paymentPageAssert.Transaction.Amount.Value === totalAmount.toString() &&
-          paymentPageAssert.Transaction.Amount.CurrencyCode === order.currency &&
+          paymentPageAssert.Transaction.Amount.CurrencyCode === order.currencyCode &&
           (paymentPageAssert.Transaction.Status === 'AUTHORIZED' ||
             paymentPageAssert.Transaction.Status === 'CAPTURED');
         if (success) {

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

@@ -1,6 +1,6 @@
 export type TransactionStatus = 'AUTHORIZED' | 'CANCELED' | 'CAPTURED' | 'PENDING';
 
-export type TransactionAmount = {
+export interface TransactionAmount {
   Value: string;
   CurrencyCode: string;
-};
+}

package/src/payment/saferpay/module.ts

@@ -36,6 +36,6 @@ export default {
   },
 };
 
-export type SaferpayTransactionsModule = {
+export interface SaferpayTransactionsModule {
   saferpayTransactions: Awaited<ReturnType<typeof configureSaferpayTransactionsModule>>;
-};
+}

package/src/payment/stripe/index.ts

@@ -90,7 +90,7 @@ const Stripe: IPaymentAdapter = {
         if (orderPayment) {
           const pricing = OrderPricingSheet({
             calculation: order.calculation,
-            currency: order.currency,
+            currencyCode: order.currencyCode,
           });
           const { userId, name, email } = await getUserData(order?.userId);
           const paymentIntent = await createOrderPaymentIntent(
@@ -121,7 +121,7 @@ const Stripe: IPaymentAdapter = {
         const { userId, name, email } = await getUserData(order?.userId);
         const pricing = OrderPricingSheet({
           calculation: order.calculation,
-          currency: order.currency,
+          currencyCode: order.currencyCode,
         });
 
         const paymentIntentObject = paymentIntentId
@@ -132,15 +132,15 @@ const Stripe: IPaymentAdapter = {
                 customer: paymentCredentials.meta?.customer,
                 confirm: true,
                 payment_method: paymentCredentials.token,
-                payment_method_types: paymentCredentials.meta?.payment_method_types, // eslint-disable-line
+                payment_method_types: paymentCredentials.meta?.payment_method_types,
                 // payment_method_options: paymentCredentials.meta?.payment_method_options, // eslint-disable-line
               },
             );
 
-        const { currency, amount } = pricing.total({ useNetPrice: false });
+        const { currencyCode, amount } = pricing.total({ useNetPrice: false });
 
         if (
-          paymentIntentObject.currency !== currency.toLowerCase() ||
+          paymentIntentObject.currency !== currencyCode.toLowerCase() ||
           paymentIntentObject.amount !== Math.round(amount)
         ) {
           throw new Error('The price has changed since the intent has been created');

package/src/payment/stripe/stripe.ts

@@ -18,7 +18,7 @@ export const initStripeClient = async (): Promise<StripeType> => {
   // @ts-ignore
   const { default: Stripe } = await import('stripe');
   stripe = new Stripe(STRIPE_SECRET, {
-    apiVersion: '2025-05-28.basil',
+    apiVersion: '2025-06-30.basil',
   });
   return stripe;
 };
@@ -122,11 +122,11 @@ export const createOrderPaymentIntent = async (
   const description = `${descriptorPrefix || EMAIL_WEBSITE_NAME || 'Unchained'}`.trim();
   const customer = options?.customer || (await upsertCustomer({ userId, name, email }));
 
-  const { currency, amount } = pricing.total({ useNetPrice: false });
+  const { currencyCode, amount } = pricing.total({ useNetPrice: false });
 
   const paymentIntent = await stripe.paymentIntents.create({
     amount: Math.round(amount),
-    currency: currency.toLowerCase(),
+    currency: currencyCode.toLowerCase(),
     description,
     statement_descriptor_suffix: `${order._id.substring(0, 4)}..${order._id.substring(order._id.length - 4)}`,
     setup_future_usage: 'off_session', // Verify your integration in this guide by including this parameter

package/src/presets/all.ts

@@ -21,7 +21,9 @@ import '../filters/strict-equal.js';
 import '../filters/local-search.js';
 
 // Workers
-import '../worker/sms.js';
+import '../worker/twilio.js';
+import '../worker/bulkgate.js';
+import '../worker/budgetsms.js';
 import '../worker/push-notification.js';
 import '../worker/enrollment-order-generator.js';
 

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

@@ -19,8 +19,12 @@ const getTaxRate = ({ order, provider }: { order?: Order; provider?: DeliveryPro
   return taxCategory.rate(order?.ordered);
 };
 
-const isDeliveryAddressInSwitzerland = ({ orderDelivery, order, country = null }) => {
-  let countryCode = country?.toUpperCase().trim() || order.countryCode;
+const isDeliveryAddressInSwitzerland = ({
+  orderDelivery,
+  order,
+  countryCode: forceCountryCode = null,
+}) => {
+  let countryCode = forceCountryCode?.toUpperCase().trim() || order.countryCode;
 
   const address = orderDelivery?.context?.address || order?.billingAddress;
 

package/src/pricing/order-delivery.ts

@@ -29,7 +29,7 @@ export const OrderDelivery: IOrderPricingAdapter = {
         if (!orderDelivery) return null;
         const pricing = DeliveryPricingSheet({
           calculation: orderDelivery.calculation,
-          currency: order.currency,
+          currencyCode: order.currencyCode,
         });
         const tax = pricing.taxSum();
         const shipping = pricing.gross();

package/src/pricing/order-discount.ts

@@ -48,7 +48,7 @@ export const OrderDiscount: IOrderPricingAdapter<OrderDiscountConfiguration> = {
           resolveRatioAndTaxDivisorForPricingSheet(
             ProductPricingSheet({
               calculation: orderPosition.calculation,
-              currency: order.currency,
+              currencyCode: order.currencyCode,
               quantity: orderPosition.quantity,
             }),
             totalAmountOfItems,
@@ -58,7 +58,7 @@ export const OrderDiscount: IOrderPricingAdapter<OrderDiscountConfiguration> = {
         const deliveryShare = resolveRatioAndTaxDivisorForPricingSheet(
           DeliveryPricingSheet({
             calculation: orderDelivery.calculation || [],
-            currency: order.currency,
+            currencyCode: order.currencyCode,
           }),
           totalAmountOfPaymentAndDelivery,
         );
@@ -66,7 +66,7 @@ export const OrderDiscount: IOrderPricingAdapter<OrderDiscountConfiguration> = {
         const paymentShare = resolveRatioAndTaxDivisorForPricingSheet(
           PaymentPricingSheet({
             calculation: orderPayment.calculation || [],
-            currency: order.currency,
+            currencyCode: order.currencyCode,
           }),
           totalAmountOfPaymentAndDelivery,
         );

package/src/pricing/order-items-discount.ts

@@ -42,7 +42,7 @@ const OrderItemsDiscount: IOrderPricingAdapter<OrderDiscountConfiguration> = {
           resolveRatioAndTaxDivisorForPricingSheet(
             ProductPricingSheet({
               calculation: orderPosition.calculation,
-              currency: order.currency,
+              currencyCode: order.currencyCode,
               quantity: orderPosition.quantity,
             }),
             totalAmountOfItems,

package/src/pricing/order-items.ts

@@ -30,7 +30,7 @@ const OrderItems: IOrderPricingAdapter = {
           (current, orderPosition) => {
             const pricing = ProductPricingSheet({
               calculation: orderPosition.calculation,
-              currency: order.currency,
+              currencyCode: order.currencyCode,
               quantity: orderPosition.quantity,
             });
             const tax = pricing.taxSum();

package/src/pricing/order-payment.ts

@@ -30,7 +30,7 @@ const OrderPayment: IOrderPricingAdapter = {
 
         const pricing = PaymentPricingSheet({
           calculation: orderPayment.calculation,
-          currency: order.currency,
+          currencyCode: order.currencyCode,
         });
         const tax = pricing.taxSum();
         const paymentFees = pricing.gross();

package/src/pricing/order-round.ts

@@ -7,7 +7,7 @@ import {
 
 interface PriceRoundSettings {
   defaultPrecision: number;
-  roundTo: (value: number, precision: number, currency: string) => number;
+  roundTo: (value: number, precision: number, currencyCode: string) => number;
 }
 
 export const OrderPriceRound: IOrderPricingAdapter & {
@@ -39,11 +39,11 @@ export const OrderPriceRound: IOrderPricingAdapter & {
   actions: (params) => {
     const pricingAdapter = OrderPricingAdapter.actions(params);
 
-    const calculateDifference = (amount: number, currency: string) => {
+    const calculateDifference = (amount: number, currencyCode: string) => {
       const roundedAmount = OrderPriceRound.settings.roundTo(
         amount,
         OrderPriceRound.settings.defaultPrecision,
-        currency,
+        currencyCode,
       );
       return roundedAmount - amount;
     };
@@ -52,7 +52,7 @@ export const OrderPriceRound: IOrderPricingAdapter & {
       ...pricingAdapter,
 
       calculate: async () => {
-        const { currency } = params.context;
+        const { currencyCode } = params.context;
 
         const { amount: deliveryAmount } = params.calculationSheet.total({
           category: OrderPricingRowCategory.Delivery,
@@ -60,7 +60,7 @@ export const OrderPriceRound: IOrderPricingAdapter & {
         });
         if (deliveryAmount) {
           pricingAdapter.resultSheet().addDelivery({
-            amount: calculateDifference(deliveryAmount, currency),
+            amount: calculateDifference(deliveryAmount, currencyCode),
             taxAmount: 0,
             meta: {
               adapter: OrderPriceRound.key,
@@ -74,7 +74,7 @@ export const OrderPriceRound: IOrderPricingAdapter & {
         });
         if (discountAmount) {
           pricingAdapter.resultSheet().addDiscount({
-            amount: calculateDifference(discountAmount, currency),
+            amount: calculateDifference(discountAmount, currencyCode),
             taxAmount: 0,
             meta: {
               adapter: OrderPriceRound.key,
@@ -89,7 +89,7 @@ export const OrderPriceRound: IOrderPricingAdapter & {
         });
         if (itemsAmount) {
           pricingAdapter.resultSheet().addItems({
-            amount: calculateDifference(itemsAmount, currency),
+            amount: calculateDifference(itemsAmount, currencyCode),
             taxAmount: 0,
             meta: {
               adapter: OrderPriceRound.key,
@@ -103,7 +103,7 @@ export const OrderPriceRound: IOrderPricingAdapter & {
         });
         if (paymentAmount) {
           pricingAdapter.resultSheet().addPayment({
-            amount: calculateDifference(paymentAmount, currency),
+            amount: calculateDifference(paymentAmount, currencyCode),
             taxAmount: 0,
             meta: {
               adapter: OrderPriceRound.key,
@@ -115,7 +115,7 @@ export const OrderPriceRound: IOrderPricingAdapter & {
           category: OrderPricingRowCategory.Taxes,
         });
         if (taxesAmount) {
-          const taxDifference = calculateDifference(taxesAmount, currency);
+          const taxDifference = calculateDifference(taxesAmount, currencyCode);
           pricingAdapter.resultSheet().calculation.push({
             category: OrderPricingRowCategory.Taxes,
             amount: taxDifference,

package/src/pricing/product-catalog-price.ts

@@ -3,28 +3,6 @@ import {
   ProductPricingAdapter,
   IProductPricingAdapter,
 } from '@unchainedshop/core';
-import { resolveBestCurrency } from '@unchainedshop/utils';
-import pMemoize from 'p-memoize';
-import ExpiryMap from 'expiry-map';
-
-const { NODE_ENV } = process.env;
-
-const memoizeCache = new ExpiryMap(NODE_ENV === 'production' ? 1000 * 60 : 100); // Cached values expire after 10 seconds
-
-export const resolveCurrency = pMemoize(
-  async (context) => {
-    const { country, currency: forcedCurrency, modules } = context;
-    const countryObject = await modules.countries.findCountry({ isoCode: country });
-    const currencies = await modules.currencies.findCurrencies({ includeInactive: false });
-    const currency =
-      forcedCurrency || resolveBestCurrency(countryObject.defaultCurrencyCode, currencies);
-    return currency;
-  },
-  {
-    cache: memoizeCache,
-    cacheKey: ([{ currency, country }]) => `${currency}-${country}`,
-  },
-);
 
 export const ProductPrice: IProductPricingAdapter = {
   ...ProductPricingAdapter,
@@ -45,9 +23,12 @@ export const ProductPrice: IProductPricingAdapter = {
       ...pricingAdapter,
 
       calculate: async () => {
-        const { product, country, quantity, modules } = params.context;
-        const currency = await resolveCurrency(params.context);
-        const price = await modules.products.prices.price(product, { country, currency, quantity });
+        const { product, countryCode, currencyCode, quantity, modules } = params.context;
+        const price = await modules.products.prices.price(product, {
+          countryCode,
+          currencyCode,
+          quantity,
+        });
         if (price) {
           const itemTotal = price.amount * quantity;
           pricingAdapter.resultSheet().addItem({