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

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;

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

@@ -0,0 +1,43 @@
+import { DeliveryPricingRowCategory, DeliveryPricingAdapter, DeliveryPricingDirector, } 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();
+            },
+        };
+    },
+};
+DeliveryPricingDirector.registerAdapter(DeliveryUkTax);

package/lib/pricing/delivery-us-sales-tax/adapter.d.ts

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

package/lib/pricing/delivery-us-sales-tax/adapter.js

@@ -0,0 +1,58 @@
+import { DeliveryPricingRowCategory, DeliveryPricingAdapter, } from '@unchainedshop/core';
+import { US_COUNTRY_CODE, isDeliveryExemptFromUsSalesTax, resolveUsSalesTaxRate } from "../tax/us.js";
+import resolveDeliveryLocation from "../utils/resolveDeliveryLocation.js";
+import { applyTaxRateToTaxableRows } from "../tax/applyTaxRateToTaxableRows.js";
+export const DeliveryUsSalesTax = {
+    ...DeliveryPricingAdapter,
+    key: 'shop.unchained.pricing.delivery-us-sales-tax',
+    version: '1.0.0',
+    label: 'Apply US State Sales Tax 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 countryCode === US_COUNTRY_CODE;
+    },
+    actions: (params) => {
+        const pricingAdapter = DeliveryPricingAdapter.actions(params);
+        const { context } = params;
+        return {
+            ...pricingAdapter,
+            calculate: async () => {
+                if (isDeliveryExemptFromUsSalesTax(context.provider)) {
+                    return pricingAdapter.calculate();
+                }
+                const { regionCode } = resolveDeliveryLocation({
+                    order: context.order,
+                    orderDelivery: context.orderDelivery,
+                    countryCode: context.countryCode,
+                });
+                const taxRate = resolveUsSalesTaxRate({
+                    regionCode,
+                    referenceDate: context.order?.ordered,
+                });
+                if (taxRate === null) {
+                    DeliveryPricingAdapter.log(`DeliveryUsSalesTax -> unknown state '${regionCode}', no sales tax applied`);
+                    return pricingAdapter.calculate();
+                }
+                DeliveryPricingAdapter.log(`DeliveryUsSalesTax -> Tax Multiplicator: ${taxRate}`);
+                applyTaxRateToTaxableRows({
+                    calculationSheet: params.calculationSheet,
+                    resultSheet: pricingAdapter.resultSheet(),
+                    taxRate,
+                    baseCategory: DeliveryPricingRowCategory.Delivery,
+                    adapterKey: DeliveryUsSalesTax.key,
+                });
+                return pricingAdapter.calculate();
+            },
+        };
+    },
+};
+export default DeliveryUsSalesTax;

package/lib/pricing/delivery-us-sales-tax/index.d.ts

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

package/lib/pricing/delivery-us-sales-tax/index.js

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

package/lib/pricing/delivery-us-sales-tax.d.ts

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

package/lib/pricing/delivery-us-sales-tax.js

@@ -0,0 +1,58 @@
+import { DeliveryPricingRowCategory, DeliveryPricingAdapter, DeliveryPricingDirector, } from '@unchainedshop/core';
+import { US_COUNTRY_CODE, isDeliveryExemptFromUsSalesTax, resolveUsSalesTaxRate } from "./tax/us.js";
+import resolveDeliveryLocation from "./utils/resolveDeliveryLocation.js";
+import { applyTaxRateToTaxableRows } from "./tax/applyTaxRateToTaxableRows.js";
+export const DeliveryUsSalesTax = {
+    ...DeliveryPricingAdapter,
+    key: 'shop.unchained.pricing.delivery-us-sales-tax',
+    version: '1.0.0',
+    label: 'Apply US State Sales Tax 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 countryCode === US_COUNTRY_CODE;
+    },
+    actions: (params) => {
+        const pricingAdapter = DeliveryPricingAdapter.actions(params);
+        const { context } = params;
+        return {
+            ...pricingAdapter,
+            calculate: async () => {
+                if (isDeliveryExemptFromUsSalesTax(context.provider)) {
+                    return pricingAdapter.calculate();
+                }
+                const { regionCode } = resolveDeliveryLocation({
+                    order: context.order,
+                    orderDelivery: context.orderDelivery,
+                    countryCode: context.countryCode,
+                });
+                const taxRate = resolveUsSalesTaxRate({
+                    regionCode,
+                    referenceDate: context.order?.ordered,
+                });
+                if (taxRate === null) {
+                    DeliveryPricingAdapter.log(`DeliveryUsSalesTax -> unknown state '${regionCode}', no sales tax applied`);
+                    return pricingAdapter.calculate();
+                }
+                DeliveryPricingAdapter.log(`DeliveryUsSalesTax -> Tax Multiplicator: ${taxRate}`);
+                applyTaxRateToTaxableRows({
+                    calculationSheet: params.calculationSheet,
+                    resultSheet: pricingAdapter.resultSheet(),
+                    taxRate,
+                    baseCategory: DeliveryPricingRowCategory.Delivery,
+                    adapterKey: DeliveryUsSalesTax.key,
+                });
+                return pricingAdapter.calculate();
+            },
+        };
+    },
+};
+DeliveryPricingDirector.registerAdapter(DeliveryUsSalesTax);

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

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

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

