thm-p3-configurator 0.0.290 → 0.0.291

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

@@ -148,7 +148,8 @@ const ProductCartSide = () => {
    * @param {Object} cartItem - Cart item object
    * @return {Object} Calculated prices for the item
    */
-  const getItemPrices = cartItem => {
+  const getItemPrices = (cartItem, product) => {
+    var _ref, _consumerPrices$price, _product$price;
     if (!cartItem) {
       return {
         purchasePrice: 0,
@@ -158,10 +159,14 @@ const ProductCartSide = () => {
       };
     }
     const hasLocationTotal = (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== undefined && (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== null;
+    const consumerPrices = (product === null || product === void 0 ? void 0 : product.consumerPrices) || null;
+    const consumerPriceIncl = (_ref = (_consumerPrices$price = consumerPrices === null || consumerPrices === void 0 ? void 0 : consumerPrices.priceInclVat) !== null && _consumerPrices$price !== void 0 ? _consumerPrices$price : cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) !== null && _ref !== void 0 ? _ref : null;
+    const fallbackSalesPrice = (_product$price = product === null || product === void 0 ? void 0 : product.price) !== null && _product$price !== void 0 ? _product$price : 0;
+    const resolvedSalesPrice = consumerPriceIncl !== null && consumerPriceIncl !== undefined ? Number(consumerPriceIncl) : Number(fallbackSalesPrice) || 0;
 
     // Get prices directly from product objects and calculate excl VAT for location
     const purchasePrice = hasLocationTotal ? cartItem.locationTotal : 0;
-    const salesPrice = (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) || 0;
+    const salesPrice = resolvedSalesPrice;
     const margin = hasLocationTotal ? salesPrice - purchasePrice : 0;
     const marginPercentage = purchasePrice ? margin / purchasePrice * 100 : 0;
     return {
@@ -209,7 +214,7 @@ const ProductCartSide = () => {
     const {
       purchasePrice,
       salesPrice
-    } = getItemPrices(cartItem);
+    } = getItemPrices(cartItem, product);
     const isBoardComputerProduct = selectedBoardComputer && String(product.articleNumber) === String(selectedBoardComputer);
     const mainRowPriceText = isToggled ? isBoardComputerProduct && Number(purchasePrice) <= 0 ? 'N.v.t.' : (0, _helpers__.formatPrice)(purchasePrice) : (0, _helpers__.formatPrice)(salesPrice);
     return /*#__PURE__*/_react.default.createElement(_ProductTableStaticRow.default, {
@@ -245,7 +250,7 @@ const ProductCartSide = () => {
     const {
       purchasePrice,
       salesPrice
-    } = getItemPrices(cartItem);
+    } = getItemPrices(cartItem, product);
     const quantity = selectedExtras[product.articleNumber] || 1;
     const price = isToggled ? purchasePrice : salesPrice;
     const accessoryPriceText = isToggled && Number(purchasePrice) <= 0 ? 'N.v.t.' : (0, _helpers__.formatPrice)(price);

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

@@ -640,9 +640,6 @@ const ProductCartTable = () => {
   const montageRateCellOverrides = APP_CONFIG.internal && !isThc && renderMontageRateInput ? displayMode === _cartTable.CART_TABLE_DISPLAY_MODES.TOGGLED_STANDARD ? {
     // Show input in discount column; keep price column as price
     discountCell: montageRateInputCell
-  } : displayMode === _cartTable.CART_TABLE_DISPLAY_MODES.DEFAULT ? {
-    // In default view, show input in the same column as vehicle coding
-    discountCell: montageRateInputCell
   } : {} : {};
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('content col-lg')
@@ -675,7 +672,7 @@ const ProductCartTable = () => {
       })),
       className: _cartTable.CART_TABLE_PRICE_CELL_CLASS
     } : {};
-    const vehicleCodingInputCell = displayMode === _cartTable.CART_TABLE_DISPLAY_MODES.DEFAULT && isTowmotive && isVehicleCodingProduct ? {
+    const vehicleCodingInputCell = displayMode === _cartTable.CART_TABLE_DISPLAY_MODES.TOGGLED_STANDARD && isTowmotive && isVehicleCodingProduct ? {
       text: renderVehicleCodingInput(product.articleNumber),
       className: _cartTable.CART_TABLE_PRICE_CELL_CLASS
     } : {};
@@ -806,6 +803,6 @@ const ProductCartTable = () => {
       value: (0, _helpers__.formatPrice)(totals === null || totals === void 0 ? void 0 : totals.totalAfterDiscountInclVat),
       className: 'fw-bold text-end'
     }, showCatalogPrice)]
-  })))), APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement(_InternalDiscountForm.default, null)));
+  })))), APP_CONFIG.internal && isToggled && /*#__PURE__*/_react.default.createElement(_InternalDiscountForm.default, null)));
 };
 var _default = exports.default = ProductCartTable;

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

@@ -319,7 +319,7 @@ const ProductsOverview = () => {
       product: a,
       category: productCategory
     }) ? -1 : 0).map(product => {
-      var _product$images, _product$images2, _product$locationPric;
+      var _product$images, _product$images2, _product$locationPric, _product$consumerPric2, _product$consumerPric3;
       const isRecommended = (0, _product.checkIfTowbarIsRecommended)({
         product,
         category: productCategory
@@ -392,7 +392,7 @@ const ProductsOverview = () => {
         },
         productSpecifications: (0, _product.extractProductSpecsArray)(product),
         showPrice: APP_CONFIG.internal ? true : false,
-        productPrice: product.price
+        productPrice: (_product$consumerPric2 = product === null || product === void 0 || (_product$consumerPric3 = product.consumerPrices) === null || _product$consumerPric3 === void 0 ? void 0 : _product$consumerPric3.priceInclVat) !== null && _product$consumerPric2 !== void 0 ? _product$consumerPric2 : product.price
       });
     }));
   }));

package/package.json

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