@unchainedshop/plugins 5.0.0-alpha.2 → 5.0.0-alpha.3

package/lib/events/aws-eventbridge.d.ts

@@ -1 +1,7 @@
-export {};
+import type { EmitAdapter } from '@unchainedshop/events';
+export declare const EventBridgeEventEmitter: ({ region, source, busName }: {
+    region: any;
+    source: any;
+    busName: any;
+}) => Promise<EmitAdapter>;
+export default EventBridgeEventEmitter;

package/lib/events/aws-eventbridge.js

@@ -1,7 +1,6 @@
-import { setEmitAdapter } from '@unchainedshop/events';
 import { createLogger } from '@unchainedshop/logger';
 const logger = createLogger('unchained:eventbridge');
-const EventBridgeEventEmitter = async ({ region, source, busName }) => {
+export const EventBridgeEventEmitter = async ({ region, source, busName }) => {
     const { EventBridgeClient, PutEventsCommand } = await import('@aws-sdk/client-eventbridge');
     const ebClient = new EventBridgeClient({ region });
     return {
@@ -24,14 +23,9 @@ const EventBridgeEventEmitter = async ({ region, source, busName }) => {
         subscribe: () => {
             throw new Error("You can't subscribe to EventBridge connected Events");
         },
+        shutdown: () => {
+            ebClient.destroy();
+        },
     };
 };
-const { EVENT_BRIDGE_REGION, EVENT_BRIDGE_SOURCE, EVENT_BRIDGE_BUS_NAME } = process.env;
-if (EVENT_BRIDGE_REGION && EVENT_BRIDGE_SOURCE && EVENT_BRIDGE_BUS_NAME) {
-    const eventBridgeAdapter = await EventBridgeEventEmitter({
-        source: EVENT_BRIDGE_SOURCE,
-        region: EVENT_BRIDGE_REGION,
-        busName: EVENT_BRIDGE_BUS_NAME,
-    });
-    setEmitAdapter(eventBridgeAdapter);
-}
+export default EventBridgeEventEmitter;

package/lib/events/redis.d.ts

@@ -1 +1,3 @@
-export {};
+import type { EmitAdapter } from '@unchainedshop/events';
+export declare const RedisEventEmitter: () => EmitAdapter;
+export default RedisEventEmitter;

package/lib/events/redis.js

@@ -1,8 +1,7 @@
 import { createClient } from '@redis/client';
-import { setEmitAdapter } from '@unchainedshop/events';
 const { REDIS_PORT = '6379', REDIS_HOST, REDIS_DB = '0' } = process.env;
 const subscribedEvents = new Set();
-const RedisEventEmitter = () => {
+export const RedisEventEmitter = () => {
     const redisPublisher = createClient({
         url: `redis://${REDIS_HOST}:${REDIS_PORT}`,
         database: parseInt(REDIS_DB, 10),
@@ -21,8 +20,9 @@ const RedisEventEmitter = () => {
                 subscribedEvents.add(eventName);
             }
         },
+        shutdown: async () => {
+            await Promise.allSettled([redisPublisher.close(), redisSubscriber.close()]);
+        },
     };
 };
-if (REDIS_HOST && REDIS_PORT && REDIS_DB) {
-    setEmitAdapter(RedisEventEmitter());
-}
+export default RedisEventEmitter;

package/lib/files/gridfs/api.js

@@ -87,7 +87,7 @@ export const gridfsRouteHandler = async (request, context) => {
             const signature = url.searchParams.get('s');
             const expiryTimestamp = url.searchParams.get('e');
             const fileDocument = await modules.files.findFile({
-                url: `${GRIDFS_PUT_SERVER_PATH}/${directoryName}/${fileName}`,
+                url: `${GRIDFS_PUT_SERVER_PATH}/${directoryName}/${encodeURIComponent(fileName)}`,
             });
             if (!fileDocument) {
                 logger.error('File not found', { fileName });

package/lib/files/gridfs/handler-express.js

@@ -59,7 +59,7 @@ const gridfsHandler = async (req, res) => {
         if (req.method === 'GET') {
             const { s: signature, e: expiryTimestamp } = req.query;
             const fileDocument = await modules.files.findFile({
-                url: `${GRIDFS_PUT_SERVER_PATH}/${directoryName}/${fileName}`,
+                url: `${GRIDFS_PUT_SERVER_PATH}/${directoryName}/${encodeURIComponent(fileName)}`,
             });
             if (fileDocument?.meta?.isPrivate) {
                 const expiry = parseInt(expiryTimestamp, 10);

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

@@ -2,6 +2,7 @@ import { createLogger } from '@unchainedshop/logger';
 import createDatatransAPI from "./api/index.js";
 import parseRegistrationData from "./parseRegistrationData.js";
 import roundedAmountFromOrder from "./roundedAmountFromOrder.js";
+import build3DSCardholder, { withCardCardholder, withSecureFieldsCardholder, } from "./build3DSCardholder.js";
 import { PaymentAdapter, PaymentError, PaymentPricingRowCategory, PaymentPricingSheet, OrderPricingSheet, } from '@unchainedshop/core';
 const logger = createLogger('unchained:datatrans');
 const { DATATRANS_SECRET, DATATRANS_SIGN_KEY, DATATRANS_API_ENDPOINT = 'https://api.sandbox.datatrans.com', DATATRANS_MERCHANT_ID, } = process.env;
@@ -221,22 +222,18 @@ export const Datatrans = {
                 const price = order
                     ? roundedAmountFromOrder(order)
                     : {};
+                const cardholder = build3DSCardholder(order);
                 if (useSecureFields) {
                     const result = await api().secureFields({
-                        ...arbitraryFields,
+                        ...withSecureFieldsCardholder(arbitraryFields, cardholder),
                         currency: price.currencyCode || 'CHF',
-                        refno,
-                        refno2,
-                        customer: {
-                            id: userId,
-                        },
                         amount: price.amount,
                     });
                     throwIfResponseError(result);
                     return JSON.stringify(result);
                 }
                 const result = await api().init({
-                    ...arbitraryFields,
+                    ...withCardCardholder(arbitraryFields, cardholder),
                     currency: price.currencyCode || 'CHF',
                     refno,
                     refno2,
@@ -349,11 +346,17 @@ export const Datatrans = {
                 if (status === 'authenticated') {
                     if (authorizeAuthenticated) {
                         checkIfTransactionAmountValid(transactionId, transaction);
+                        const { orderPayment, order } = context;
+                        const userId = order?.userId || context?.userId;
+                        const refno = orderPayment
+                            ? Buffer.from(orderPayment._id, 'hex').toString('base64')
+                            : transaction.refno;
+                        const refno2 = userId || transaction.refno2;
                         await authorizeAuth({
                             ...(authorizeAuthenticated || {}),
                             transactionId,
-                            refno: transaction.refno,
-                            refno2: transaction.refno2,
+                            refno,
+                            refno2,
                         });
                         status = 'authorized';
                     }

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

@@ -0,0 +1,12 @@
+import type { Order } from '@unchainedshop/core-orders';
+export interface Cardholder {
+    cardholderName?: string;
+    email?: string;
+    homePhone?: {
+        cc: string;
+        subscriber: string;
+    };
+}
+export default function build3DSCardholder(order?: Order): Cardholder | undefined;
+export declare const withCardCardholder: (arbitraryFields: any, cardholder?: Cardholder) => any;
+export declare const withSecureFieldsCardholder: (arbitraryFields: any, cardholder?: Cardholder) => any;

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

@@ -0,0 +1,44 @@
+import { phoneNumberToParts } from '@unchainedshop/utils';
+export default function build3DSCardholder(order) {
+    if (!order)
+        return undefined;
+    const { billingAddress, contact } = order;
+    const cardholderName = [billingAddress?.firstName, billingAddress?.lastName].filter(Boolean).join(' ');
+    const homePhone = phoneNumberToParts(contact?.telNumber, billingAddress?.countryCode);
+    const cardholder = {};
+    if (cardholderName)
+        cardholder.cardholderName = cardholderName;
+    if (contact?.emailAddress)
+        cardholder.email = contact.emailAddress;
+    if (homePhone)
+        cardholder.homePhone = homePhone;
+    if (Object.keys(cardholder).length === 0)
+        return undefined;
+    return cardholder;
+}
+const mergeCardholder = (container, cardholder) => {
+    const threeDS = container?.['3D'] || {};
+    return {
+        ...container,
+        '3D': {
+            ...threeDS,
+            cardholder: {
+                ...cardholder,
+                ...(threeDS.cardholder || {}),
+            },
+        },
+    };
+};
+export const withCardCardholder = (arbitraryFields, cardholder) => {
+    if (!cardholder)
+        return arbitraryFields;
+    return {
+        ...arbitraryFields,
+        card: mergeCardholder(arbitraryFields?.card, cardholder),
+    };
+};
+export const withSecureFieldsCardholder = (arbitraryFields, cardholder) => {
+    if (!cardholder)
+        return arbitraryFields;
+    return mergeCardholder(arbitraryFields, cardholder);
+};

package/lib/payment/paypal-checkout.js

@@ -58,19 +58,31 @@ const PaypalCheckout = {
                     throw new Error('You have to provide orderID in paymentContext');
                 }
                 try {
-                    const request = new checkoutNodeJssdk.orders.OrdersGetRequest(orderID);
                     const client = new checkoutNodeJssdk.core.PayPalHttpClient(environment());
-                    const paypalOrder = await client.execute(request);
+                    const getRequest = new checkoutNodeJssdk.orders.OrdersGetRequest(orderID);
+                    let paypalResult = (await client.execute(getRequest)).result;
+                    if (paypalResult.status === 'APPROVED') {
+                        const captureRequest = new checkoutNodeJssdk.orders.OrdersCaptureRequest(orderID);
+                        captureRequest.requestBody({});
+                        paypalResult = (await client.execute(captureRequest)).result;
+                    }
+                    if (paypalResult.status !== 'COMPLETED') {
+                        throw new Error(`PayPal order not completed (status: ${paypalResult.status})`);
+                    }
+                    const capture = paypalResult.purchase_units?.[0]?.payments?.captures?.find((c) => c.status === 'COMPLETED');
+                    if (!capture) {
+                        throw new Error('PayPal order has no completed capture');
+                    }
                     const pricing = OrderPricingSheet({
                         calculation: order.calculation,
                         currencyCode: order.currencyCode,
                     });
                     const ourTotal = roundToDecimals(pricing.total({ useNetPrice: false }).amount / 100, 2);
-                    const paypalTotal = roundToDecimals(paypalOrder.result.purchase_units[0].amount.value, 2);
-                    if (ourTotal === paypalTotal) {
+                    const paidTotal = roundToDecimals(capture.amount.value, 2);
+                    if (ourTotal === paidTotal && capture.amount.currency_code === order.currencyCode) {
                         return order;
                     }
-                    logger.warn('Missmatch PAYPAL ORDER', JSON.stringify(paypalOrder.result, null, 2));
+                    logger.warn('Missmatch PAYPAL ORDER', JSON.stringify(paypalResult, null, 2));
                     logger.debug('OUR ORDER', order);
                     logger.debug('OUR PRICE', pricing);
                     throw new Error(`Payment mismatch`);

package/lib/payment/stripe/stripe.js

@@ -7,7 +7,7 @@ if (STRIPE_SECRET) {
     try {
         const { default: Stripe } = await import('stripe');
         stripe = new Stripe(STRIPE_SECRET, {
-            apiVersion: '2026-04-22.dahlia',
+            apiVersion: '2026-07-29.dahlia',
         });
     }
     catch {

package/lib/presets/base.js

@@ -19,6 +19,8 @@ import { LicensedEnrollmentsPlugin } from "../enrollments/licensed/index.js";
 import { NodeEventEmitter } from "../events/node-event-emitter.js";
 import { BulkImportPlugin } from "../worker/bulk-import/index.js";
 import { ZombieKillerPlugin } from "../worker/zombie-killer/index.js";
+import { GCGuestsPlugin } from "../worker/gc-guests/index.js";
+import { InvalidateCartsPlugin } from "../worker/invalidate-carts/index.js";
 import { MessagePlugin } from "../worker/message/index.js";
 import { ExternalPlugin } from "../worker/external/index.js";
 import { HttpRequestPlugin } from "../worker/http-request/index.js";
@@ -46,6 +48,8 @@ export function registerBasePlugins() {
     setEmitAdapter(NodeEventEmitter());
     pluginRegistry.register(BulkImportPlugin);
     pluginRegistry.register(ZombieKillerPlugin);
+    pluginRegistry.register(GCGuestsPlugin);
+    pluginRegistry.register(InvalidateCartsPlugin);
     pluginRegistry.register(MessagePlugin);
     pluginRegistry.register(ExternalPlugin);
     pluginRegistry.register(HttpRequestPlugin);

package/lib/presets/countries/eu.d.ts

@@ -0,0 +1 @@
+export declare function registerEuTaxPlugins(): void;

package/lib/presets/countries/eu.js

@@ -0,0 +1,7 @@
+import { ProductEuTaxPlugin } from "../../pricing/product-eu-tax/index.js";
+import { DeliveryEuTaxPlugin } from "../../pricing/delivery-eu-tax/index.js";
+import { pluginRegistry } from '@unchainedshop/core';
+export function registerEuTaxPlugins() {
+    pluginRegistry.register(ProductEuTaxPlugin);
+    pluginRegistry.register(DeliveryEuTaxPlugin);
+}

package/lib/presets/countries/uk.d.ts

@@ -0,0 +1 @@
+export declare function registerUkTaxPlugins(): void;

package/lib/presets/countries/uk.js

@@ -0,0 +1,7 @@
+import { ProductUkTaxPlugin } from "../../pricing/product-uk-tax/index.js";
+import { DeliveryUkTaxPlugin } from "../../pricing/delivery-uk-tax/index.js";
+import { pluginRegistry } from '@unchainedshop/core';
+export function registerUkTaxPlugins() {
+    pluginRegistry.register(ProductUkTaxPlugin);
+    pluginRegistry.register(DeliveryUkTaxPlugin);
+}

package/lib/presets/countries/us.d.ts

@@ -0,0 +1 @@
+export declare function registerUsSalesTaxPlugins(): void;

package/lib/presets/countries/us.js

@@ -0,0 +1,7 @@
+import { ProductUsSalesTaxPlugin } from "../../pricing/product-us-sales-tax/index.js";
+import { DeliveryUsSalesTaxPlugin } from "../../pricing/delivery-us-sales-tax/index.js";
+import { pluginRegistry } from '@unchainedshop/core';
+export function registerUsSalesTaxPlugins() {
+    pluginRegistry.register(ProductUsSalesTaxPlugin);
+    pluginRegistry.register(DeliveryUsSalesTaxPlugin);
+}

package/lib/pricing/delivery-eu-tax/adapter.d.ts

@@ -0,0 +1,3 @@
+import { type IDeliveryPricingAdapter } from '@unchainedshop/core';
+export declare const DeliveryEuTax: IDeliveryPricingAdapter;
+export default DeliveryEuTax;

package/lib/pricing/delivery-eu-tax/adapter.js

@@ -0,0 +1,55 @@
+import { DeliveryPricingRowCategory, DeliveryPricingAdapter, } from '@unchainedshop/core';
+import { isEuMemberCountry, resolveEuTaxCategoryFromDeliveryProvider, resolveEuTaxRate, } from "../tax/eu.js";
+import resolveDeliveryLocation from "../utils/resolveDeliveryLocation.js";
+import { applyTaxRateToTaxableRows } from "../tax/applyTaxRateToTaxableRows.js";
+export const DeliveryEuTax = {
+    ...DeliveryPricingAdapter,
+    key: 'shop.unchained.pricing.delivery-eu-tax',
+    version: '1.0.0',
+    label: 'Apply EU VAT on Delivery Fees',
+    orderIndex: 80,
+    isActivatedFor: (context) => {
+        if (!context.order)
+            return false;
+        if (!context.orderDelivery)
+            return false;
+        const { countryCode } = resolveDeliveryLocation({
+            order: context.order,
+            orderDelivery: context.orderDelivery,
+            countryCode: context.countryCode,
+        });
+        return isEuMemberCountry(countryCode);
+    },
+    actions: (params) => {
+        const pricingAdapter = DeliveryPricingAdapter.actions(params);
+        const { context } = params;
+        return {
+            ...pricingAdapter,
+            calculate: async () => {
+                const { countryCode } = resolveDeliveryLocation({
+                    order: context.order,
+                    orderDelivery: context.orderDelivery,
+                    countryCode: context.countryCode,
+                });
+                const category = resolveEuTaxCategoryFromDeliveryProvider(context.provider);
+                const taxRate = resolveEuTaxRate({
+                    countryCode,
+                    category,
+                    referenceDate: context.order?.ordered,
+                });
+                if (taxRate === null)
+                    return pricingAdapter.calculate();
+                DeliveryPricingAdapter.log(`DeliveryEuTax -> Tax Multiplicator: ${taxRate}`);
+                applyTaxRateToTaxableRows({
+                    calculationSheet: params.calculationSheet,
+                    resultSheet: pricingAdapter.resultSheet(),
+                    taxRate,
+                    baseCategory: DeliveryPricingRowCategory.Delivery,
+                    adapterKey: DeliveryEuTax.key,
+                });
+                return pricingAdapter.calculate();
+            },
+        };
+    },
+};
+export default DeliveryEuTax;

package/lib/pricing/delivery-eu-tax/index.d.ts

@@ -0,0 +1,4 @@
+import { type IPlugin } from '@unchainedshop/core';
+export declare const DeliveryEuTaxPlugin: IPlugin;
+export default DeliveryEuTaxPlugin;
+export { DeliveryEuTax } from './adapter.ts';

package/lib/pricing/delivery-eu-tax/index.js

@@ -0,0 +1,10 @@
+import {} from '@unchainedshop/core';
+import { DeliveryEuTax } from "./adapter.js";
+export const DeliveryEuTaxPlugin = {
+    key: 'shop.unchained.pricing.delivery-eu-tax',
+    label: 'Delivery EU Tax Plugin',
+    version: '1.0.0',
+    adapters: [DeliveryEuTax],
+};
+export default DeliveryEuTaxPlugin;
+export { DeliveryEuTax } from "./adapter.js";

package/lib/pricing/delivery-eu-tax.d.ts

@@ -0,0 +1,2 @@
+import { type IDeliveryPricingAdapter } from '@unchainedshop/core';
+export declare const DeliveryEuTax: IDeliveryPricingAdapter;

package/lib/pricing/delivery-eu-tax.js

@@ -0,0 +1,55 @@
+import { DeliveryPricingRowCategory, DeliveryPricingAdapter, DeliveryPricingDirector, } from '@unchainedshop/core';
+import { isEuMemberCountry, resolveEuTaxCategoryFromDeliveryProvider, resolveEuTaxRate, } from "./tax/eu.js";
+import resolveDeliveryLocation from "./utils/resolveDeliveryLocation.js";
+import { applyTaxRateToTaxableRows } from "./tax/applyTaxRateToTaxableRows.js";
+export const DeliveryEuTax = {
+    ...DeliveryPricingAdapter,
+    key: 'shop.unchained.pricing.delivery-eu-tax',
+    version: '1.0.0',
+    label: 'Apply EU VAT on Delivery Fees',
+    orderIndex: 80,
+    isActivatedFor: (context) => {
+        if (!context.order)
+            return false;
+        if (!context.orderDelivery)
+            return false;
+        const { countryCode } = resolveDeliveryLocation({
+            order: context.order,
+            orderDelivery: context.orderDelivery,
+            countryCode: context.countryCode,
+        });
+        return isEuMemberCountry(countryCode);
+    },
+    actions: (params) => {
+        const pricingAdapter = DeliveryPricingAdapter.actions(params);
+        const { context } = params;
+        return {
+            ...pricingAdapter,
+            calculate: async () => {
+                const { countryCode } = resolveDeliveryLocation({
+                    order: context.order,
+                    orderDelivery: context.orderDelivery,
+                    countryCode: context.countryCode,
+                });
+                const category = resolveEuTaxCategoryFromDeliveryProvider(context.provider);
+                const taxRate = resolveEuTaxRate({
+                    countryCode,
+                    category,
+                    referenceDate: context.order?.ordered,
+                });
+                if (taxRate === null)
+                    return pricingAdapter.calculate();
+                DeliveryPricingAdapter.log(`DeliveryEuTax -> Tax Multiplicator: ${taxRate}`);
+                applyTaxRateToTaxableRows({
+                    calculationSheet: params.calculationSheet,
+                    resultSheet: pricingAdapter.resultSheet(),
+                    taxRate,
+                    baseCategory: DeliveryPricingRowCategory.Delivery,
+                    adapterKey: DeliveryEuTax.key,
+                });
+                return pricingAdapter.calculate();
+            },
+        };
+    },
+};
+DeliveryPricingDirector.registerAdapter(DeliveryEuTax);

package/lib/pricing/delivery-swiss-tax/adapter.js

@@ -1,6 +1,7 @@
 import { DeliveryPricingRowCategory, DeliveryPricingAdapter, } from '@unchainedshop/core';
 import { resolveTaxCategoryFromDeliveryProvider, SwissTaxCategories } from "../tax/ch.js";
 import isDeliveryAddressInCountry from "../utils/isDeliveryAddressInCountry.js";
+import { applyTaxRateToTaxableRows } from "../tax/applyTaxRateToTaxableRows.js";
 export const DeliverySwissTax = {
     ...DeliveryPricingAdapter,
     key: 'shop.unchained.pricing.delivery-swiss-tax',
@@ -27,32 +28,12 @@ export const DeliverySwissTax = {
                 const taxCategory = resolveTaxCategoryFromDeliveryProvider(context.provider) || SwissTaxCategories.DEFAULT;
                 const taxRate = taxCategory.rate(context.order?.ordered);
                 DeliveryPricingAdapter.log(`DeliverySwissTax -> Tax Multiplicator: ${taxRate}`);
-                params.calculationSheet.filterBy({ isTaxable: true }).forEach(({ isNetPrice, ...row }) => {
-                    if (!isNetPrice) {
-                        const taxAmount = row.amount - row.amount / (1 + taxRate);
-                        pricingAdapter.resultSheet().calculation.push({
-                            ...row,
-                            amount: -taxAmount,
-                            isTaxable: false,
-                            isNetPrice: false,
-                            meta: { adapter: DeliverySwissTax.key },
-                        });
-                        pricingAdapter.resultSheet().addTax({
-                            amount: taxAmount,
-                            rate: taxRate,
-                            baseCategory: DeliveryPricingRowCategory.Delivery,
-                            meta: { adapter: DeliverySwissTax.key },
-                        });
-                    }
-                    else {
-                        const taxAmount = row.amount * taxRate;
-                        pricingAdapter.resultSheet().addTax({
-                            amount: taxAmount,
-                            rate: taxRate,
-                            baseCategory: DeliveryPricingRowCategory.Delivery,
-                            meta: { adapter: DeliverySwissTax.key },
-                        });
-                    }
+                applyTaxRateToTaxableRows({
+                    calculationSheet: params.calculationSheet,
+                    resultSheet: pricingAdapter.resultSheet(),
+                    taxRate,
+                    baseCategory: DeliveryPricingRowCategory.Delivery,
+                    adapterKey: DeliverySwissTax.key,
                 });
                 return pricingAdapter.calculate();
             },

package/lib/pricing/delivery-swiss-tax.js

@@ -1,6 +1,7 @@
 import { DeliveryPricingRowCategory, DeliveryPricingAdapter, DeliveryPricingDirector, } from '@unchainedshop/core';
 import { resolveTaxCategoryFromDeliveryProvider, SwissTaxCategories } from "./tax/ch.js";
 import isDeliveryAddressInCountry from "./utils/isDeliveryAddressInCountry.js";
+import { applyTaxRateToTaxableRows } from "./tax/applyTaxRateToTaxableRows.js";
 export const DeliverySwissTax = {
     ...DeliveryPricingAdapter,
     key: 'shop.unchained.pricing.delivery-swiss-tax',
@@ -27,32 +28,12 @@ export const DeliverySwissTax = {
                 const taxCategory = resolveTaxCategoryFromDeliveryProvider(context.provider) || SwissTaxCategories.DEFAULT;
                 const taxRate = taxCategory.rate(context.order?.ordered);
                 DeliveryPricingAdapter.log(`DeliverySwissTax -> Tax Multiplicator: ${taxRate}`);
-                params.calculationSheet.filterBy({ isTaxable: true }).forEach(({ isNetPrice, ...row }) => {
-                    if (!isNetPrice) {
-                        const taxAmount = row.amount - row.amount / (1 + taxRate);
-                        pricingAdapter.resultSheet().calculation.push({
-                            ...row,
-                            amount: -taxAmount,
-                            isTaxable: false,
-                            isNetPrice: false,
-                            meta: { adapter: DeliverySwissTax.key },
-                        });
-                        pricingAdapter.resultSheet().addTax({
-                            amount: taxAmount,
-                            rate: taxRate,
-                            baseCategory: DeliveryPricingRowCategory.Delivery,
-                            meta: { adapter: DeliverySwissTax.key },
-                        });
-                    }
-                    else {
-                        const taxAmount = row.amount * taxRate;
-                        pricingAdapter.resultSheet().addTax({
-                            amount: taxAmount,
-                            rate: taxRate,
-                            baseCategory: DeliveryPricingRowCategory.Delivery,
-                            meta: { adapter: DeliverySwissTax.key },
-                        });
-                    }
+                applyTaxRateToTaxableRows({
+                    calculationSheet: params.calculationSheet,
+                    resultSheet: pricingAdapter.resultSheet(),
+                    taxRate,
+                    baseCategory: DeliveryPricingRowCategory.Delivery,
+                    adapterKey: DeliverySwissTax.key,
                 });
                 return pricingAdapter.calculate();
             },

package/lib/pricing/delivery-uk-tax/adapter.d.ts

@@ -0,0 +1,3 @@
+import { type IDeliveryPricingAdapter } from '@unchainedshop/core';
+export declare const DeliveryUkTax: IDeliveryPricingAdapter;
+export default DeliveryUkTax;

package/lib/pricing/delivery-uk-tax/adapter.js

@@ -0,0 +1,43 @@
+import { DeliveryPricingRowCategory, DeliveryPricingAdapter, } from '@unchainedshop/core';
+import { resolveUkTaxCategoryFromDeliveryProvider, UkTaxCategories, UK_VAT_COUNTRY_CODES, } from "../tax/uk.js";
+import isDeliveryAddressInCountry from "../utils/isDeliveryAddressInCountry.js";
+import { applyTaxRateToTaxableRows } from "../tax/applyTaxRateToTaxableRows.js";
+export const DeliveryUkTax = {
+    ...DeliveryPricingAdapter,
+    key: 'shop.unchained.pricing.delivery-uk-tax',
+    version: '1.0.0',
+    label: 'Apply UK VAT on Delivery Fees',
+    orderIndex: 80,
+    isActivatedFor: (context) => {
+        if (!context.order)
+            return false;
+        if (!context.orderDelivery)
+            return false;
+        return isDeliveryAddressInCountry({
+            order: context.order,
+            orderDelivery: context.orderDelivery,
+            countryCode: context.countryCode,
+        }, UK_VAT_COUNTRY_CODES);
+    },
+    actions: (params) => {
+        const pricingAdapter = DeliveryPricingAdapter.actions(params);
+        const { context } = params;
+        return {
+            ...pricingAdapter,
+            calculate: async () => {
+                const taxCategory = resolveUkTaxCategoryFromDeliveryProvider(context.provider) || UkTaxCategories.STANDARD;
+                const taxRate = taxCategory.rate(context.order?.ordered);
+                DeliveryPricingAdapter.log(`DeliveryUkTax -> Tax Multiplicator: ${taxRate}`);
+                applyTaxRateToTaxableRows({
+                    calculationSheet: params.calculationSheet,
+                    resultSheet: pricingAdapter.resultSheet(),
+                    taxRate,
+                    baseCategory: DeliveryPricingRowCategory.Delivery,
+                    adapterKey: DeliveryUkTax.key,
+                });
+                return pricingAdapter.calculate();
+            },
+        };
+    },
+};
+export default DeliveryUkTax;

package/lib/pricing/delivery-uk-tax/index.d.ts

@@ -0,0 +1,4 @@
+import { type IPlugin } from '@unchainedshop/core';
+export declare const DeliveryUkTaxPlugin: IPlugin;
+export default DeliveryUkTaxPlugin;
+export { DeliveryUkTax } from './adapter.ts';

package/lib/pricing/delivery-uk-tax/index.js

@@ -0,0 +1,10 @@
+import {} from '@unchainedshop/core';
+import { DeliveryUkTax } from "./adapter.js";
+export const DeliveryUkTaxPlugin = {
+    key: 'shop.unchained.pricing.delivery-uk-tax',
+    label: 'Delivery UK Tax Plugin',
+    version: '1.0.0',
+    adapters: [DeliveryUkTax],
+};
+export default DeliveryUkTaxPlugin;
+export { DeliveryUkTax } from "./adapter.js";

package/lib/pricing/delivery-uk-tax.d.ts

@@ -0,0 +1,2 @@
+import { type IDeliveryPricingAdapter } from '@unchainedshop/core';
+export declare const DeliveryUkTax: IDeliveryPricingAdapter;