@@ -0,0 +1,56 @@
+import { ProductPricingAdapter, ProductPricingRowCategory, } from '@unchainedshop/core';
+import { resolveEuTaxCategoryFromDeliveryProvider, resolveEuTaxCategoryFromProduct, resolveEuTaxRate, } from "../tax/eu.js";
+import resolveDeliveryLocation from "../utils/resolveDeliveryLocation.js";
+import { applyTaxRateToTaxableRows } from "../tax/applyTaxRateToTaxableRows.js";
+export const ProductEuTax = {
+    ...ProductPricingAdapter,
+    key: 'shop.unchained.pricing.product-eu-tax',
+    version: '1.0.0',
+    label: 'Apply EU VAT on Product',
+    orderIndex: 80,
+    isActivatedFor: () => {
+        return true;
+    },
+    actions: (params) => {
+        const pricingAdapter = ProductPricingAdapter.actions(params);
+        const { context } = params;
+        return {
+            ...pricingAdapter,
+            calculate: async () => {
+                const orderDelivery = context.order?.deliveryId
+                    ? await context.modules.orders.deliveries.findDelivery({
+                        orderDeliveryId: context.order?.deliveryId,
+                    })
+                    : null;
+                const { countryCode } = resolveDeliveryLocation({ ...context, orderDelivery });
+                let category = resolveEuTaxCategoryFromProduct(context.product);
+                if (!category) {
+                    const provider = orderDelivery?.deliveryProviderId
+                        ? await context.modules.delivery.findProvider({
+                            deliveryProviderId: orderDelivery?.deliveryProviderId,
+                        })
+                        : null;
+                    if (provider)
+                        category = resolveEuTaxCategoryFromDeliveryProvider(provider);
+                }
+                const taxRate = resolveEuTaxRate({
+                    countryCode,
+                    category,
+                    referenceDate: context.order?.ordered,
+                });
+                if (taxRate === null)
+                    return pricingAdapter.calculate();
+                ProductPricingAdapter.log(`ProductEuTax -> Tax Multiplicator: ${taxRate}`);
+                applyTaxRateToTaxableRows({
+                    calculationSheet: params.calculationSheet,
+                    resultSheet: pricingAdapter.resultSheet(),
+                    taxRate,
+                    baseCategory: ProductPricingRowCategory.Item,
+                    adapterKey: ProductEuTax.key,
+                });
+                return pricingAdapter.calculate();
+            },
+        };
+    },
+};
+export default ProductEuTax;

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

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

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

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

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

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

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

@@ -0,0 +1,56 @@
+import { ProductPricingDirector, ProductPricingAdapter, ProductPricingRowCategory, } from '@unchainedshop/core';
+import { resolveEuTaxCategoryFromDeliveryProvider, resolveEuTaxCategoryFromProduct, resolveEuTaxRate, } from "./tax/eu.js";
+import resolveDeliveryLocation from "./utils/resolveDeliveryLocation.js";
+import { applyTaxRateToTaxableRows } from "./tax/applyTaxRateToTaxableRows.js";
+export const ProductEuTax = {
+    ...ProductPricingAdapter,
+    key: 'shop.unchained.pricing.product-eu-tax',
+    version: '1.0.0',
+    label: 'Apply EU VAT on Product',
+    orderIndex: 80,
+    isActivatedFor: () => {
+        return true;
+    },
+    actions: (params) => {
+        const pricingAdapter = ProductPricingAdapter.actions(params);
+        const { context } = params;
+        return {
+            ...pricingAdapter,
+            calculate: async () => {
+                const orderDelivery = context.order?.deliveryId
+                    ? await context.modules.orders.deliveries.findDelivery({
+                        orderDeliveryId: context.order?.deliveryId,
+                    })
+                    : null;
+                const { countryCode } = resolveDeliveryLocation({ ...context, orderDelivery });
+                let category = resolveEuTaxCategoryFromProduct(context.product);
+                if (!category) {
+                    const provider = orderDelivery?.deliveryProviderId
+                        ? await context.modules.delivery.findProvider({
+                            deliveryProviderId: orderDelivery?.deliveryProviderId,
+                        })
+                        : null;
+                    if (provider)
+                        category = resolveEuTaxCategoryFromDeliveryProvider(provider);
+                }
+                const taxRate = resolveEuTaxRate({
+                    countryCode,
+                    category,
+                    referenceDate: context.order?.ordered,
+                });
+                if (taxRate === null)
+                    return pricingAdapter.calculate();
+                ProductPricingAdapter.log(`ProductEuTax -> Tax Multiplicator: ${taxRate}`);
+                applyTaxRateToTaxableRows({
+                    calculationSheet: params.calculationSheet,
+                    resultSheet: pricingAdapter.resultSheet(),
+                    taxRate,
+                    baseCategory: ProductPricingRowCategory.Item,
+                    adapterKey: ProductEuTax.key,
+                });
+                return pricingAdapter.calculate();
+            },
+        };
+    },
+};
+ProductPricingDirector.registerAdapter(ProductEuTax);

