thm-p3-configurator 0.0.294 → 0.0.295

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

@@ -41,7 +41,7 @@ const ProductCardDiscountAlert = _ref => {
     price,
     discountedPrice
   } = _ref;
-  if (!discountedPrice || !price) {
+  if (!discountedPrice || !price || discountedPrice >= price) {
     return null;
   }
   const discountLabel = (0, _react.useMemo)(() => {

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

@@ -119,8 +119,8 @@ const ProductCard = _ref => {
     isBoardComputer: isBoardComputer
   }), /*#__PURE__*/_react.default.createElement(_ProductCardDiscountAlert.default, {
     label: productDiscountedLabel,
-    price: productPrice,
-    discountedPrice: productDiscountedPrice
+    price: productDiscountedPrice,
+    discountedPrice: productPrice
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)("".concat(productImage ? 'col-md-8' : 'col-12', " d-flex flex-wrap"))
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -130,8 +130,8 @@ const ProductCard = _ref => {
   }, productTitle, showPrice && /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('col-12 col-md-auto d-flex flex-xxl-column my-2 my-xxl-0')
   }, /*#__PURE__*/_react.default.createElement(_ProductCardPrice.default, {
-    price: productPrice,
-    discountedPrice: productDiscountedPrice
+    price: productDiscountedPrice < productPrice ? productPrice : productDiscountedPrice,
+    discountedPrice: productDiscountedPrice < productPrice ? productDiscountedPrice : productPrice
   }))), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('card-text row no-gutters flex-wrap align-items-bottom justify-content-start')
   }, /*#__PURE__*/_react.default.createElement(_ProductCardUsps.default, {

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

@@ -169,24 +169,14 @@ 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$consumerPric, _product$consumerPric2, _product$locationPric, _product$images, _product$images2, _product$boldDescript;
+        var _product$consumerPric, _product$price, _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;
-          }
-        }
+
+        // Determine main price (incl. VAT) from consumerPrices, or fallback to product.price if missing
+        const resolvedProductPrice = typeof (product === null || product === void 0 || (_product$consumerPric = product.consumerPrices) === null || _product$consumerPric === void 0 ? void 0 : _product$consumerPric.priceInclVat) === 'number' ? product.consumerPrices.priceInclVat : (_product$price = product === null || product === void 0 ? void 0 : product.price) !== null && _product$price !== void 0 ? _product$price : null;
+
+        // Only show fromPrice if it's provided (not undefined/null/empty)
+        const resolvedProductDiscountedPrice = typeof (product === null || product === void 0 ? void 0 : product.fromPrice) === 'number' ? product.fromPrice : 0;
         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,

package/package.json

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