thm-p3-configurator 0.0.254 → 0.0.256

package/dist/src/shared/__containers__/ProductsCartOverview.js

@@ -184,6 +184,10 @@ const ProductCartTable = () => {
   // Subtotal calculation variables
   let mainProductsSubtotal = 0;
   let accessoireProductsSubtotal = 0;
+  const marketCorrectionPurchaseExcl = Number(marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.locationTotal) || 0;
+  const marketCorrectionSalesExcl = Number(totals === null || totals === void 0 ? void 0 : totals.totalMarketCorrectionExclVat) || (marketCorrection !== null && marketCorrection !== void 0 && marketCorrection.consumerTotal ? Number(marketCorrection.consumerTotal) / 1.21 : 0);
+  const marketCorrectionSalesIncl = Number(totals === null || totals === void 0 ? void 0 : totals.totalMarketCorrectionInclVat) || Number(marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.consumerTotal) || 0;
+  const marketCorrectionMargin = marketCorrectionSalesExcl - marketCorrectionPurchaseExcl;
   const calculatePurchaseSubtotal = products => {
     return products.reduce((total, product) => {
       var _product$priceInfo;
@@ -288,10 +292,10 @@ const ProductCartTable = () => {
     mainProductsSubtotal = calculatePurchaseSubtotal(mainProducts);
     accessoireProductsSubtotal = calculatePurchaseSubtotal(accessoireProducts);
   }
-  const shouldIncludeMarketCorrection = isToggled && (marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.locationTotal);
+  const hasMarketCorrectionValue = marketCorrectionPurchaseExcl > 0 || marketCorrectionSalesExcl > 0 || marketCorrectionSalesIncl > 0;
+  const shouldIncludeMarketCorrection = isToggled && hasMarketCorrectionValue && marketCorrectionPurchaseExcl > 0;
   if (shouldIncludeMarketCorrection) {
-    const marketCorrectionPrice = Number(marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.locationTotal) || 0;
-    mainProductsSubtotal += marketCorrectionPrice;
+    mainProductsSubtotal += marketCorrectionPurchaseExcl;
   }
   if (isLoadingProducts) {
     return /*#__PURE__*/_react.default.createElement(_FullPageSpinner.default, null);
@@ -389,26 +393,23 @@ const ProductCartTable = () => {
       text: (0, _helpers__.formatPrice)(totals === null || totals === void 0 ? void 0 : totals.montagePricePlusMarketCorrectionInclVat),
       className: 'cart__table-price text-end'
     }])]
-  }), console.log('totals', totals), isToggled && ((totals === null || totals === void 0 ? void 0 : totals.totalMarketCorrectionInclVat) > 0 || (totals === null || totals === void 0 ? void 0 : totals.totalMarketCorrectionExclVat) > 0) && /*#__PURE__*/_react.default.createElement(_ProductTableStaticRow.default, {
+  }), isToggled && hasMarketCorrectionValue && /*#__PURE__*/_react.default.createElement(_ProductTableStaticRow.default, {
     productTitle: 'Marktcorrectie',
     productImage: _montagePlaceholder.default,
-    extraCells: [{}, {}, {}, ...(isToggled ? isTmg ? [{}, {
+    extraCells: [{}, {}, {}, ...(isTmg ? [{}, {
       text: 'N.v.t.',
       className: 'cart__table-price text-end'
     }, {
-      text: (0, _helpers__.formatPrice)(totals === null || totals === void 0 ? void 0 : totals.totalMarketCorrectionInclVat),
+      text: (0, _helpers__.formatPrice)(marketCorrectionSalesIncl),
       className: 'cart__table-price text-end'
     }] : [{
-      text: (totals === null || totals === void 0 ? void 0 : totals.totalMarketCorrectionExclVat) > 0 ? totals === null || totals === void 0 ? void 0 : totals.totalMarketCorrectionExclVat : 'N.v.t.',
+      text: (0, _helpers__.formatPrice)(marketCorrectionMargin),
       className: 'cart__table-price text-end'
     }, {
-      text: totals === null || totals === void 0 ? void 0 : totals.totalMarketCorrectionInclVat,
+      text: (0, _helpers__.formatPrice)(marketCorrectionPurchaseExcl),
       className: 'cart__table-price text-end'
     }, {
-      text: totals === null || totals === void 0 ? void 0 : totals.totalMarketCorrectionInclVat,
-      className: 'cart__table-price text-end'
-    }] : [{}, {}, {
-      text: 'test',
+      text: (0, _helpers__.formatPrice)(marketCorrectionSalesExcl),
       className: 'cart__table-price text-end'
     }])]
   }), /*#__PURE__*/_react.default.createElement(_ProductTableSectionTotal.default, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thm-p3-configurator",
-  "version": "0.0.254",
+  "version": "0.0.256",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "author": "EnoRm.",