package/lib/pricing/product-quotation-price.d.ts

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

package/lib/pricing/product-quotation-price.js

@@ -0,0 +1,40 @@
+import { ProductPricingDirector, ProductPricingAdapter, } from '@unchainedshop/core';
+export const ProductQuotationPrice = {
+    ...ProductPricingAdapter,
+    key: 'shop.unchained.pricing.quotation-price',
+    version: '1.0.0',
+    label: 'Apply negotiated quotation price',
+    orderIndex: 20,
+    isActivatedFor: (context) => {
+        return Boolean(context.quotationId);
+    },
+    actions: (params) => {
+        const pricingAdapter = ProductPricingAdapter.actions(params);
+        return {
+            ...pricingAdapter,
+            calculate: async () => {
+                const { quotationId, currencyCode, quantity, modules } = params.context;
+                const quotation = await modules.quotations.findQuotation({ quotationId: quotationId });
+                const isApplicable = quotation &&
+                    quotation.price != null &&
+                    quotation.currencyCode === currencyCode &&
+                    (modules.quotations.isProposalValid(quotation) ||
+                        modules.quotations.normalizedStatus(quotation) === 'FULFILLED');
+                if (isApplicable) {
+                    const negotiatedTotal = Math.round(quotation.price) * quantity;
+                    const correction = negotiatedTotal - params.calculationSheet.sum();
+                    if (correction !== 0) {
+                        pricingAdapter.resultSheet().addItem({
+                            amount: correction,
+                            isTaxable: false,
+                            isNetPrice: false,
+                            meta: { adapter: ProductQuotationPrice.key, quotationId: quotation._id },
+                        });
+                    }
+                }
+                return pricingAdapter.calculate();
+            },
+        };
+    },
+};
+ProductPricingDirector.registerAdapter(ProductQuotationPrice);

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

@@ -1,6 +1,7 @@
 import { ProductPricingAdapter, ProductPricingRowCategory, } from '@unchainedshop/core';
 import { resolveTaxCategoryFromDeliveryProvider, resolveTaxCategoryFromProduct, SwissTaxCategories, } from "../tax/ch.js";
 import isDeliveryAddressInCountry from "../utils/isDeliveryAddressInCountry.js";
