thm-p3-configurator 0.0.237 → 0.0.239

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

@@ -155,11 +155,12 @@ const ProductCartSide = () => {
         marginPercentage: 0
       };
     }
+    const hasLocationTotal = (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== undefined && (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== null;
 
     // Get prices directly from product objects and calculate excl VAT for location
-    const purchasePrice = cartItem !== null && cartItem !== void 0 && cartItem.locationTotal ? cartItem.locationTotal : (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) || 0;
+    const purchasePrice = hasLocationTotal ? cartItem.locationTotal : 0;
     const salesPrice = (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) || 0;
-    const margin = salesPrice - purchasePrice;
+    const margin = hasLocationTotal ? salesPrice - purchasePrice : 0;
     const marginPercentage = purchasePrice ? margin / purchasePrice * 100 : 0;
     return {
       purchasePrice,

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

@@ -3,7 +3,6 @@
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.reduce.js");
 require("core-js/modules/es.json.stringify.js");
-require("core-js/modules/es.parse-float.js");
 require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.weak-map.js");
@@ -23,7 +22,6 @@ exports.default = void 0;
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.reduce.js");
 require("core-js/modules/es.json.stringify.js");
-require("core-js/modules/es.parse-float.js");
 require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/esnext.iterator.constructor.js");
@@ -187,6 +185,12 @@ const ProductCartTable = () => {
   // Subtotal calculation variables
   let mainProductsSubtotal = 0;
   let accessoireProductsSubtotal = 0;
+  const calculatePurchaseSubtotal = products => {
+    return products.reduce((total, product) => {
+      var _product$priceInfo;
+      return total + Number((product === null || product === void 0 || (_product$priceInfo = product.priceInfo) === null || _product$priceInfo === void 0 ? void 0 : _product$priceInfo.purchasePrice) || 0);
+    }, 0);
+  };
 
   /**
    * Calculate item prices from a cart item
@@ -233,11 +237,12 @@ const ProductCartTable = () => {
     let purchasePrice = 0;
     let salesPrice = 0;
     const hasLocationTotal = (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== undefined && (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== null;
+    const locationTotal = hasLocationTotal ? Number(cartItem.locationTotal) : 0;
 
     // Get prices directly from product objects
     if (APP_CONFIG.internal) {
-      purchasePrice = cartItem !== null && cartItem !== void 0 && cartItem.locationTotal ? cartItem.locationTotal : (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) || 0;
-      salesPrice = isToggled ? (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) / 1.21 : cartItem !== null && cartItem !== void 0 && cartItem.locationTotal ? cartItem.locationTotal : (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) || 0;
+      purchasePrice = locationTotal;
+      salesPrice = isToggled ? (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) / 1.21 : hasLocationTotal ? locationTotal : (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) || 0;
     } else {
       purchasePrice = (product === null || product === void 0 ? void 0 : product.price) || 0;
       salesPrice = (product === null || product === void 0 ? void 0 : product.price) || 0;
@@ -281,14 +286,14 @@ const ProductCartTable = () => {
     });
 
     // Calculate subtotals based on locationTotal (purchasePrice)
-    mainProductsSubtotal = mainProducts.reduce((total, product) => {
-      return total + parseFloat(product.priceInfo.purchasePrice);
-    }, 0);
-    accessoireProductsSubtotal = accessoireProducts.reduce((total, product) => {
-      return total + parseFloat(product.priceInfo.purchasePrice);
-    }, 0);
+    mainProductsSubtotal = calculatePurchaseSubtotal(mainProducts);
+    accessoireProductsSubtotal = calculatePurchaseSubtotal(accessoireProducts);
+  }
+  const shouldIncludeMarketCorrection = isToggled && (marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.locationTotal);
+  if (shouldIncludeMarketCorrection) {
+    const marketCorrectionPrice = Number(marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.locationTotal) || 0;
+    mainProductsSubtotal += marketCorrectionPrice;
   }
-  mainProductsSubtotal = mainProductsSubtotal + (marketCorrection !== null && marketCorrection !== void 0 && marketCorrection.locationTotal ? parseFloat(marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.locationTotal) : 0);
   if (isLoadingProducts) {
     return /*#__PURE__*/_react.default.createElement(_FullPageSpinner.default, null);
   }

package/package.json

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