@unchainedshop/plugins 2.6.1 → 2.7.1

package/src/pricing/product-discount.ts

@@ -5,8 +5,9 @@ import {
 } from '@unchainedshop/types/products.pricing.js';
 import { ProductPricingDirector, ProductPricingAdapter } from '@unchainedshop/core-products';
 import { calculation as calcUtils } from '@unchainedshop/utils';
+import { ProductDiscountConfiguration } from '@unchainedshop/core-products/director/ProductDiscountConfiguration.js';
 
-const ProductDiscount: IProductPricingAdapter = {
+const ProductDiscount: IProductPricingAdapter<ProductDiscountConfiguration> = {
   ...ProductPricingAdapter,
 
   key: 'shop.unchained.pricing.product-discount',
@@ -21,10 +22,15 @@ const ProductDiscount: IProductPricingAdapter = {
   actions: (params) => {
     const pricingAdapter = ProductPricingAdapter.actions(params);
 
-    const addDiscount = (discount: Discount, total: number, isTaxable: boolean) => {
-      const { configuration, discountId } = discount;
-      const { isNetPrice = false, ...meta } = configuration;
-      const amount = calcUtils.applyRate(configuration, total);
+    const addDiscounts = (
+      discount: Discount<ProductDiscountConfiguration>,
+      total: number,
+      resolvedConfiguration: ProductDiscountConfiguration,
+    ) => {
+      const { discountId } = discount;
+      const { isNetPrice = false, taxRate, ...meta } = resolvedConfiguration;
+      const amount = calcUtils.applyRate(resolvedConfiguration, total);
+      const isTaxable = taxRate === undefined || taxRate === null;
 
       pricingAdapter.resultSheet().addDiscount({
         amount: amount * -1,
@@ -33,28 +39,50 @@ const ProductDiscount: IProductPricingAdapter = {
         isTaxable,
         meta: { adapter: ProductDiscount.key, ...meta },
       });
+      if (!isTaxable && taxRate) {
+        const taxAmount = calcUtils.getTaxAmount(amount, taxRate, isNetPrice);
+        pricingAdapter.resultSheet().addTax({
+          amount: taxAmount * -1,
+          rate: taxRate,
+          discountId,
+          baseCategory: ProductPricingRowCategory.Discount,
+          meta: { adapter: ProductDiscount.key, discountId, ...meta },
+        });
+        if (!isNetPrice) {
+          pricingAdapter.resultSheet().addDiscount({
+            amount: taxAmount,
+            discountId,
+            isNetPrice: false,
+            isTaxable: false,
+            meta: { adapter: ProductDiscount.key, discountId, ...meta },
+          });
+        }
+      }
     };
 
     return {
       ...pricingAdapter,
 
       calculate: async () => {
-        const taxableTotal = params.calculationSheet.sum({
-          category: ProductPricingRowCategory.Item,
-          isTaxable: true,
-        });
-        const nonTaxableTotal = params.calculationSheet.sum({
-          category: ProductPricingRowCategory.Item,
-          isTaxable: false,
-        });
-
         params.discounts.forEach((discount) => {
-          if (taxableTotal !== 0) {
-            addDiscount(discount, taxableTotal, true);
-          }
-          if (nonTaxableTotal !== 0) {
-            addDiscount(discount, nonTaxableTotal, false);
-          }
+          const { configuration } = discount;
+
+          const resolvedConfiguration = configuration.customPriceConfigurationResolver
+            ? configuration.customPriceConfigurationResolver(
+                params.context.product,
+                params.context.quantity,
+                params.context.configuration,
+              )
+            : configuration;
+
+          if (!resolvedConfiguration) return;
+
+          const total = params.calculationSheet.total({
+            category: ProductPricingRowCategory.Item,
+            useNetPrice: resolvedConfiguration.isNetPrice,
+          });
+
+          addDiscounts(discount, total.amount, resolvedConfiguration);
         });
 
         return pricingAdapter.calculate();

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

@@ -1,5 +1,8 @@
 import { ProductPricingDirector, ProductPricingAdapter } from '@unchainedshop/core-products';
-import { IProductPricingAdapter } from '@unchainedshop/types/products.pricing.js';
+import {
+  IProductPricingAdapter,
+  ProductPricingRowCategory,
+} from '@unchainedshop/types/products.pricing.js';
 import { Product } from '@unchainedshop/types/products.js';
 import { Order } from '@unchainedshop/types/orders.js';
 import { SwissTaxCategories } from './tax/ch.js';
@@ -73,6 +76,7 @@ export const ProductSwissTax: IProductPricingAdapter = {
             pricingAdapter.resultSheet().addTax({
               amount: taxAmount,
               rate: taxRate,
+              baseCategory: ProductPricingRowCategory.Item,
               meta: { adapter: ProductSwissTax.key },
             });
           } else {
@@ -80,6 +84,7 @@ export const ProductSwissTax: IProductPricingAdapter = {
             pricingAdapter.resultSheet().addTax({
               amount: taxAmount,
               rate: taxRate,
+              baseCategory: ProductPricingRowCategory.Item,
               meta: { adapter: ProductSwissTax.key },
             });
           }