thm-p3-configurator 0.0.292 → 0.0.293

package/dist/src/shared/__components__/ProductCard/ProductCardPrice.js

@@ -21,14 +21,17 @@ const ProductCardPrice = _ref => {
       className: (0, _helpers__.withStyle)('card__price')
     }, (0, _helpers__.formatPrice)(price));
   }
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, discountedPrice < price ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _helpers__.withStyle)('card__price')
-  }, /*#__PURE__*/_react.default.createElement("span", {
-    className: (0, _helpers__.withStyle)('strikethrough card-price-label')
-  }, (0, _helpers__.formatPrice)(price))), /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _helpers__.withStyle)('card__price text-danger')
-  }, (0, _helpers__.formatPrice)(discountedPrice))) : /*#__PURE__*/_react.default.createElement("div", {
+  if (discountedPrice < price) {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _helpers__.withStyle)('card__price')
+    }, /*#__PURE__*/_react.default.createElement("span", {
+      className: (0, _helpers__.withStyle)('strikethrough card-price-label')
+    }, (0, _helpers__.formatPrice)(price))), /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _helpers__.withStyle)('card__price text-danger')
+    }, (0, _helpers__.formatPrice)(discountedPrice)));
+  }
+  return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('card__price')
-  }, (0, _helpers__.formatPrice)(price)));
+  }, (0, _helpers__.formatPrice)(price));
 };
 var _default = exports.default = ProductCardPrice;

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

@@ -21,6 +21,7 @@ var _queries = require("../__api__/queries");
 var _ProductCard = _interopRequireDefault(require("../__components__/ProductCard"));
 var _InlineSpinner = _interopRequireDefault(require("../__components__/Spinners/InlineSpinner"));
 var _constants__ = require("../__constants__");
+var _cartTable = require("../__constants__/cartTable");
 var _FormulaContext = require("../__context__/FormulaContext");
 var _OrderSessionContext = require("../__context__/OrderSessionContext");
 var _helpers__ = require("../__helpers__");
@@ -168,7 +169,24 @@ const ExtraProductsOverview = () => {
         className: (0, _helpers__.withStyle)(index === 0 ? 'mt-0' : 'mt-5'),
         key: "category-".concat(item.categoryName)
       }, /*#__PURE__*/_react.default.createElement("h2", null, item.categoryName), item.products.map((product, index) => {
-        var _product$locationPric, _product$images, _product$images2, _product$boldDescript;
+        var _product$consumerPric, _product$consumerPric2, _product$locationPric, _product$images, _product$images2, _product$boldDescript;
+        const isSelectedExtra = selectedExtras.hasOwnProperty(product.articleNumber);
+        const salesPriceInclVat = product === null || product === void 0 || (_product$consumerPric = product.consumerPrices) === null || _product$consumerPric === void 0 ? void 0 : _product$consumerPric.priceInclVat;
+        const listPriceExclVat = product === null || product === void 0 || (_product$consumerPric2 = product.consumerPrices) === null || _product$consumerPric2 === void 0 ? void 0 : _product$consumerPric2.listPriceExclVat;
+        const hasSalesPriceInclVat = salesPriceInclVat != null && !Number.isNaN(Number(salesPriceInclVat));
+        const resolvedSalesPriceInclVat = hasSalesPriceInclVat ? Number(salesPriceInclVat) : null;
+        const resolvedListPriceInclVat = listPriceExclVat != null && !Number.isNaN(Number(listPriceExclVat)) ? Number(listPriceExclVat) * _cartTable.VAT_RATE : null;
+        let resolvedProductPrice = (product === null || product === void 0 ? void 0 : product.fromPrice) || (product === null || product === void 0 ? void 0 : product.price);
+        let resolvedProductDiscountedPrice = product !== null && product !== void 0 && product.fromPrice ? product === null || product === void 0 ? void 0 : product.price : null;
+        if (hasSalesPriceInclVat) {
+          if (resolvedListPriceInclVat != null && resolvedListPriceInclVat > resolvedSalesPriceInclVat) {
+            resolvedProductPrice = resolvedListPriceInclVat;
+            resolvedProductDiscountedPrice = resolvedSalesPriceInclVat;
+          } else {
+            resolvedProductPrice = resolvedSalesPriceInclVat;
+            resolvedProductDiscountedPrice = null;
+          }
+        }
         return /*#__PURE__*/_react.default.createElement(_ProductCard.default, {
           isTmg: isTmg,
           stock: product === null || product === void 0 || (_product$locationPric = product.locationPrices) === null || _product$locationPric === void 0 ? void 0 : _product$locationPric.stock,
@@ -194,9 +212,9 @@ const ExtraProductsOverview = () => {
               productCategory
             });
           },
-          productDiscountedPrice: product !== null && product !== void 0 && product.fromPrice ? product.price : null,
+          productDiscountedPrice: resolvedProductDiscountedPrice,
           productDiscountedLabel: (_product$boldDescript = product.boldDescription) === null || _product$boldDescript === void 0 ? void 0 : _product$boldDescript.ops[0].insert,
-          productPrice: product.fromPrice || product.price,
+          productPrice: resolvedProductPrice,
           productSpecifications: product.specifications ? (0, _product.extractProductSpecsArray)(product.specifications) : [],
           showPrice: true
         });

package/package.json

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