+import { applyTaxRateToTaxableRows } from "../tax/applyTaxRateToTaxableRows.js";
 export const ProductSwissTax = {
     ...ProductPricingAdapter,
     key: 'shop.unchained.pricing.product-swiss-tax',
@@ -41,32 +42,12 @@ export const ProductSwissTax = {
                     taxCategory = SwissTaxCategories.DEFAULT;
                 const taxRate = taxCategory.rate(context.order?.ordered);
                 ProductPricingAdapter.log(`ProductSwissTax -> 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: ProductSwissTax.key },
-                        });
-                        pricingAdapter.resultSheet().addTax({
-                            amount: taxAmount,
-                            rate: taxRate,
-                            baseCategory: ProductPricingRowCategory.Item,
-                            meta: { adapter: ProductSwissTax.key },
-                        });
-                    }
-                    else {
-                        const taxAmount = row.amount * taxRate;
-                        pricingAdapter.resultSheet().addTax({
-                            amount: taxAmount,
-                            rate: taxRate,
-                            baseCategory: ProductPricingRowCategory.Item,
-                            meta: { adapter: ProductSwissTax.key },
-                        });
-                    }
+                applyTaxRateToTaxableRows({
+                    calculationSheet: params.calculationSheet,
+                    resultSheet: pricingAdapter.resultSheet(),
+                    taxRate,
+                    baseCategory: ProductPricingRowCategory.Item,
+                    adapterKey: ProductSwissTax.key,
                 });
                 return pricingAdapter.calculate();
             },

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

@@ -1,6 +1,7 @@
 import { ProductPricingDirector, ProductPricingAdapter, ProductPricingRowCategory, } from '@unchainedshop/core';
 import { resolveTaxCategoryFromDeliveryProvider, resolveTaxCategoryFromProduct, SwissTaxCategories, } from "./tax/ch.js";
 import isDeliveryAddressInCountry from "./utils/isDeliveryAddressInCountry.js";
+import { applyTaxRateToTaxableRows } from "./tax/applyTaxRateToTaxableRows.js";
 export const ProductSwissTax = {
     ...ProductPricingAdapter,
     key: 'shop.unchained.pricing.product-swiss-tax',
@@ -41,32 +42,12 @@ export const ProductSwissTax = {
                     taxCategory = SwissTaxCategories.DEFAULT;
                 const taxRate = taxCategory.rate(context.order?.ordered);
                 ProductPricingAdapter.log(`ProductSwissTax -> 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: ProductSwissTax.key },
-                        });
-                        pricingAdapter.resultSheet().addTax({
-                            amount: taxAmount,
-                            rate: taxRate,
-                            baseCategory: ProductPricingRowCategory.Item,
-                            meta: { adapter: ProductSwissTax.key },
-                        });
-                    }
-                    else {
-                        const taxAmount = row.amount * taxRate;
-                        pricingAdapter.resultSheet().addTax({
-                            amount: taxAmount,
-                            rate: taxRate,
-                            baseCategory: ProductPricingRowCategory.Item,
-                            meta: { adapter: ProductSwissTax.key },
-                        });
-                    }
+                applyTaxRateToTaxableRows({
+                    calculationSheet: params.calculationSheet,
+                    resultSheet: pricingAdapter.resultSheet(),
+                    taxRate,
+                    baseCategory: ProductPricingRowCategory.Item,
+                    adapterKey: ProductSwissTax.key,
                 });
                 return pricingAdapter.calculate();
             },

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

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

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

@@ -0,0 +1,57 @@
+import { ProductPricingAdapter, ProductPricingRowCategory, } from '@unchainedshop/core';
+import { resolveUkTaxCategoryFromDeliveryProvider, resolveUkTaxCategoryFromProduct, UkTaxCategories, UK_VAT_COUNTRY_CODES, } from "../tax/uk.js";
+import isDeliveryAddressInCountry from "../utils/isDeliveryAddressInCountry.js";
+import { applyTaxRateToTaxableRows } from "../tax/applyTaxRateToTaxableRows.js";
+export const ProductUkTax = {
+    ...ProductPricingAdapter,
+    key: 'shop.unchained.pricing.product-uk-tax',
+    version: '1.0.0',
+    label: 'Apply UK VAT on Product',
+    orderIndex: 80,
+    isActivatedFor: () => {
+        return true;
+    },
+    actions: (params) => {
+        const pricingAdapter = ProductPricingAdapter.actions(params);
+        const { context } = params;
+        return {
+            ...pricingAdapter,
+            calculate: async () => {
+                const orderDelivery = context.order?.deliveryId
+                    ? await context.modules.orders.deliveries.findDelivery({
+                        orderDeliveryId: context.order?.deliveryId,
+                    })
+                    : null;
+                if (!isDeliveryAddressInCountry({
+                    ...context,
+                    orderDelivery,
+                }, UK_VAT_COUNTRY_CODES)) {
+                    return pricingAdapter.calculate();
+                }
+                let taxCategory = resolveUkTaxCategoryFromProduct(context.product);
+                if (!taxCategory) {
+                    const provider = orderDelivery?.deliveryProviderId
+                        ? await context.modules.delivery.findProvider({
+                            deliveryProviderId: orderDelivery?.deliveryProviderId,
+                        })
+                        : null;
+                    if (provider)
+                        taxCategory = resolveUkTaxCategoryFromDeliveryProvider(provider);
+                }
+                if (!taxCategory)
+                    taxCategory = UkTaxCategories.STANDARD;
+                const taxRate = taxCategory.rate(context.order?.ordered);
+                ProductPricingAdapter.log(`ProductUkTax -> Tax Multiplicator: ${taxRate}`);
+                applyTaxRateToTaxableRows({
+                    calculationSheet: params.calculationSheet,
+                    resultSheet: pricingAdapter.resultSheet(),
+                    taxRate,
+                    baseCategory: ProductPricingRowCategory.Item,
+                    adapterKey: ProductUkTax.key,
+                });
+                return pricingAdapter.calculate();
+            },
+        };
+    },
+};
+export default ProductUkTax;