thm-p3-configurator 0.0.288 → 0.0.290

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

@@ -168,6 +168,7 @@ const ProductCartTable = () => {
     selectedBranch,
     vehicleCodingDiscountPercentage,
     consumerDiscounts,
+    touchedConsumerDiscounts,
     montageRate,
     isMontageTariffFixed
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
@@ -207,7 +208,8 @@ const ProductCartTable = () => {
       type: _OrderSessionContext.orderSessionActions.SET_CONSUMER_DISCOUNT_PERCENTAGE,
       payload: {
         articleNumber,
-        percentage: parsed
+        percentage: parsed,
+        userModified: true
       }
     });
     if (isVehicleCoding) {
@@ -285,19 +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 => {
-      if ((item === null || item === void 0 ? void 0 : item.consumerDiscountPercentage) !== undefined && (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: item.articleNumber,
-            percentage: item.consumerDiscountPercentage
+            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,
+            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);
@@ -345,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,
@@ -372,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,
@@ -392,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 {
@@ -428,10 +465,17 @@ 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 _ref3, _consumerDiscounts$pr;
+      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 consumerDiscountPercentage = (_ref3 = (_consumerDiscounts$pr = consumerDiscounts === null || consumerDiscounts === void 0 ? void 0 : consumerDiscounts[product.articleNumber]) !== null && _consumerDiscounts$pr !== void 0 ? _consumerDiscounts$pr : cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerDiscountPercentage) !== null && _ref3 !== void 0 ? _ref3 : null;
+      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$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
+      const consumerDiscountPercentage = isTouched ? storedDiscount !== null && storedDiscount !== void 0 ? storedDiscount : 0 : cartDiscount || productDefault || 0;
       return _objectSpread(_objectSpread({}, product), {}, {
         priceInfo,
         consumerDiscountPercentage
@@ -441,7 +485,7 @@ const ProductCartTable = () => {
       mainProducts: rawMainProducts.map(enhanceProduct),
       accessoireProducts: rawAccessoireProducts.map(enhanceProduct)
     };
-  }, [products, selectedTowbar, selectedCombiset, selectedCableset, selectedBoardComputer, selectedExtras, cartLookup, consumerDiscounts, useTmgDisplayMode, isToggled]);
+  }, [products, selectedTowbar, selectedCombiset, selectedCableset, selectedBoardComputer, selectedExtras, cartLookup, consumerDiscounts, touchedConsumerDiscounts, useTmgDisplayMode, isToggled]);
 
   // Calculate subtotals
   const subtotals = (0, _react.useMemo)(() => {

package/dist/src/shared/__context__/OrderSessionContext.js

@@ -136,6 +136,7 @@ const INITIAL_ORDER_SESSION_STATE = {
   customerAgreed: undefined,
   vehicleCodingDiscountPercentage: null,
   consumerDiscounts: {},
+  touchedConsumerDiscounts: {},
   montageRate: null,
   isMontageTariffFixed: false,
   vehicle: {
@@ -841,12 +842,16 @@ const orderSessionReducer = (state, action) => {
       {
         const {
           articleNumber,
-          percentage
+          percentage,
+          userModified = false
         } = action.payload;
         return _objectSpread(_objectSpread({}, state), {}, {
           consumerDiscounts: _objectSpread(_objectSpread({}, state.consumerDiscounts), {}, {
             [articleNumber]: percentage
           }),
+          touchedConsumerDiscounts: userModified ? _objectSpread(_objectSpread({}, state.touchedConsumerDiscounts), {}, {
+            [articleNumber]: true
+          }) : state.touchedConsumerDiscounts,
           isTouched: true
         });
       }

package/package.json

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