thm-p3-configurator 0.0.289 → 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

@@ -287,20 +287,44 @@ const ProductCartTable = () => {
   const montageTotalExcl = Number((totals === null || totals === void 0 ? void 0 : totals.totalMontageExclVat) || 0);
   const montageHourlyExcl = montageHours > 0 ? montageTotalExcl / montageHours : null;
   (0, _react.useEffect)(() => {
-    if (!isToggled || !(cart !== null && cart !== void 0 && cart.length)) return;
-    cart.forEach(item => {
-      // Only sync non-zero values from cart; let product default be used for 0
-      if ((item === null || item === void 0 ? void 0 : item.consumerDiscountPercentage) > 0 && (consumerDiscounts === null || consumerDiscounts === void 0 ? void 0 : consumerDiscounts[item.articleNumber]) === undefined) {
+    if (!(cart !== null && cart !== void 0 && cart.length) || !products) return;
+
+    // Sync product default discounts to consumerDiscounts for API calls
+    const allProducts = [...(products.Trekhaak || []), ...(products.Kabelset || []), ...(products.Combiset || []), ...(products['Elektronica boordcomputer updaten'] || []), ...(products.Extras || [])];
+    allProducts.forEach(product => {
+      var _product$consumerPric, _product$consumerPric2, _cartItem$consumerDis;
+      const articleNumber = product === null || product === void 0 ? void 0 : product.articleNumber;
+      if (!articleNumber) return;
+      const cartItem = cart.find(c => c.articleNumber === articleNumber);
+      if (!cartItem) return;
+      const isTouched = (touchedConsumerDiscounts === null || touchedConsumerDiscounts === void 0 ? void 0 : touchedConsumerDiscounts[articleNumber]) === true;
+      const hasStoredDiscount = (consumerDiscounts === null || consumerDiscounts === void 0 ? void 0 : consumerDiscounts[articleNumber]) !== undefined;
+      const productDefault = (_product$consumerPric = product === null || product === void 0 || (_product$consumerPric2 = product.consumerPrices) === null || _product$consumerPric2 === void 0 ? void 0 : _product$consumerPric2.discountPercentage) !== null && _product$consumerPric !== void 0 ? _product$consumerPric : 0;
+      const cartDiscount = (_cartItem$consumerDis = cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerDiscountPercentage) !== null && _cartItem$consumerDis !== void 0 ? _cartItem$consumerDis : 0;
+
+      // If user hasn't touched and no stored discount, sync product default
+      if (!isTouched && !hasStoredDiscount && productDefault > 0) {
+        dispatch({
+          type: _OrderSessionContext.orderSessionActions.SET_CONSUMER_DISCOUNT_PERCENTAGE,
+          payload: {
+            articleNumber,
+            percentage: productDefault,
+            userModified: false
+          }
+        });
+      } else if (cartDiscount > 0 && !hasStoredDiscount) {
+        // Sync non-zero cart values
         dispatch({
           type: _OrderSessionContext.orderSessionActions.SET_CONSUMER_DISCOUNT_PERCENTAGE,
           payload: {
-            articleNumber: item.articleNumber,
-            percentage: item.consumerDiscountPercentage
+            articleNumber,
+            percentage: cartDiscount,
+            userModified: false
           }
         });
       }
     });
-  }, [cart, consumerDiscounts, dispatch, isToggled]);
+  }, [cart, consumerDiscounts, touchedConsumerDiscounts, dispatch, products]);
   (0, _react.useEffect)(() => {
     const rateFromApi = totals === null || totals === void 0 ? void 0 : totals.montageRate;
     const uiRate = (0, _montageRate.toUiMontageRate)(rateFromApi);
@@ -348,7 +372,7 @@ const ProductCartTable = () => {
     };
   }, [marketCorrection, totals]);
   const getItemPrices = (cartItem, product) => {
-    var _product$consumerPric3, _product$consumerPric4;
+    var _product$consumerPric6, _product$consumerPric7;
     if (!cartItem) {
       return {
         purchasePrice: 0,
@@ -375,9 +399,9 @@ const ProductCartTable = () => {
     // TMG-style case (used for TOGGLED_TMG display mode)
     // This provides more robust price calculations with proper fallbacks
     if (useTmgDisplayMode && isToggled && product !== null && product !== void 0 && product.consumerPrices) {
-      var _product$locationPric, _ref, _ref2, _product$consumerPric, _product$consumerPric2;
+      var _product$locationPric, _ref, _ref2, _product$consumerPric3, _product$consumerPric4;
       const purchasePrice = locationTotal || Number((product === null || product === void 0 || (_product$locationPric = product.locationPrices) === null || _product$locationPric === void 0 ? void 0 : _product$locationPric.priceExclVat) || 0);
-      const salesPriceRaw = (_ref = (_ref2 = (_product$consumerPric = product === null || product === void 0 || (_product$consumerPric2 = product.consumerPrices) === null || _product$consumerPric2 === void 0 ? void 0 : _product$consumerPric2.priceExclVat) !== null && _product$consumerPric !== void 0 ? _product$consumerPric : (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) != null ? Number(cartItem.consumerTotal) / _cartTable.VAT_RATE : null) !== null && _ref2 !== void 0 ? _ref2 : product === null || product === void 0 ? void 0 : product.price) !== null && _ref !== void 0 ? _ref : 0;
+      const salesPriceRaw = (_ref = (_ref2 = (_product$consumerPric3 = product === null || product === void 0 || (_product$consumerPric4 = product.consumerPrices) === null || _product$consumerPric4 === void 0 ? void 0 : _product$consumerPric4.priceExclVat) !== null && _product$consumerPric3 !== void 0 ? _product$consumerPric3 : (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) != null ? Number(cartItem.consumerTotal) / _cartTable.VAT_RATE : null) !== null && _ref2 !== void 0 ? _ref2 : product === null || product === void 0 ? void 0 : product.price) !== null && _ref !== void 0 ? _ref : 0;
       const salesPrice = salesPriceRaw && !Number.isNaN(Number(salesPriceRaw)) ? Number(salesPriceRaw) : 0;
       return {
         purchasePrice,
@@ -395,12 +419,22 @@ const ProductCartTable = () => {
     let salesPriceIncl = 0;
     if (APP_CONFIG.internal) {
       purchasePrice = locationTotal;
-      salesPrice = isToggled ? (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) / _cartTable.VAT_RATE : hasLocationTotal ? locationTotal : (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) || 0;
+      // When toggled, calculate sales price from cart's consumerTotal (backend-calculated with discount)
+      // Fall back to product's priceExclVat if cart doesn't have a value
+      if (isToggled) {
+        var _ref3, _product$consumerPric5;
+        const cartConsumerExcl = cartItem !== null && cartItem !== void 0 && cartItem.consumerTotal ? Number(cartItem.consumerTotal) / _cartTable.VAT_RATE : null;
+        salesPrice = (_ref3 = cartConsumerExcl !== null && cartConsumerExcl !== void 0 ? cartConsumerExcl : product === null || product === void 0 || (_product$consumerPric5 = product.consumerPrices) === null || _product$consumerPric5 === void 0 ? void 0 : _product$consumerPric5.priceExclVat) !== null && _ref3 !== void 0 ? _ref3 : 0;
+      } else {
+        salesPrice = 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;
     }
-    const consumerPriceInclVat = (_product$consumerPric3 = product === null || product === void 0 || (_product$consumerPric4 = product.consumerPrices) === null || _product$consumerPric4 === void 0 ? void 0 : _product$consumerPric4.priceInclVat) !== null && _product$consumerPric3 !== void 0 ? _product$consumerPric3 : (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) != null ? Number(cartItem.consumerTotal) : 0;
+
+    // Use cart's consumerTotal first (reflects current discount), then fall back to product's priceInclVat
+    const consumerPriceInclVat = (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) != null ? Number(cartItem.consumerTotal) : (_product$consumerPric6 = product === null || product === void 0 || (_product$consumerPric7 = product.consumerPrices) === null || _product$consumerPric7 === void 0 ? void 0 : _product$consumerPric7.priceInclVat) !== null && _product$consumerPric6 !== void 0 ? _product$consumerPric6 : 0;
     const salesPriceNumber = Number(salesPrice) || 0;
     salesPriceIncl = consumerPriceInclVat > 0 ? Number(consumerPriceInclVat) : salesPriceNumber > 0 ? salesPriceNumber * _cartTable.VAT_RATE : 0;
     return {
@@ -431,13 +465,13 @@ const ProductCartTable = () => {
     const extras = Object.keys(selectedExtras);
     const rawAccessoireProducts = extras.length > 0 ? ((_products$Extras = products.Extras) === null || _products$Extras === void 0 ? void 0 : _products$Extras.filter(p => extras.includes(p.articleNumber.toString()))) || [] : [];
     const enhanceProduct = product => {
-      var _cartItem$consumerDis, _product$consumerPric5, _product$consumerPric6;
+      var _cartItem$consumerDis2, _product$consumerPric8, _product$consumerPric9;
       const cartItem = cartLookup === null || cartLookup === void 0 ? void 0 : cartLookup[product.articleNumber];
       const priceInfo = getItemPrices(cartItem, product);
       const storedDiscount = consumerDiscounts === null || consumerDiscounts === void 0 ? void 0 : consumerDiscounts[product.articleNumber];
       const isTouched = (touchedConsumerDiscounts === null || touchedConsumerDiscounts === void 0 ? void 0 : touchedConsumerDiscounts[product.articleNumber]) === true;
-      const cartDiscount = (_cartItem$consumerDis = cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerDiscountPercentage) !== null && _cartItem$consumerDis !== void 0 ? _cartItem$consumerDis : 0;
-      const productDefault = (_product$consumerPric5 = product === null || product === void 0 || (_product$consumerPric6 = product.consumerPrices) === null || _product$consumerPric6 === void 0 ? void 0 : _product$consumerPric6.discountPercentage) !== null && _product$consumerPric5 !== void 0 ? _product$consumerPric5 : 0;
+      const cartDiscount = (_cartItem$consumerDis2 = cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerDiscountPercentage) !== null && _cartItem$consumerDis2 !== void 0 ? _cartItem$consumerDis2 : 0;
+      const productDefault = (_product$consumerPric8 = product === null || product === void 0 || (_product$consumerPric9 = product.consumerPrices) === null || _product$consumerPric9 === void 0 ? void 0 : _product$consumerPric9.discountPercentage) !== null && _product$consumerPric8 !== void 0 ? _product$consumerPric8 : 0;
 
       // If user explicitly modified this discount, use stored value (even if 0)
       // Otherwise use cart value if non-zero, else product default
@@ -606,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')
@@ -641,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
     } : {};
@@ -772,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.289",
+  "version": "0.0.291",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "author": "EnoRm.",