thm-p3-configurator 0.0.288 → 0.0.289

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) {
@@ -287,7 +289,8 @@ const ProductCartTable = () => {
   (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) {
+      // 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) {
         dispatch({
           type: _OrderSessionContext.orderSessionActions.SET_CONSUMER_DISCOUNT_PERCENTAGE,
           payload: {
@@ -428,10 +431,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$consumerDis, _product$consumerPric5, _product$consumerPric6;
       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$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;
+
+      // 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 +451,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.289",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "author": "EnoRm.",