@crystaldesign/web-planner-logic 25.5.0-beta.2 → 25.5.0-beta.21

package/build/cjs/{index-e9136eb2.js → index-4977414c.js}

@@ -1032,7 +1032,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
     value: function getIDMItems(catalogId, serieId, typeNos) {
       return '/live/v3.0/catalogs/' + catalogId + '/series/' + serieId + '/items' + (typeNos !== null && typeNos !== void 0 && typeNos.length ? '?filter=' + typeNos.map(function (t) {
         return encodeURIComponent('typeNo==' + t);
-      }).join(' || ') : '?fields=properties;serieNo;featureClassRefNo;priceTypeRef;itemIdentification;catalogPage;weightBrutto;weightNetto;volume;minimumDeliveryTime;widthBasicShapeNominalValue;widthBasicShapeFrom;widthBasicShapeTo;widthBasicShapeStepSize;heightBasicShapeNominalValue;heightBasicShapeFrom;heightBasicShapeTo;heightBasicShapeStepSize;depthBasicShapeNominalValue;depthBasicShapeFrom;depthBasicShapeTo;depthBasicShapeStepSize;typeKey;eClassNo;detailInfoRefs;partListExclusive;partListRef;decisionRefs;typeNo;sequenceNo;edpNumber;eanNumber;shortText;fullText;planningAdvice;salesNumber');
+      }).join(' || ') : '?fields=properties;serieNo;featureClassRefNo;priceTypeRef;itemIdentification;catalogPage;weightBrutto;weightNetto;volume;minimumDeliveryTime;widthBasicShapeNominalValue;widthBasicShapeFrom;widthBasicShapeTo;widthBasicShapeStepSize;heightBasicShapeNominalValue;heightBasicShapeFrom;heightBasicShapeTo;heightBasicShapeStepSize;depthBasicShapeNominalValue;depthBasicShapeFrom;depthBasicShapeTo;depthBasicShapeStepSize;typeKey;eClassNo;detailInfoRefs;detailInfos;partListExclusive;partListRef;decisionRefs;typeNo;sequenceNo;edpNumber;eanNumber;shortText;fullText;planningAdvice;salesNumber');
     }
   }, {
     key: "getIDMItem",
@@ -1636,6 +1636,11 @@ var CatalogPlannerArticleData = /*#__PURE__*/function () {
     get: function get() {
       return this.catPlanArt.articleCodex;
     }
+  }, {
+    key: "longDescription",
+    get: function get() {
+      return this.catPlanArt.catalogArticle.longDescription;
+    }
   }, {
     key: "svgs",
     get: function get() {
@@ -16341,7 +16346,10 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
   }, {
     key: "pdfUrl",
     get: function get() {
-      return this.opv.pdfUrl;
+      var _this$opv$textbaustei, _this$opv$textbaustei2;
+      return (_this$opv$textbaustei = (_this$opv$textbaustei2 = this.opv.textbausteine) === null || _this$opv$textbaustei2 === void 0 || (_this$opv$textbaustei2 = _this$opv$textbaustei2.find(function (item) {
+        return item.Memo.endsWith('.pdf');
+      })) === null || _this$opv$textbaustei2 === void 0 ? void 0 : _this$opv$textbaustei2.Memo) !== null && _this$opv$textbaustei !== void 0 ? _this$opv$textbaustei : this.opv.pdfUrl;
     }
   }, {
     key: "rals",
@@ -17446,7 +17454,8 @@ function getCatalogOptionValueDataType(codex, jsonOPV, catalogData) {
     showOnlyWhenHasPrice: jsonOPV.ShowOnlyWhenHasPrice && jsonOPV.ShowOnlyWhenHasPrice == 'True' ? true : false,
     priceUnit: jsonOPV.PriceUnit,
     value: jsonOPV.Value,
-    property: [].concat(_toConsumableArray__default["default"]((_jsonOPV$Metadatas = jsonOPV.Metadatas) !== null && _jsonOPV$Metadatas !== void 0 ? _jsonOPV$Metadatas : []), _toConsumableArray__default["default"]((_mask$properties = mask === null || mask === void 0 ? void 0 : mask.properties) !== null && _mask$properties !== void 0 ? _mask$properties : []))
+    property: [].concat(_toConsumableArray__default["default"]((_jsonOPV$Metadatas = jsonOPV.Metadatas) !== null && _jsonOPV$Metadatas !== void 0 ? _jsonOPV$Metadatas : []), _toConsumableArray__default["default"]((_mask$properties = mask === null || mask === void 0 ? void 0 : mask.properties) !== null && _mask$properties !== void 0 ? _mask$properties : [])),
+    textbausteine: jsonOPV.Textbausteine
   };
   if (jsonOPV.MeasureUnit) {
     switch (jsonOPV.MeasureUnit) {
@@ -17604,6 +17613,7 @@ function initCatalogPlannerArticleView$1(catalogData, catPlanArticle, catalogPro
           articleCodex: catPlanArticle.codex,
           catalogCodex: catalogData.catalogCodex,
           title: title,
+          longDescription: catPlanArticle.longDescription,
           width: catPlanArticle.articleSizeX,
           height: catPlanArticle.articleSizeZ,
           depth: catPlanArticle.articleSizeY,
@@ -17664,6 +17674,7 @@ function initCatalogPlannerArticleView$1(catalogData, catPlanArticle, catalogPro
       articleCodex: catPlanArticle.codex,
       catalogCodex: catalogData.catalogCodex,
       title: title,
+      longDescription: catPlanArticle.longDescription,
       width: catPlanArticle.articleSizeX,
       height: catPlanArticle.articleSizeZ,
       depth: catPlanArticle.articleSizeY,
@@ -18567,6 +18578,7 @@ function initArticleRelations(articleRelations, catalogArticleData, catalog) {
         price: !catalog.dontShowBasePrice ? (_myAcc$BasePrice = myAcc.BasePrice) !== null && _myAcc$BasePrice !== void 0 ? _myAcc$BasePrice : catalogArticleData.articlePrice : 0,
         articleCodex: myAcc.Codex,
         catalogCodex: myAcc.CatalogCodex,
+        longDescription: myAcc.longDescription,
         positionGroupNr: myAcc.PositionGroupNr,
         typeNr: _catalogArticle.typeNr,
         image: _catalogArticle.image ? catalog.getCatImageURL(_catalogArticle.image, '') : undefined,
@@ -19520,7 +19532,7 @@ function initIDMArticles(jsonItems, catalogData) {
   }
 }
 function getCatalogArticle(article, catalogData) {
-  var _catalogData$catalogM, _articleMask$name, _articleMask$properti, _article$weightNetto, _article$detailInfos, _article$detailInfos2;
+  var _catalogData$catalogM, _ref, _articleMask$name, _article$fullText, _article$fullText2, _article$shortText, _articleMask$properti, _article$weightNetto, _article$detailInfos, _article$detailInfos2, _articleMask$groupnam, _articleMask$groupnam2;
   var articleMask = (_catalogData$catalogM = catalogData.catalogMask) === null || _catalogData$catalogM === void 0 || (_catalogData$catalogM = _catalogData$catalogM.articles) === null || _catalogData$catalogM === void 0 ? void 0 : _catalogData$catalogM[article.typeNo];
   var lang = catalogData.api.getLanguageLowercase();
   var featureProperties = convertProperties(article.properties, lang, 'featureNos');
@@ -19543,11 +19555,11 @@ function getCatalogArticle(article, catalogData) {
     hasArticleRelations: false,
     hasPartlistArticle: !!article.partListRef,
     hasType1Dependencies: false,
-    name: DivaUtils__default["default"].getLocals((_articleMask$name = articleMask === null || articleMask === void 0 ? void 0 : articleMask.name) !== null && _articleMask$name !== void 0 ? _articleMask$name : article.shortText, lang),
-    longDescription: DivaUtils__default["default"].getLocals(article.fullText, lang),
-    longDescription_locales: article.fullText,
+    name: DivaUtils__default["default"].getLocals((_ref = (_articleMask$name = articleMask === null || articleMask === void 0 ? void 0 : articleMask.name) !== null && _articleMask$name !== void 0 ? _articleMask$name : article.shortText) !== null && _ref !== void 0 ? _ref : article.fullText, lang),
+    longDescription: DivaUtils__default["default"].getLocals((_article$fullText = article.fullText) !== null && _article$fullText !== void 0 ? _article$fullText : article.shortText, lang),
+    longDescription_locales: (_article$fullText2 = article.fullText) !== null && _article$fullText2 !== void 0 ? _article$fullText2 : article.shortText,
     isHidden: !!(articleMask !== null && articleMask !== void 0 && articleMask.hidden),
-    origName: DivaUtils__default["default"].getLocals(article.shortText, lang),
+    origName: DivaUtils__default["default"].getLocals((_article$shortText = article.shortText) !== null && _article$shortText !== void 0 ? _article$shortText : article.fullText, lang),
     properties: [].concat(_toConsumableArray__default["default"](convertProperties(article.properties, lang)), _toConsumableArray__default["default"]((_articleMask$properti = articleMask === null || articleMask === void 0 ? void 0 : articleMask.properties) !== null && _articleMask$properti !== void 0 ? _articleMask$properti : [])),
     optionProperties: optionProperties,
     featureProperties: featureProperties,
@@ -19579,12 +19591,12 @@ function getCatalogArticle(article, catalogData) {
         url: d.url,
         detailInfoNo: d.detailInfoNo
       };
-    })
+    }),
+    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 : article.typeKey
   };
 }
 
 /*
-    groupName: articleMask?.groupname?.[catalogData.api.getLanguage()] ?? jsonArticle.GroupName,
     mainCategory: jsonArticle.MainCategory && jsonArticle.MainCategory != '' ? jsonArticle.MainCategory : undefined,
     price: jsonArticle.VKP1 && isNaN(jsonArticle.VKP1) ? Number(jsonArticle.VKP1.replace(',', '.')) : jsonArticle.VKP1,
     priceGroup: jsonArticle.PriceGroup,
@@ -19663,15 +19675,16 @@ function getCatalogPlanner(article, catalogArticle) {
   };
 }
 function initCatalogPlannerArticleView(catalogData, catPlanArticle, catalogProps, plannerPaletteViewInfo) {
-  var _catPlanArticle$filte, _catPlanArticle$svgs;
+  var _catPlanArticle$filte, _catPlanArticle$group, _catPlanArticle$svgs;
   plannerPaletteViewInfo.catalogPlannerArticles.push({
     articleCodex: catPlanArticle.codex,
     avlFilter: catPlanArticle.avlFilter,
     avrFilter: catPlanArticle.avrFilter,
+    longDescription: catPlanArticle.longDescription,
     catalogCodex: catPlanArticle.catalogCodex,
     codex: catPlanArticle.codex,
     filterType: (_catPlanArticle$filte = catPlanArticle.filterType) !== null && _catPlanArticle$filte !== void 0 ? _catPlanArticle$filte : 'DockNone',
-    groupName: '',
+    groupName: (_catPlanArticle$group = catPlanArticle.groupName) !== null && _catPlanArticle$group !== void 0 ? _catPlanArticle$group : '',
     hasAVC: !!catPlanArticle.topAVC,
     hasAVN: !!catPlanArticle.topAVN,
     hasAVO: !!catPlanArticle.topAVO,
@@ -19829,8 +19842,6 @@ var DivaCatalogData = /*#__PURE__*/function () {
       hidePricePreviewOnlyOnOptions: [],
       forceConfigSingle: false,
       //                                    das einzeln konfigurieren wird in diesem Katalog gezwungen
-      doubleClickOnConfig: false,
-      //                                  Felher bei Ada IDM wird somit ausgebessert
       doUseRuleDescForPartListArticles: false,
       initOptionTreeTwice: false,
       //                                  Felher bei Cotta IDM wird somit ausgebes
@@ -19890,6 +19901,10 @@ var DivaCatalogData = /*#__PURE__*/function () {
       this.catalogData = initIDMCatalogData(json, orderSet, api);
       initIDMArticles(articleJson, this);
     }
+    if (this.origProperties) {
+      var _this$catalogMask$cat2, _this$catalogMask2;
+      this.initPropertiesAfterOptionsInit(catalogCodex, [].concat(_toConsumableArray__default["default"](json.Properties), _toConsumableArray__default["default"]((_this$catalogMask$cat2 = (_this$catalogMask2 = this.catalogMask) === null || _this$catalogMask2 === void 0 || (_this$catalogMask2 = _this$catalogMask2.catalog) === null || _this$catalogMask2 === void 0 ? void 0 : _this$catalogMask2.properties) !== null && _this$catalogMask$cat2 !== void 0 ? _this$catalogMask$cat2 : [])));
+    }
   }
   return _createClass__default["default"](DivaCatalogData, [{
     key: "getCatImageURL",
@@ -20470,11 +20485,6 @@ var DivaCatalogData = /*#__PURE__*/function () {
       var _this$optionValues2;
       return Object.values((_this$optionValues2 = this.optionValues) !== null && _this$optionValues2 !== void 0 ? _this$optionValues2 : {});
     }
-  }, {
-    key: "doubleClickOnConfig",
-    get: function get() {
-      return this.catalogProps.doubleClickOnConfig;
-    }
   }, {
     key: "initOptionTreeTwice",
     get: function get() {
@@ -20814,6 +20824,7 @@ var DivaCatalogData = /*#__PURE__*/function () {
             break;
           case 'DEFAULT_DO_SHOW_3DDIMENSIONS':
             _this5.catalogProps.defaultDimensionsActive = '1' == item.Value || 'true' == item.Value.toLowerCase();
+            break;
           // Planner Topics
           case 'IS_IDM3D_CAT':
             _this5.catalogProps.isIDM3DCat = item.Value == '1' || item.Value.toLowerCase() == 'true';
@@ -20987,9 +20998,6 @@ var DivaCatalogData = /*#__PURE__*/function () {
               return 'OPT' + t;
             });
             break;
-          case 'DOUBLE_CLICK_ON_CONFIG':
-            _this5.catalogProps.doubleClickOnConfig = '1' == item.Value;
-            break;
           case 'INIT_OPTIONTREE_TWICE':
             _this5.catalogProps.initOptionTreeTwice = '1' == item.Value;
             break;
@@ -21029,17 +21037,6 @@ var DivaCatalogData = /*#__PURE__*/function () {
           case 'ADD_PA_ON_EDO':
             _this5.handleEdoArticles(properties, item);
             break;
-          default:
-            if (key.startsWith('3D_STATBG_ROOMLIST')) {
-              //  item.Value =
-              //   "weissraum_LUECK;backgroundimgroom_lueck_modern;backgroundimgroom_lueck_romantic;backgroundimgroom_lueck_loft;backgroundimgroom_lueck_night";
-              _this5.catalogProps.roomList3DStaticBGImage.set(item.Codex, item.Value.split(';'));
-            } else if (key.startsWith('3D_STANDARD_WHITEROOM')) {
-              _this5.catalogProps.diva3dStandardWhiteroom = item.Value;
-            } else if (key.startsWith('DIVA3D_IMAGE')) {
-              _this5.handleDIVA3DMetaTag(item);
-            }
-            break;
         }
       });
       if (!diva3DRenderingIsSet) {
@@ -21048,6 +21045,25 @@ var DivaCatalogData = /*#__PURE__*/function () {
         }
       }
     }
+  }, {
+    key: "initPropertiesAfterOptionsInit",
+    value: function initPropertiesAfterOptionsInit(catalogCodex, properties) {
+      var _this6 = this;
+      properties.forEach(function (item, index) {
+        //3D Allgemein
+        var key = item.Codex;
+        if (key.startsWith(catalogCodex + '__')) key = key.replace(catalogCodex + '__', '');
+        if (key.startsWith('3D_STATBG_ROOMLIST')) {
+          //  item.Value =
+          //   "weissraum_LUECK;backgroundimgroom_lueck_modern;backgroundimgroom_lueck_romantic;backgroundimgroom_lueck_loft;backgroundimgroom_lueck_night";
+          _this6.catalogProps.roomList3DStaticBGImage.set(item.Codex, item.Value.split(';'));
+        } else if (key.startsWith('3D_STANDARD_WHITEROOM')) {
+          _this6.catalogProps.diva3dStandardWhiteroom = item.Value;
+        } else if (key.startsWith('DIVA3D_IMAGE')) {
+          _this6.handleDIVA3DMetaTag(item);
+        }
+      });
+    }
   }, {
     key: "handleDIVA3DMetaTag",
     value: function handleDIVA3DMetaTag(item) {
@@ -21187,10 +21203,10 @@ var DivaCatalogData = /*#__PURE__*/function () {
   }, {
     key: "initMask",
     value: function initMask(initProps) {
-      var _this$catalogMask2;
-      if ((_this$catalogMask2 = this.catalogMask) !== null && _this$catalogMask2 !== void 0 && _this$catalogMask2.catalog) {
-        var _this$catalogMask$cat2;
-        if ((_this$catalogMask$cat2 = this.catalogMask.catalog.name) !== null && _this$catalogMask$cat2 !== void 0 && _this$catalogMask$cat2[this.api.getLanguage()]) this.catalogData.catalogName = this.catalogMask.catalog.name[this.api.getLanguage()];
+      var _this$catalogMask3;
+      if ((_this$catalogMask3 = this.catalogMask) !== null && _this$catalogMask3 !== void 0 && _this$catalogMask3.catalog) {
+        var _this$catalogMask$cat3;
+        if ((_this$catalogMask$cat3 = this.catalogMask.catalog.name) !== null && _this$catalogMask$cat3 !== void 0 && _this$catalogMask$cat3[this.api.getLanguage()]) this.catalogData.catalogName = this.catalogMask.catalog.name[this.api.getLanguage()];
         if (this.catalogMask.catalog.name) this.catalogData.name_locales = this.catalogMask.catalog.name;
         if (this.catalogMask.catalog.properties && initProps) this.initProperties(this.catalogCodex, [].concat(_toConsumableArray__default["default"](this.origProperties), _toConsumableArray__default["default"](this.catalogMask.catalog.properties)));
       }
@@ -21616,12 +21632,12 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
   }, {
     key: "IsDockingFilterFeature",
     get: function get() {
-      return this.option.idmVariantenArt ? [89, 90].includes(this.option.idmVariantenArt) : false;
+      return this.option.idmVariantenArt ? [89, 90, 1089, 1090].includes(this.option.idmVariantenArt) : false;
     }
   }, {
     key: "IsIDMSpecialFeature",
     get: function get() {
-      return this.option.idmVariantenArt ? [95, 96, 97, 89, 90].includes(this.option.idmVariantenArt) : false;
+      return this.option.idmVariantenArt ? [95, 96, 97, 89, 90, 1095, 1096, 1097, 1089, 1090].includes(this.option.idmVariantenArt) : false;
     }
   }, {
     key: "visibleOptionValues",
@@ -22316,8 +22332,9 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "updateIDMSpecificFeature",
     value: function updateIDMSpecificFeature(ops) {
+      var _ops$option$idmVarian, _ops$option$idmVarian2, _ops$option$idmVarian3, _ops$option$idmVarian4, _ops$option$idmVarian5;
       if (!this.article.parentHasSameOption(ops.optionCodex)) return;
-      if (ops.option.idmVariantenArt == 90) {
+      if ([90, 1090].includes((_ops$option$idmVarian = ops.option.idmVariantenArt) !== null && _ops$option$idmVarian !== void 0 ? _ops$option$idmVarian : 0)) {
         //R (Anschlusstyp R) - AVR
         var newAVRFilter = [],
           visibleOPVs = ops.visibleOptionValues;
@@ -22326,7 +22343,7 @@ var DivaEngine = /*#__PURE__*/function () {
         }
         this.article.newPossibleAVRFilters = newAVRFilter;
       }
-      if (ops.option.idmVariantenArt == 89) {
+      if ([89, 1089].includes((_ops$option$idmVarian2 = ops.option.idmVariantenArt) !== null && _ops$option$idmVarian2 !== void 0 ? _ops$option$idmVarian2 : 0)) {
         //L (Anschlusstyp L) - AVL
         var newAVLFilter = [],
           _visibleOPVs = ops.visibleOptionValues;
@@ -22336,7 +22353,7 @@ var DivaEngine = /*#__PURE__*/function () {
         this.article.newPossibleAVLFilters = newAVLFilter;
       }
       //beim article abspeichern. Das Planungselement kann es sich per Funktion von dort dann holen
-      if (ops.option.idmVariantenArt == 97) {
+      if ([97, 1097].includes((_ops$option$idmVarian3 = ops.option.idmVariantenArt) !== null && _ops$option$idmVarian3 !== void 0 ? _ops$option$idmVarian3 : 0)) {
         //Planungshöhe
         try {
           var _ops$freeText;
@@ -22349,7 +22366,7 @@ var DivaEngine = /*#__PURE__*/function () {
         }
       }
       //beim article abspeichern. Das Planungselement kann es sich per Funktion von dort dann holen
-      if (ops.option.idmVariantenArt == 96 || ops.option.diameter) {
+      if ([96, 1096].includes((_ops$option$idmVarian4 = ops.option.idmVariantenArt) !== null && _ops$option$idmVarian4 !== void 0 ? _ops$option$idmVarian4 : 0) || ops.option.diameter) {
         //Planungstiefe
         try {
           var _ops$freeText2;
@@ -22362,7 +22379,7 @@ var DivaEngine = /*#__PURE__*/function () {
         }
       }
       //beim article abspeichern. Das Planungselement kann es sich per Funktion von dort dann holen
-      if (ops.option.idmVariantenArt == 95 || ops.option.diameter) {
+      if ([95, 1095].includes((_ops$option$idmVarian5 = ops.option.idmVariantenArt) !== null && _ops$option$idmVarian5 !== void 0 ? _ops$option$idmVarian5 : 0) || ops.option.diameter) {
         //Planungsbreite  - ACHTUNG Fehler wenn mm
 
         try {
@@ -22492,8 +22509,10 @@ var DivaEngine = /*#__PURE__*/function () {
       var _this$article$set$Vie;
       //die Klasse ArticleOptionState wird einfach neu initialisiert
       var oldOPS = this.article.getArticleOptionState(optionCodex);
+      if (!oldOPS) return;
       if (keepEnalbed) {
         oldOPS.val = undefined;
+        oldOPS.isDoShow = oldOPS.visibleCount > 1;
         return;
       }
       var option = oldOPS.option;
@@ -22690,7 +22709,7 @@ var DivaEngine = /*#__PURE__*/function () {
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
           var ops = _step3.value;
           //when an option has no decisions the first visible optionValue has to be selected per default
-          if (ops.val === undefined && ops.visibleCount) {
+          if (ops.val === undefined && ops.visibleCount && !this.article.CatalogData.useDiomexConfigLogic) {
             this.assignOptionValue(ops.optionCodex, Object.keys(ops.visibleOptionValues)[0]);
           }
           if (ops.visibleCount && ops.IsIDMSpecialFeature) {
@@ -23228,6 +23247,7 @@ var DivaEngine = /*#__PURE__*/function () {
     value: function evalPartlist(newConfigValues) {
       var partlistArticlesToLoad = [];
       var myPartlistArticles = this.article.groupedPartlists;
+      var partlistGroup = [];
       for (var iKey in myPartlistArticles) {
         var groupDecisionVal;
         var key = Number(iKey);
@@ -23238,6 +23258,9 @@ var DivaEngine = /*#__PURE__*/function () {
           for (var b = 0; b < myPartlistArticles[key].length; b++) {
             var startTime = Date.now();
             var myPartListPos = myPartlistArticles[key][b];
+            if (myPartListPos.PartlistGroup && partlistGroup.includes(myPartListPos.PartlistGroup)) {
+              continue;
+            }
             if (myPartListPos.ItemRefArticles) {
               var decisions = myPartListPos.PartListPosDecisionsAndPosCounts;
               if (decisions) {
@@ -23250,16 +23273,16 @@ var DivaEngine = /*#__PURE__*/function () {
                   if ((_myDecisionVal = myDecisionVal) !== null && _myDecisionVal !== void 0 && _myDecisionVal.isValidDOC || relationTypeNone) {
                     // wenn die Decision gültig, gelten die ItemRefArticles
                     partlistAdded = true;
-                    partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, newConfigValues, myDecisionVal, groupDecisionVal, myDecisionNumber);
+                    partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, partlistGroup, newConfigValues, myDecisionVal, groupDecisionVal, myDecisionNumber);
                     break;
                   }
                 }
                 if (decisions.length === 0) {
                   LOG$f.log('partlistarticle loaded for haveing 0 decisions: ', myPartListPos.ItemRefArticles);
-                  partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, newConfigValues);
+                  partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, partlistGroup, newConfigValues);
                 } else if (!partlistAdded && this.article.CatalogData.useDecisionPosCountValue && myPartListPos.PosCountValue > 0) {
                   LOG$f.log('partlistarticle loaded for having default PosCountValue ', myPartListPos.ItemRefArticles);
-                  partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, newConfigValues);
+                  partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, partlistGroup, newConfigValues);
                 }
               }
             }
@@ -23271,7 +23294,7 @@ var DivaEngine = /*#__PURE__*/function () {
     }
   }, {
     key: "addPartilstToPartlistArticlesToLoad",
-    value: function addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, newConfigValues, myDecisionVal, groupDecisionVal, decisionNumber) {
+    value: function addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, partlistGroup, newConfigValues, myDecisionVal, groupDecisionVal, decisionNumber) {
       var _myPartListPos$Option,
         _this2 = this;
       var allDecisions = this.article.catalogArticle.articleDecisions;
@@ -23328,7 +23351,7 @@ var DivaEngine = /*#__PURE__*/function () {
           _loop3(i);
         }
         if (quanitity >= 1) {
-          var _myDecisionVal$Rule, _previousPartlistArti;
+          var _myDecisionVal$Rule;
           partlistArticlesToLoad.push({
             CatalogCodex: catalogCodex !== null && catalogCodex !== void 0 ? catalogCodex : _this2.article.catalogCodex,
             BasketID: previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.basketId,
@@ -23343,11 +23366,13 @@ var DivaEngine = /*#__PURE__*/function () {
             RuleDesc: myRuleDesc,
             RuleDesc_locales: myRuleDesc_locales,
             PosInvisibility: myPartListPos.PosInvisibility,
-            VariantValues: _objectSpread$g(_objectSpread$g({}, (_previousPartlistArti = previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantValues) !== null && _previousPartlistArti !== void 0 ? _previousPartlistArti : {}), newConfigValues !== null && newConfigValues !== void 0 ? newConfigValues : {}),
+            ConfigurationMode: myPartListPos.ConfigurationMode,
+            VariantValues: _this2.article.variantValuesForPla(myPartListPos.ConfigurationMode, previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantValues, newConfigValues),
             VariantItemData: previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantItemData,
             optionImgForPrint: optionImgForPrint,
             optionsForPrint: optionsForPrint
           });
+          if (myPartListPos.PartlistGroup) partlistGroup.push(myPartListPos.PartlistGroup);
         }
       };
       for (var d = 0; d < myPartListPos.ItemRefArticles.length; d++) {
@@ -23475,7 +23500,7 @@ var DivaEngine = /*#__PURE__*/function () {
               } else if (calcUnit2Price != 0) {
                 //for diamter option
                 if (ops.option.diameter) {
-                  ops.usedCalcPrice = calcUnit2Price * this.article.calcWidth * this.article.calcDepth;
+                  ops.usedCalcPrice = calcUnit2Price * freeTextMeasure * freeTextMeasure;
                 } else {
                   if (firstUnit2Param == 0) {
                     firstUnit2Param = freeTextMeasure;
@@ -23700,6 +23725,35 @@ var DivaEngine = /*#__PURE__*/function () {
         }
       }
     }
+  }, {
+    key: "getValuesInfluencingOPT",
+    value: function getValuesInfluencingOPT(featureNo) {
+      var decisions = this.article.catalogArticle.articleDecisions;
+      //add the partlist spesific decisions to the normal decisions
+      if (this.article.initDecisions) decisions = decisions.concat(this.article.initDecisions);
+      var variantValuesArr = [];
+      var relevantDecisions = decisions.filter(function (d) {
+        var _d$Options;
+        return (_d$Options = d.Options) === null || _d$Options === void 0 ? void 0 : _d$Options.includes(featureNo);
+      });
+      for (var i = 0; i < relevantDecisions.length; i++) {
+        var decision = relevantDecisions[i];
+        if (decision.Type == '1' && decision.DOC) {
+          for (var j = 0; j < decision.DOC.length; j++) {
+            var _oc$Row;
+            var oc = decision.DOC[j];
+            var variantValues = {};
+            if (!Object.values((_oc$Row = oc.Row) !== null && _oc$Row !== void 0 ? _oc$Row : {}).length) continue;
+            for (var key in oc.Row) {
+              if (key == featureNo) continue;
+              variantValues[key] = oc.Row[key][0];
+            }
+            variantValuesArr.push(variantValues);
+          }
+        }
+      }
+      return variantValuesArr;
+    }
   }, {
     key: "getOptionPrice",
     value: function getOptionPrice(calculatedPrice, optItem, digits) {
@@ -23784,17 +23838,23 @@ var IDMEngine = /*#__PURE__*/function () {
       LOG$e.debug('eval Decisions total time in ' + (endTime - startTime) + ' of ' + count);
     }
   }, {
-    key: "evalDecisionsfunction",
-    value: function evalDecisionsfunction() {
+    key: "decisions",
+    get: function get() {
       var _unsortedDecisons;
       var unsortedDecisons = this.article.articleIDMDecisions;
-      if (!((_unsortedDecisons = unsortedDecisons) !== null && _unsortedDecisons !== void 0 && _unsortedDecisons.length)) return;
+      if (!((_unsortedDecisons = unsortedDecisons) !== null && _unsortedDecisons !== void 0 && _unsortedDecisons.length)) return [];
       //add the partlist spesific decisions to the normal decisions
 
       if (this.article.initDecisions) unsortedDecisons = unsortedDecisons.concat(this.article.initDecisions);
-      var decisions = unsortedDecisons.sort(function (a, b) {
+      return unsortedDecisons.sort(function (a, b) {
         return a.prio - b.prio;
       });
+    }
+  }, {
+    key: "evalDecisionsfunction",
+    value: function evalDecisionsfunction() {
+      var decisions = this.decisions;
+      if (!decisions.length) return;
       for (var i = 0; i < decisions.length; i++) {
         decisions[i].enabled = true;
         decisions[i].disableHistory = [];
@@ -24249,6 +24309,7 @@ var IDMEngine = /*#__PURE__*/function () {
       var oldOPS = this.article.getArticleOptionState(featureNo);
       if (keepEnalbed) {
         oldOPS.val = undefined;
+        oldOPS.isDoShow = oldOPS.visibleCount > 1;
         return;
       }
       var option = oldOPS.option;
@@ -24366,10 +24427,12 @@ var IDMEngine = /*#__PURE__*/function () {
       var partlistArticlesToLoad = [];
       var myPartlistArticles = (_this$article$catalog4 = this.article.catalogArticle.idmPartlist) === null || _this$article$catalog4 === void 0 ? void 0 : _this$article$catalog4.partlistPos;
       if (!(myPartlistArticles !== null && myPartlistArticles !== void 0 && myPartlistArticles.length)) return [];
+      var partlistGroup = [];
       for (var i = 0; i < myPartlistArticles.length; i++) {
         var _myPartListPos$decisi;
         var myPartListPos = myPartlistArticles[i];
         if (!myPartListPos.itemRefTypeNo) continue;
+        if (myPartListPos.partlistGroup && partlistGroup.includes(myPartListPos.partlistGroup)) continue;
         var decisions = this.article.CatalogData.getDecisionsByNo([].concat(_toConsumableArray__default["default"]((_myPartListPos$decisi = myPartListPos.decisions) !== null && _myPartListPos$decisi !== void 0 ? _myPartListPos$decisi : []), _toConsumableArray__default["default"](myPartListPos.decisionPosCount ? [myPartListPos.decisionPosCount] : [])));
         var partlistAdded = false;
         for (var c = 0; c < decisions.length; c++) {
@@ -24378,22 +24441,22 @@ var IDMEngine = /*#__PURE__*/function () {
           var isValidDOC = relationTypeNone ? undefined : this.checkDecisionNumber(decision.decisionNo);
           if (!isValidDOC && !relationTypeNone) continue;
           partlistAdded = true;
-          partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, newConfigValues, undefined, !relationTypeNone ? decision.decisionNo : undefined);
+          partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, partlistGroup, newConfigValues, undefined, !relationTypeNone ? decision.decisionNo : undefined);
           break;
         }
         if (decisions.length === 0 && !partlistAdded) {
           LOG$e.log('partlistarticle loaded for haveing 0 decisions: ', myPartListPos.itemRefTypeNo);
-          partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, newConfigValues);
+          partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, partlistGroup, newConfigValues);
         } else if (!partlistAdded && myPartListPos.posCountValue > 0) {
           LOG$e.log('partlistarticle loaded for having default PosCountValue ', myPartListPos.itemRefTypeNo);
-          partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, newConfigValues);
+          partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, partlistGroup, newConfigValues);
         }
       }
       return partlistArticlesToLoad;
     }
   }, {
     key: "addPartilstToPartlistArticlesToLoad",
-    value: function addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, newConfigValues, rule, decisionNo) {
+    value: function addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, partlistGroup, newConfigValues, rule, decisionNo) {
       var decisions = this.article.CatalogData.getDecisionsByNo(myPartListPos.decisions);
 
       //const optionsForPrint: string[] = (myPartListPos.OptionsForPrint as string)?.split(';').map((o: string) => 'OPT' + o);
@@ -24444,7 +24507,7 @@ var IDMEngine = /*#__PURE__*/function () {
         _loop2(i);
       }
       if (quanitity >= 1) {
-        var _catalogCodex$toStrin, _previousPartlistArti;
+        var _catalogCodex$toStrin;
         partlistArticlesToLoad.push({
           CatalogCodex: (_catalogCodex$toStrin = catalogCodex.toString()) !== null && _catalogCodex$toStrin !== void 0 ? _catalogCodex$toStrin : this.article.catalogCodex,
           BasketID: previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.basketId,
@@ -24461,11 +24524,13 @@ var IDMEngine = /*#__PURE__*/function () {
           RuleDesc: myRuleDesc,
           RuleDesc_locales: myRuleDesc_locales,
           PosInvisibility: myPartListPos.posInvisibility,
-          VariantValues: _objectSpread$f(_objectSpread$f({}, (_previousPartlistArti = previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantValues) !== null && _previousPartlistArti !== void 0 ? _previousPartlistArti : {}), newConfigValues !== null && newConfigValues !== void 0 ? newConfigValues : {}),
+          ConfigurationMode: myPartListPos.configurationMode,
+          VariantValues: this.article.variantValuesForPla(myPartListPos.configurationMode, previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantValues, newConfigValues),
           VariantItemData: previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantItemData
           //optionImgForPrint,
           //optionsForPrint,
         });
+        if (myPartListPos.partlistGroup) partlistGroup.push(myPartListPos.partlistGroup);
       }
       return partlistArticlesToLoad;
     }
@@ -24551,16 +24616,17 @@ var IDMEngine = /*#__PURE__*/function () {
   }, {
     key: "updateIDMSpecificFeature",
     value: function updateIDMSpecificFeature(myArtOPS) {
+      var _myArtOPS$option$idmV, _myArtOPS$option$idmV2, _myArtOPS$option$idmV3, _myArtOPS$option$idmV4, _myArtOPS$option$idmV5;
       if (!this.article.parentHasSameOption(myArtOPS.optionCodex)) return;
-      if (myArtOPS.option.idmVariantenArt == 90) {
+      if ([90, 1090].includes((_myArtOPS$option$idmV = myArtOPS.option.idmVariantenArt) !== null && _myArtOPS$option$idmV !== void 0 ? _myArtOPS$option$idmV : 0)) {
         //R (Anschlusstyp R) - AVR
         this.article.newPossibleAVRFilters = Object.keys(myArtOPS.visibleOptionValues);
       }
-      if (myArtOPS.option.idmVariantenArt == 89) {
+      if ([89, 1089].includes((_myArtOPS$option$idmV2 = myArtOPS.option.idmVariantenArt) !== null && _myArtOPS$option$idmV2 !== void 0 ? _myArtOPS$option$idmV2 : 0)) {
         //L (Anschlusstyp L) - AVL
         this.article.newPossibleAVLFilters = Object.keys(myArtOPS.visibleOptionValues);
       }
-      if (myArtOPS.option.idmVariantenArt == 97) {
+      if ([97, 1097].includes((_myArtOPS$option$idmV3 = myArtOPS.option.idmVariantenArt) !== null && _myArtOPS$option$idmV3 !== void 0 ? _myArtOPS$option$idmV3 : 0)) {
         try {
           var _myArtOPS$measureValu;
           this.article.doUpdatePlannerSize = true;
@@ -24569,7 +24635,7 @@ var IDMEngine = /*#__PURE__*/function () {
           LOG$e.warn('Invalid Planungdepth - IDMVariantenArt 97: ' + myArtOPS.option.name + ' ' + myArtOPS.valName, e);
         }
       }
-      if (myArtOPS.option.idmVariantenArt == 96 || myArtOPS.option.diameter) {
+      if ([96, 1096].includes((_myArtOPS$option$idmV4 = myArtOPS.option.idmVariantenArt) !== null && _myArtOPS$option$idmV4 !== void 0 ? _myArtOPS$option$idmV4 : 0) || myArtOPS.option.diameter) {
         try {
           var _myArtOPS$measureValu2;
           this.article.doUpdatePlannerSize = true;
@@ -24578,7 +24644,7 @@ var IDMEngine = /*#__PURE__*/function () {
           LOG$e.warn('Invalid Planungdepth - IDMVariantenArt 96: ' + myArtOPS.option.name + ' ' + myArtOPS.valName, e);
         }
       }
-      if (myArtOPS.option.idmVariantenArt == 95 || myArtOPS.option.diameter) {
+      if ([95, 1095].includes((_myArtOPS$option$idmV5 = myArtOPS.option.idmVariantenArt) !== null && _myArtOPS$option$idmV5 !== void 0 ? _myArtOPS$option$idmV5 : 0) || myArtOPS.option.diameter) {
         try {
           var _myArtOPS$measureValu3;
           this.article.doUpdatePlannerSize = true;
@@ -24588,6 +24654,30 @@ var IDMEngine = /*#__PURE__*/function () {
         }
       }
     }
+  }, {
+    key: "getValuesInfluencingOPT",
+    value: function getValuesInfluencingOPT(featureNo) {
+      var variantValuesArr = [];
+      var decisions = this.decisions;
+      var relevantDecisions = decisions.filter(function (d) {
+        return d.featureRefs.includes(featureNo);
+      });
+      for (var i = 0; i < relevantDecisions.length; i++) {
+        var decision = relevantDecisions[i];
+        if (decision.decisionType == 1) {
+          for (var j = 0; j < decision.optionCombinations.length; j++) {
+            var oc = decision.optionCombinations[j];
+            var variantValues = {};
+            for (var key in oc.parsedOptionSetRefs) {
+              if (key == featureNo) continue;
+              variantValues[key] = oc.parsedOptionSetRefs[key].value[0];
+            }
+            variantValuesArr.push(variantValues);
+          }
+        }
+      }
+      return variantValuesArr;
+    }
   }, {
     key: "evalMeasureFormula",
     value: function evalMeasureFormula(formula) {
@@ -24687,6 +24777,7 @@ var DivaArticle = /*#__PURE__*/function () {
       partlistDecisionNo: initParams.partlistDecisionNo,
       partListParentArticle: initParams.parentArticle,
       partlistArticleVisibleInTree: initParams.partlistArticleVisibleInTree,
+      partlistArticleStandalone: initParams.partlistArticleStandalone,
       hasPartlistArticle: initParams.hasPartlistArticle ? initParams.hasPartlistArticle : false,
       noPrice: (_initParams$noPrice = initParams.noPrice) !== null && _initParams$noPrice !== void 0 ? _initParams$noPrice : false,
       retailArticleNr: initParams.RetailArticleNr ? initParams.RetailArticleNr : initParams.retailArticleNr,
@@ -24756,7 +24847,8 @@ var DivaArticle = /*#__PURE__*/function () {
         currentAccessorires: [],
         parentElementId: isNotDockedAccessoire ? this.set.getDivaArticles()[this.relatedToBasketId].elementId : undefined,
         isNotDockedAccessoire: isNotDockedAccessoire,
-        svgsWithFormula: []
+        svgsWithFormula: [],
+        varaintValuesInfluencingAVLAVRFilter: []
       };
       var plannerElement = this.article.catalogArticle.catalogPlannerArticle;
       if (plannerElement) {
@@ -24827,6 +24919,11 @@ var DivaArticle = /*#__PURE__*/function () {
     get: function get() {
       return this.article.partlistArticleVisibleInTree && this.hasOptionsThatParentDoesNotHave;
     }
+  }, {
+    key: "partlistArticleStandalone",
+    get: function get() {
+      return this.article.partlistArticleStandalone;
+    }
   }, {
     key: "partlistArticlesReqursive",
     get: function get() {
@@ -24841,6 +24938,7 @@ var DivaArticle = /*#__PURE__*/function () {
     get: function get() {
       var _this$partListParentA;
       if (!this.partListParentArticle) return false;
+      if (this.partlistArticleStandalone) return true;
       //a partlistartilce should really only be visible in the configtree when the parent does not have a option in his Optiontree that the partlistarticle has
       // first usecase https://app.asana.com/0/1204193128085691/1204389027061737
       var myOptions = this.articleOptionStatesKeys;
@@ -24851,17 +24949,24 @@ var DivaArticle = /*#__PURE__*/function () {
     }
   }, {
     key: "getRecursivePartlistArticles",
-    value: function getRecursivePartlistArticles(onlyVisible) {
+    value: function getRecursivePartlistArticles(onlyVisible, excludeStandalonePla) {
       var partlistArticles = {};
       for (var basketId in this.partlistArticles) {
         var partlistArticle = this.partlistArticles[basketId];
-        if (!onlyVisible || partlistArticle.partlistArticleVisibleInTree) partlistArticles[basketId] = partlistArticle;
+        if (!onlyVisible || partlistArticle.partlistArticleVisibleInTree || !excludeStandalonePla && partlistArticle.partlistArticleStandalone) partlistArticles[basketId] = partlistArticle;
         if (partlistArticle.hasPartlistArticle) {
-          partlistArticles = _objectSpread$e(_objectSpread$e({}, partlistArticles), partlistArticle.getRecursivePartlistArticles(onlyVisible));
+          partlistArticles = _objectSpread$e(_objectSpread$e({}, partlistArticles), partlistArticle.getRecursivePartlistArticles(onlyVisible, excludeStandalonePla));
         }
       }
       return partlistArticles;
     }
+  }, {
+    key: "variantValuesForPla",
+    value: function variantValuesForPla(configurationMode, previousPartlistArticleVariantValues, newConfigValues) {
+      //if configurationMode is true its previous values are more important than the values of the parentelement because its standalone configurable
+      if (configurationMode) return _objectSpread$e(_objectSpread$e({}, newConfigValues !== null && newConfigValues !== void 0 ? newConfigValues : {}), previousPartlistArticleVariantValues !== null && previousPartlistArticleVariantValues !== void 0 ? previousPartlistArticleVariantValues : {});
+      return _objectSpread$e(_objectSpread$e({}, previousPartlistArticleVariantValues !== null && previousPartlistArticleVariantValues !== void 0 ? previousPartlistArticleVariantValues : {}), newConfigValues !== null && newConfigValues !== void 0 ? newConfigValues : {});
+    }
   }, {
     key: "partlistArticlesAsArray",
     get: function get() {
@@ -25505,31 +25610,32 @@ var DivaArticle = /*#__PURE__*/function () {
       });
       if (firstMatch) return firstMatch;
       if (from !== ((_this$partListParentA9 = this.partListParentArticle) === null || _this$partListParentA9 === void 0 ? void 0 : _this$partListParentA9.basketId) && (_this$partListParentA10 = this.partListParentArticle) !== null && _this$partListParentA10 !== void 0 && _this$partListParentA10.getArticleOptionState(codex, undefined, checkOnAccessoireParent)) {
-        return this.partListParentArticle.getArticleOptionState(codex, this.basketId, checkOnAccessoireParent);
+        var ops = this.partListParentArticle.getArticleOptionState(codex, this.basketId, checkOnAccessoireParent);
+        if (ops) return ops;
       }
       if (Object.keys((_this$partlistArticle3 = this.partlistArticles) !== null && _this$partlistArticle3 !== void 0 ? _this$partlistArticle3 : {}).length > 0) {
         for (var key in this.partlistArticles) {
           if (from === key) continue;
           var partlistArticle = this.partlistArticles[key];
-          var ops = partlistArticle.getArticleOptionState(codex, this.basketId, checkOnAccessoireParent);
-          if (ops) return ops;
+          var _ops = partlistArticle.getArticleOptionState(codex, this.basketId, checkOnAccessoireParent);
+          if (_ops) return _ops;
         }
       }
       var _iterator5 = _createForOfIteratorHelper$6(this.articleOptionStatesData),
         _step5;
       try {
         for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var _ops2 = _step5.value;
+          var _ops3 = _step5.value;
           if (!codex.includes('.')) {
-            if (_ops2.option.ocd == codex && _ops2.isDoShow && !_ops2.isDisabled) {
-              return _ops2;
+            if (_ops3.option.ocd == codex && _ops3.isDoShow && !_ops3.isDisabled) {
+              return _ops3;
             }
           } else {
             var _this$parentOptionCod = this.parentOptionCodex(codex),
               optionCodex = _this$parentOptionCod.optionCodex,
               partenOptionCodex = _this$parentOptionCod.partenOptionCodex;
-            if ((_ops2.option.ocd == optionCodex || _ops2.option.codex == optionCodex) && _ops2.option.parentOptionCodex == partenOptionCodex) {
-              return _ops2;
+            if ((_ops3.option.ocd == optionCodex || _ops3.option.codex == optionCodex) && _ops3.option.parentOptionCodex == partenOptionCodex) {
+              return _ops3;
             }
           }
         }
@@ -25539,8 +25645,8 @@ var DivaArticle = /*#__PURE__*/function () {
         _iterator5.f();
       }
       if (checkOnAccessoireParent && this.accessoireParentArticle) {
-        var _ops = this.accessoireParentArticle.getArticleOptionState(codex, this.basketId, checkOnAccessoireParent);
-        if (_ops) return _ops;
+        var _ops2 = this.accessoireParentArticle.getArticleOptionState(codex, this.basketId, checkOnAccessoireParent);
+        if (_ops2) return _ops2;
       }
       return undefined;
     }
@@ -25734,9 +25840,9 @@ var DivaArticle = /*#__PURE__*/function () {
     get: function get() {
       var _this$partlistArticle4;
       if (Object.values((_this$partlistArticle4 = this.partlistArticles) !== null && _this$partlistArticle4 !== void 0 ? _this$partlistArticle4 : {}).find(function (p) {
-        return p.partlistArticleVisibleInTree;
+        return p.partlistArticleVisibleInTree || p.partlistArticleStandalone;
       })) return true;
-      return this.partlistArticleVisibleInTree;
+      return this.partlistArticleVisibleInTree || this.partlistArticleStandalone;
     }
   }, {
     key: "partListParentArticle",
@@ -26197,13 +26303,15 @@ var DivaArticle = /*#__PURE__*/function () {
             invisible: ops.isInvisible,
             visibleOPVs: Object.values(ops.visibleOptionValues).map(function (v) {
               return v.codex;
-            })
+            }),
+            optName: ops.optionName
           };
           if (ops.freeText) {
             ret[ops.optionCodex + '_val'] = {
               selOPV: ops.freeText,
               visibleOPVs: [],
-              invisible: true
+              invisible: true,
+              optName: ''
             };
           }
         }
@@ -26335,8 +26443,9 @@ var DivaArticle = /*#__PURE__*/function () {
         _step14;
       try {
         for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+          var _ops$idmVariantenArt;
           var ops = _step14.value;
-          if (ops.isDoShow && (!(ops.idmVariantenArt == 95 || ops.idmVariantenArt == 96 || ops.idmVariantenArt == 97) || ops.isVisibleFreeText) && ops.val && ops.visibleCount > 0 && !ops.isDescribingState) {
+          if (ops.isDoShow && (![95, 96, 97, 1095, 1096, 1097].includes((_ops$idmVariantenArt = ops.idmVariantenArt) !== null && _ops$idmVariantenArt !== void 0 ? _ops$idmVariantenArt : 0) || ops.isVisibleFreeText) && ops.val && ops.visibleCount > 0 && !ops.isDescribingState) {
             variantValues.push((this.CatalogData.isIDMFormat ? ops.optionCodex : ops.optionCodex.substring(3)) + '_' + (this.CatalogData.isIDMFormat ? ops.val.codex : ops.val.codex.substring(3)) + (ops.freeText ? '_' + ops.freeText : ops.value ? '_' + ops.value : ''));
           }
         }
@@ -26489,6 +26598,9 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "deletePartlistArticles",
     value: function deletePartlistArticles() {
+      for (var pl in this.article.partlistArticles) {
+        this.article.partlistArticles[pl].deleted = true;
+      }
       if (Object.keys(this.article.partlistArticles).length) this.article.previousPartlistArticles = this.article.partlistArticles;
       this.article.partlistArticles = {};
     }
@@ -26779,9 +26891,9 @@ var DivaArticle = /*#__PURE__*/function () {
             _step21;
           try {
             for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
-              var _ops3 = _step21.value;
-              if (_ops3.option.ocd == optionCodex && _ops3.isDoShow && (parentOptionCodex == '' || parentOptionCodex == _ops3.option.parentOptionCodex)) {
-                ret = this.checkOptionSearchOPV(_ops3.option, optionValueCodex, ret);
+              var _ops4 = _step21.value;
+              if (_ops4.option.ocd == optionCodex && _ops4.isDoShow && (parentOptionCodex == '' || parentOptionCodex == _ops4.option.parentOptionCodex)) {
+                ret = this.checkOptionSearchOPV(_ops4.option, optionValueCodex, ret);
               }
             }
             //fallback for pfister classification usecase
@@ -26794,9 +26906,9 @@ var DivaArticle = /*#__PURE__*/function () {
             _step22;
           try {
             for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-              var _ops4 = _step22.value;
-              if (_ops4.option.ocd == optionCodex && optionCodex !== null && optionCodex !== void 0 && optionCodex.startsWith('OPTOPT') && (parentOptionCodex == '' || parentOptionCodex == _ops4.option.parentOptionCodex)) {
-                return this.checkOptionSearchOPV(_ops4.option, optionValueCodex, ret);
+              var _ops5 = _step22.value;
+              if (_ops5.option.ocd == optionCodex && optionCodex !== null && optionCodex !== void 0 && optionCodex.startsWith('OPTOPT') && (parentOptionCodex == '' || parentOptionCodex == _ops5.option.parentOptionCodex)) {
+                return this.checkOptionSearchOPV(_ops5.option, optionValueCodex, ret);
               }
             }
           } catch (err) {
@@ -27019,6 +27131,18 @@ var DivaArticle = /*#__PURE__*/function () {
       }
       return visibleOptionValues[Object.keys(visibleOptionValues)[0]];
     }
+  }, {
+    key: "getVariantValuesInfluencingAVLAVRFilter",
+    value: function getVariantValuesInfluencingAVLAVRFilter() {
+      var filterOptions = [(!this.CatalogData.isIDMFormat ? 'OPT' : '') + '89', (!this.CatalogData.isIDMFormat ? 'OPT' : '') + '90'];
+      var variantValues = [];
+      for (var i = 0; i < filterOptions.length; i++) {
+        if (this.getArticleOptionState(filterOptions[i])) {
+          variantValues = [].concat(_toConsumableArray__default["default"](this.engine.getValuesInfluencingOPT(filterOptions[i])), _toConsumableArray__default["default"](variantValues));
+        }
+      }
+      return variantValues;
+    }
   }, {
     key: "updateOptionsWithAddToMeasure",
     value: function updateOptionsWithAddToMeasure(optionCodex) {
@@ -27089,7 +27213,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-c89976b9.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-2db3c4a8.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -27152,6 +27276,39 @@ var DivaArticle = /*#__PURE__*/function () {
       if (!this.partListParentArticle) return true;
       return !!this.partListParentArticle.getArticleOptionStateFlat(opt) || this.partlistArticleVisibleInTree;
     }
+  }, {
+    key: "afterInit",
+    value: function () {
+      var _afterInit = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2() {
+        var variantValues, i, _ops$visibleOptionVal, ops, _ops$visibleOptionVal2;
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              if (this.CatalogData.useDiomexConfigLogic) {
+                _context2.next = 2;
+                break;
+              }
+              return _context2.abrupt("return", {});
+            case 2:
+              variantValues = {};
+              for (i = 0; i < this.articleOptionStates.length; i++) {
+                ops = this.articleOptionStates[i];
+                if (ops.val === undefined && Object.values((_ops$visibleOptionVal = ops.visibleOptionValues) !== null && _ops$visibleOptionVal !== void 0 ? _ops$visibleOptionVal : {}).length && !ops.isInvisible) {
+                  variantValues[ops.optionCodex] = Object.values((_ops$visibleOptionVal2 = ops.visibleOptionValues) !== null && _ops$visibleOptionVal2 !== void 0 ? _ops$visibleOptionVal2 : {})[0].codex;
+                }
+              }
+              return _context2.abrupt("return", variantValues);
+            case 5:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function afterInit() {
+        return _afterInit.apply(this, arguments);
+      }
+      return afterInit;
+    }()
   }, {
     key: "getValidValues",
     value: function getValidValues(myValues, mergeOptionToSameOption, setConfigDoesOverWrite) {
@@ -27200,8 +27357,8 @@ var DivaArticle = /*#__PURE__*/function () {
         }
       }
       for (var _key2 in myValues) {
-        var _ops5 = this.getArticleOptionState(_key2);
-        if (_ops5) {
+        var _ops6 = this.getArticleOptionState(_key2);
+        if (_ops6) {
           validValues[_key2] = myValues[_key2];
         } else if (_key2.endsWith('_val') && this.getArticleOptionState(_key2.replace(/_val/g, ''))) {
           validValues[_key2] = myValues[_key2];
@@ -27210,10 +27367,10 @@ var DivaArticle = /*#__PURE__*/function () {
             _step24;
           try {
             for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-              var _ops6 = _step24.value;
-              if (_ops6.optionOcd == _key2) {
-                var values = this.checkOptionSearchOPV(_ops6.option, myValues[_key2], {});
-                if (values !== null && values !== void 0 && values.opv) validValues[_ops6.optionCodex] = values.opv.codex;
+              var _ops7 = _step24.value;
+              if (_ops7.optionOcd == _key2) {
+                var values = this.checkOptionSearchOPV(_ops7.option, myValues[_key2], {});
+                if (values !== null && values !== void 0 && values.opv) validValues[_ops7.optionCodex] = values.opv.codex;
               }
             }
           } catch (err) {
@@ -27223,9 +27380,9 @@ var DivaArticle = /*#__PURE__*/function () {
           }
         }
         //for classification usecase when suboption and option have the same name like OPTOPT_MATERIAL_1_00 and OPTOPT_MATERIAL_1_00.OPTOPT_MATERIAL_1_00
-        if (_ops5) {
-          var _ops5$valCodex;
-          if ((_ops5$valCodex = _ops5.valCodex) !== null && _ops5$valCodex !== void 0 && _ops5$valCodex.startsWith('OPVSUB_') && !validValues[_key2 + '.' + _key2] && this.getArticleOptionState(_key2 + '.' + _key2)) {
+        if (_ops6) {
+          var _ops6$valCodex;
+          if ((_ops6$valCodex = _ops6.valCodex) !== null && _ops6$valCodex !== void 0 && _ops6$valCodex.startsWith('OPVSUB_') && !validValues[_key2 + '.' + _key2] && this.getArticleOptionState(_key2 + '.' + _key2)) {
             validValues[_key2 + '.' + _key2] = myValues[_key2];
           }
         }
@@ -27565,7 +27722,8 @@ var DivaArticle = /*#__PURE__*/function () {
           var ops = _step28.value;
           var OP = ops.optionCodex;
           if (ops) {
-            var doHideSizeOption = ops.idmVariantenArt == 95 || ops.idmVariantenArt == 96 || ops.idmVariantenArt == 97;
+            var _ops$idmVariantenArt2;
+            var doHideSizeOption = [95, 96, 97, 1095, 1096, 1097].includes((_ops$idmVariantenArt2 = ops.idmVariantenArt) !== null && _ops$idmVariantenArt2 !== void 0 ? _ops$idmVariantenArt2 : 0);
             if (ops.isVisibleFreeText == true) {
               doHideSizeOption = false;
             }
@@ -27736,15 +27894,15 @@ var DivaArticle = /*#__PURE__*/function () {
     value: function validateAndSetNewConfigValues(newConfigValues) {
       var freeTextValues = {};
       for (var key in newConfigValues) {
-        var _ops7, _ops8, _newConfigValues$key;
+        var _ops8, _ops9, _newConfigValues$key;
         var ops = this.getArticleOptionState(key);
         var _this$parentOptionCod5 = this.parentOptionCodex(key),
           optionCodex = _this$parentOptionCod5.optionCodex,
           partenOptionCodex = _this$parentOptionCod5.partenOptionCodex;
-        if ((_ops7 = ops) !== null && _ops7 !== void 0 && _ops7.isMultiselect) {
+        if ((_ops8 = ops) !== null && _ops8 !== void 0 && _ops8.isMultiselect) {
           ops = this.handleMultiselect(ops, newConfigValues, key);
         }
-        if ((_ops8 = ops) !== null && _ops8 !== void 0 && _ops8.isFreeText) {
+        if ((_ops9 = ops) !== null && _ops9 !== void 0 && _ops9.isFreeText) {
           this.handleFreeText(ops, newConfigValues, key, freeTextValues);
         }
         var opvCodex = (_newConfigValues$key = newConfigValues[key]) === null || _newConfigValues$key === void 0 ? void 0 : _newConfigValues$key.split(';')[0];
@@ -27755,8 +27913,8 @@ var DivaArticle = /*#__PURE__*/function () {
             var myFreeText = foundItem.opv.isFreeText ? newConfigValues[optionCodex + '_val'] : undefined;
             this.engine.updateArtOPV(foundItem.opv, foundItem.opt.codex, this.getArticleOptionState(foundItem.opt.codex), myFreeText);
           } else {
-            var _ops9;
-            if (ops && !((_ops9 = ops) !== null && _ops9 !== void 0 && _ops9.isFreeText)) {
+            var _ops10;
+            if (ops && !((_ops10 = ops) !== null && _ops10 !== void 0 && _ops10.isFreeText)) {
               // to initialize freetexts where the freetext is not the only selectable opv in the options
               this.checkIfSelectableOpvIsFreetext(ops, opvCodex, newConfigValues);
             }
@@ -28013,7 +28171,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               if (!(article.articleType == 'OPTION' || article.articleType == 'OPTIONTREE')) {
-                _context5.next = 8;
+                _context5.next = 11;
                 break;
               }
               _context5.next = 3;
@@ -28022,13 +28180,20 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               _context5.next = 5;
               return this.updateCfgValues(article, defaultValues, variantValues);
             case 5:
-              if (!(article.set.PlannerMode !== 'BoxPlanner')) {
+              if (!(from === 'initializingPartlist')) {
                 _context5.next = 8;
                 break;
               }
               _context5.next = 8;
-              return setHandlerInstance.updateArticlesOptionStatesOfActSet(article.set, defaultValues, [article.basketId], ignorePlanner, from);
+              return this.updateEmptyOption(article);
             case 8:
+              if (!(article.set.PlannerMode !== 'BoxPlanner')) {
+                _context5.next = 11;
+                break;
+              }
+              _context5.next = 11;
+              return setHandlerInstance.updateArticlesOptionStatesOfActSet(article.set, defaultValues, [article.basketId], ignorePlanner, from);
+            case 11:
             case "end":
               return _context5.stop();
           }
@@ -28054,7 +28219,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     key: "updateArticlesOptionStates",
     value: function () {
       var _updateArticlesOptionStates = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(myValues, targetArticlesWithNewValues, targetArticlesToUpdate, articles, from) {
-        var newEDOExtraArticles, partlistArticlesToLoad, valuesArray, i, actArticle, newPartlistArticlesToLoad, _actArticle$checkDefa, variantValues, triggerUpdate;
+        var newEDOExtraArticles, partlistArticlesToLoad, valuesArray, i, _actArticle, actArticle, newPLATL, _actArticle$checkDefa, variantValues, triggerUpdate, pla;
         return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -28064,74 +28229,79 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               i = 0;
             case 4:
               if (!(i < targetArticlesToUpdate.length)) {
-                _context6.next = 36;
+                _context6.next = 40;
                 break;
               }
               valuesArray[i] = {};
               actArticle = articles[targetArticlesToUpdate[i]];
+              if ((_actArticle = actArticle) !== null && _actArticle !== void 0 && _actArticle.deleted && actArticle.isPartListArticle && actArticle.partListParentArticle) {
+                actArticle = actArticle.partListParentArticle.partlistArticles[actArticle.basketId];
+              }
               if (!(!actArticle || actArticle.deleted)) {
-                _context6.next = 11;
+                _context6.next = 12;
                 break;
               }
               targetArticlesToUpdate.splice(i, 1);
               i--;
-              return _context6.abrupt("continue", 33);
-            case 11:
+              return _context6.abrupt("continue", 37);
+            case 12:
               if (targetArticlesWithNewValues.includes(targetArticlesToUpdate[i])) {
                 valuesArray[i] = actArticle.getValidValues(_objectSpread$d({}, myValues), actArticle.CatalogData.mergeOptionsToSameOption);
               }
 
               //only set config if valuesArray are not empty or the article is initializing
+              newPLATL = void 0; // partlistarticle to load
               if (!(Object.entries(valuesArray[i]).length > 0 || from !== null && from !== void 0 && from.startsWith('initializing'))) {
-                _context6.next = 28;
+                _context6.next = 29;
                 break;
               }
-              _context6.next = 15;
+              _context6.next = 17;
               return this.updateCfgValues(actArticle, valuesArray[i], {}, undefined, undefined, from == 'calcVariant');
-            case 15:
-              newPartlistArticlesToLoad = _context6.sent;
+            case 17:
+              newPLATL = _context6.sent;
               _actArticle$checkDefa = actArticle.checkDefaultGlobalOpt(valuesArray[i]), variantValues = _actArticle$checkDefa.variantValues, triggerUpdate = _actArticle$checkDefa.triggerUpdate;
               valuesArray[i] = variantValues;
-              _context6.next = 20;
+              _context6.next = 22;
               return this.updateAccessoriesFromGlobalOption(valuesArray[i], actArticle);
-            case 20:
+            case 22:
               if (!triggerUpdate) {
-                _context6.next = 24;
+                _context6.next = 26;
                 break;
               }
-              _context6.next = 23;
+              _context6.next = 25;
               return this.updateCfgValues(actArticle, valuesArray[i], {}, undefined, undefined, from == 'calcVariant');
-            case 23:
-              newPartlistArticlesToLoad = _context6.sent;
-            case 24:
-              partlistArticlesToLoad = partlistArticlesToLoad.concat(newPartlistArticlesToLoad);
+            case 25:
+              newPLATL = _context6.sent;
+            case 26:
               newEDOExtraArticles = this.checkEDOArticles(articles);
-              _context6.next = 33;
+              _context6.next = 32;
               break;
-            case 28:
-              _context6.t0 = partlistArticlesToLoad;
+            case 29:
               _context6.next = 31;
               return this.updateCfgValues(actArticle, {}, {}, undefined, undefined, from == 'calcVariant');
             case 31:
-              _context6.t1 = _context6.sent;
-              partlistArticlesToLoad = _context6.t0.concat.call(_context6.t0, _context6.t1);
-            case 33:
+              newPLATL = _context6.sent;
+            case 32:
+              _context6.next = 34;
+              return this.updateEmptyOption(actArticle);
+            case 34:
+              pla = _context6.sent;
+              if (pla !== undefined) newPLATL = pla;
+              partlistArticlesToLoad = partlistArticlesToLoad.concat(newPLATL);
+            case 37:
               i++;
               _context6.next = 4;
               break;
-            case 36:
-              _context6.next = 38;
-              return this.triggerUpdateOnVisiblePartilstArticles(targetArticlesToUpdate, articles);
-            case 38:
-              _context6.next = 40;
-              return this.triggerMoreUpdates(targetArticlesToUpdate, valuesArray, articles, from);
             case 40:
+              _context6.next = 42;
+              return this.triggerUpdateOnVisiblePartilstArticles(targetArticlesToUpdate, articles);
+            case 42:
               return _context6.abrupt("return", {
                 newEDOExtraArticles: newEDOExtraArticles,
                 targetArticlesToUpdate: targetArticlesToUpdate,
                 partlistArticlesToLoad: partlistArticlesToLoad
               });
-            case 41:
+            case 43:
             case "end":
               return _context6.stop();
           }
@@ -28143,38 +28313,38 @@ var DivaArticleHandler = /*#__PURE__*/function () {
       return updateArticlesOptionStates;
     }()
   }, {
-    key: "triggerMoreUpdates",
+    key: "triggerUpdateOnVisiblePartilstArticles",
     value: function () {
-      var _triggerMoreUpdates = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee6(targetArticlesToUpdate, valuesArray, articles, from) {
-        var i, article;
+      var _triggerUpdateOnVisiblePartilstArticles = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee6(targetArticlesToUpdate, articles) {
+        var _articles$targetArtic;
+        var key, configuredArticle, toIgnore, actArticle;
         return _regeneratorRuntime__default["default"].wrap(function _callee6$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              if (!(!targetArticlesToUpdate.length || from !== 'calcVariant')) {
-                _context7.next = 2;
+              if (!((_articles$targetArtic = articles[targetArticlesToUpdate[0]]) !== null && _articles$targetArtic !== void 0 && _articles$targetArtic.hasPartlistArticleVisibleInTree)) {
+                _context7.next = 13;
                 break;
               }
-              return _context7.abrupt("return");
+              _context7.t0 = _regeneratorRuntime__default["default"].keys(articles);
             case 2:
-              i = 0;
-            case 3:
-              if (!(i < targetArticlesToUpdate.length)) {
+              if ((_context7.t1 = _context7.t0()).done) {
                 _context7.next = 13;
                 break;
               }
-              article = articles[targetArticlesToUpdate[i]];
-              if (!(!article.CatalogData.isIDMFormat && (article.CatalogData.doubleClickOnConfig || article.hasType1Dependencies))) {
-                _context7.next = 10;
+              key = _context7.t1.value;
+              configuredArticle = articles[targetArticlesToUpdate[0]];
+              toIgnore = configuredArticle.pushParentId();
+              if (![configuredArticle.basketId].concat(_toConsumableArray__default["default"](toIgnore)).includes(key)) {
+                _context7.next = 8;
                 break;
               }
-              _context7.next = 8;
-              return this.updateCfgValues(article, valuesArray[i], {});
+              return _context7.abrupt("continue", 2);
             case 8:
-              _context7.next = 10;
-              return this.updateCfgValues(article, valuesArray[i], {});
-            case 10:
-              i++;
-              _context7.next = 3;
+              actArticle = articles[key];
+              _context7.next = 11;
+              return this.updateCfgValues(actArticle, {}, {});
+            case 11:
+              _context7.next = 2;
               break;
             case 13:
             case "end":
@@ -28182,55 +28352,43 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           }
         }, _callee6, this);
       }));
-      function triggerMoreUpdates(_x19, _x20, _x21, _x22) {
-        return _triggerMoreUpdates.apply(this, arguments);
+      function triggerUpdateOnVisiblePartilstArticles(_x19, _x20) {
+        return _triggerUpdateOnVisiblePartilstArticles.apply(this, arguments);
       }
-      return triggerMoreUpdates;
+      return triggerUpdateOnVisiblePartilstArticles;
     }()
   }, {
-    key: "triggerUpdateOnVisiblePartilstArticles",
+    key: "updateEmptyOption",
     value: function () {
-      var _triggerUpdateOnVisiblePartilstArticles = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7(targetArticlesToUpdate, articles) {
-        var _articles$targetArtic;
-        var key, configuredArticle, toIgnore, actArticle;
+      var _updateEmptyOption = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7(article) {
+        var emyptsOptionsToSet;
         return _regeneratorRuntime__default["default"].wrap(function _callee7$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              if (!((_articles$targetArtic = articles[targetArticlesToUpdate[0]]) !== null && _articles$targetArtic !== void 0 && _articles$targetArtic.hasPartlistArticleVisibleInTree)) {
-                _context8.next = 13;
-                break;
-              }
-              _context8.t0 = _regeneratorRuntime__default["default"].keys(articles);
+              _context8.next = 2;
+              return article.afterInit();
             case 2:
-              if ((_context8.t1 = _context8.t0()).done) {
-                _context8.next = 13;
+              emyptsOptionsToSet = _context8.sent;
+              if (!Object.keys(emyptsOptionsToSet).length) {
+                _context8.next = 7;
                 break;
               }
-              key = _context8.t1.value;
-              configuredArticle = articles[targetArticlesToUpdate[0]];
-              toIgnore = configuredArticle.pushParentId();
-              if (![configuredArticle.basketId].concat(_toConsumableArray__default["default"](toIgnore)).includes(key)) {
-                _context8.next = 8;
-                break;
-              }
-              return _context8.abrupt("continue", 2);
+              _context8.next = 6;
+              return this.updateCfgValues(article, emyptsOptionsToSet, {});
+            case 6:
+              return _context8.abrupt("return", _context8.sent);
+            case 7:
+              return _context8.abrupt("return", undefined);
             case 8:
-              actArticle = articles[key];
-              _context8.next = 11;
-              return this.updateCfgValues(actArticle, {}, {});
-            case 11:
-              _context8.next = 2;
-              break;
-            case 13:
             case "end":
               return _context8.stop();
           }
         }, _callee7, this);
       }));
-      function triggerUpdateOnVisiblePartilstArticles(_x23, _x24) {
-        return _triggerUpdateOnVisiblePartilstArticles.apply(this, arguments);
+      function updateEmptyOption(_x21) {
+        return _updateEmptyOption.apply(this, arguments);
       }
-      return triggerUpdateOnVisiblePartilstArticles;
+      return updateEmptyOption;
     }()
   }, {
     key: "updateAccessoriesFromGlobalOption",
@@ -28259,7 +28417,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           }
         }, _callee8, this);
       }));
-      function updateAccessoriesFromGlobalOption(_x25, _x26) {
+      function updateAccessoriesFromGlobalOption(_x22, _x23) {
         return _updateAccessoriesFromGlobalOption.apply(this, arguments);
       }
       return updateAccessoriesFromGlobalOption;
@@ -28497,12 +28655,14 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               _iterator3.f();
               return _context11.finish(30);
             case 33:
+              if (article.plannerData) article.plannerData.varaintValuesInfluencingAVLAVRFilter = article.getVariantValuesInfluencingAVLAVRFilter();
+            case 34:
             case "end":
               return _context11.stop();
           }
         }, _callee9, null, [[12, 27, 30, 33]]);
       }));
-      function initCfgValues(_x27, _x28, _x29) {
+      function initCfgValues(_x24, _x25, _x26) {
         return _initCfgValues.apply(this, arguments);
       }
       return initCfgValues;
@@ -28522,7 +28682,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           }
         }, _callee10, this);
       }));
-      function setValidVariantValues(_x30) {
+      function setValidVariantValues(_x27) {
         return _setValidVariantValues.apply(this, arguments);
       }
       return setValidVariantValues;
@@ -28608,7 +28768,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           }
         }, _callee11, this);
       }));
-      function updateCfgValues(_x31, _x32, _x33, _x34, _x35, _x36) {
+      function updateCfgValues(_x28, _x29, _x30, _x31, _x32, _x33) {
         return _updateCfgValues.apply(this, arguments);
       }
       return updateCfgValues;
@@ -28665,7 +28825,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           }
         }, _callee12, this);
       }));
-      function updateLastElement(_x37) {
+      function updateLastElement(_x34) {
         return _updateLastElement.apply(this, arguments);
       }
       return updateLastElement;
@@ -28707,7 +28867,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           }
         }, _callee13);
       }));
-      function updateOption(_x38, _x39, _x40, _x41) {
+      function updateOption(_x35, _x36, _x37, _x38) {
         return _updateOption.apply(this, arguments);
       }
       return updateOption;
@@ -28749,7 +28909,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           }
         }, _callee14, this);
       }));
-      function evalAndLoadPartlistArticles(_x42, _x43, _x44) {
+      function evalAndLoadPartlistArticles(_x39, _x40, _x41) {
         return _evalAndLoadPartlistArticles.apply(this, arguments);
       }
       return evalAndLoadPartlistArticles;
@@ -28788,7 +28948,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           }
         }, _callee15, this);
       }));
-      function loadPartlistArticles(_x45, _x46, _x47) {
+      function loadPartlistArticles(_x42, _x43, _x44) {
         return _loadPartlistArticles.apply(this, arguments);
       }
       return loadPartlistArticles;
@@ -28798,7 +28958,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     key: "loadPartlistArticle",
     value: function () {
       var _loadPartlistArticle = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee16(doLoadItem, article, newConfigValues) {
-        var nArticle;
+        var nArticle, _doLoadItem$VariantVa;
         return _regeneratorRuntime__default["default"].wrap(function _callee16$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
@@ -28812,7 +28972,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               }
               doLoadItem.BasketID = nArticle.basketId;
               _context18.next = 7;
-              return this.toDoAfterArticleLoaded(nArticle, {}, _objectSpread$d(_objectSpread$d({}, doLoadItem.VariantValues), newConfigValues), 'initializingPartlist', doLoadItem.VariantItemData);
+              return this.toDoAfterArticleLoaded(nArticle, {}, nArticle.variantValuesForPla(nArticle.partlistArticleStandalone, (_doLoadItem$VariantVa = doLoadItem.VariantValues) !== null && _doLoadItem$VariantVa !== void 0 ? _doLoadItem$VariantVa : {}, newConfigValues !== null && newConfigValues !== void 0 ? newConfigValues : {}), 'initializingPartlist', doLoadItem.VariantItemData);
             case 7:
               article.addPartlistArticle(nArticle);
             case 8:
@@ -28821,7 +28981,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           }
         }, _callee16, this);
       }));
-      function loadPartlistArticle(_x48, _x49, _x50) {
+      function loadPartlistArticle(_x45, _x46, _x47) {
         return _loadPartlistArticle.apply(this, arguments);
       }
       return loadPartlistArticle;
@@ -28851,6 +29011,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
         supplierOrderCodex: doLoadItem.SupplierOrderCodex,
         initDecisions: doLoadItem.initDecisions,
         partlistArticleVisibleInTree: doLoadItem.PosInvisibility === 0,
+        partlistArticleStandalone: doLoadItem.ConfigurationMode,
         optionsForPrint: doLoadItem.optionsForPrint,
         optionImgForPrint: doLoadItem.optionImgForPrint,
         catalogCodex: doLoadItem.CatalogCodex
@@ -28982,7 +29143,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           }
         }, _callee17, this);
       }));
-      function evalOpvsOnOpvsConstructionRules(_x51) {
+      function evalOpvsOnOpvsConstructionRules(_x48) {
         return _evalOpvsOnOpvsConstructionRules.apply(this, arguments);
       }
       return evalOpvsOnOpvsConstructionRules;
@@ -29185,7 +29346,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           }
         }, _callee18);
       }));
-      function triggerShelfplannerVisibility(_x52, _x53) {
+      function triggerShelfplannerVisibility(_x49, _x50) {
         return _triggerShelfplannerVisibility.apply(this, arguments);
       }
       return triggerShelfplannerVisibility;
@@ -29262,7 +29423,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           IsPartlistArticle: article.isPartListArticle,
           IsPlannerElement: article.hasCatalogPlannerArticle,
           HasPartlistArticle: article.hasPartlistArticle,
-          PartlistArticleInvisibility: !article.partlistArticleVisibleInTree && !article.optionsForPrint,
+          PartlistArticleInvisibility: !article.partlistArticleVisibleInTree && !article.optionsForPrint && !article.partlistArticleStandalone,
           SendToSAP: article.sendToSap,
           ShelfPlandata: article.shelfPlanner ? DivaUtils__default["default"].encodeBasketJson((_article$shelfPlanner3 = (_article$shelfPlanner4 = article.shelfPlanner) === null || _article$shelfPlanner4 === void 0 ? void 0 : _article$shelfPlanner4.generateShelfPlandata()) !== null && _article$shelfPlanner3 !== void 0 ? _article$shelfPlanner3 : (_article$doorPlanner = article.doorPlanner) === null || _article$doorPlanner === void 0 ? void 0 : _article$doorPlanner.getMovedData(article.basketId)) : undefined,
           MetaData: !hasFavorites ? article.MetaData : undefined,
@@ -29509,7 +29670,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           }
         }, _callee19, this);
       }));
-      function correctPartlistArticlesByGlobalRules(_x54, _x55, _x56, _x57) {
+      function correctPartlistArticlesByGlobalRules(_x51, _x52, _x53, _x54) {
         return _correctPartlistArticlesByGlobalRules.apply(this, arguments);
       }
       return correctPartlistArticlesByGlobalRules;
@@ -30172,7 +30333,7 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
           var myOption = myTabGroup.options[lKey];
           if (myOption.idmVariantType) {
             var _catalog$getOption;
-            var opgPairs = [[2, 3], [4, 5], [6, 7], [11, 12], [226, 224]];
+            var opgPairs = [[2, 3], [4, 5], [6, 7], [11, 12]];
             for (var i = 0; i < opgPairs.length; i++) {
               var optionStep = this.getOptionWhereIDMVariantIs(iKey, opgPairs[i][1]);
               if (myOption.idmVariantType == opgPairs[i][0] && optionStep && !optionStep.mergesToOPG) {
@@ -30427,6 +30588,7 @@ var DivaSet = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "matchingOrigProduct", void 0);
     _defineProperty__default["default"](this, "_supplierColors", void 0);
     _defineProperty__default["default"](this, "_logDecisions", false);
+    _defineProperty__default["default"](this, "_logTotalStateForVariants", false);
     /**Favorits state */
     _defineProperty__default["default"](this, "_handlelingCurrentFavorites", false);
     _defineProperty__default["default"](this, "_favorites", {
@@ -31700,7 +31862,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context5.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-4ebcc53d.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-17cec7e7.js'); });
             case 3:
               _yield$import = _context5.sent;
               DoorPlanner = _yield$import["default"];
@@ -31867,6 +32029,14 @@ var DivaSet = /*#__PURE__*/function () {
     set: function set(val) {
       this._logDecisions = val;
     }
+  }, {
+    key: "logTotalStateForVariants",
+    get: function get() {
+      return this._logTotalStateForVariants;
+    },
+    set: function set(val) {
+      this._logTotalStateForVariants = val;
+    }
   }, {
     key: "showAccessioreOnLastTab",
     get: function get() {
@@ -31884,6 +32054,7 @@ var DivaSet = /*#__PURE__*/function () {
       var clonedSet = new DivaSet(this.CatalogData, this.setId, {}, _objectSpread$c({}, this.setState));
       clonedSet.setData = _objectSpread$c({}, this.setData);
       clonedSet.configSingle = this.configSingle;
+      clonedSet.logTotalStateForVariants = this.logTotalStateForVariants;
       var articles = this.getDivaArticles();
       //if boxplanner needs to be working, the planner needs to be cloned too
       //this.setState.plannerHandler = this.setState.plannerHandler.clonePlannerHandler(clonedSet, this);
@@ -33665,7 +33836,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
         }
         configStepKey = configStepKey + '_' + 'acc' + (set.CatalogData.forceConfigAllAccessoires ? article.articleCodex : basketId);
       }
-      var plaBasketIds = Object.keys(articles[basketId].getRecursivePartlistArticles(true));
+      var plaBasketIds = Object.keys(articles[basketId].getRecursivePartlistArticles(true, true));
       var singleOPVOnly = ops.visibleCount == 1 && !ops.isFreeText && !set.CatalogData.dontHideOption.includes(ops.option.codex) && !((_set$ViewConfig3 = set.ViewConfig) !== null && _set$ViewConfig3 !== void 0 && _set$ViewConfig3.showSingleOPVOnly);
       var isAccessoire = !!article.relatedToBasketId ? article.articleCodex : false;
       if (!configTree.getTabGroupByCodex(tabGroupCodex)) {
@@ -34091,7 +34262,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
           notTotallyMatichingOPVs = false,
           myOptionState = undefined;
         for (var i = 0; i < configStep.targetArticles.length; i++) {
-          var _myOptionState;
+          var _myOptionState, _myOptionState$idmVar;
           var article = articles[configStep.targetArticles[i]];
           myOptionState = article.getArticleOptionState(configStep.option);
           if (!myOptionState) throw new Error('myOptionState ' + configStep.option + ' is undefined');
@@ -34103,7 +34274,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
           if (myOptionState.isFreeText && myOptionState.freeTextLang) {
             freeTextLang = myOptionState.freeTextLang;
           }
-          if (myOptionState.headerPosVariationType == 'V' || myOptionState.idmVariantenArt == 35) {
+          if (myOptionState.headerPosVariationType == 'V' || [35, 1035].includes((_myOptionState$idmVar = myOptionState.idmVariantenArt) !== null && _myOptionState$idmVar !== void 0 ? _myOptionState$idmVar : 0)) {
             // 35 is the seatingheight. Articles should not be albe to have different seatheight
             //get schnittmenge of all the articles
             if (i === 0) {
@@ -36180,7 +36351,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           var _article$partListPare, _article$partListPare2;
           return group.includes((_article$partListPare = (_article$partListPare2 = article.partListParentArticle) === null || _article$partListPare2 === void 0 ? void 0 : _article$partListPare2.basketId) !== null && _article$partListPare !== void 0 ? _article$partListPare : '');
         });
-        if (group) {
+        if (group && !article.partlistArticleStandalone) {
           group.push(article.basketId);
         } else {
           groupedArticles.push([article.basketId]);
@@ -36297,16 +36468,26 @@ var DivaSetHandler = /*#__PURE__*/function () {
             case 2:
               opt = set.CatalogData.getOption((_configItems$0$option = configItems[0].optionOcd) !== null && _configItems$0$option !== void 0 ? _configItems$0$option : configItems[0].op);
               previewType = set.api.pricePreview;
-              if (!(!opt || !previewType || previewType == 'off' || opt.mergeIDMToOPG || opt.isDescribingState || configItems[0].isOPVG || configItems.length == 1 || opt.showOnSeparatTabgroup || set.PlannerMode === 'BoxPlanner' || ['TEXTBOX', 'NUMBERBOX', 'RANGE'].includes(paletteType) || (_set$api$ReturnToFrom = set.api.ReturnToFromParams) !== null && _set$api$ReturnToFrom !== void 0 && _set$api$ReturnToFrom.includes('PRODUCTCREATOR') || configItems.length > 300 && !configItems[0].groupName || (_set$CatalogData$show = set.CatalogData.showPricePreviewOnlyOnOptions) !== null && _set$CatalogData$show !== void 0 && _set$CatalogData$show.length && !set.CatalogData.showPricePreviewOnlyOnOptions.includes(opt.codex.substring(3)) || (_set$CatalogData$hide = set.CatalogData.hidePricePreviewOnlyOnOptions) !== null && _set$CatalogData$hide !== void 0 && _set$CatalogData$hide.length && set.CatalogData.hidePricePreviewOnlyOnOptions.includes(opt.codex.substring(3)))) {
+              if (!(!opt || opt.mergeIDMToOPG || configItems[0].isOPVG || opt.showOnSeparatTabgroup || set.PlannerMode === 'BoxPlanner' || ['TEXTBOX', 'NUMBERBOX', 'RANGE'].includes(paletteType) || (_set$api$ReturnToFrom = set.api.ReturnToFromParams) !== null && _set$api$ReturnToFrom !== void 0 && _set$api$ReturnToFrom.includes('PRODUCTCREATOR'))) {
                 _context26.next = 6;
                 break;
               }
               return _context26.abrupt("return", configItems);
             case 6:
+              if (!(!previewType || previewType == 'off' || configItems.length == 1 || opt.isDescribingState || configItems.length > 300 && !configItems[0].groupName || (_set$CatalogData$show = set.CatalogData.showPricePreviewOnlyOnOptions) !== null && _set$CatalogData$show !== void 0 && _set$CatalogData$show.length && !set.CatalogData.showPricePreviewOnlyOnOptions.includes(opt.codex.substring(3)) || (_set$CatalogData$hide = set.CatalogData.hidePricePreviewOnlyOnOptions) !== null && _set$CatalogData$hide !== void 0 && _set$CatalogData$hide.length && set.CatalogData.hidePricePreviewOnlyOnOptions.includes(opt.codex.substring(3)))) {
+                _context26.next = 9;
+                break;
+              }
+              if (set.logTotalStateForVariants) {
+                _context26.next = 9;
+                break;
+              }
+              return _context26.abrupt("return", configItems);
+            case 9:
               targetArticles = set.configTree.getTargetArticles(configStepKey);
-              _context26.next = 9;
+              _context26.next = 12;
               return this.calcVariants(set, configItems, targetArticles, opt.codex);
-            case 9:
+            case 12:
               variants = _context26.sent;
               if (previewType) {
                 configItems.map(function (c, index) {
@@ -36317,7 +36498,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 });
               }
               return _context26.abrupt("return", configItems);
-            case 12:
+            case 15:
             case "end":
               return _context26.stop();
           }
@@ -36338,7 +36519,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
             case 0:
               variantInfo = [];
               set = realSet.cloneSet();
-              articles = set.getDivaArticles();
+              articles = set.getDivaArticles(true);
               origPrice = set.getSetPrice();
               articleConfigs = {};
               for (i = 0; i < targetArticles.length; i++) {
@@ -36445,7 +36626,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               }
               hash = DivaUtils.md5(JSON.stringify([].concat(hashVariantValues, _toConsumableArray__default["default"](Object.values(totalConfig)))));
               dataHash = set.CatalogData.getVariantsPriceByHash(hash);
-              if (!dataHash) {
+              if (!(dataHash && (!set.logTotalStateForVariants || dataHash.articleSnapshot))) {
                 _context28.next = 21;
                 break;
               }
@@ -36480,7 +36661,8 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 calcTime: calcTime,
                 firstPrice: firstPrice,
                 variantValues: hashVariantValues,
-                hashObj: [].concat(hashVariantValues, _toConsumableArray__default["default"](Object.values(totalConfig)))
+                hashObj: [].concat(hashVariantValues, _toConsumableArray__default["default"](Object.values(totalConfig))),
+                articleSnapshot: set.logTotalStateForVariants ? set.cloneSet().getDivaArticles() : undefined
               };
               set.CatalogData.setVariantsPriceByHash(hash, priceObj);
               return _context28.abrupt("return", priceObj);
@@ -37549,7 +37731,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     this.plannerConfig = plannerConfig;
     this.assignNewDivaNr = !!this.plannerConfig.assignNewDivaNr;
     this._handler = plannerConfig.handler;
-    if (this.plannerConfig.divaNr == undefined && this.plannerConfig.basketData == undefined && this.plannerConfig.catalogCodex == undefined && this.plannerConfig.productId == undefined && this.plannerConfig.customProductId == undefined && this.plannerConfig.returnTo != 'TEST_CONFIGURATORLOGIC' && !((_this$plannerConfig$s = this.plannerConfig.settings) !== null && _this$plannerConfig$s !== void 0 && (_this$plannerConfig$s = _this$plannerConfig$s.viewConfig) !== null && _this$plannerConfig$s !== void 0 && (_this$plannerConfig$s = _this$plannerConfig$s.plannerType) !== null && _this$plannerConfig$s !== void 0 && _this$plannerConfig$s.includes('PRODUCTS') || (_this$plannerConfig$s2 = this.plannerConfig.settings) !== null && _this$plannerConfig$s2 !== void 0 && (_this$plannerConfig$s2 = _this$plannerConfig$s2.viewConfig) !== null && _this$plannerConfig$s2 !== void 0 && (_this$plannerConfig$s2 = _this$plannerConfig$s2.plannerType) !== null && _this$plannerConfig$s2 !== void 0 && _this$plannerConfig$s2.includes('PROMOTED'))) {
+    if (this.plannerConfig.divaNr == undefined && this.plannerConfig.basketData == undefined && this.plannerConfig.catalogCodex === undefined && this.plannerConfig.productId == undefined && this.plannerConfig.customProductId == undefined && this.plannerConfig.returnTo != 'TEST_CONFIGURATORLOGIC' && !((_this$plannerConfig$s = this.plannerConfig.settings) !== null && _this$plannerConfig$s !== void 0 && (_this$plannerConfig$s = _this$plannerConfig$s.viewConfig) !== null && _this$plannerConfig$s !== void 0 && (_this$plannerConfig$s = _this$plannerConfig$s.plannerType) !== null && _this$plannerConfig$s !== void 0 && _this$plannerConfig$s.includes('PRODUCTS') || (_this$plannerConfig$s2 = this.plannerConfig.settings) !== null && _this$plannerConfig$s2 !== void 0 && (_this$plannerConfig$s2 = _this$plannerConfig$s2.viewConfig) !== null && _this$plannerConfig$s2 !== void 0 && (_this$plannerConfig$s2 = _this$plannerConfig$s2.plannerType) !== null && _this$plannerConfig$s2 !== void 0 && _this$plannerConfig$s2.includes('PROMOTED'))) {
       LOG$8.error(new DivaUtils.DivaError('Keine Öffnungsparameter', {
         code: 'WC_0003'
       }));
@@ -37676,7 +37858,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
             case 22:
               this.baskets[this.divaNr] = this.plannerConfig.basketData;
               if (!this.baskets[this.divaNr].CustomerJourneyId) this.baskets[this.divaNr].CustomerJourneyId = DivaUtils.nanoid();
-              if (this.actBasket.OrigCatalogCodex) {
+              if (this.actBasket.OrigCatalogCodex !== undefined) {
                 this.origConfiguration.originCatalogCodex = this.actBasket.OrigCatalogCodex;
                 this.origConfiguration.originArticleCodexes = this.actBasket.OrigArticleCodexes;
               } else if (this.actBasket.OrigDivaNr) {
@@ -37687,7 +37869,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               this.hasConfiguratorSessionId = true;
               returnSuccessfully = true;
             case 29:
-              if (!this.plannerConfig.catalogCodex) {
+              if (!(this.plannerConfig.catalogCodex !== undefined)) {
                 _context.next = 33;
                 break;
               }
@@ -37982,7 +38164,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               LOG$8.debug('divaNr: ' + divaNr + ' was loaded successfully from server!');
               if (basketFromAPI.OrigDivaNr) {
                 this.origConfiguration.originDivaNr = basketFromAPI.OrigDivaNr;
-              } else if (basketFromAPI.OrigCatalogCodex) {
+              } else if (basketFromAPI.OrigCatalogCodex !== undefined) {
                 this.origConfiguration.originCatalogCodex = basketFromAPI.OrigCatalogCodex;
                 this.origConfiguration.originArticleCodexes = basketFromAPI.OrigArticleCodexes;
               } else {
@@ -38352,7 +38534,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
   }, {
     key: "fillOrigConfigurations",
     value: function fillOrigConfigurations() {
-      if (this.origConfiguration.originCatalogCodex) {
+      if (this.origConfiguration.originCatalogCodex !== undefined) {
         this.actBasket.OrigCatalogCodex = this.origConfiguration.originCatalogCodex;
         this.actBasket.OrigArticleCodexes = this.origConfiguration.originArticleCodexes;
         this.actBasket.OrigDivaNr = undefined;
@@ -38398,7 +38580,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               _context11.next = 19;
               break;
             case 17:
-              if (!(response === 'ERROR_NO_BASKET_SAVED' || response === 'ERROR_BASKET_AFTER_SAVE')) {
+              if (!(response === 'ERROR_NO_BASKET_SAVED' || response === 'ERROR_BASKET_AFTER_SAVE' || response === 'ERROR_NO_BASKET_SAVED_ENTITY_EXISTS')) {
                 _context11.next = 19;
                 break;
               }
@@ -38555,7 +38737,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context12.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-85b20c41.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-6f5672b9.js'); });
             case 5:
               _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -38563,7 +38745,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 9:
               _context12.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-11ecd966.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-e1f87ae3.js'); });
             case 11:
               _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -38571,7 +38753,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 15:
               _context12.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-5ebc3e01.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-d3864f70.js'); });
             case 17:
               _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -38579,7 +38761,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 21:
               _context12.next = 23;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-63132754.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-db6b5fca.js'); });
             case 23:
               _yield$import4 = _context12.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -40007,7 +40189,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-1c1b8c1a.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-77d09d15.js'); });
             case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -41564,7 +41746,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context4.next = 10;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-d13cca7a.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-32079554.js'); });
             case 10:
               _yield$import = _context4.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -41575,7 +41757,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context4.abrupt("break", 21);
             case 15:
               _context4.next = 17;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-10481078.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-34742921.js'); });
             case 17:
               _yield$import2 = _context4.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -43622,9 +43804,9 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     }
   }, {
     key: "getDivaArticles",
-    value: function getDivaArticles() {
+    value: function getDivaArticles(visiblePartlistArticlesAlso, allPartlistArticlesAlso) {
       var _this$actSet3;
-      return (_this$actSet3 = this.actSet()) === null || _this$actSet3 === void 0 ? void 0 : _this$actSet3.getDivaArticles();
+      return (_this$actSet3 = this.actSet()) === null || _this$actSet3 === void 0 ? void 0 : _this$actSet3.getDivaArticles(visiblePartlistArticlesAlso, allPartlistArticlesAlso);
     }
 
     //for debugging
@@ -44555,11 +44737,11 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               this.divaBasketHandler.fillOrigConfigurations();
               actBasket.Updated = Date.now();
               if (!returnTo) {
-                _context27.next = 51;
+                _context27.next = 52;
                 break;
               }
               _context27.t3 = returnTo;
-              _context27.next = _context27.t3 === 'OPEN_SELLER_PRODUCTCREATOR' ? 27 : _context27.t3 === 'OPEN_SELLER_BASKET' ? 30 : _context27.t3 === 'OPEN_PDF' ? 32 : _context27.t3 === 'SAVE_BASKET_WITH_MODAL' ? 32 : _context27.t3 === 'SAVE_BASKET' ? 32 : _context27.t3 === 'SAVE_BASKET_SYNC' ? 32 : _context27.t3 === 'OPEN_LEAFLET_BARRIER' ? 32 : 51;
+              _context27.next = _context27.t3 === 'OPEN_SELLER_PRODUCTCREATOR' ? 27 : _context27.t3 === 'OPEN_SELLER_BASKET' ? 30 : _context27.t3 === 'OPEN_PDF' ? 33 : _context27.t3 === 'SAVE_BASKET_WITH_MODAL' ? 33 : _context27.t3 === 'SAVE_BASKET' ? 33 : _context27.t3 === 'SAVE_BASKET_SYNC' ? 33 : _context27.t3 === 'OPEN_LEAFLET_BARRIER' ? 33 : 52;
               break;
             case 27:
               (_this$actions35 = this.actions) === null || _this$actions35 === void 0 || _this$actions35.toggleLoading('buildScene', false, false);
@@ -44573,8 +44755,11 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                   basketData: actBasket
                 }
               });
-              return _context27.abrupt("break", 51);
+              return _context27.abrupt("break", 52);
             case 30:
+              if (this.divaBasketHandler.basketWasSavedWithCurrentDocVersion) {
+                actBasket.setDocumentVersion(actBasket.getDocumentVersion() + 1);
+              }
               (_this$actions37 = this.actions) === null || _this$actions37 === void 0 || _this$actions37.openComponent({
                 type: 'SELLER',
                 parameters: {
@@ -44585,51 +44770,51 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                   basketData: actBasket
                 }
               });
-              return _context27.abrupt("break", 51);
-            case 32:
+              return _context27.abrupt("break", 52);
+            case 33:
               if (!(event == 'onSaveProduct')) {
-                _context27.next = 42;
+                _context27.next = 43;
                 break;
               }
               //copy basket, so we only save a copy as baseconfiguration and can continue working with the original basket
               actBasket = new basketModel.BasketData(JSON.parse(JSON.stringify(actBasket)));
-              _context27.next = 36;
+              _context27.next = 37;
               return DivaUtils__default["default"].updateBasketOrgInfo(actBasket, this.plannerConfig.currentOrganization, this.plannerConfig.currentUser);
-            case 36:
-              _context27.next = 38;
+            case 37:
+              _context27.next = 39;
               return this.api.getDataWithoutCache(this.api.getUniqueNewDivaNr(), undefined, 'basket');
-            case 38:
+            case 39:
               newDivaNr = _context27.sent;
               actBasket.convertToBaseConfiguration(newDivaNr.divaNr);
-              _context27.next = 50;
+              _context27.next = 51;
               break;
-            case 42:
+            case 43:
               if (this.divaBasketHandler.basketWasSavedWithCurrentDocVersion) {
                 this.divaBasketHandler.basketWasSavedWithCurrentDocVersion = undefined;
                 actBasket.setDocumentVersion(actBasket.getDocumentVersion() + 1);
               }
               this.divaBasketHandler.basketWasSavedWithCurrentDocVersion = true;
               actBasket.setDivaNr(this.divaBasketHandler.actDivaNr.split('-').length > 2 ? this.divaBasketHandler.actDivaNr.split('-')[0] + '-' + this.divaBasketHandler.actDivaNr.split('-')[1] : this.divaBasketHandler.actDivaNr);
-              _context27.next = 47;
+              _context27.next = 48;
               return this.divaBasketHandler.saveToBasket(this.api, actBasket, returnTo);
-            case 47:
+            case 48:
               _result2 = _context27.sent;
               if (!(_result2 === 'ERROR_NO_BASKET_SAVED' || _result2 === 'ERROR_BASKET_AFTER_SAVE')) {
-                _context27.next = 50;
+                _context27.next = 51;
                 break;
               }
               return _context27.abrupt("return", 'canceled');
-            case 50:
-              return _context27.abrupt("break", 51);
             case 51:
+              return _context27.abrupt("break", 52);
+            case 52:
               if (returnTo == 'DONT_SAVE_BASKET') event = 'dontSaveBasket';
               actBasket = (_this$divaBasketHandl2 = this.divaBasketHandler.getBasketData(actBasket.DivaNr, actBasket.DocumentVersion)) !== null && _this$divaBasketHandl2 !== void 0 ? _this$divaBasketHandl2 : actBasket; //get pdf documenturl from saved basket
-              _context27.next = 55;
+              _context27.next = 56;
               return this.addToBasket(actBasket, event);
-            case 55:
+            case 56:
               product = _context27.sent;
               return _context27.abrupt("return", product !== null && product !== void 0 ? product : 'saved');
-            case 57:
+            case 58:
             case "end":
               return _context27.stop();
           }
@@ -44679,7 +44864,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       //if planner is hidden by config but nothing is planned initially
       if (plannerType === 'NONE') {
         var _this$plannerConfig$a8, _this$actSet11;
-        if (!this.plannerConfig.divaNr && this.plannerConfig.catalogCodex && !((_this$plannerConfig$a8 = this.plannerConfig.articleCodexes) !== null && _this$plannerConfig$a8 !== void 0 && _this$plannerConfig$a8.length) && !this.plannerConfig.productId && !this.plannerConfig.customProductId && !this.plannerConfig.basketData && !((_this$actSet11 = this.actSet()) !== null && _this$actSet11 !== void 0 && (_this$actSet11 = _this$actSet11.CatalogData.startPlannerArticle) !== null && _this$actSet11 !== void 0 && _this$actSet11.length)) {
+        if (!this.plannerConfig.divaNr && this.plannerConfig.catalogCodex !== undefined && !((_this$plannerConfig$a8 = this.plannerConfig.articleCodexes) !== null && _this$plannerConfig$a8 !== void 0 && _this$plannerConfig$a8.length) && !this.plannerConfig.productId && !this.plannerConfig.customProductId && !this.plannerConfig.basketData && !((_this$actSet11 = this.actSet()) !== null && _this$actSet11 !== void 0 && (_this$actSet11 = _this$actSet11.CatalogData.startPlannerArticle) !== null && _this$actSet11 !== void 0 && _this$actSet11.length)) {
           plannerType = 'PLANNER';
         }
       }
@@ -44954,39 +45139,39 @@ var DivaWebPlanner = /*#__PURE__*/function () {
             case 0:
               event = _args29.length > 1 && _args29[1] !== undefined ? _args29[1] : 'onAddToBasket';
               _context29.t0 = event;
-              _context29.next = _context29.t0 === 'onWebPlanerPrint' ? 5 : _context29.t0 === 'onWebPlanerSave' ? 7 : _context29.t0 === 'onWebPlanerShare' ? 9 : _context29.t0 === 'onRequestConsulation' ? 11 : _context29.t0 === 'onSave' ? 13 : _context29.t0 === 'onSendEmail' ? 15 : _context29.t0 === 'onSaveProduct' ? 20 : _context29.t0 === 'dontSaveBasket' ? 27 : _context29.t0 === 'onAddToBasket' ? 28 : _context29.t0 === 'onSendContactForm' ? 30 : 33;
+              _context29.next = _context29.t0 === 'onWebPlanerPrint' ? 4 : _context29.t0 === 'onWebPlanerSave' ? 6 : _context29.t0 === 'onWebPlanerShare' ? 8 : _context29.t0 === 'onRequestConsulation' ? 10 : _context29.t0 === 'onSave' ? 12 : _context29.t0 === 'onSendEmail' ? 14 : _context29.t0 === 'onSaveProduct' ? 19 : _context29.t0 === 'dontSaveBasket' ? 26 : _context29.t0 === 'onAddToBasket' ? 26 : _context29.t0 === 'onSendContactForm' ? 28 : 31;
               break;
-            case 5:
+            case 4:
               (_this$actions38 = this.actions) === null || _this$actions38 === void 0 || _this$actions38.onEvent({
                 type: 'onWebPlanerPrint',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 35);
-            case 7:
+              return _context29.abrupt("break", 33);
+            case 6:
               (_this$actions39 = this.actions) === null || _this$actions39 === void 0 || _this$actions39.onEvent({
                 type: 'onWebPlanerSave',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 35);
-            case 9:
+              return _context29.abrupt("break", 33);
+            case 8:
               (_this$actions40 = this.actions) === null || _this$actions40 === void 0 || _this$actions40.onEvent({
                 type: 'onWebPlanerShare',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 35);
-            case 11:
+              return _context29.abrupt("break", 33);
+            case 10:
               (_this$actions41 = this.actions) === null || _this$actions41 === void 0 || _this$actions41.onEvent({
                 type: 'onRequestConsulation',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 35);
-            case 13:
+              return _context29.abrupt("break", 33);
+            case 12:
               (_this$actions42 = this.actions) === null || _this$actions42 === void 0 || _this$actions42.onEvent({
                 type: 'onSave',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 35);
-            case 15:
+              return _context29.abrupt("break", 33);
+            case 14:
               emailConfig = (_this$divaBasketHandl4 = this.divaBasketHandler.emailConfig) !== null && _this$divaBasketHandl4 !== void 0 ? _this$divaBasketHandl4 : this.getEmailConfig(); //reset the emailConfig
               this.divaBasketHandler.emailConfig = undefined;
               if (emailConfig) {
@@ -45020,45 +45205,44 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 35);
-            case 20:
+              return _context29.abrupt("break", 33);
+            case 19:
               this.actSet().CatalogData;
-              _context29.next = 23;
+              _context29.next = 22;
               return this.api.saveAsProduct(this.sets, actBasket);
-            case 23:
+            case 22:
               products = _context29.sent;
               (_this$actions44 = this.actions) === null || _this$actions44 === void 0 || _this$actions44.onEvent({
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
               if (!products) {
-                _context29.next = 27;
+                _context29.next = 26;
                 break;
               }
               return _context29.abrupt("return", products[0]);
-            case 27:
-            case 28:
+            case 26:
               (_this$actions45 = this.actions) === null || _this$actions45 === void 0 || _this$actions45.onEvent({
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 35);
-            case 30:
+              return _context29.abrupt("break", 33);
+            case 28:
               (_this$actions46 = this.actions) === null || _this$actions46 === void 0 || _this$actions46.onEvent({
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
               this.openContactForm(this.divaBasketHandler);
-              return _context29.abrupt("break", 35);
-            case 33:
+              return _context29.abrupt("break", 33);
+            case 31:
               (_this$actions47 = this.actions) === null || _this$actions47 === void 0 || _this$actions47.onEvent({
                 type: event,
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 35);
-            case 35:
+              return _context29.abrupt("break", 33);
+            case 33:
               return _context29.abrupt("return");
-            case 36:
+            case 34:
             case "end":
               return _context29.stop();
           }
@@ -45116,7 +45300,35 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       (_this$api = this.api) === null || _this$api === void 0 || _this$api.clearCache();
       this.divaCatalogs = {};
     }
-
+  }, {
+    key: "getCurrentBasket",
+    value: function () {
+      var _getCurrentBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee30(event, force, returnTo, dontGoToSummary) {
+        var _this$actSet33, _this$divaBasketHandl5, _this$onClickAddToBas3;
+        return _regeneratorRuntime__default["default"].wrap(function _callee30$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
+            case 0:
+              if (!(this.divaBasketHandler.basketWasSavedWithCurrentDocVersion && ((_this$actSet33 = this.actSet()) === null || _this$actSet33 === void 0 ? void 0 : _this$actSet33.setHash) === ((_this$divaBasketHandl5 = this.divaBasketHandler.actBasket) === null || _this$divaBasketHandl5 === void 0 || (_this$divaBasketHandl5 = _this$divaBasketHandl5.OrderSets) === null || _this$divaBasketHandl5 === void 0 ? void 0 : _this$divaBasketHandl5[0].SetHash))) {
+                _context30.next = 2;
+                break;
+              }
+              return _context30.abrupt("return", true);
+            case 2:
+              _context30.next = 4;
+              return (_this$onClickAddToBas3 = this.onClickAddToBasket) === null || _this$onClickAddToBas3 === void 0 ? void 0 : _this$onClickAddToBas3.call(this, event, force, returnTo, dontGoToSummary);
+            case 4:
+              return _context30.abrupt("return", !!_context30.sent);
+            case 5:
+            case "end":
+              return _context30.stop();
+          }
+        }, _callee30, this);
+      }));
+      function getCurrentBasket(_x80, _x81, _x82, _x83) {
+        return _getCurrentBasket.apply(this, arguments);
+      }
+      return getCurrentBasket;
+    }()
     /*********************************END Functions in Logik called From View END *************************************/
     /*********************************** Register Funictions from Logik to View ***************************************/
   }, {
@@ -45339,9 +45551,9 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "initApiForLogicOnly",
     value: //just for testing purposes
     function () {
-      var _initApiForLogicOnly = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee30(organization, lang, getSessionGuid, handler, applicationEnvironment, apiKey, jwt) {
-        return _regeneratorRuntime__default["default"].wrap(function _callee30$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+      var _initApiForLogicOnly = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee31(organization, lang, getSessionGuid, handler, applicationEnvironment, apiKey, jwt) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee31$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
               //empty services
               this.api = new DivaApiHandler(_objectSpread$5(_objectSpread$5({}, this.plannerConfig), {}, {
@@ -45354,17 +45566,17 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 jwt: jwt,
                 apiKey: apiKey
               }), handler);
-              _context30.next = 3;
+              _context31.next = 3;
               return this.divaBasketHandler.initWWSClient(this.api.getWWSClient());
             case 3:
               this.plannerHandler = new DivaPlannerHandler(true);
             case 4:
             case "end":
-              return _context30.stop();
+              return _context31.stop();
           }
-        }, _callee30, this);
+        }, _callee31, this);
       }));
-      function initApiForLogicOnly(_x80, _x81, _x82, _x83, _x84, _x85, _x86) {
+      function initApiForLogicOnly(_x84, _x85, _x86, _x87, _x88, _x89, _x90) {
         return _initApiForLogicOnly.apply(this, arguments);
       }
       return initApiForLogicOnly;
@@ -45377,16 +45589,16 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "loadBasket",
     value: function () {
-      var _loadBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee31() {
-        return _regeneratorRuntime__default["default"].wrap(function _callee31$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+      var _loadBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee32() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee32$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
             case 0:
-              return _context31.abrupt("return", this.divaBasketHandler.initializeBasket(this.api));
+              return _context32.abrupt("return", this.divaBasketHandler.initializeBasket(this.api));
             case 1:
             case "end":
-              return _context31.stop();
+              return _context32.stop();
           }
-        }, _callee31, this);
+        }, _callee32, this);
       }));
       function loadBasket() {
         return _loadBasket.apply(this, arguments);
@@ -45401,39 +45613,39 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "initBasket",
     value: function () {
-      var _initBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee32(init3D, ignoreFavorites) {
+      var _initBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee33(init3D, ignoreFavorites) {
         var initSetState, set, basket;
-        return _regeneratorRuntime__default["default"].wrap(function _callee32$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee33$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
             case 0:
               this.divaNr = this.divaBasketHandler.actDivaNr;
               initSetState = this.getInitStateForSet(!init3D);
               this.plannerHandler.initPlanner(initSetState, this.getPlannerHandlerFunctions());
-              _context32.next = 5;
+              _context33.next = 5;
               return setHandlerInstance.initSetsByOrderSet(this.divaBasketHandler.getOrderSetsByDivaNr(this.divaNr), initSetState);
             case 5:
               //TODO check if when basket gets repaired the product match gets called
               set = this.actSet();
               setHandlerInstance.loadConfigStructureOfActSet(set, this.getCurPlannerType());
               if (!(favoritesHandlerInstance.FavoritesDefined(set) && !ignoreFavorites)) {
-                _context32.next = 10;
+                _context33.next = 10;
                 break;
               }
-              _context32.next = 10;
+              _context33.next = 10;
               return this.handleFavorites(init3D ? 'CALC' : 'REPAIR');
             case 10:
-              _context32.next = 12;
+              _context33.next = 12;
               return setHandlerInstance.fillOrderLinesAndOrderSets(this.sets, this.divaBasketHandler, !init3D, this.doAllowSetPlanner(), this.ReturnTo);
             case 12:
-              basket = _context32.sent;
-              return _context32.abrupt("return", basket);
+              basket = _context33.sent;
+              return _context33.abrupt("return", basket);
             case 14:
             case "end":
-              return _context32.stop();
+              return _context33.stop();
           }
-        }, _callee32, this);
+        }, _callee33, this);
       }));
-      function initBasket(_x87, _x88) {
+      function initBasket(_x91, _x92) {
         return _initBasket.apply(this, arguments);
       }
       return initBasket;
@@ -45447,21 +45659,21 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getValidVariantsLength",
     value: function () {
-      var _getValidVariantsLength = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee33() {
+      var _getValidVariantsLength = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee34() {
         var set;
-        return _regeneratorRuntime__default["default"].wrap(function _callee33$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee34$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
               set = this.actSet();
-              _context33.next = 3;
+              _context34.next = 3;
               return favoritesHandlerInstance.getValidVariants(set, true);
             case 3:
-              return _context33.abrupt("return", _context33.sent.length);
+              return _context34.abrupt("return", _context34.sent.length);
             case 4:
             case "end":
-              return _context33.stop();
+              return _context34.stop();
           }
-        }, _callee33, this);
+        }, _callee34, this);
       }));
       function getValidVariantsLength() {
         return _getValidVariantsLength.apply(this, arguments);
@@ -45471,46 +45683,46 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "handleFavorites",
     value: function () {
-      var _handleFavorites = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee34(mode) {
+      var _handleFavorites = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee35(mode) {
         var _this5 = this;
         var set, i;
-        return _regeneratorRuntime__default["default"].wrap(function _callee34$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee35$(_context35) {
+          while (1) switch (_context35.prev = _context35.next) {
             case 0:
               set = this.actSet();
               i = 0;
             case 2:
               if (!favoritesHandlerInstance.IsCalcForSummary) {
-                _context34.next = 11;
+                _context35.next = 11;
                 break;
               }
-              _context34.next = 5;
+              _context35.next = 5;
               return DivaUtils__default["default"].Sleep(200);
             case 5:
               i++;
               if (!(i > 1000)) {
-                _context34.next = 9;
+                _context35.next = 9;
                 break;
               }
               LOG$1.error(new DivaUtils.DivaError('error on generating Variants of Summary'));
-              return _context34.abrupt("break", 11);
+              return _context35.abrupt("break", 11);
             case 9:
-              _context34.next = 2;
+              _context35.next = 2;
               break;
             case 11:
-              _context34.next = 13;
+              _context35.next = 13;
               return favoritesHandlerInstance.handleFavorites(set, mode, this.divaBasketHandler.actBasket, this.saveToBasketWrapper.bind(this), this.doConfigure.bind(this), function () {
                 return _this5.update2DGrid(set);
               }, this.actions);
             case 13:
-              return _context34.abrupt("return", _context34.sent);
+              return _context35.abrupt("return", _context35.sent);
             case 14:
             case "end":
-              return _context34.stop();
+              return _context35.stop();
           }
-        }, _callee34, this);
+        }, _callee35, this);
       }));
-      function handleFavorites(_x89) {
+      function handleFavorites(_x93) {
         return _handleFavorites.apply(this, arguments);
       }
       return handleFavorites;
@@ -45523,48 +45735,48 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "initSapOrderLinesFromBasket",
     value: function () {
-      var _initSapOrderLinesFromBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee35(divaNr, init3D, onlyLoadOldBakset) {
+      var _initSapOrderLinesFromBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee36(divaNr, init3D, onlyLoadOldBakset) {
         var result, oldBasket, basket;
-        return _regeneratorRuntime__default["default"].wrap(function _callee35$(_context35) {
-          while (1) switch (_context35.prev = _context35.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee36$(_context36) {
+          while (1) switch (_context36.prev = _context36.next) {
             case 0:
               if (divaNr) this.divaBasketHandler.updateDivaNrInBasket(divaNr);
-              _context35.next = 3;
+              _context36.next = 3;
               return this.loadBasket();
             case 3:
-              result = _context35.sent;
+              result = _context36.sent;
               if (!onlyLoadOldBakset) {
-                _context35.next = 6;
+                _context36.next = 6;
                 break;
               }
-              return _context35.abrupt("return", {
+              return _context36.abrupt("return", {
                 oldBasket: new basketModel.BasketData(JSON.parse(JSON.stringify(this.divaBasketHandler.actBasket))),
                 cache: {}
               });
             case 6:
               if (!(result === false)) {
-                _context35.next = 8;
+                _context36.next = 8;
                 break;
               }
               throw new Error('Could not load basket! ' + divaNr);
             case 8:
               oldBasket = new basketModel.BasketData(JSON.parse(JSON.stringify(this.divaBasketHandler.actBasket)));
-              _context35.next = 11;
+              _context36.next = 11;
               return this.initBasket(init3D);
             case 11:
-              basket = _context35.sent;
-              return _context35.abrupt("return", {
+              basket = _context36.sent;
+              return _context36.abrupt("return", {
                 basket: basket,
                 oldBasket: oldBasket,
                 cache: this.api.getJsonDataCache()
               });
             case 13:
             case "end":
-              return _context35.stop();
+              return _context36.stop();
           }
-        }, _callee35, this);
+        }, _callee36, this);
       }));
-      function initSapOrderLinesFromBasket(_x90, _x91, _x92) {
+      function initSapOrderLinesFromBasket(_x94, _x95, _x96) {
         return _initSapOrderLinesFromBasket.apply(this, arguments);
       }
       return initSapOrderLinesFromBasket;