@crystaldesign/web-planner-logic 25.4.0-beta.46 → 25.4.0-beta.48

package/build/cjs/{index-6cf8bb85.js → index-c3426ca1.js}

@@ -16192,6 +16192,11 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
     set: function set(val) {
       this.opv.groupName = val;
     }
+  }, {
+    key: "origGroupName",
+    get: function get() {
+      return this.opv.origGroupName;
+    }
   }, {
     key: "groupName_locales",
     get: function get() {
@@ -16620,6 +16625,11 @@ var CatalogArticleData = /*#__PURE__*/function () {
     get: function get() {
       return this._catalogArticle.groupName;
     }
+  }, {
+    key: "origGroupName",
+    get: function get() {
+      return this._catalogArticle.origGroupName;
+    }
   }, {
     key: "groupName_locales",
     get: function get() {
@@ -17278,6 +17288,7 @@ function getCatalogArticle$1(jsonArticle, catalogData) {
     properties: [].concat(_toConsumableArray__default["default"]((_jsonArticle$Metadata = jsonArticle.Metadatas) !== null && _jsonArticle$Metadata !== void 0 ? _jsonArticle$Metadata : []), _toConsumableArray__default["default"]((_articleMask$properti = articleMask === null || articleMask === void 0 ? void 0 : articleMask.properties) !== null && _articleMask$properti !== void 0 ? _articleMask$properti : [])),
     image: jsonArticle.Image && jsonArticle.Image != '' ? jsonArticle.Image : undefined,
     groupName: (_articleMask$groupnam = articleMask === null || articleMask === void 0 || (_articleMask$groupnam2 = articleMask.groupname) === null || _articleMask$groupnam2 === void 0 ? void 0 : _articleMask$groupnam2[catalogData.api.getLanguage()]) !== null && _articleMask$groupnam !== void 0 ? _articleMask$groupnam : jsonArticle.GroupName,
+    origGroupName: jsonArticle.GroupName,
     mainCategory: jsonArticle.MainCategory && jsonArticle.MainCategory != '' ? jsonArticle.MainCategory : undefined,
     width: jsonArticle.Width && jsonArticle.Width != '' ? Number(jsonArticle.Width.replace('cm', '').replace(',', '.')) : undefined,
     height: jsonArticle.Height && jsonArticle.Height != '' ? Number(jsonArticle.Height.replace('cm', '').replace(',', '.')) : undefined,
@@ -17416,6 +17427,7 @@ function getCatalogOptionValueDataType(codex, jsonOPV, catalogData) {
     description: jsonOPV.Description,
     description_locales: jsonOPV.Description_locales,
     groupName: (_mask$groupname$catal = mask === null || mask === void 0 || (_mask$groupname = mask.groupname) === null || _mask$groupname === void 0 ? void 0 : _mask$groupname[catalogData.api.getLanguage()]) !== null && _mask$groupname$catal !== void 0 ? _mask$groupname$catal : jsonOPV.GroupName && jsonOPV.GroupName != '' ? jsonOPV.GroupName : undefined,
+    origGroupName: jsonOPV.GroupName && jsonOPV.GroupName != '' ? jsonOPV.GroupName : undefined,
     groupName_locales: (_mask$groupname2 = mask === null || mask === void 0 ? void 0 : mask.groupname) !== null && _mask$groupname2 !== void 0 ? _mask$groupname2 : jsonOPV.GroupName_locales,
     hiddenByMask: mask === null || mask === void 0 ? void 0 : mask.hidden,
     textureName: jsonOPV.TextureName && jsonOPV.TextureName != '' ? jsonOPV.TextureName : jsonOPV.PFTFile && jsonOPV.PFTFile != '' ? jsonOPV.PFTFile : undefined,
@@ -17797,6 +17809,11 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
     get: function get() {
       return this.opv.catalogOPV.groupName;
     }
+  }, {
+    key: "origGroupName",
+    get: function get() {
+      return this.opv.catalogOPV.origGroupName;
+    }
   }, {
     key: "description",
     get: function get() {
@@ -18165,6 +18182,11 @@ var ArticleOptionData = /*#__PURE__*/function () {
     get: function get() {
       var _this$opt$catalogOPT;
       if ((_this$opt$catalogOPT = this.opt.catalogOPT) !== null && _this$opt$catalogOPT !== void 0 && _this$opt$catalogOPT.maskTabgroup) return this.opt.catalogOPT.maskTabgroup;
+      return this.origTabGroup;
+    }
+  }, {
+    key: "origTabGroup",
+    get: function get() {
       if (this.opt.subTabGroupOfSubTemplate) return this.opt.subTabGroupOfSubTemplate;
       return this.opt.tabGroup;
     }
@@ -19773,6 +19795,8 @@ var DivaCatalogData = /*#__PURE__*/function () {
       //                                    is a string that can define which DPs are hidden. semicolon splitted eg: "AVC;AVR"
 
       //Konfiguration
+      useDiomexConfigLogic: false,
+      //                                 configurationslogik von diomex wird angewannt. Diese erlaubt dass optionen auch keinen wert aktuell gewählt haben. hier wird nicht standardmäßig der erste wert selektiert, falls der alter wert nicht miehr gültig ist.
       UsePrgAsOpvArticleNr: false,
       //                                 spezielle Lösung für Jutzler - bei Zubehösets ist die Artikelnummer nicht der SubArticleCodex sondern der Codex der Preisgruppe
       articleConfigSingle: false,
@@ -20526,6 +20550,11 @@ var DivaCatalogData = /*#__PURE__*/function () {
     get: function get() {
       return this.catalogProps.warningRules;
     }
+  }, {
+    key: "useDiomexConfigLogic",
+    get: function get() {
+      return this.catalogProps.useDiomexConfigLogic;
+    }
   }, {
     key: "bannerRules",
     get: function get() {
@@ -20869,6 +20898,9 @@ var DivaCatalogData = /*#__PURE__*/function () {
             _this5.catalogProps.reconfigAfterArticleDocked = item.Value == '1';
             break;
           // Configuration
+          case 'USE_DIOMEX_CONFIG_LOGIC':
+            _this5.catalogProps.useDiomexConfigLogic = item.Value == '1';
+            break;
           case 'USEPRGASOPVARTICLENR':
             _this5.catalogProps.UsePrgAsOpvArticleNr = item.Value == '1';
             break;
@@ -21394,6 +21426,7 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
     this.articleOptionState = {
       option: option,
       name: '',
+      origName: '',
       imageOPVs: {},
       visibleOPVs: {},
       visibleOPVsImages: {},
@@ -21442,6 +21475,11 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
     get: function get() {
       return this.articleOptionState.option.tabGroup;
     }
+  }, {
+    key: "optionOrigTabGroup",
+    get: function get() {
+      return this.articleOptionState.option.origTabGroup;
+    }
   }, {
     key: "optionTabGroup_locales",
     get: function get() {
@@ -21537,7 +21575,10 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
   }, {
     key: "origName",
     get: function get() {
-      return this.articleOptionState.name;
+      return this.articleOptionState.origName;
+    },
+    set: function set(newName) {
+      this.articleOptionState.origName = newName;
     }
   }, {
     key: "valName",
@@ -22063,7 +22104,7 @@ var DivaEngine = /*#__PURE__*/function () {
   function DivaEngine(article) {
     _classCallCheck__default["default"](this, DivaEngine);
     _defineProperty__default["default"](this, "article", void 0);
-    _defineProperty__default["default"](this, "decisionDebugStacks", []);
+    _defineProperty__default["default"](this, "decisionDebugStack", []);
     this.article = article;
   }
   return _createClass__default["default"](DivaEngine, [{
@@ -22357,8 +22398,11 @@ var DivaEngine = /*#__PURE__*/function () {
       if (doDefine) {
         ops.isDefined = true;
       }
-      var newName = this.itemInfo(myOPVItem, !ops.option.hideGroupNameInOrderText, ops.freeText);
-      ops.name = newName;
+      var _this$itemInfo = this.itemInfo(myOPVItem, !ops.option.hideGroupNameInOrderText, ops.freeText),
+        name = _this$itemInfo.name,
+        origName = _this$itemInfo.origName;
+      ops.name = name;
+      ops.origName = origName;
       ops.isDoShow = true;
       ops.isDisabled = false;
       if (ops.isFreeText) {
@@ -22398,28 +22442,44 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "itemInfo",
     value: function itemInfo(myOPV, evalParentDesc, freeText) {
-      var myDesc = myOPV.description;
-      if (!myDesc) myDesc = myOPV.origName;
+      var _myOPV$description, _myOPV$description2;
+      var name = (_myOPV$description = myOPV.description) !== null && _myOPV$description !== void 0 ? _myOPV$description : myOPV.name;
+      var origName = (_myOPV$description2 = myOPV.description) !== null && _myOPV$description2 !== void 0 ? _myOPV$description2 : myOPV.origName;
       if (myOPV.isFreeText && freeText) {
         if (myOPV.measureUnit) {
-          myDesc += ': ' + freeText + ' ' + myOPV.measureUnit;
+          name += ': ' + freeText + ' ' + myOPV.measureUnit;
+          origName += ': ' + freeText + ' ' + myOPV.measureUnit;
         } else {
-          myDesc += ': ' + freeText;
+          name += ': ' + freeText;
+          origName += ': ' + freeText;
         }
       }
       if (evalParentDesc) {
         var opvGroupName = myOPV.groupName;
-        if (opvGroupName && myDesc.toLowerCase().search(opvGroupName.toLowerCase()) >= 0) return (myOPV.parentName ? myOPV.parentName + ' - ' : '') + myDesc;else return (myOPV.groupName ? myOPV.groupName + ' - ' : '') + myDesc;
+        if (opvGroupName && name.toLowerCase().search(opvGroupName.toLowerCase()) >= 0) return {
+          name: (myOPV.parentName ? myOPV.parentName + ' - ' : '') + name,
+          origName: (myOPV.parentName ? myOPV.parentName + ' - ' : '') + origName
+        };else return {
+          name: (myOPV.groupName ? myOPV.groupName + ' - ' : '') + name,
+          origName: (myOPV.origGroupName ? myOPV.origGroupName + ' - ' : '') + origName
+        };
       } else {
-        return myDesc;
+        return {
+          name: name,
+          origName: origName
+        };
       }
     }
   }, {
     key: "clearOP",
-    value: function clearOP(optionCodex) {
+    value: function clearOP(optionCodex, keepEnalbed) {
       var _this$article$set$Vie;
       //die Klasse ArticleOptionState wird einfach neu initialisiert
       var oldOPS = this.article.getArticleOptionState(optionCodex);
+      if (keepEnalbed) {
+        oldOPS.val = undefined;
+        return;
+      }
       var option = oldOPS.option;
       var optionState = new ArticleOptionStateData(option, this.article.getIsConfigSingle, oldOPS.defaultOPV, (_this$article$set$Vie = this.article.set.ViewConfig) === null || _this$article$set$Vie === void 0 ? void 0 : _this$article$set$Vie.useIsOptionDefinedWarning);
       optionState.isDisabled = true;
@@ -22437,7 +22497,20 @@ var DivaEngine = /*#__PURE__*/function () {
         if (this.article.hasType1Dependencies) {
           //Überprüft, ob die alle Optionen gültige Optionswerte haben.
           //wenn nicht, werden gültige Defaultwerte initialisiert
-          this.evalAllDecisions();
+          var beforeSnapshot = undefined;
+          var afterSnapshot = undefined;
+          var count = 0;
+          var startTime = Date.now();
+          this.article.decisionDebugStacks = [];
+          do {
+            var _afterSnapshot;
+            beforeSnapshot = (_afterSnapshot = afterSnapshot) !== null && _afterSnapshot !== void 0 ? _afterSnapshot : this.article.snapshot;
+            this.evalAllDecisions();
+            afterSnapshot = this.article.snapshot;
+            count++;
+          } while (JSON.stringify(afterSnapshot) !== JSON.stringify(beforeSnapshot) && count < 50);
+          var endTime = Date.now();
+          LOG$f.debug('eval Decisions total time in ' + (endTime - startTime) + ' of ' + count);
         } else {
           //check in DB if there are still catalogs with hasType1Dependencies == false. After some time this souldnt be the usecase anymore and the hasType1Dependencies == false logic can be removed here
           //deprected
@@ -22449,7 +22522,6 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "evalAllDecisions",
     value: function evalAllDecisions() {
-      var _myDecision$disableHi, _myDecision$disableHi2, _myDecision$disableHi3;
       var myDecisions = this.article.catalogArticle.articleDecisions;
       //add the partlist spesific decisions to the normal decisions
       if (this.article.initDecisions) myDecisions = myDecisions.concat(this.article.initDecisions);
@@ -22472,8 +22544,10 @@ var DivaEngine = /*#__PURE__*/function () {
       } finally {
         _iterator2.f();
       }
-      var decisionDebugStack = [];
+      this.decisionDebugStack = [];
+      var beforeSnapshot = this.article.set.logDecisions ? this.article.snapshot : undefined;
       for (var m = 0; m < myDecisions.length; m++) {
+        var startTime = Date.now();
         //Alle Optionen Mit DOC Type 1 ermitten - diese zunächst alle ausblenden, werden dann später über Formeln wieder eingeschaltet
         var myDecision = myDecisions[m];
         if (myDecision.enabled && myDecision.DOC) {
@@ -22481,46 +22555,45 @@ var DivaEngine = /*#__PURE__*/function () {
             case '2':
               //Aktionsregel. Wenn das erste JsRule erfüllt ist muss man die restlichen DecisionOptionCombinations nicht mehr kontrollieren.
               this.evalType2Decision(myDecision, myDecisions);
-              decisionDebugStack.push({
-                text: myDecision.Number + ' type: 2 ' + ((_myDecision$disableHi = myDecision.disableHistory) === null || _myDecision$disableHi === void 0 ? void 0 : _myDecision$disableHi.join(',')),
-                nr: myDecision.Number,
-                decision: JSON.parse(JSON.stringify(myDecision))
-              });
               break;
             case '1':
               this.evalType1Decision(myDecision);
-              decisionDebugStack.push({
-                text: myDecision.Number + ' type: 1 ' + ((_myDecision$disableHi2 = myDecision.disableHistory) === null || _myDecision$disableHi2 === void 0 ? void 0 : _myDecision$disableHi2.join(',')),
-                nr: myDecision.Number,
-                decision: JSON.parse(JSON.stringify(myDecision))
-              });
               break;
             case '0':
               this.evalType0Decision(myDecision);
-              decisionDebugStack.push({
-                text: myDecision.Number + ' type: 0 ' + ((_myDecision$disableHi3 = myDecision.disableHistory) === null || _myDecision$disableHi3 === void 0 ? void 0 : _myDecision$disableHi3.join(',')),
-                nr: myDecision.Number,
-                decision: JSON.parse(JSON.stringify(myDecision))
-              });
               break;
+            case '3':
+              continue;
           }
-        } else {
-          var _myDecision$disableHi4;
-          decisionDebugStack.push({
-            text: myDecision.Number + ' ' + ((_myDecision$disableHi4 = myDecision.disableHistory) === null || _myDecision$disableHi4 === void 0 ? void 0 : _myDecision$disableHi4.join(',')),
-            nr: myDecision.Number,
-            decision: JSON.parse(JSON.stringify(myDecision))
-          });
         }
+        beforeSnapshot = this.pushDecisionDebug(myDecision, beforeSnapshot);
+        var endTime = Date.now();
+        LOG$f.debug('decision ' + myDecision.Number + ' article ' + this.article.articleCodex + ' time ' + (endTime - startTime));
       }
-      if (this.decisionDebugStacks.length > 6) this.decisionDebugStacks.shift();
-      this.decisionDebugStacks.push({
-        stack: decisionDebugStack,
+      this.article.decisionDebugStacks.push({
+        stack: this.decisionDebugStack,
         variantValues: this.article.VariantValues
       });
       this.evalShowOnlyWhenHasPrice();
       this.updateIDMSpecificFeatures();
     }
+  }, {
+    key: "pushDecisionDebug",
+    value: function pushDecisionDebug(decision, beforeSnapshot) {
+      var _decision$disableHist;
+      if (!this.article.set.logDecisions || !beforeSnapshot) return undefined;
+      var afterSnapshot = this.article.snapshot;
+      this.decisionDebugStack.push({
+        text: decision.Number + ' type:' + decision.Type + ' ' + ((_decision$disableHist = decision.disableHistory) === null || _decision$disableHist === void 0 ? void 0 : _decision$disableHist.join(',')),
+        nr: decision.Number,
+        decision: JSON.parse(JSON.stringify(decision)),
+        snapshots: {
+          before: beforeSnapshot,
+          after: afterSnapshot
+        }
+      });
+      return afterSnapshot;
+    }
 
     /**
      * @deprecated
@@ -22681,7 +22754,20 @@ var DivaEngine = /*#__PURE__*/function () {
                     }
                     break;
                   case '3':
-                  case 'SET_FEATURE_DEFAULT': //wenn man einen Artikel mit bestehenden VariantValues initialisiert, sollten keine Defaultwerte gesetzt werden
+                  case 'SET_FEATURE_DEFAULT':
+                    //wenn man einen Artikel mit bestehenden VariantValues initialisiert, sollten keine Defaultwerte gesetzt werden
+                    if (!myDoc.JsFormula || myDoc.JsFormula == '' || this.article.evalRule(myDoc.JsFormula)) {
+                      ignorNextAction = true;
+                      var _ops3 = this.article.getArticleOptionState('OPT' + myDA.OptionRefCodex);
+                      if (_ops3 && _ops3.val === undefined) {
+                        if (myDA.OptionValueRefCodex) {
+                          this.assignOptionValue('OPT' + myDA.OptionCodex, 'OPV' + myDA.OptionValueRefCodex);
+                        } else if (myDA.OptionRefCodex && _ops3) {
+                          this.assignOptionValue('OPT' + myDA.OptionCodex, 'OPV' + myDA.OptionCodex + _ops3.valCodex.replace('OPV' + _ops3.optionCodex.substring(3), ''));
+                        }
+                      }
+                    }
+                    break;
                   case 'SET_FEATURE_DEFAULT_NULL':
                     break;
                   case 'DISABLE_DECISION':
@@ -22764,13 +22850,13 @@ var DivaEngine = /*#__PURE__*/function () {
             for (var f = 0; f < doAlsoCheckOPTs.length; f++) {
               var _myDoc$Row;
               var checkOptX = doAlsoCheckOPTs[f];
-              var _ops3 = this.article.getArticleOptionState(checkOptX);
-              if (_ops3 && (_myDoc$Row = myDoc.Row) !== null && _myDoc$Row !== void 0 && _myDoc$Row[checkOptX] && _ops3.valCodex && !myDoc.Row[checkOptX].includes(_ops3.valCodex)) {
+              var _ops4 = this.article.getArticleOptionState(checkOptX);
+              if (_ops4 && (_myDoc$Row = myDoc.Row) !== null && _myDoc$Row !== void 0 && _myDoc$Row[checkOptX] && _ops4.valCodex && !myDoc.Row[checkOptX].includes(_ops4.valCodex)) {
                 if (!myDoc.Row[checkOptX].find(function (o) {
                   return !o.startsWith('!');
                 })) {
                   //all is inverted
-                  if (myDoc.Row[checkOptX].includes('!' + _ops3.valCodex)) {
+                  if (myDoc.Row[checkOptX].includes('!' + _ops4.valCodex)) {
                     doUseDoc = false;
                     break;
                   }
@@ -22841,7 +22927,11 @@ var DivaEngine = /*#__PURE__*/function () {
         var valCodex = ops.valCodex;
         ops.visibleCount = Object.keys(possibleOPVs).length;
         if ((!valCodex || !possibleOPVs[valCodex]) && Object.keys(possibleOPVs).length > 0) {
-          this.updateArtOPV(this.article.getDefaultOpv(possibleOPVs), OPT, ops, undefined);
+          if (this.article.CatalogData.useDiomexConfigLogic) {
+            this.clearOP(OPT, true);
+          } else {
+            this.updateArtOPV(this.article.getDefaultOpv(possibleOPVs), OPT, ops, undefined);
+          }
         }
         doAlsoCheckOPTs.push(OPT);
         //Hier führende Optionen prüfen
@@ -22871,8 +22961,8 @@ var DivaEngine = /*#__PURE__*/function () {
               for (var f = 0; f < doAlsoCheckOPTs.length; f++) {
                 var _myDoc$Row3;
                 var checkOptX = doAlsoCheckOPTs[f];
-                var _ops4 = this.article.getArticleOptionState(checkOptX);
-                if (_ops4 && (_myDoc$Row3 = myDoc.Row) !== null && _myDoc$Row3 !== void 0 && _myDoc$Row3[checkOptX] && _ops4.valCodex && !myDoc.Row[checkOptX].includes(_ops4.valCodex)) {
+                var _ops5 = this.article.getArticleOptionState(checkOptX);
+                if (_ops5 && (_myDoc$Row3 = myDoc.Row) !== null && _myDoc$Row3 !== void 0 && _myDoc$Row3[checkOptX] && _ops5.valCodex && !myDoc.Row[checkOptX].includes(_ops5.valCodex)) {
                   doUseDoc = false;
                   break;
                 }
@@ -22903,7 +22993,11 @@ var DivaEngine = /*#__PURE__*/function () {
           var valCodex = ops.valCodex;
           ops.visibleCount = Object.keys(possibleOPVs).length;
           if ((!valCodex || !possibleOPVs[valCodex]) && Object.keys(possibleOPVs).length > 0) {
-            this.updateArtOPV(this.article.getDefaultOpv(possibleOPVs), OPT, ops, undefined);
+            if (this.article.CatalogData.useDiomexConfigLogic) {
+              this.clearOP(OPT, true);
+            } else {
+              this.updateArtOPV(this.article.getDefaultOpv(possibleOPVs), OPT, ops, undefined);
+            }
           }
         } else if (p < myDecision.Options.length - 1) {
           doAlsoCheckOPTs.push(OPT);
@@ -23125,6 +23219,7 @@ var DivaEngine = /*#__PURE__*/function () {
         }
         if (groupDecisionVal && groupDecisionVal.isValidDOC || key == -1) {
           for (var b = 0; b < myPartlistArticles[key].length; b++) {
+            var startTime = Date.now();
             var myPartListPos = myPartlistArticles[key][b];
             if (myPartListPos.ItemRefArticles) {
               var decisions = myPartListPos.PartListPosDecisionsAndPosCounts;
@@ -23151,6 +23246,7 @@ var DivaEngine = /*#__PURE__*/function () {
                 }
               }
             }
+            LOG$f.debug('partlist ' + myPartListPos.$id + ' article ' + this.article.articleCodex + '  time ' + (Date.now() - startTime));
           }
         }
       }
@@ -23224,6 +23320,7 @@ var DivaEngine = /*#__PURE__*/function () {
             RetailPrefix: myPartListPos.RetailPrefix,
             Quantity: quanitity,
             PartlistRule: (groupDecisionVal ? groupDecisionVal.Rule + ' && ' : '') + myDecisionVal ? DivaUtils__default["default"].getOptionValuePairsByRule((_myDecisionVal$Rule = myDecisionVal === null || myDecisionVal === void 0 ? void 0 : myDecisionVal.Rule) !== null && _myDecisionVal$Rule !== void 0 ? _myDecisionVal$Rule : '', _this2.article.VariantValues) : undefined,
+            partlistDecisionNo: decisionNumber,
             SupplierOrderCodex: myPartListPos.SupplierOrderCodex,
             initDecisions: initDecisionsFiltered,
             RuleDesc: myRuleDesc,
@@ -23234,8 +23331,6 @@ var DivaEngine = /*#__PURE__*/function () {
             optionImgForPrint: optionImgForPrint,
             optionsForPrint: optionsForPrint
           });
-        } else {
-          LOG$f.error(new DivaUtils.DivaError('For article: ' + _this2.article.articleCodex + ' name: ' + _this2.article.name + ' decisionNr: ' + decisionNumber + ' was not found as DecisionType 3'));
         }
       };
       for (var d = 0; d < myPartListPos.ItemRefArticles.length; d++) {
@@ -23265,7 +23360,7 @@ var DivaEngine = /*#__PURE__*/function () {
             }
           }
         } else {
-          LOG$f.error(new DivaUtils.DivaError('For article: ' + this.article.articleCodex + ' name: ' + this.article.name + ' decisionNr: ' + DecisionNumber + ' was not found as DecisionType 3'));
+          LOG$f.error(new DivaUtils.DivaError('For article: ' + this.article.articleCodex + ' name: ' + this.article.origName + ' decisionNr: ' + DecisionNumber + ' was not found as DecisionType 3'));
         }
       }
       return {
@@ -23345,7 +23440,7 @@ var DivaEngine = /*#__PURE__*/function () {
           if ((mUnit || OP == 'OPTUMFANG' || OP == 'OPTUMFANG_KREIS') && this.article.parentHasSameOption(OP) && !((_ops$addToMeasure = ops.addToMeasure) !== null && _ops$addToMeasure !== void 0 && _ops$addToMeasure.length)) {
             var freeTextMeasure = parseFloat(ops.freeText ? ops.freeText : '');
             var newFreeTextMeasure = this.article.calcAddToMeasure(OP, freeTextMeasure);
-            LOG$f.debug('freetext changed by addToMeasure at price calculation', newFreeTextMeasure, freeTextMeasure, ops.addToMeasure);
+            if (newFreeTextMeasure) LOG$f.debug('freetext changed by addToMeasure at price calculation', newFreeTextMeasure, freeTextMeasure, ops.addToMeasure);
             freeTextMeasure = newFreeTextMeasure;
             if (freeTextMeasure || OP == 'OPTUMFANG' || OP == 'OPTUMFANG_KREIS') {
               if (calcUnitPrice != 0) {
@@ -23397,8 +23492,8 @@ var DivaEngine = /*#__PURE__*/function () {
         _step6;
       try {
         for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var _ops5 = _step6.value;
-          var targetPPGPrefixes = _ops5.targetPPGPrefixes;
+          var _ops6 = _step6.value;
+          var targetPPGPrefixes = _ops6.targetPPGPrefixes;
           if (!targetPPGPrefixes) continue;
           var _loop5 = function _loop5() {
             var targetPrefix = targetPPGPrefixes[_i5];
@@ -23407,8 +23502,8 @@ var DivaEngine = /*#__PURE__*/function () {
               return ((_item$PPG = item.PPG) === null || _item$PPG === void 0 ? void 0 : _item$PPG.split('_')[0]) == targetPrefix;
             });
             if (priceRef) {
-              if (_ops5.isPercentage) {
-                priceRef.calcPrice = priceRef.Price * (1 + _ops5.calcPrice);
+              if (_ops6.isPercentage) {
+                priceRef.calcPrice = priceRef.Price * (1 + _ops6.calcPrice);
               }
             }
           };
@@ -23488,11 +23583,11 @@ var DivaEngine = /*#__PURE__*/function () {
         _step9;
       try {
         for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-          var _ops6$targetPPGPrefix, _ops6$targetPPGPrefix2;
-          var _ops6 = _step9.value;
-          var targetOption = (_ops6$targetPPGPrefix = (_ops6$targetPPGPrefix2 = _ops6.targetPPGPrefixes) === null || _ops6$targetPPGPrefix2 === void 0 ? void 0 : _ops6$targetPPGPrefix2[0]) !== null && _ops6$targetPPGPrefix !== void 0 ? _ops6$targetPPGPrefix : _ops6.targetOption;
-          if (_ops6.isPercentage && targetOption == 'GLOBAL') {
-            articleUsedCalcPrice = articleUsedCalcPrice * (1 + _ops6.calcPrice);
+          var _ops7$targetPPGPrefix, _ops7$targetPPGPrefix2;
+          var _ops7 = _step9.value;
+          var targetOption = (_ops7$targetPPGPrefix = (_ops7$targetPPGPrefix2 = _ops7.targetPPGPrefixes) === null || _ops7$targetPPGPrefix2 === void 0 ? void 0 : _ops7$targetPPGPrefix2[0]) !== null && _ops7$targetPPGPrefix !== void 0 ? _ops7$targetPPGPrefix : _ops7.targetOption;
+          if (_ops7.isPercentage && targetOption == 'GLOBAL') {
+            articleUsedCalcPrice = articleUsedCalcPrice * (1 + _ops7.calcPrice);
           }
         }
       } catch (err) {
@@ -23609,10 +23704,10 @@ var DivaEngine = /*#__PURE__*/function () {
                   _step10;
                 try {
                   for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-                    var _ops7 = _step10.value;
-                    if (_ops7.ocd == searchOpt || _ops7.optionCodex == searchOpt) {
-                      if (_ops7 && _ops7.price > 0) {
-                        myPercBasePrice += _ops7.price * _ops7.quantity;
+                    var _ops8 = _step10.value;
+                    if (_ops8.ocd == searchOpt || _ops8.optionCodex == searchOpt) {
+                      if (_ops8 && _ops8.price > 0) {
+                        myPercBasePrice += _ops8.price * _ops8.quantity;
                         break;
                       }
                     }
@@ -23635,11 +23730,6 @@ var DivaEngine = /*#__PURE__*/function () {
         return calculatedPrice;
       }
     }
-  }, {
-    key: "getDecisionDebugStacks",
-    value: function getDecisionDebugStacks() {
-      return this.decisionDebugStacks;
-    }
   }]);
 }();
 
@@ -23653,7 +23743,7 @@ var IDMEngine = /*#__PURE__*/function () {
   function IDMEngine(article) {
     _classCallCheck__default["default"](this, IDMEngine);
     _defineProperty__default["default"](this, "article", void 0);
-    _defineProperty__default["default"](this, "decisionDebugStacks", []);
+    _defineProperty__default["default"](this, "decisionDebugStack", []);
     this.article = article;
   }
   return _createClass__default["default"](IDMEngine, [{
@@ -23664,19 +23754,21 @@ var IDMEngine = /*#__PURE__*/function () {
       var afterHash = undefined;
       var count = 0;
       var startTime = Date.now();
-      while (!afterHash || afterHash !== beforeHash && count < 50) {
-        beforeHash = this.article.snapshot;
+      this.article.decisionDebugStacks = [];
+      do {
+        var _afterHash;
+        beforeHash = (_afterHash = afterHash) !== null && _afterHash !== void 0 ? _afterHash : JSON.stringify(this.article.snapshot);
         this.evalDecisionsfunction();
-        afterHash = this.article.snapshot;
+        afterHash = JSON.stringify(this.article.snapshot);
         count++;
-      }
+      } while (afterHash !== beforeHash && count < 50);
       var endTime = Date.now();
       LOG$e.debug('eval Decisions total time in ' + (endTime - startTime) + ' of ' + count);
     }
   }, {
     key: "evalDecisionsfunction",
     value: function evalDecisionsfunction() {
-      var _unsortedDecisons, _decision$disableHist, _decision$disableHist2, _decision$disableHist3;
+      var _unsortedDecisons;
       var unsortedDecisons = this.article.articleIDMDecisions;
       if (!((_unsortedDecisons = unsortedDecisons) !== null && _unsortedDecisons !== void 0 && _unsortedDecisons.length)) return;
       //add the partlist spesific decisions to the normal decisions
@@ -23705,7 +23797,8 @@ var IDMEngine = /*#__PURE__*/function () {
       } finally {
         _iterator.f();
       }
-      var decisionDebugStack = [];
+      this.decisionDebugStack = [];
+      var beforeSnapshot = this.article.set.logDecisions ? this.article.snapshot : undefined;
       for (var m = 0; m < decisions.length; m++) {
         var startTime = Date.now();
         //Alle Optionen Mit DOC Type 1 ermitten - diese zunächst alle ausblenden, werden dann später über Formeln wieder eingeschaltets
@@ -23714,50 +23807,47 @@ var IDMEngine = /*#__PURE__*/function () {
           switch (decision.decisionType) {
             case 2:
               this.evalType2Decision(decision, decisions);
-              decisionDebugStack.push({
-                text: decision.decisionNo + ' type: 2 ' + ((_decision$disableHist = decision.disableHistory) === null || _decision$disableHist === void 0 ? void 0 : _decision$disableHist.join(',')),
-                nr: decision.decisionNo,
-                decision: JSON.parse(JSON.stringify(decision))
-              });
               break;
             case 1:
               this.evalType1Decision(decision);
-              decisionDebugStack.push({
-                text: decision.decisionNo + ' type: 1 ' + ((_decision$disableHist2 = decision.disableHistory) === null || _decision$disableHist2 === void 0 ? void 0 : _decision$disableHist2.join(',')),
-                nr: decision.decisionNo,
-                decision: JSON.parse(JSON.stringify(decision))
-              });
               break;
             case 0:
               this.evalType0Decision(decision);
-              decisionDebugStack.push({
-                text: decision.decisionNo + ' type: 0 ' + ((_decision$disableHist3 = decision.disableHistory) === null || _decision$disableHist3 === void 0 ? void 0 : _decision$disableHist3.join(',')),
-                nr: decision.decisionNo,
-                decision: JSON.parse(JSON.stringify(decision))
-              });
               break;
+            case 3:
+              continue;
             default:
               LOG$e.error(new Error('decisionType ' + decision.decisionType + ' not implemented'));
               break;
           }
-        } else {
-          var _decision$disableHist4;
-          decisionDebugStack.push({
-            text: decision.decisionNo + ' ' + ((_decision$disableHist4 = decision.disableHistory) === null || _decision$disableHist4 === void 0 ? void 0 : _decision$disableHist4.join(',')),
-            nr: decision.decisionNo,
-            decision: JSON.parse(JSON.stringify(decision))
-          });
         }
+        beforeSnapshot = this.pushDecisionDebug(decision, beforeSnapshot);
         var endTime = Date.now();
         LOG$e.debug('decision ' + decision.decisionNo + ' time ' + (endTime - startTime));
       }
-      if (this.decisionDebugStacks.length > 6) this.decisionDebugStacks.shift();
-      this.decisionDebugStacks.push({
-        stack: decisionDebugStack,
+      this.article.decisionDebugStacks.push({
+        stack: this.decisionDebugStack,
         variantValues: this.article.VariantValues
       });
       this.updateIDMSpecificFeatures();
     }
+  }, {
+    key: "pushDecisionDebug",
+    value: function pushDecisionDebug(decision, beforeSnapshot) {
+      var _decision$disableHist;
+      if (!this.article.set.logDecisions || !beforeSnapshot) return undefined;
+      var afterSnapshot = this.article.snapshot;
+      this.decisionDebugStack.push({
+        text: decision.decisionNo + ' type:' + decision.decisionType + ' ' + ((_decision$disableHist = decision.disableHistory) === null || _decision$disableHist === void 0 ? void 0 : _decision$disableHist.join(',')),
+        nr: decision.decisionNo,
+        decision: JSON.parse(JSON.stringify(decision)),
+        snapshots: {
+          before: beforeSnapshot,
+          after: afterSnapshot
+        }
+      });
+      return afterSnapshot;
+    }
   }, {
     key: "sortFeatures",
     value: function sortFeatures(featureNos) {
@@ -23867,7 +23957,11 @@ var IDMEngine = /*#__PURE__*/function () {
         var valCodex = ops.valCodex;
         ops.visibleCount = Object.keys(possibleOPVs).length;
         if ((!valCodex || !possibleOPVs[valCodex]) && Object.keys(possibleOPVs).length > 0) {
-          this.updateArtOPV(this.article.getDefaultOpv(possibleOPVs), featureNo, ops, undefined);
+          if (this.article.CatalogData.useDiomexConfigLogic) {
+            this.clearOP(featureNo, true);
+          } else {
+            this.updateArtOPV(this.article.getDefaultOpv(possibleOPVs), featureNo, ops, undefined);
+          }
         }
         doAlsoCheckFeatureNos.push(featureNo);
         //Hier führende Optionen prüfen
@@ -23934,7 +24028,11 @@ var IDMEngine = /*#__PURE__*/function () {
           var valCodex = ops.valCodex;
           ops.visibleCount = Object.keys(possibleOPVs).length;
           if ((!valCodex || !possibleOPVs[valCodex]) && Object.keys(possibleOPVs).length > 0) {
-            this.updateArtOPV(this.article.getDefaultOpv(possibleOPVs), featureNo, ops, undefined);
+            if (this.article.CatalogData.useDiomexConfigLogic) {
+              this.clearOP(featureNo, true);
+            } else {
+              this.updateArtOPV(this.article.getDefaultOpv(possibleOPVs), featureNo, ops, undefined);
+            }
           }
         } else if (p < sortedDeatureRefs.length - 1) {
           doAlsoCheckFeature.push(featureNo);
@@ -23966,7 +24064,6 @@ var IDMEngine = /*#__PURE__*/function () {
               case '0':
               case 'SET_FEATURE_FIXED':
               case 'SET_FEATURE':
-                //Variante A: Option "myDA.OptionCodex" soll den Wert "OPV" + myDA.OptionValueRefCodex bekommen
                 if (!_this2.article.getArticleOptionState(action.target) || action.target == '') return 0; // continue
                 if (action.ref == 'FORMULA_REF') {
                   var _ops3 = _this2.article.getArticleOptionState(action.target);
@@ -24119,10 +24216,14 @@ var IDMEngine = /*#__PURE__*/function () {
     }
   }, {
     key: "clearOP",
-    value: function clearOP(optionCodex) {
+    value: function clearOP(featureNo, keepEnalbed) {
       var _this$article$set$Vie;
       //die Klasse ArticleOptionState wird einfach neu initialisiert
-      var oldOPS = this.article.getArticleOptionState(optionCodex);
+      var oldOPS = this.article.getArticleOptionState(featureNo);
+      if (keepEnalbed) {
+        oldOPS.val = undefined;
+        return;
+      }
       var option = oldOPS.option;
       var optionState = new ArticleOptionStateData(option, this.article.getIsConfigSingle, oldOPS.defaultOPV, (_this$article$set$Vie = this.article.set.ViewConfig) === null || _this$article$set$Vie === void 0 ? void 0 : _this$article$set$Vie.useIsOptionDefinedWarning);
       optionState.isDisabled = true;
@@ -24167,15 +24268,16 @@ var IDMEngine = /*#__PURE__*/function () {
     value: function setOP(featureNo, option, freeText, doDefine, byFormula) {
       var myArtOPS = this.article.getArticleOptionState(featureNo);
       if (!myArtOPS) {
-        LOG$e.error(new DivaUtils.DivaError('OptionCodex: ' + featureNo + ' in articleCodex: ' + this.article.articleCodex + ' not found!'));
+        LOG$e.error(new DivaUtils.DivaError('FeautureNo: ' + featureNo + ' in articleCodex: ' + this.article.articleCodex + ' not found!'));
         return;
       }
       myArtOPS.val = option; //akteull OPV wird gesetzt
       if (doDefine) {
         myArtOPS.isDefined = true;
       }
-      var newName = option.name; // this.itemInfo(myOPVItem, true && !myArtOPS.option.hideGroupNameInOrderText, myArtOPS.freeText);
+      var newName = option.name; // TODO add freetext info to current optionstate name  this.itemInfo(myOPVItem, true && !myArtOPS.option.hideGroupNameInOrderText, myArtOPS.freeText);
       myArtOPS.name = newName;
+      myArtOPS.origName = newName;
       myArtOPS.isDoShow = true;
       myArtOPS.isDisabled = false;
       if (myArtOPS.isFreeText) {
@@ -24203,56 +24305,9 @@ var IDMEngine = /*#__PURE__*/function () {
   }, {
     key: "evalSetFeatureDefaultDecisions",
     value: function evalSetFeatureDefaultDecisions() {
-      //zunächst ein Gerüst mit allen möglichen gültigen OPVs erstellen,
-      //dieses wird später durch Schnittmengen mit mögliche ValidOptionValues reduziert
-      var allDecisions = this.article.catalogArticle.articleDecisions;
-      var ret = {};
-      if (allDecisions.length > 0) {
-        for (var i = 0; i < allDecisions.length; i++) {
-          allDecisions[i].enabled = true;
-        }
-        for (var m = 0; m < allDecisions.length; m++) {
-          //Alle Optionen Mit DOC Type 1 ermitten - diese zunächst alle ausblenden, werden dann später über Formeln wieder eingeschaltet
-          var myDecision = allDecisions[m];
-          var ignorNextAction = false;
-          if (myDecision.enabled && myDecision.DOC) {
-            for (var j = 0; j < myDecision.DOC.length; j++) {
-              //DecisionOptionCombination
+      //TODO for IDM
 
-              //Gibt es innerhalb einer Decision eine eine gültige DOC, die OPVs der in ValidOptionValues vorkommenden Optionen zunächst alle disabeln, werden dann über eine gültige Formel wieder enabled
-              var myDoc = myDecision.DOC[j];
-              //let isValidDOC = !myDoc.JsFormula || myDoc.JsFormula == "" || this.evalRule(myDoc.JsFormula);
-              if (!ignorNextAction) {
-                if (myDecision.Type == '2') {
-                  //Aktionsregel. Wenn das erste JsRule erfüllt ist muss man die restlichen DecisionOptionCombinations nicht mehr kontrollieren.
-                  if (myDoc.DA) {
-                    for (var _i = 0; _i < myDoc.DA.length; _i++) {
-                      var myDA = myDoc.DA[_i];
-                      var myOptionCodex = myDA.OptionCodex ? 'OPT' + myDA.OptionCodex : '';
-                      if (this.article.getArticleOptionState(myOptionCodex)) {
-                        if (myDA.Type == 'SET_FEATURE_DEFAULT' || myDA.Type == 'SET_FEATURE_DEFAULT_NULL') {
-                          //wenn man einen Artikel mit bestehenden VariantValues initialisiert, sollten keine Defaultwerte gesetzt werden
-                          if (!myDoc.JsFormula || myDoc.JsFormula == '' || this.article.evalRule(myDoc.JsFormula)) {
-                            ignorNextAction = true;
-                            ret[myOptionCodex] = 'OPV' + myDA.OptionValueRefCodex;
-                          }
-                        } else if (myDA.Type == 'SET_FEATURE_FIXED') {
-                          //wenn man einen Artikel mit bestehenden VariantValues initialisiert, sollten keine Defaultwerte gesetzt werden
-                          if (!myDoc.JsFormula || myDoc.JsFormula == '' || this.article.evalRule(myDoc.JsFormula)) {
-                            ignorNextAction = true;
-                            ret[myOptionCodex] = 'OPV' + myDA.OptionValueRefCodex;
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      return ret;
+      return {};
     }
 
     //***********************************************Partlist evaluieren ************************************************/
@@ -24275,7 +24330,7 @@ var IDMEngine = /*#__PURE__*/function () {
           var isValidDOC = relationTypeNone ? undefined : this.checkDecisionNumber(decision.decisionNo);
           if (!isValidDOC && !relationTypeNone) continue;
           partlistAdded = true;
-          partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, newConfigValues);
+          partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, newConfigValues, undefined, !relationTypeNone ? decision.decisionNo : undefined);
           break;
         }
         if (decisions.length === 0 && !partlistAdded) {
@@ -24290,7 +24345,7 @@ var IDMEngine = /*#__PURE__*/function () {
     }
   }, {
     key: "addPartilstToPartlistArticlesToLoad",
-    value: function addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, newConfigValues, rule) {
+    value: function addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, newConfigValues, rule, decisionNo) {
       var decisions = this.article.CatalogData.getDecisionsByNo(myPartListPos.decisions);
 
       //const optionsForPrint: string[] = (myPartListPos.OptionsForPrint as string)?.split(';').map((o: string) => 'OPT' + o);
@@ -24352,6 +24407,7 @@ var IDMEngine = /*#__PURE__*/function () {
           // TODO WWS IDM myPartListPos.RetailPrefix,
           Quantity: quanitity,
           PartlistRule: rule ? DivaUtils__default["default"].getOptionValuePairsByRule(rule, this.article.VariantValues) : undefined,
+          partlistDecisionNo: decisionNo,
           //SupplierOrderCodex:  // TODO WWS IDM ,myPartListPos.SupplierOrderCodex,
           initDecisions: initDecisionsFiltered,
           RuleDesc: myRuleDesc,
@@ -24405,7 +24461,7 @@ var IDMEngine = /*#__PURE__*/function () {
             isValidDOC = true;
           }
         } else {
-          LOG$e.error(new DivaUtils.DivaError('For article: ' + this.article.articleCodex + ' name: ' + this.article.name + ' decisionNr: ' + decisionNo + ' was not found as DecisionType 3'));
+          LOG$e.error(new DivaUtils.DivaError('For article: ' + this.article.articleCodex + ' name: ' + this.article.origName + ' decisionNr: ' + decisionNo + ' was not found as DecisionType 3'));
         }
       }
       return isValidDOC;
@@ -24511,11 +24567,6 @@ var IDMEngine = /*#__PURE__*/function () {
         throw new Error('formula: ' + formula + 'failed to eval ' + origFormula);
       }
     }
-  }, {
-    key: "getDecisionDebugStacks",
-    value: function getDecisionDebugStacks() {
-      return this.decisionDebugStacks;
-    }
   }, {
     key: "updateArticleOptionTree",
     value: function updateArticleOptionTree() {}
@@ -24543,6 +24594,7 @@ var DivaArticle = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "actPlannerData", void 0);
     //Hier steht die aktuelle Konfiguration
     _defineProperty__default["default"](this, "_engine", void 0);
+    _defineProperty__default["default"](this, "decisionDebugStacks", []);
     _defineProperty__default["default"](this, "getIsConfigSingle", function () {
       return _this.set.configSingle;
     });
@@ -24584,6 +24636,7 @@ var DivaArticle = /*#__PURE__*/function () {
       loadingErrors: [],
       priceRefs: [],
       partlistRule: initParams.partlistRule,
+      partlistDecisionNo: initParams.partlistDecisionNo,
       partListParentArticle: initParams.parentArticle,
       partlistArticleVisibleInTree: initParams.partlistArticleVisibleInTree,
       hasPartlistArticle: initParams.hasPartlistArticle ? initParams.hasPartlistArticle : false,
@@ -24681,11 +24734,7 @@ var DivaArticle = /*#__PURE__*/function () {
         this.actPlannerData.svgsWithFormula = plannerElement.topSvgsWithFormula;
       }
     }
-  }, {
-    key: "decisionDebugStacks",
-    get: function get() {
-      return this._engine.getDecisionDebugStacks();
-    }
+
     /*************************************************GETTER & SETTER **************************************************************************** */
   }, {
     key: "basketId",
@@ -25136,7 +25185,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 }
               } else {
                 var _ops$val;
-                ret += ops.optionOrigName + ': ' + DivaUtils__default["default"].stripTags(ops.name) + ((_ops$val = ops.val) !== null && _ops$val !== void 0 && _ops$val.vCodex ? ' (' + ops.val.vCodex + ')' : '') + "'";
+                ret += ops.optionOrigName + ': ' + DivaUtils__default["default"].stripTags(ops.origName) + ((_ops$val = ops.val) !== null && _ops$val !== void 0 && _ops$val.vCodex ? ' (' + ops.val.vCodex + ')' : '') + "'";
               }
             }
           }
@@ -25204,11 +25253,25 @@ var DivaArticle = /*#__PURE__*/function () {
     get: function get() {
       return this.article.relatedToShelfGrid !== undefined ? true : false;
     }
+  }, {
+    key: "origName",
+    get: function get() {
+      var _this$article$actDesc;
+      var ret = (_this$article$actDesc = this.article.actDescription) !== null && _this$article$actDesc !== void 0 ? _this$article$actDesc : this.catalogArticleOrigName;
+      return ret + this.addRuleDesc();
+    }
   }, {
     key: "name",
     get: function get() {
-      var _this$article$actDesc, _this$optionsForPrint;
-      var ret = (_this$article$actDesc = this.article.actDescription) !== null && _this$article$actDesc !== void 0 ? _this$article$actDesc : this.catalogArticleName;
+      var _this$article$actDesc2;
+      var ret = (_this$article$actDesc2 = this.article.actDescription) !== null && _this$article$actDesc2 !== void 0 ? _this$article$actDesc2 : this.catalogArticleName;
+      return ret + this.addRuleDesc();
+    }
+  }, {
+    key: "addRuleDesc",
+    value: function addRuleDesc() {
+      var _this$optionsForPrint;
+      var ret = '';
       if (this.RetailPrefix != 'SAP' && this.article.ruleDesc && this.article.ruleDesc != '' && !((_this$optionsForPrint = this.optionsForPrint) !== null && _this$optionsForPrint !== void 0 && _this$optionsForPrint.length)) {
         var ruleDesc = this.article.ruleDesc;
         if (!this.set.api.ruleDescWithoutParenthesis()) ruleDesc = '(' + ruleDesc + ')';
@@ -25235,6 +25298,11 @@ var DivaArticle = /*#__PURE__*/function () {
     }
   }, {
     key: "catalogArticleName",
+    get: function get() {
+      return this.article.catalogArticle.name;
+    }
+  }, {
+    key: "catalogArticleOrigName",
     get: function get() {
       return this.article.catalogArticle.origName;
     }
@@ -25603,6 +25671,11 @@ var DivaArticle = /*#__PURE__*/function () {
     get: function get() {
       return this.article.partlistRule;
     }
+  }, {
+    key: "partlistDecisionNo",
+    get: function get() {
+      return this.article.partlistDecisionNo;
+    }
   }, {
     key: "bundleRules",
     get: function get() {
@@ -26069,14 +26142,21 @@ var DivaArticle = /*#__PURE__*/function () {
         _step9;
       try {
         for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+          var _ops$val$codex, _ops$val4;
           var ops = _step9.value;
-          if (ops.valCodex) {
-            ret[ops.optionCodex] = ops.valCodex + Object.values(ops.visibleOptionValues).map(function (v) {
+          ret[ops.optionCodex] = {
+            selOPV: (_ops$val$codex = (_ops$val4 = ops.val) === null || _ops$val4 === void 0 ? void 0 : _ops$val4.codex) !== null && _ops$val$codex !== void 0 ? _ops$val$codex : '',
+            invisible: ops.isInvisible,
+            visibleOPVs: Object.values(ops.visibleOptionValues).map(function (v) {
               return v.codex;
-            }).join(';');
-            if (ops.freeText) {
-              ret[ops.optionCodex + '_val'] = ops.freeText;
-            }
+            })
+          };
+          if (ops.freeText) {
+            ret[ops.optionCodex + '_val'] = {
+              selOPV: ops.freeText,
+              visibleOPVs: [],
+              invisible: true
+            };
           }
         }
       } catch (err) {
@@ -26084,7 +26164,7 @@ var DivaArticle = /*#__PURE__*/function () {
       } finally {
         _iterator9.f();
       }
-      return JSON.stringify(ret);
+      return ret;
     }
   }, {
     key: "VisibleVariantValues",
@@ -26961,7 +27041,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-d43d612b.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-ad514889.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -27443,7 +27523,7 @@ var DivaArticle = /*#__PURE__*/function () {
             }
             if (ops.isDoShow && !doHideSizeOption && ops.val) {
               if (ops.visibleCount > 0) {
-                var _ops$valName_locales2, _this$optionsForPrint2, _this$optionsForPrint3, _ops$val4;
+                var _ops$valName_locales2, _this$optionsForPrint2, _this$optionsForPrint3, _ops$val5;
                 var isfreeText = false,
                   isMeasureValue = false,
                   freeText = undefined,
@@ -27460,13 +27540,15 @@ var DivaArticle = /*#__PURE__*/function () {
                 var myOptItem = {
                   BasketID: this.basketId,
                   OPT: this.CatalogData.isIDMFormat ? OP : OP.substring(3),
+                  MaskOPTName: ops.optionOrigName !== ops.optionName ? ops.optionName : undefined,
                   OPTName: ops.optionOrigName,
                   OPTName_locales: ops.optionName_locales,
                   OptionOCD: ops.optionOcd,
                   OCD: ops.ocd,
                   OPV: this.CatalogData.isIDMFormat ? ops.val.codex : ops.val.codex.substring(3),
                   vOPV: !this.CatalogData.dontUseVCodexInBasket ? ops.vCodex : undefined,
-                  OPVName: DivaUtils__default["default"].stripTags(ops.name),
+                  OPVName: DivaUtils__default["default"].stripTags(ops.origName),
+                  MaskOPVName: ops.origName !== ops.name ? DivaUtils__default["default"].stripTags(ops.name) : undefined,
                   OPVName_locales: DivaUtils__default["default"].stripTagsFromDict((_ops$valName_locales2 = ops.valName_locales) !== null && _ops$valName_locales2 !== void 0 ? _ops$valName_locales2 : {}),
                   OPVImage: ops.val.image ? this.CatalogData.getCatImageURL(ops.val.image, '_gal') : '',
                   FreeText: freeText,
@@ -27481,7 +27563,8 @@ var DivaArticle = /*#__PURE__*/function () {
                   PriceUnit: !ops.isPercentage ? ops.priceUnit : undefined,
                   CalcPrice: ops.calcPrice,
                   PriceID: ops.priceId,
-                  TabGroup: ops.optionTabGroup,
+                  TabGroup: ops.optionOrigTabGroup,
+                  MaskTabGroup: ops.optionTabGroup,
                   TabGroup_locales: ops.optionTabGroup_locales,
                   SendToSAP: ops.option.sendToSAP,
                   ArticlePlaceholder: ops.option.articlePlaceholder,
@@ -27489,7 +27572,7 @@ var DivaArticle = /*#__PURE__*/function () {
                   HideInOrderText: ops.hideInOrderText,
                   IsDescribingState: ops.isDescribingState,
                   FreeTextLang: ops.freeTextLang,
-                  OPVHexVal: (_ops$val4 = ops.val) === null || _ops$val4 === void 0 ? void 0 : _ops$val4.hexColor
+                  OPVHexVal: (_ops$val5 = ops.val) === null || _ops$val5 === void 0 ? void 0 : _ops$val5.hexColor
                 };
                 variantBasketData.push(new basketModel.VariantItemData(myOptItem));
               }
@@ -28713,12 +28796,13 @@ var DivaArticleHandler = /*#__PURE__*/function () {
         ruleDesc_locales: doLoadItem.RuleDesc_locales,
         basketId: doLoadItem.BasketID,
         partlistRule: doLoadItem.PartlistRule,
+        partlistDecisionNo: doLoadItem.partlistDecisionNo,
         retailArticleNr: doLoadItem.RetailArticleNr,
         retailPrefix: doLoadItem.RetailPrefix,
         configArticleCodex: doLoadItem.RetailArticleNr,
         supplierOrderCodex: doLoadItem.SupplierOrderCodex,
         initDecisions: doLoadItem.initDecisions,
-        partlistArticleVisibleInTree: doLoadItem.PosInvisibility === 0 || doLoadItem.PosInvisibility == 2,
+        partlistArticleVisibleInTree: doLoadItem.PosInvisibility === 0,
         optionsForPrint: doLoadItem.optionsForPrint,
         optionImgForPrint: doLoadItem.optionImgForPrint,
         catalogCodex: doLoadItem.CatalogCodex
@@ -29095,7 +29179,8 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           TypeNr: article.typeNr,
           ArticleEAN: article.articleEAN,
           ArticleGUID: article.articleGUID,
-          Name: article.name,
+          Name: article.origName,
+          MaskName: article.name,
           Name_locales: article.name_locales,
           Size: repairOnly ? undefined : article.actSizeText,
           Width: article.width,
@@ -29275,7 +29360,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
   }, {
     key: "getAccessoiresBasketData",
     value: function getAccessoiresBasketData(setId, article, ops, PosNr) {
-      var _ops$valName;
+      var _ops$val$origName, _ops$val2, _ops$val$name, _ops$val3;
       return new basketModel.OrderLineData({
         SetID: setId,
         BasketID: 'B' + DivaUtils.nanoid(),
@@ -29287,7 +29372,8 @@ var DivaArticleHandler = /*#__PURE__*/function () {
         PosNr: PosNr,
         ArticleCodex: ops.isAccessoirArtNr,
         ConfigArticleCodex: ops.isAccessoirArtNr,
-        Name: ops.optionOrigName + ': ' + DivaUtils__default["default"].stripTags((_ops$valName = ops.valName) !== null && _ops$valName !== void 0 ? _ops$valName : ''),
+        Name: ops.optionOrigName + ': ' + DivaUtils__default["default"].stripTags((_ops$val$origName = (_ops$val2 = ops.val) === null || _ops$val2 === void 0 ? void 0 : _ops$val2.origName) !== null && _ops$val$origName !== void 0 ? _ops$val$origName : ''),
+        MaskName: ops.optionName + ': ' + DivaUtils__default["default"].stripTags((_ops$val$name = (_ops$val3 = ops.val) === null || _ops$val3 === void 0 ? void 0 : _ops$val3.name) !== null && _ops$val$name !== void 0 ? _ops$val$name : ''),
         Quantity: ops.quantity,
         Price: ops.calcPrice,
         CalcPrice: ops.calcPrice * ops.quantity,
@@ -30292,6 +30378,7 @@ var DivaSet = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "matchingProduct", void 0);
     _defineProperty__default["default"](this, "matchingOrigProduct", void 0);
     _defineProperty__default["default"](this, "_supplierColors", void 0);
+    _defineProperty__default["default"](this, "_logDecisions", false);
     /**Favorits state */
     _defineProperty__default["default"](this, "_handlelingCurrentFavorites", false);
     _defineProperty__default["default"](this, "_favorites", {
@@ -31565,7 +31652,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context5.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-2977ab3a.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-d91465d3.js'); });
             case 3:
               _yield$import = _context5.sent;
               DoorPlanner = _yield$import["default"];
@@ -31724,6 +31811,14 @@ var DivaSet = /*#__PURE__*/function () {
     set: function set(supplierColors) {
       this._supplierColors = supplierColors;
     }
+  }, {
+    key: "logDecisions",
+    get: function get() {
+      return this._logDecisions;
+    },
+    set: function set(val) {
+      this._logDecisions = val;
+    }
   }, {
     key: "showAccessioreOnLastTab",
     get: function get() {
@@ -32825,7 +32920,7 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
       var highestId = 0;
       for (var i = 0; i < set.oldConfigVariants.length; i++) {
         var variant = set.oldConfigVariants[i];
-        if (variant.VariantID && highestId < variant.VariantID) {
+        if (variant.VariantID && highestId <= variant.VariantID) {
           highestId = variant.VariantID + 1;
         }
       }
@@ -38412,7 +38507,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context12.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-0f3c613d.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-c472cb21.js'); });
             case 5:
               _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -38420,7 +38515,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 9:
               _context12.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-07f2698c.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-cfd55a37.js'); });
             case 11:
               _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -38428,7 +38523,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 15:
               _context12.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-04d83f4f.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-50df6529.js'); });
             case 17:
               _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -38436,7 +38531,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 21:
               _context12.next = 23;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-1932acc8.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-93dd1f08.js'); });
             case 23:
               _yield$import4 = _context12.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -39864,7 +39959,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _context3.next = 2;
-              return Promise.resolve().then(function () { return require('./Host3DSignalR-18ae1779.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-d0505d29.js'); });
             case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -41418,7 +41513,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context4.next = 10;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-bf570694.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-83054c27.js'); });
             case 10:
               _yield$import = _context4.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -41429,7 +41524,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context4.abrupt("break", 21);
             case 15:
               _context4.next = 17;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-c3c21e39.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-02bf7f84.js'); });
             case 17:
               _yield$import2 = _context4.sent;
               DivaBoxPlanner = _yield$import2["default"];