@crystaldesign/web-planner-logic 25.15.0-beta.9 → 25.16.0-beta.1

package/build/esm/{index-9dab2b35.js → index-808fb8b3.js}

@@ -26,8 +26,8 @@ import _typeof from '@babel/runtime/helpers/typeof';
 })();
 
 var _excluded = ["type"];
-function ownKeys$k(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$k(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$k(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$k(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$l(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$l(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$l(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$l(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 // Import types from AI service
 
 var LOG$p = DivaUtils.initLog('Planner', 'WEB-PLANNER-LOGIC');
@@ -264,8 +264,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
               if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig2 = this.apiConfig) !== null && _this$apiConfig2 !== void 0 && _this$apiConfig2.api2.web) {
                 api2Url = this.apiConfig.api2.web;
               }
-              _context2.t0 = _objectSpread$k;
-              _context2.t1 = _objectSpread$k({}, init.config.headers);
+              _context2.t0 = _objectSpread$l;
+              _context2.t1 = _objectSpread$l({}, init.config.headers);
               _context2.t2 = {};
               _context2.next = 21;
               return this.getSessionGuid('V', undefined, this.OrganizationId, api2Url);
@@ -1222,11 +1222,11 @@ var DivaApiHandler = /*#__PURE__*/function () {
               headers = this.getAiServiceAuthHeaders(leadKey);
               _context9.next = 4;
               return this.fetchData(url, {
-                data: _objectSpread$k(_objectSpread$k({}, data), {}, {
+                data: _objectSpread$l(_objectSpread$l({}, data), {}, {
                   organizationId: this.OrganizationId
                 }),
                 config: {
-                  headers: _objectSpread$k(_objectSpread$k({}, headers), {}, {
+                  headers: _objectSpread$l(_objectSpread$l({}, headers), {}, {
                     'X-Session-Id': DivaUtils.SessionId,
                     'X-Configurator-Id': (_DivaUtils$Configurat = DivaUtils.ConfigurationId) !== null && _DivaUtils$Configurat !== void 0 ? _DivaUtils$Configurat : ''
                   })
@@ -2247,6 +2247,11 @@ var OptionCatalogData = /*#__PURE__*/function () {
     get: function get() {
       return this.opt.propertyObj.isDefaultValueForOptions;
     }
+  }, {
+    key: "checkForReversed",
+    get: function get() {
+      return this.opt.propertyObj.checkForReversed;
+    }
   }, {
     key: "freetextDefaultValue",
     get: function get() {
@@ -2409,6 +2414,16 @@ var setOptionsProperties = function setOptionsProperties(catalogData, opt, prope
       case 'ISDEFAULTVALUEFOROPTIONS':
         opt.isDefaultValueForOptions = prop.Value;
         break;
+      case 'CHECK_FOR_REVERSE_CHANGES':
+        if (prop.Value) {
+          opt.checkForReversed = {
+            checkForReversingChanges: prop.Value.startsWith('BLOCK') ? 'BLOCK' : 'WARN',
+            checkOnlyForOptions: prop.Value.split(';').slice(1).map(function (t) {
+              return (!catalogData.isIDMFormat ? 'OPT' : '') + t;
+            })
+          };
+        }
+        break;
       case 'FREETEXT_DEFAULT_VALUE':
         opt.freetextDefaultValue = prop.Value;
         break;
@@ -16702,9 +16717,9 @@ var setOptionValueProperties = function setOptionValueProperties(catalogData, op
   return metaDatas;
 };
 
-function _createForOfIteratorHelper$b(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$b(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray$b(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$b(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$b(r, a) : void 0; } }
-function _arrayLikeToArray$b(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _createForOfIteratorHelper$c(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$c(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray$c(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$c(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$c(r, a) : void 0; } }
+function _arrayLikeToArray$c(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 //kaufmännischer Artikel
 var CatalogArticleData = /*#__PURE__*/function () {
   function CatalogArticleData(catalogArticle, catalogData) {
@@ -17073,6 +17088,11 @@ var CatalogArticleData = /*#__PURE__*/function () {
     get: function get() {
       return this._catalogArticle.decisions;
     }
+  }, {
+    key: "articleReferencedDecisions",
+    get: function get() {
+      return this._catalogArticle.articleReferencedDecisions;
+    }
   }, {
     key: "articleIDMDecisions",
     get: function get() {
@@ -17441,7 +17461,7 @@ var CatalogArticleData = /*#__PURE__*/function () {
     value: function getOptionValueFromOption(opt, opv) {
       if (this._catalogArticle.articleOptions[opt] && this._catalogArticle.articleOptions[opt].hasOPG) {
         var myOPGs = this._catalogArticle.articleOptions[opt].articleOptionValues;
-        var _iterator = _createForOfIteratorHelper$b(myOPGs),
+        var _iterator = _createForOfIteratorHelper$c(myOPGs),
           _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -17632,6 +17652,7 @@ function getCatalogArticle$1(jsonArticle, catalogData) {
     arePricesLoaded: false,
     articleOptions: {},
     decisions: [],
+    articleReferencedDecisions: [],
     idmDecisions: [],
     properties: properties,
     image: jsonArticle.Image && jsonArticle.Image != '' ? jsonArticle.Image : undefined,
@@ -18569,9 +18590,9 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
   }]);
 }();
 
-function _createForOfIteratorHelper$a(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$a(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray$a(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$a(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$a(r, a) : void 0; } }
-function _arrayLikeToArray$a(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _createForOfIteratorHelper$b(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$b(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray$b(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$b(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$b(r, a) : void 0; } }
+function _arrayLikeToArray$b(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var ArticleOptionData = /*#__PURE__*/function () {
   function ArticleOptionData(opt, catalogData) {
     var _this$tabGroup, _this$opt$property;
@@ -18667,7 +18688,7 @@ var ArticleOptionData = /*#__PURE__*/function () {
   }, {
     key: "getOpvByOcd",
     value: function getOpvByOcd(codex) {
-      var _iterator = _createForOfIteratorHelper$a(this.opt.articleOptionValues),
+      var _iterator = _createForOfIteratorHelper$b(this.opt.articleOptionValues),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -18829,6 +18850,11 @@ var ArticleOptionData = /*#__PURE__*/function () {
       if (this.opt.propertyObj.isDefaultValueForOptions !== undefined) return this.opt.propertyObj.isDefaultValueForOptions;
       return this.opt.catalogOPT.isDefaultValueForOptions;
     }
+  }, {
+    key: "checkForReversed",
+    get: function get() {
+      return this.opt.catalogOPT.checkForReversed;
+    }
   }, {
     key: "freetextDefaultValue",
     get: function get() {
@@ -19032,6 +19058,9 @@ function _loadMoreFromDivaArticle() {
           if (json.Decisions && json.Decisions.length > 0) {
             catalogArticle.decisions = json.Decisions;
             initDecisions(catalog, catalogArticleData);
+            catalogArticle.articleReferencedDecisions = catalogArticle.decisions.filter(function (d) {
+              return json.DecisionRefs == undefined || json.DecisionRefs.includes(d.Number);
+            });
           }
           if (json.TemplateCodex) catalogArticle.templateCodex = json.TemplateCodex;
           if (json.RetailArticleNr) catalogArticle.retailArticleNr = json.RetailArticleNr;
@@ -19225,6 +19254,9 @@ function loadArticleOptions(json, catalogArticleData, set) {
   if (json.Decisions && json.Decisions.length > 0) {
     catalogArticle.decisions = JSON.parse(JSON.stringify(json.Decisions));
     initDecisions(set.CatalogData, catalogArticleData);
+    catalogArticle.articleReferencedDecisions = catalogArticle.decisions.filter(function (d) {
+      return json.DecisionRefs == undefined || json.DecisionRefs.includes(d.Number);
+    });
   }
   if (json.PartLists && json.PartLists.length > 0) {
     catalogArticle.partListArticles = json.PartLists;
@@ -19439,8 +19471,8 @@ function getArticleOptionValueType(set, codex, jsonOPV, catalogOPV, myArticle, i
   return opv;
 }
 
-function ownKeys$j(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$j(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$j(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$j(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$k(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$k(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$k(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$k(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$k = DivaUtils.initLog('Planner', 'WEB-PLANNER-LOGIC');
 function loadMoreFromIDMArticles(_x, _x2) {
   return _loadMoreFromIDMArticles.apply(this, arguments);
@@ -19724,11 +19756,11 @@ var getPriceFeatureGroups = function getPriceFeatureGroups(catalogArticleDatas,
 var initializeDecision = function initializeDecision(decision, idmOptionGroups) {
   var _decision$optionCombi;
   var optionCombinations = (_decision$optionCombi = decision.optionCombinations) === null || _decision$optionCombi === void 0 ? void 0 : _decision$optionCombi.map(function (c) {
-    return _objectSpread$j(_objectSpread$j({}, c), {}, {
+    return _objectSpread$k(_objectSpread$k({}, c), {}, {
       projectOptionsSetRefs: parseOptionSetRef(c.projectOptionsSetRefs, idmOptionGroups)
     });
   });
-  return _objectSpread$j(_objectSpread$j({}, decision), {}, {
+  return _objectSpread$k(_objectSpread$k({}, decision), {}, {
     optionCombinations: optionCombinations === null || optionCombinations === void 0 ? void 0 : optionCombinations.sort(function (a, b) {
       return a.sequence - b.sequence;
     })
@@ -19737,11 +19769,11 @@ var initializeDecision = function initializeDecision(decision, idmOptionGroups)
 var initializePriceFeatureGroups = function initializePriceFeatureGroups(priceFeatureGroup, idmOptionGroups) {
   var _priceFeatureGroup$pr;
   var finishes = (_priceFeatureGroup$pr = priceFeatureGroup.projectFinishes) === null || _priceFeatureGroup$pr === void 0 ? void 0 : _priceFeatureGroup$pr.map(function (c) {
-    return _objectSpread$j(_objectSpread$j({}, c), {}, {
+    return _objectSpread$k(_objectSpread$k({}, c), {}, {
       projectOptionsSetRefs: c.optionsSetRef ? parseOptionSetRef(c.optionsSetRef, idmOptionGroups) : []
     });
   });
-  return _objectSpread$j(_objectSpread$j({}, priceFeatureGroup), {}, {
+  return _objectSpread$k(_objectSpread$k({}, priceFeatureGroup), {}, {
     projectFinishes: finishes === null || finishes === void 0 ? void 0 : finishes.sort(function (a, b) {
       return a.sequence - b.sequence;
     })
@@ -20093,6 +20125,7 @@ function getCatalogArticle(article, catalogData) {
     typeNr: article.eanNumber,
     configArticleCodex: article.edpNumber,
     decisions: [],
+    articleReferencedDecisions: [],
     idmDecisions: [],
     decisionsRefs: article.decisionRefs,
     catalogCodex: catalogData.catalogCodex,
@@ -20277,8 +20310,8 @@ function initCatalogPlannerArticleView(catalogData, catPlanArticle, catalogProps
   });
 }
 
-function ownKeys$i(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$i(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$i(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$i(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$j(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$j(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$j(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$j(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 
 /*
 Diese KLasse enthält Inforamtion zu einem Catalog (C)
@@ -21349,7 +21382,7 @@ var DivaCatalogData = /*#__PURE__*/function () {
   }, {
     key: "setVariantsPriceByHash",
     value: function setVariantsPriceByHash(hash, data) {
-      this.variantsPriceHashObj[hash] = _objectSpread$i(_objectSpread$i({}, data), {}, {
+      this.variantsPriceHashObj[hash] = _objectSpread$j(_objectSpread$j({}, data), {}, {
         calcTime: -1
       });
     }
@@ -21869,7 +21902,7 @@ var DivaCatalogData = /*#__PURE__*/function () {
 var mapMask = function mapMask(mask) {
   var _mappedMask$catalog;
   if (!mask) return undefined;
-  var mappedMask = _objectSpread$i({}, mask);
+  var mappedMask = _objectSpread$j({}, mask);
   var mapProperties = function mapProperties(props) {
     if (Array.isArray(props)) return props;
     var mappedProps = [];
@@ -21899,8 +21932,8 @@ var mapMask = function mapMask(mask) {
   return mappedMask;
 };
 
-function ownKeys$h(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$h(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$h(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$h(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$i(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$i(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$i(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$i(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 //import IDMCatalogData from '../model/Catalog/IDMCatalogData';
 
 var LOG$h = DivaUtils.initLog('Planner', 'WEB-PLANNER-LOGIC');
@@ -22118,7 +22151,7 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
               }
               throw new Error('Serie not found: ' + serieNo);
             case 11:
-              catalogData = new DivaCatalogData(_objectSpread$h(_objectSpread$h({}, serieData[0]), {}, {
+              catalogData = new DivaCatalogData(_objectSpread$i(_objectSpread$i({}, serieData[0]), {}, {
                 catalogData: catalogApiData
               }), serieNo, orderSet, state.api, itemsList, undefined, true, additionalModelInfos);
               return _context4.abrupt("return", catalogData);
@@ -22165,11 +22198,11 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
 }();
 var catalogHandlerInstance = new DivaCatalogHandler();
 
-function ownKeys$g(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$g(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$g(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$g(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _createForOfIteratorHelper$9(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$9(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray$9(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$9(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$9(r, a) : void 0; } }
-function _arrayLikeToArray$9(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function ownKeys$h(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$h(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$h(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$h(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _createForOfIteratorHelper$a(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$a(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray$a(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$a(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$a(r, a) : void 0; } }
+function _arrayLikeToArray$a(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var ArticleOptionStateData = /*#__PURE__*/function () {
   function ArticleOptionStateData(option, getIsConfigSingle, defaultOPV, useIsOptionDefinedWarning) {
     _classCallCheck(this, ArticleOptionStateData);
@@ -22271,7 +22304,7 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
         return opv.codex;
       })) !== null && _this$articleOptionSt !== void 0 ? _this$articleOptionSt : [];
       var option = this.option;
-      var _iterator = _createForOfIteratorHelper$9(option.articleOptionValues),
+      var _iterator = _createForOfIteratorHelper$a(option.articleOptionValues),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -22281,7 +22314,7 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
           if (value.isOPVG) {
             var _opg$articleOptionVal;
             var opg = value;
-            var _iterator2 = _createForOfIteratorHelper$9((_opg$articleOptionVal = opg.articleOptionValues) !== null && _opg$articleOptionVal !== void 0 ? _opg$articleOptionVal : new Map()),
+            var _iterator2 = _createForOfIteratorHelper$a((_opg$articleOptionVal = opg.articleOptionValues) !== null && _opg$articleOptionVal !== void 0 ? _opg$articleOptionVal : new Map()),
               _step2;
             try {
               for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -22747,7 +22780,7 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
     get: function get() {
       if (!this.option.onlyVisibleIfNotDocked) return undefined;
       var ret = {};
-      var _iterator3 = _createForOfIteratorHelper$9(this.visibleOptionValues.keys()),
+      var _iterator3 = _createForOfIteratorHelper$a(this.visibleOptionValues.keys()),
         _step3;
       try {
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -22903,20 +22936,22 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
     key: "cloneOptionState",
     value: function cloneOptionState(getIsConfigSingle) {
       var clonedOps = new ArticleOptionStateData(this.option, getIsConfigSingle);
-      clonedOps.articleOptionState = _objectSpread$g(_objectSpread$g({}, this.articleOptionState), {}, {
-        imageOPVs: _objectSpread$g({}, this.articleOptionState.imageOPVs),
+      clonedOps.articleOptionState = _objectSpread$h(_objectSpread$h({}, this.articleOptionState), {}, {
+        imageOPVs: _objectSpread$h({}, this.articleOptionState.imageOPVs),
         visibleOPVs: new Map(this.articleOptionState.visibleOPVs),
         visibleOPVsImages: new Map(this.articleOptionState.visibleOPVsImages),
-        favoriteOPVs: _objectSpread$g({}, this.articleOptionState.favoriteOPVs)
+        favoriteOPVs: _objectSpread$h({}, this.articleOptionState.favoriteOPVs)
       });
       return clonedOps;
     }
   }]);
 }();
 
-function _createForOfIteratorHelper$8(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$8(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray$8(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$8(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$8(r, a) : void 0; } }
-function _arrayLikeToArray$8(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function ownKeys$g(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$g(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$g(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$g(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _createForOfIteratorHelper$9(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$9(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray$9(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$9(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$9(r, a) : void 0; } }
+function _arrayLikeToArray$9(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var LOG$g = DivaUtils.initLog('Planner', 'WEB-PLANNER-LOGIC');
 var DivaEngine = /*#__PURE__*/function () {
   function DivaEngine(article) {
@@ -22935,7 +22970,7 @@ var DivaEngine = /*#__PURE__*/function () {
       var maxPriceOfGroup = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
       var maxPriceOfGroupCodex = ['', '', '', '', '', '', '', '', '', ''];
       var previousVaraintValues = this.article.VariantValues;
-      var _iterator = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+      var _iterator = _createForOfIteratorHelper$9(this.article.articleOptionStates.values()),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -22954,7 +22989,7 @@ var DivaEngine = /*#__PURE__*/function () {
           var visibleOptionValues = new Map();
           if (myOpt.hasOPG) {
             var myOPGs = myOpt.articleOptionValues;
-            var _iterator2 = _createForOfIteratorHelper$8(myOPGs),
+            var _iterator2 = _createForOfIteratorHelper$9(myOPGs),
               _step2;
             try {
               for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -22964,7 +22999,7 @@ var DivaEngine = /*#__PURE__*/function () {
                 var myOPVsInOPG = value.articleOptionValues;
                 if (this.checkItemVisibility(value, ops) && myOPVsInOPG) {
                   visibleOptionValues.set(value.codex, value);
-                  var _iterator3 = _createForOfIteratorHelper$8(myOPVsInOPG),
+                  var _iterator3 = _createForOfIteratorHelper$9(myOPVsInOPG),
                     _step3;
                   try {
                     for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -22998,7 +23033,7 @@ var DivaEngine = /*#__PURE__*/function () {
           } else {
             var myOPVs = myOpt.articleOptionValues;
             if (myOPVs) {
-              var _iterator4 = _createForOfIteratorHelper$8(myOPVs),
+              var _iterator4 = _createForOfIteratorHelper$9(myOPVs),
                 _step4;
               try {
                 for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
@@ -23164,7 +23199,7 @@ var DivaEngine = /*#__PURE__*/function () {
         //R (Anschlusstyp R) - AVR
         var newAVRFilter = [],
           visibleOPVs = ops.visibleOptionValues;
-        var _iterator5 = _createForOfIteratorHelper$8(visibleOPVs),
+        var _iterator5 = _createForOfIteratorHelper$9(visibleOPVs),
           _step5;
         try {
           for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
@@ -23184,7 +23219,7 @@ var DivaEngine = /*#__PURE__*/function () {
         //L (Anschlusstyp L) - AVL
         var newAVLFilter = [],
           _visibleOPVs = ops.visibleOptionValues;
-        var _iterator6 = _createForOfIteratorHelper$8(_visibleOPVs),
+        var _iterator6 = _createForOfIteratorHelper$9(_visibleOPVs),
           _step6;
         try {
           for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
@@ -23405,17 +23440,22 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "evalAllDecisions",
     value: function evalAllDecisions() {
-      var myDecisions = this.article.catalogArticle.articleDecisions;
+      var myDecisions = this.article.catalogArticle.articleReferencedDecisions;
+      for (var i = myDecisions.length - 1; i >= 0; i--) {
+        if (myDecisions[i].addedViaDisableEnableRef) {
+          myDecisions.splice(i, 1);
+        }
+      }
       //add the partlist spesific decisions to the normal decisions
       if (this.article.initDecisions) myDecisions = myDecisions.concat(this.article.initDecisions);
-      for (var i = 0; i < myDecisions.length; i++) {
+      for (var _i = 0; _i < myDecisions.length; _i++) {
         var _this$article$catalog;
-        if ((_this$article$catalog = this.article.catalogArticle.decisionsUsedForPartlist) !== null && _this$article$catalog !== void 0 && _this$article$catalog.includes(Number(myDecisions[i].Number))) continue;
-        myDecisions[i].enabled = true;
-        myDecisions[i].disableHistory = [];
-        myDecisions[i].activeCombination = undefined;
+        if ((_this$article$catalog = this.article.catalogArticle.decisionsUsedForPartlist) !== null && _this$article$catalog !== void 0 && _this$article$catalog.includes(Number(myDecisions[_i].Number))) continue;
+        myDecisions[_i].enabled = true;
+        myDecisions[_i].disableHistory = [];
+        myDecisions[_i].activeCombination = undefined;
       }
-      var _iterator7 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+      var _iterator7 = _createForOfIteratorHelper$9(this.article.articleOptionStates.values()),
         _step7;
       try {
         for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
@@ -23492,8 +23532,8 @@ var DivaEngine = /*#__PURE__*/function () {
       for (var i = 0; i < myDecisions.length; i++) {
         myDecisions[i].enabled = true;
       }
-      for (var _i = 0; _i < myDecisions.length; _i++) {
-        var myDecision = myDecisions[_i];
+      for (var _i2 = 0; _i2 < myDecisions.length; _i2++) {
+        var myDecision = myDecisions[_i2];
         //Alle Optionen Mit DOC Type 1 ermitten - diese zunächst alle ausblenden, werden dann später über Formeln wieder eingeschaltet
         if (myDecision.enabled && myDecision.DOC) {
           for (var j = 0; j < myDecision.DOC.length; j++) {
@@ -23554,7 +23594,7 @@ var DivaEngine = /*#__PURE__*/function () {
     key: "updateIDMSpecificFeatures",
     value: function updateIDMSpecificFeatures() {
       //updaten idm planner specific options
-      var _iterator8 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+      var _iterator8 = _createForOfIteratorHelper$9(this.article.articleOptionStates.values()),
         _step8;
       try {
         for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
@@ -23679,7 +23719,7 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "setFeatureInvisible",
     value: function setFeatureInvisible(myDecision, opt, hasSetFeatureInvisible) {
-      if (!hasSetFeatureInvisible[opt]) {
+      if (!hasSetFeatureInvisible[opt] && !this.article.CatalogData.useDiomexConfigLogic) {
         //Standardmässig den Wert Invisible aus dem Optionsbaum anwenden
         this.article.getArticleOptionState(opt).isInvisible = this.article.catalogArticle.getOPTDefaultInVisible(opt);
         hasSetFeatureInvisible[opt] = true;
@@ -23704,6 +23744,7 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "disableDecision",
     value: function disableDecision(myDecision, myDoc, myDecisions) {
+      var _this2 = this;
       if (myDecision.activeCombination == -1) return;
       var SearchDecNumber = [];
       if (myDoc.DA) for (var m = 0; m < myDoc.DA.length; m++) {
@@ -23712,10 +23753,39 @@ var DivaEngine = /*#__PURE__*/function () {
           SearchDecNumber.push(Number(decisionAction.DecisionNr));
         }
       }
-      myDecisions.filter(function (d) {
-        return SearchDecNumber.includes(Number(d.Number));
-      }).map(function (d) {
+      SearchDecNumber.map(function (d) {
+        return myDecisions.find(function (de) {
+          return de.Number == d.toString();
+        });
+      }).map(function (d, index) {
         var _d$disableHistory;
+        var decisionNumber = SearchDecNumber[index];
+        if (!d) {
+          var decision = _this2.article.catalogArticle.articleDecisions.find(function (d) {
+            return d.Number == decisionNumber.toString();
+          });
+          if (!decision) {
+            LOG$g.warn('Decision ' + decisionNumber + ' that is referenced in disable decision ' + myDecision.Number + ' not found.');
+            return;
+          }
+          var insertIndex = 0;
+          var prios = myDecisions.map(function (d) {
+            return d.Prio;
+          });
+          if (decision.Prio <= myDecision.Prio) LOG$g.warn('Decision ' + decisionNumber + ' that is referenced in enable decision ' + myDecision.Number + ' has a lower prio than the enable decision.');
+          for (var i = 0; i < prios.length; i++) {
+            if (Number(prios[i]) >= Number(decision.Prio)) {
+              insertIndex = i;
+              break;
+            }
+          }
+          myDecisions.splice(insertIndex, 0, _objectSpread$g(_objectSpread$g({}, decision), {}, {
+            enabled: false,
+            disableHistory: ['referenced and disabled By ' + myDecision.Number],
+            addedViaDisableEnableRef: true
+          }));
+          return;
+        }
         d.enabled = false;
         (_d$disableHistory = d.disableHistory) === null || _d$disableHistory === void 0 || _d$disableHistory.push('disabled By ' + myDecision.Number);
       });
@@ -23723,6 +23793,7 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "enableDecision",
     value: function enableDecision(myDecision, myDoc, myDecisions) {
+      var _this3 = this;
       if (myDecision.activeCombination == -1) return;
       var SearchDecNumber = [];
       if (myDoc.DA) {
@@ -23733,10 +23804,39 @@ var DivaEngine = /*#__PURE__*/function () {
           }
         }
       }
-      myDecisions.filter(function (d) {
-        return SearchDecNumber.includes(Number(d.Number));
-      }).map(function (d) {
+      SearchDecNumber.map(function (d) {
+        return myDecisions.find(function (de) {
+          return de.Number == d.toString();
+        });
+      }).map(function (d, index) {
         var _d$disableHistory2;
+        var decisionNumber = SearchDecNumber[index];
+        if (!d) {
+          var decision = _this3.article.catalogArticle.articleDecisions.find(function (d) {
+            return d.Number == decisionNumber.toString();
+          });
+          if (!decision) {
+            LOG$g.warn('Decision ' + decisionNumber + ' that is referenced in enable decision ' + myDecision.Number + ' not found.');
+            return;
+          }
+          var insertIndex = 0;
+          var prios = myDecisions.map(function (d) {
+            return d.Prio;
+          });
+          if (decision.Prio <= myDecision.Prio) LOG$g.warn('Decision ' + decisionNumber + ' that is referenced in enable decision ' + myDecision.Number + ' has a lower prio than the enable decision.');
+          for (var i = 0; i < prios.length; i++) {
+            if (Number(prios[i]) >= Number(decision.Prio)) {
+              insertIndex = i;
+              break;
+            }
+          }
+          myDecisions.splice(insertIndex, 0, _objectSpread$g(_objectSpread$g({}, decision), {}, {
+            enabled: true,
+            disableHistory: ['referenced and enabled By ' + myDecision.Number],
+            addedViaDisableEnableRef: true
+          }));
+          return;
+        }
         d.enabled = true;
         (_d$disableHistory2 = d.disableHistory) === null || _d$disableHistory2 === void 0 || _d$disableHistory2.push('enabled By ' + myDecision.Number);
       });
@@ -23744,13 +23844,13 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "evalType1Decision",
     value: function evalType1Decision(myDecision) {
-      var _this2 = this;
+      var _this4 = this;
       var validOPVs = {};
       var doAlsoCheckOPTs = [];
       if (myDecision.Options && myDecision.DOC) {
         var _loop2 = function _loop2() {
           var OPT = myDecision.Options[p];
-          var ops = _this2.article.getArticleOptionStateFlat(OPT);
+          var ops = _this4.article.getArticleOptionStateFlat(OPT);
           if (!ops) return 1; // break
           if (!validOPVs[OPT]) validOPVs[OPT] = new Map();
           var possibleOPVs = new Map(ops.visibleOptionValues);
@@ -23761,7 +23861,7 @@ var DivaEngine = /*#__PURE__*/function () {
             //wenn diese Row mehrere Optionen hat, dann müssen die bisher gesetzten schon übereinstimmen
 
             var myDoc = myDecision.DOC[j];
-            var doUseDoc = _this2.checkIfDocIsValid(myDoc, doAlsoCheckOPTs);
+            var doUseDoc = _this4.checkIfDocIsValid(myDoc, doAlsoCheckOPTs);
             if (doUseDoc) {
               var _myDoc$Row;
               myDecision.activeCombination = j;
@@ -23806,7 +23906,7 @@ var DivaEngine = /*#__PURE__*/function () {
                     var negatedValues = new Set(myDoc.Row[OPT].map(function (v) {
                       return v.slice(1);
                     })); // remove the '!' from the value
-                    var _iterator9 = _createForOfIteratorHelper$8(ops.visibleOptionValues),
+                    var _iterator9 = _createForOfIteratorHelper$9(ops.visibleOptionValues),
                       _step9;
                     try {
                       for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
@@ -23839,10 +23939,10 @@ var DivaEngine = /*#__PURE__*/function () {
           ops.updateVisibleOptionValues(new Map(schnittmenge));
           var valCodex = ops.valCodex;
           if ((!valCodex || !schnittmenge.get(valCodex)) && ops.visibleOPVKeys.length > 0) {
-            if (_this2.article.CatalogData.useDiomexConfigLogic) {
-              _this2.clearOP(OPT, true);
+            if (_this4.article.CatalogData.useDiomexConfigLogic) {
+              _this4.clearOP(OPT, true);
             } else {
-              _this2.updateArtOPV(_this2.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
+              _this4.updateArtOPV(_this4.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
             }
           }
           doAlsoCheckOPTs.push(OPT);
@@ -23879,13 +23979,13 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "evalType0Decision",
     value: function evalType0Decision(myDecision) {
-      var _this3 = this;
+      var _this5 = this;
       var invalidOPVs = {},
         doAlsoCheckOPTs = [];
       if (myDecision.Options && myDecision.Options.length > 1 && myDecision.DOC) {
         var _loop3 = function _loop3() {
           var OPT = myDecision.Options[p];
-          var ops = _this3.article.getArticleOptionStateFlat(OPT);
+          var ops = _this5.article.getArticleOptionStateFlat(OPT);
           if (!ops) return 1; // break
           if (!invalidOPVs[OPT]) invalidOPVs[OPT] = new Map();
           var possibleOPVs = ops.visibleOptionValues;
@@ -23902,7 +24002,7 @@ var DivaEngine = /*#__PURE__*/function () {
                 for (var f = 0; f < doAlsoCheckOPTs.length; f++) {
                   var _myDoc$Row3;
                   var checkOptX = doAlsoCheckOPTs[f];
-                  var _ops3 = _this3.article.getArticleOptionState(checkOptX);
+                  var _ops3 = _this5.article.getArticleOptionState(checkOptX);
                   if (_ops3 && (_myDoc$Row3 = myDoc.Row) !== null && _myDoc$Row3 !== void 0 && _myDoc$Row3[checkOptX] && _ops3.valCodex && !myDoc.Row[checkOptX].includes(_ops3.valCodex)) {
                     doUseDoc = false;
                     break;
@@ -23930,10 +24030,10 @@ var DivaEngine = /*#__PURE__*/function () {
             ops.updateVisibleOptionValues(schnittmenge);
             var valCodex = ops.valCodex;
             if ((!valCodex || !schnittmenge.get(valCodex)) && ops.visibleOPVKeys.length > 0) {
-              if (_this3.article.CatalogData.useDiomexConfigLogic) {
-                _this3.clearOP(OPT, true);
+              if (_this5.article.CatalogData.useDiomexConfigLogic) {
+                _this5.clearOP(OPT, true);
               } else {
-                _this3.updateArtOPV(_this3.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
+                _this5.updateArtOPV(_this5.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
               }
             }
           } else if (p < myDecision.Options.length - 1) {
@@ -23948,7 +24048,7 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "evalShowOnlyWhenHasPrice",
     value: function evalShowOnlyWhenHasPrice() {
-      var _iterator10 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+      var _iterator10 = _createForOfIteratorHelper$9(this.article.articleOptionStates.values()),
         _step10;
       try {
         for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
@@ -24096,7 +24196,9 @@ var DivaEngine = /*#__PURE__*/function () {
     value: function evalSetFeatureDefaultDecisions() {
       //zunächst ein Gerüst mit allen möglichen gültigen OPVs erstellen,
       //dieses wird später durch Schnittmengen mit mögliche ValidOptionValues reduziert
-      var myDecisions = this.article.catalogArticle.articleDecisions;
+      var myDecisions = this.article.catalogArticle.articleReferencedDecisions.filter(function (d) {
+        return !d.addedViaDisableEnableRef;
+      });
       var ret = {};
       if (myDecisions.length > 0) {
         for (var i = 0; i < myDecisions.length; i++) {
@@ -24106,7 +24208,7 @@ var DivaEngine = /*#__PURE__*/function () {
           var _this$article$catalog3;
           //Alle Optionen Mit DOC Type 1 ermitten - diese zunächst alle ausblenden, werden dann später über Formeln wieder eingeschaltet
           var myDecision = myDecisions[m];
-          if ((_this$article$catalog3 = this.article.catalogArticle.decisionsUsedForPartlist) !== null && _this$article$catalog3 !== void 0 && _this$article$catalog3.includes(Number(myDecisions[m].Number))) continue;
+          if ((_this$article$catalog3 = this.article.catalogArticle.decisionsUsedForPartlist) !== null && _this$article$catalog3 !== void 0 && _this$article$catalog3.includes(Number(myDecision.Number))) continue;
           var ignorNextAction = false;
           if (myDecision.enabled && myDecision.DOC) {
             for (var j = 0; j < myDecision.DOC.length; j++) {
@@ -24119,8 +24221,8 @@ var DivaEngine = /*#__PURE__*/function () {
                 if (myDecision.Type == '2') {
                   //Aktionsregel. Wenn das erste JsRule erfüllt ist muss man die restlichen DecisionOptionCombinations nicht mehr kontrollieren.
                   if (myDoc.DA) {
-                    for (var _i2 = 0; _i2 < myDoc.DA.length; _i2++) {
-                      var myDA = myDoc.DA[_i2];
+                    for (var _i3 = 0; _i3 < myDoc.DA.length; _i3++) {
+                      var myDA = myDoc.DA[_i3];
                       var myOptionCodex = myDA.OptionCodex ? 'OPT' + myDA.OptionCodex : '';
                       if (this.article.getArticleOptionState(myOptionCodex)) {
                         if (myDA.Type == 'SET_FEATURE_DEFAULT' || myDA.Type == 'SET_FEATURE_DEFAULT_NULL') {
@@ -24208,7 +24310,7 @@ var DivaEngine = /*#__PURE__*/function () {
     key: "addPartilstToPartlistArticlesToLoad",
     value: function addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, partlistGroup, newConfigValues, myDecisionVal, groupDecisionVal, decisionNumber) {
       var _myPartListPos$Option,
-        _this4 = this;
+        _this6 = this;
       var allDecisions = this.article.catalogArticle.articleDecisions;
       var decisions = myPartListPos.PartListPosDecisionsAndPosCounts;
       var optionsForPrint = (_myPartListPos$Option = myPartListPos.OptionsForPrint) === null || _myPartListPos$Option === void 0 ? void 0 : _myPartListPos$Option.split(';');
@@ -24219,9 +24321,9 @@ var DivaEngine = /*#__PURE__*/function () {
         var articleCodex = myPartListPos.ItemRefArticles[d].ArticleCodex;
         var catalogCodex = myPartListPos.ItemRefArticles[d].CatalogCodex;
         var retailArticleNr = myPartListPos.RetailArticleNr && myPartListPos.RetailArticleNr != '' ? myPartListPos.RetailArticleNr : undefined;
-        if (myDecisionVal && (myDecisionVal.Rule && myDecisionVal.Rule != '' && _this4.article.CatalogData.doUseRuleDescForPartListArticles() || myPartListPos.RetailArticleNr == 'CUST')) {
-          myRuleDesc = DivaUtils.getRuleDescription(myDecisionVal.Rule, _this4.article.articleOptionStates, _this4.article.set.api.ruleDescSeperator());
-          myRuleDesc_locales = DivaUtils.getRuleDescription_locales(myDecisionVal.Rule, _this4.article.articleOptionStates, _this4.article.set.api.ruleDescSeperator());
+        if (myDecisionVal && (myDecisionVal.Rule && myDecisionVal.Rule != '' && _this6.article.CatalogData.doUseRuleDescForPartListArticles() || myPartListPos.RetailArticleNr == 'CUST')) {
+          myRuleDesc = DivaUtils.getRuleDescription(myDecisionVal.Rule, _this6.article.articleOptionStates, _this6.article.set.api.ruleDescSeperator());
+          myRuleDesc_locales = DivaUtils.getRuleDescription_locales(myDecisionVal.Rule, _this6.article.articleOptionStates, _this6.article.set.api.ruleDescSeperator());
         }
         var initDecisions = decisions.filter(function (decision) {
           return decision.RelationType !== 'PosCount';
@@ -24231,7 +24333,7 @@ var DivaEngine = /*#__PURE__*/function () {
           });
         });
         var quanitity = 1;
-        if (_this4.article.CatalogData.useDecisionPosCountValue) {
+        if (_this6.article.CatalogData.useDecisionPosCountValue) {
           var _decision$DOC;
           // get SetPosCountValue from decsion action if defined and else use myPartListPos.PosCountValue;
           var decision = decisionNumber ? allDecisions.find(function (d) {
@@ -24246,11 +24348,11 @@ var DivaEngine = /*#__PURE__*/function () {
             return a.SetPosCountValue !== undefined;
           })) === null || _decision$DOC === void 0 ? void 0 : _decision$DOC.SetPosCountValue;
           quanitity = setPosCountValue !== undefined ? setPosCountValue : myPartListPos.PosCountValue;
-        } else if (_this4.article.CatalogData.usePosCountValue) {
+        } else if (_this6.article.CatalogData.usePosCountValue) {
           quanitity = myPartListPos.PosCountValue;
         }
-        quanitity = quanitity * _this4.article.quantity;
-        var previousPartlistArticle = _this4.article.getPreviousPartlistArticle(articleCodex);
+        quanitity = quanitity * _this6.article.quantity;
+        var previousPartlistArticle = _this6.article.getPreviousPartlistArticle(articleCodex);
         var initDecisionsFiltered = [];
         var _loop5 = function _loop5(i) {
           if (initDecisions[i] && !initDecisionsFiltered.find(function (d) {
@@ -24265,13 +24367,13 @@ var DivaEngine = /*#__PURE__*/function () {
         if (quanitity >= 1) {
           var _myDecisionVal$Rule;
           partlistArticlesToLoad.push({
-            CatalogCodex: catalogCodex !== null && catalogCodex !== void 0 ? catalogCodex : _this4.article.catalogCodex,
+            CatalogCodex: catalogCodex !== null && catalogCodex !== void 0 ? catalogCodex : _this6.article.catalogCodex,
             BasketID: previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.basketId,
             ArticleCodex: articleCodex,
             RetailArticleNr: retailArticleNr,
             RetailPrefix: myPartListPos.RetailPrefix,
             Quantity: quanitity,
-            PartlistRule: (groupDecisionVal ? groupDecisionVal.Rule + ' && ' : '') + myDecisionVal ? DivaUtils.getOptionValuePairsByRule((_myDecisionVal$Rule = myDecisionVal === null || myDecisionVal === void 0 ? void 0 : myDecisionVal.Rule) !== null && _myDecisionVal$Rule !== void 0 ? _myDecisionVal$Rule : '', _this4.article.VariantValues) : undefined,
+            PartlistRule: (groupDecisionVal ? groupDecisionVal.Rule + ' && ' : '') + myDecisionVal ? DivaUtils.getOptionValuePairsByRule((_myDecisionVal$Rule = myDecisionVal === null || myDecisionVal === void 0 ? void 0 : myDecisionVal.Rule) !== null && _myDecisionVal$Rule !== void 0 ? _myDecisionVal$Rule : '', _this6.article.VariantValues) : undefined,
             partlistDecisionNo: decisionNumber,
             SupplierOrderCodex: myPartListPos.SupplierOrderCodex,
             initDecisions: initDecisionsFiltered,
@@ -24280,7 +24382,7 @@ var DivaEngine = /*#__PURE__*/function () {
             RuleDesc_locales: myRuleDesc_locales,
             PosInvisibility: myPartListPos.PosInvisibility,
             ConfigurationMode: myPartListPos.ConfigurationMode,
-            VariantValues: _this4.article.variantValuesForPla(myPartListPos.ConfigurationMode, previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantValues, newConfigValues),
+            VariantValues: _this6.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
@@ -24328,7 +24430,7 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "calcConfigPrice",
     value: function calcConfigPrice(maxPriceOfGroupCodex, digits) {
-      var _this5 = this,
+      var _this7 = this,
         _this$article$catalog4;
       //Wenn im Planer für dieses Shape mehere Rules gibt, müssen wir diese jetzt prüfen, ob jetzt ein anderes shape gültig ist.
       //wenn ja, hier neues shape übergeben
@@ -24361,7 +24463,7 @@ var DivaEngine = /*#__PURE__*/function () {
       }
 
       //mengen und größenabhängige Preisberechungn.
-      var _iterator11 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+      var _iterator11 = _createForOfIteratorHelper$9(this.article.articleOptionStates.values()),
         _step11;
       try {
         for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
@@ -24453,7 +24555,7 @@ var DivaEngine = /*#__PURE__*/function () {
       } finally {
         _iterator11.f();
       }
-      var _iterator12 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+      var _iterator12 = _createForOfIteratorHelper$9(this.article.articleOptionStates.values()),
         _step12;
       try {
         for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
@@ -24461,8 +24563,8 @@ var DivaEngine = /*#__PURE__*/function () {
           var targetPPGPrefixes = _ops4.targetPPGPrefixes;
           if (!targetPPGPrefixes) continue;
           var _loop7 = function _loop7() {
-            var targetPrefix = targetPPGPrefixes[_i6];
-            var priceRef = _this5.article.priceRefs.find(function (item) {
+            var targetPrefix = targetPPGPrefixes[_i7];
+            var priceRef = _this7.article.priceRefs.find(function (item) {
               var _item$PPG;
               return ((_item$PPG = item.PPG) === null || _item$PPG === void 0 ? void 0 : _item$PPG.split('_')[0]) == targetPrefix;
             });
@@ -24472,7 +24574,7 @@ var DivaEngine = /*#__PURE__*/function () {
               }
             }
           };
-          for (var _i6 = 0; _i6 < targetPPGPrefixes.length; _i6++) {
+          for (var _i7 = 0; _i7 < targetPPGPrefixes.length; _i7++) {
             _loop7();
           }
         }
@@ -24481,17 +24583,17 @@ var DivaEngine = /*#__PURE__*/function () {
       } finally {
         _iterator12.f();
       }
-      for (var _i3 = 0; _i3 < this.article.priceRefs.length; _i3++) {
-        var basePriceRef = this.article.priceRefs[_i3];
+      for (var _i4 = 0; _i4 < this.article.priceRefs.length; _i4++) {
+        var basePriceRef = this.article.priceRefs[_i4];
         if (!basePriceRef.TargetPPGPrefixes) continue;
         var _loop6 = function _loop6() {
           var targetPrefix = basePriceRef.TargetPPGPrefixes[_j];
           var myArtOpv;
-          var priceRef = _this5.article.priceRefs.find(function (item) {
+          var priceRef = _this7.article.priceRefs.find(function (item) {
             return item.PPG && item.PPG.split('_')[0] == targetPrefix;
           });
           if (!priceRef) {
-            var _iterator13 = _createForOfIteratorHelper$8(_this5.article.articleOptionStates.values()),
+            var _iterator13 = _createForOfIteratorHelper$9(_this7.article.articleOptionStates.values()),
               _step13;
             try {
               for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
@@ -24522,14 +24624,14 @@ var DivaEngine = /*#__PURE__*/function () {
           _loop6();
         }
       }
-      for (var _i4 = 0; _i4 < this.article.priceRefs.length; _i4++) {
+      for (var _i5 = 0; _i5 < this.article.priceRefs.length; _i5++) {
         var _priceRef$calcPrice;
-        var priceRef = this.article.priceRefs[_i4];
+        var priceRef = this.article.priceRefs[_i5];
         if (priceRef.IsPercentage) continue;
         myArticleBasePrice += priceRef.Price ? DivaUtils.decimalAdjust('round', (_priceRef$calcPrice = priceRef.calcPrice) !== null && _priceRef$calcPrice !== void 0 ? _priceRef$calcPrice : priceRef.Price, digits) : 0.0;
       }
       var articleUsedCalcPrice = myArticleBasePrice;
-      var _iterator14 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+      var _iterator14 = _createForOfIteratorHelper$9(this.article.articleOptionStates.values()),
         _step14;
       try {
         for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
@@ -24544,7 +24646,7 @@ var DivaEngine = /*#__PURE__*/function () {
       } finally {
         _iterator14.f();
       }
-      var _iterator15 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+      var _iterator15 = _createForOfIteratorHelper$9(this.article.articleOptionStates.values()),
         _step15;
       try {
         for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
@@ -24560,8 +24662,8 @@ var DivaEngine = /*#__PURE__*/function () {
       } finally {
         _iterator15.f();
       }
-      for (var _i5 = 0; _i5 < this.article.priceRefs.length; _i5++) {
-        var _priceRef = this.article.priceRefs[_i5];
+      for (var _i6 = 0; _i6 < this.article.priceRefs.length; _i6++) {
+        var _priceRef = this.article.priceRefs[_i6];
         if (!_priceRef.IsPercentage) continue;
         if (!_priceRef.TargetPPGPrefixes) continue;
         for (var j = 0; j < _priceRef.TargetPPGPrefixes.length; j++) {
@@ -24700,7 +24802,7 @@ var DivaEngine = /*#__PURE__*/function () {
               if (a[i].trim() != '') {
                 var searchOpt = 'OPT' + a[i].trim();
                 //Optionsbaum des Artikels durchsuchen
-                var _iterator16 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+                var _iterator16 = _createForOfIteratorHelper$9(this.article.articleOptionStates.values()),
                   _step16;
                 try {
                   for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
@@ -24735,7 +24837,7 @@ var DivaEngine = /*#__PURE__*/function () {
     value: function updateConfigDependentMedia() {
       var _this$article$catalog5,
         _this$article$catalog6,
-        _this6 = this;
+        _this8 = this;
       var catalogData = this.article.CatalogData;
       //articlebild berechnung
 
@@ -24761,12 +24863,12 @@ var DivaEngine = /*#__PURE__*/function () {
       }
 
       // this functions updates the images of OPVs that depend on rules
-      var _iterator17 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+      var _iterator17 = _createForOfIteratorHelper$9(this.article.articleOptionStates.values()),
         _step17;
       try {
         for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
           var ops = _step17.value;
-          var _iterator18 = _createForOfIteratorHelper$8(ops.visibleOptionValues),
+          var _iterator18 = _createForOfIteratorHelper$9(ops.visibleOptionValues),
             _step18;
           try {
             for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
@@ -24775,8 +24877,8 @@ var DivaEngine = /*#__PURE__*/function () {
                 opv = _step18$value[1];
               if (opv.images) {
                 var imageFound = false;
-                for (var _i8 = 0; _i8 < opv.images.length; _i8++) {
-                  var image = opv.images[_i8];
+                for (var _i9 = 0; _i9 < opv.images.length; _i9++) {
+                  var image = opv.images[_i9];
                   var rule = image.jsFormula;
                   if (rule.includes('ARTICLECODEX')) {
                     rule = rule.replace(/ARTICLECODEX/g, "'" + this.article.articleCodex + "'");
@@ -24821,8 +24923,8 @@ var DivaEngine = /*#__PURE__*/function () {
         var plannerCatArt = this.article.catalogArticle.catalogPlannerArticle;
         if (plannerCatArt.hasTopSvgsWithFormula) {
           var svgsWithFormula = plannerCatArt.topSvgsWithFormula;
-          for (var _i7 = 0; _i7 < svgsWithFormula.length; _i7++) {
-            var mySVG = svgsWithFormula[_i7],
+          for (var _i8 = 0; _i8 < svgsWithFormula.length; _i8++) {
+            var mySVG = svgsWithFormula[_i8],
               myRule = DivaUtils.getRuleByFormula(mySVG.JsFormula, this.article.catalogCodex, catalogData.multiselectOptions);
             if (this.article.evalRule(myRule, '')) {
               newSVGFile = mySVG.SVG;
@@ -24864,7 +24966,7 @@ var DivaEngine = /*#__PURE__*/function () {
             code: 'WC_0011',
             custom: {
               formulas: (_plannerCatArt$topSvg = plannerCatArt.topSvgsWithFormula) === null || _plannerCatArt$topSvg === void 0 ? void 0 : _plannerCatArt$topSvg.map(function (item) {
-                return DivaUtils.getRuleByFormula(item.JsFormula, _this6.article.catalogCodex, catalogData.multiselectOptions);
+                return DivaUtils.getRuleByFormula(item.JsFormula, _this8.article.catalogCodex, catalogData.multiselectOptions);
               }),
               catalogName: catalogData.catalogName,
               catalogCodex: this.article.catalogCodex,
@@ -24891,9 +24993,9 @@ var DivaEngine = /*#__PURE__*/function () {
 
 function ownKeys$f(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$f(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$f(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$f(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _createForOfIteratorHelper$7(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$7(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray$7(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$7(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$7(r, a) : void 0; } }
-function _arrayLikeToArray$7(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _createForOfIteratorHelper$8(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$8(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray$8(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$8(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$8(r, a) : void 0; } }
+function _arrayLikeToArray$8(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var LOG$f = DivaUtils.initLog('Planner', 'WEB-PLANNER-LOGIC');
 var IDMEngine = /*#__PURE__*/function () {
   function IDMEngine(article) {
@@ -24945,7 +25047,7 @@ var IDMEngine = /*#__PURE__*/function () {
         decisions[i].disableHistory = [];
         decisions[i].activeCombination = undefined;
       }
-      var _iterator = _createForOfIteratorHelper$7(this.article.articleOptionStates.values()),
+      var _iterator = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -25273,7 +25375,7 @@ var IDMEngine = /*#__PURE__*/function () {
   }, {
     key: "evalDisableDecision",
     value: function evalDisableDecision(actions, decision, allDecisions, disable) {
-      var _iterator2 = _createForOfIteratorHelper$7(actions),
+      var _iterator2 = _createForOfIteratorHelper$8(actions),
         _step2;
       try {
         var _loop5 = function _loop5() {
@@ -25305,7 +25407,7 @@ var IDMEngine = /*#__PURE__*/function () {
   }, {
     key: "evalSetFeatureVisible",
     value: function evalSetFeatureVisible(actions, hasSetFeatureInvisible, invisible) {
-      var _iterator3 = _createForOfIteratorHelper$7(actions),
+      var _iterator3 = _createForOfIteratorHelper$8(actions),
         _step3;
       try {
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -25324,7 +25426,7 @@ var IDMEngine = /*#__PURE__*/function () {
   }, {
     key: "evalSetFeatureDefault",
     value: function evalSetFeatureDefault(actions, decision, isNull) {
-      var _iterator4 = _createForOfIteratorHelper$7(actions),
+      var _iterator4 = _createForOfIteratorHelper$8(actions),
         _step4;
       try {
         for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
@@ -25361,7 +25463,7 @@ var IDMEngine = /*#__PURE__*/function () {
   }, {
     key: "evalSetFeature",
     value: function evalSetFeature(actions, decision, isFixed) {
-      var _iterator5 = _createForOfIteratorHelper$7(actions),
+      var _iterator5 = _createForOfIteratorHelper$8(actions),
         _step5;
       try {
         for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
@@ -25731,7 +25833,7 @@ var IDMEngine = /*#__PURE__*/function () {
     key: "updateIDMSpecificFeatures",
     value: function updateIDMSpecificFeatures() {
       //updaten idm planner specific options
-      var _iterator6 = _createForOfIteratorHelper$7(this.article.articleOptionStates.values()),
+      var _iterator6 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
         _step6;
       try {
         for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
@@ -25818,7 +25920,7 @@ var IDMEngine = /*#__PURE__*/function () {
             var oc = decision.optionCombinations[j];
             var variantValues = {};
             var useVVs = true;
-            var _iterator7 = _createForOfIteratorHelper$7(oc.projectOptionsSetRefs),
+            var _iterator7 = _createForOfIteratorHelper$8(oc.projectOptionsSetRefs),
               _step7;
             try {
               for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
@@ -25915,12 +26017,12 @@ var IDMEngine = /*#__PURE__*/function () {
       }
 
       // this functions updates the images of OPVs that depend on rules
-      var _iterator8 = _createForOfIteratorHelper$7(this.article.articleOptionStates.values()),
+      var _iterator8 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
         _step8;
       try {
         for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
           var ops = _step8.value;
-          var _iterator9 = _createForOfIteratorHelper$7(ops.visibleOptionValues),
+          var _iterator9 = _createForOfIteratorHelper$8(ops.visibleOptionValues),
             _step9;
           try {
             for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
@@ -26061,9 +26163,9 @@ var IDMEngine = /*#__PURE__*/function () {
   }]);
 }();
 
-function _createForOfIteratorHelper$6(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$6(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray$6(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$6(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$6(r, a) : void 0; } }
-function _arrayLikeToArray$6(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _createForOfIteratorHelper$7(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$7(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray$7(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$7(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$7(r, a) : void 0; } }
+function _arrayLikeToArray$7(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function ownKeys$e(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$e(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$e(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$e(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$e = DivaUtils.initLog('Planner', 'WEB-PLANNER-LOGIC');
@@ -26547,7 +26649,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "getTabgroupsAsString",
     get: function get() {
       var ret = '';
-      var _iterator = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+      var _iterator = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -26569,7 +26671,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "articleVariantValues",
     get: function get() {
       var ret = '';
-      var _iterator2 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+      var _iterator2 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
         _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -26664,7 +26766,7 @@ var DivaArticle = /*#__PURE__*/function () {
       var newLine = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ', ';
       var articleOptions = this.getArticleOptionStatesWithOptionsForPrint();
       var ret = '';
-      var _iterator3 = _createForOfIteratorHelper$6(articleOptions.values()),
+      var _iterator3 = _createForOfIteratorHelper$7(articleOptions.values()),
         _step3;
       try {
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -26697,7 +26799,7 @@ var DivaArticle = /*#__PURE__*/function () {
     value: function articleVariantDesc_locales() {
       var newLine = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ', ';
       var ret = {};
-      var _iterator4 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+      var _iterator4 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
         _step4;
       try {
         for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
@@ -26976,7 +27078,7 @@ var DivaArticle = /*#__PURE__*/function () {
           if (_ops) return _ops;
         }
       }
-      var _iterator5 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+      var _iterator5 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
         _step5;
       try {
         for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
@@ -27008,7 +27110,7 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "getValueByMeasureKey",
     value: function getValueByMeasureKey(measureKey) {
-      var _iterator6 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+      var _iterator6 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
         _step6;
       try {
         for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
@@ -27095,7 +27197,7 @@ var DivaArticle = /*#__PURE__*/function () {
       if (diomexArticleCodex) return diomexArticleCodex;
       var supplierOrderCodex = this.supplierOrderCodex;
       if (supplierOrderCodex) return supplierOrderCodex;
-      var _iterator7 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+      var _iterator7 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
         _step7;
       try {
         for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
@@ -27675,7 +27777,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "VariantValues",
     get: function get() {
       var ret = {};
-      var _iterator8 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+      var _iterator8 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
         _step8;
       try {
         for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
@@ -27698,7 +27800,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "snapshot",
     get: function get() {
       var ret = {};
-      var _iterator9 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+      var _iterator9 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
         _step9;
       try {
         for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
@@ -27731,7 +27833,7 @@ var DivaArticle = /*#__PURE__*/function () {
     get: function get() {
       var ret = {};
       var opss = this.getAllArticleOptionsStates();
-      var _iterator10 = _createForOfIteratorHelper$6(opss),
+      var _iterator10 = _createForOfIteratorHelper$7(opss),
         _step10;
       try {
         for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
@@ -27755,7 +27857,7 @@ var DivaArticle = /*#__PURE__*/function () {
     get: function get() {
       var ret = {};
       var opss = this.getAllArticleOptionsStates();
-      var _iterator11 = _createForOfIteratorHelper$6(opss),
+      var _iterator11 = _createForOfIteratorHelper$7(opss),
         _step11;
       try {
         for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
@@ -27776,7 +27878,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "VariantValuesWithoutFreetext",
     get: function get() {
       var ret = {};
-      var _iterator12 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+      var _iterator12 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
         _step12;
       try {
         for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
@@ -27796,7 +27898,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "VariantValuesParentOption",
     get: function get() {
       var ret = {};
-      var _iterator13 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+      var _iterator13 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
         _step13;
       try {
         for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
@@ -27831,7 +27933,7 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "setDifferentOptions",
     value: function setDifferentOptions(options) {
-      var _iterator14 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+      var _iterator14 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
         _step14;
       try {
         for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
@@ -27865,7 +27967,7 @@ var DivaArticle = /*#__PURE__*/function () {
     get: function get() {
       var hash = this.catalogCodex + '_' + this.articleCodex + '_' + this.quantity + '_';
       var variantValues = [];
-      var _iterator15 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+      var _iterator15 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
         _step15;
       try {
         for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
@@ -27886,7 +27988,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "VariantValuesWithoutOPTandOPV",
     get: function get() {
       var ret = {};
-      var _iterator16 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+      var _iterator16 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
         _step16;
       try {
         for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
@@ -27920,7 +28022,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "getVariantValuesTillOPT",
     value: function getVariantValuesTillOPT(opt) {
       var ret = {};
-      var _iterator17 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+      var _iterator17 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
         _step17;
       try {
         for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
@@ -27962,7 +28064,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "requiredUserInputOptions",
     get: function get() {
       var options = [];
-      var _iterator18 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+      var _iterator18 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
         _step18;
       try {
         for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
@@ -28067,7 +28169,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "getMetaData",
     value: function getMetaData(locales) {
       var metaDatas = locales ? this.article.catalogArticle.metaData_locales : this.article.catalogArticle.metaData;
-      var _iterator19 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+      var _iterator19 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
         _step19;
       try {
         for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
@@ -28139,27 +28241,26 @@ var DivaArticle = /*#__PURE__*/function () {
                 opvDoesExist = false;
               var opvsInOption = refOptData.articleOptionValues;
               if (refOptData.hasOPG && opvsInOption) {
-                var _iterator20 = _createForOfIteratorHelper$6(opvsInOption),
+                var _iterator20 = _createForOfIteratorHelper$7(opvsInOption.keys()),
                   _step20;
                 try {
                   for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
-                    var _step20$value = _slicedToArray(_step20.value, 2),
-                      iKey = _step20$value[0],
-                      opg = _step20$value[1];
+                    var iKey = _step20.value;
                     if (opvIsValid && anyDoShowFound) break;
+                    var opg = refOps.visibleOptionValues.get(iKey);
+                    if (!opg) continue;
                     var opvsFromOpg = opg.articleOptionValues;
                     if (!opvsFromOpg) continue;
                     if (refOps.visibleOptionValues.get(iKey)) {
                       anyDoShowFound = true;
                     }
-                    var _iterator21 = _createForOfIteratorHelper$6(opvsFromOpg),
+                    var _iterator21 = _createForOfIteratorHelper$7(opvsFromOpg.keys()),
                       _step21;
                     try {
                       for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
-                        var _step21$value = _slicedToArray(_step21.value, 2),
-                          jKey = _step21$value[0],
-                          opv = _step21$value[1];
-                        if (refOps.visibleOptionValues.get(iKey)) {
+                        var jKey = _step21.value;
+                        var opv = opvsFromOpg.get(jKey);
+                        if (opv && refOps.visibleOptionValues.get(iKey)) {
                           var parentName = opv.parentName;
                           if (parentName) {
                             alternativeOPV[jKey] = parentName;
@@ -28190,25 +28291,34 @@ var DivaArticle = /*#__PURE__*/function () {
                   _iterator20.f();
                 }
               } else if (opvsInOption) {
-                for (var _iKey in opvsInOption) {
-                  if (opvIsValid && anyDoShowFound) break;
-                  if (refOps.visibleOptionValues.get(_iKey)) {
-                    anyDoShowFound = true;
-                    alternativeOPV[_iKey] = opvsInOption.get(_iKey).name;
-                  }
-                  if (_iKey == curOpvValue || this.hasType1Dependencies && curOpvValue.replace('OPV' + opt.substring(3), '') == _iKey.replace('OPV' + refOps.optionCodex.substring(3), '')) {
-                    //Der Artikel darf den Optionswert von der BaseOption  übernehmen
-                    opvDoesExist = true;
+                var _iterator22 = _createForOfIteratorHelper$7(opvsInOption.keys()),
+                  _step22;
+                try {
+                  for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
+                    var _iKey = _step22.value;
+                    if (opvIsValid && anyDoShowFound) break;
                     if (refOps.visibleOptionValues.get(_iKey)) {
-                      refOps.defaultOPV = _iKey;
-                      optToChange[refOptCodex] = _iKey;
-                      if (optToChange[opt + '_val']) {
-                        optToChange[refOptCodex + '_val'] = optToChange[opt + '_val'];
+                      anyDoShowFound = true;
+                      alternativeOPV[_iKey] = opvsInOption.get(_iKey).name;
+                    }
+                    if (_iKey == curOpvValue || this.hasType1Dependencies && curOpvValue.replace('OPV' + opt.substring(3), '') == _iKey.replace('OPV' + refOps.optionCodex.substring(3), '')) {
+                      //Der Artikel darf den Optionswert von der BaseOption  übernehmen
+                      opvDoesExist = true;
+                      if (refOps.visibleOptionValues.get(_iKey)) {
+                        refOps.defaultOPV = _iKey;
+                        optToChange[refOptCodex] = _iKey;
+                        if (optToChange[opt + '_val']) {
+                          optToChange[refOptCodex + '_val'] = optToChange[opt + '_val'];
+                        }
+                        opvIsValid = true;
                       }
-                      opvIsValid = true;
+                      break;
                     }
-                    break;
                   }
+                } catch (err) {
+                  _iterator22.e(err);
+                } finally {
+                  _iterator22.f();
                 }
               }
               if (!opvIsValid || ignoreOPVIsValid) {
@@ -28258,11 +28368,11 @@ var DivaArticle = /*#__PURE__*/function () {
           for (var _i2 = 0; _i2 < articles.length; _i2++) {
             var variantValues = {};
             var accessoire = articles[_i2];
-            var _iterator22 = _createForOfIteratorHelper$6(accessoire.articleOptionStates.values()),
-              _step22;
+            var _iterator23 = _createForOfIteratorHelper$7(accessoire.articleOptionStates.values()),
+              _step23;
             try {
-              for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-                var ops = _step22.value;
+              for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
+                var ops = _step23.value;
                 if (singleOpts.includes(ops.optionCodex)) {
                   if (accessoire.hasType1Dependencies) {
                     variantValues[ops.optionCodex] = curOpvValue.replace('OPV' + opt.substring(3), 'OPV' + ops.optionCodex.substring(3));
@@ -28272,9 +28382,9 @@ var DivaArticle = /*#__PURE__*/function () {
                 }
               }
             } catch (err) {
-              _iterator22.e(err);
+              _iterator23.e(err);
             } finally {
-              _iterator22.f();
+              _iterator23.f();
             }
             if (Object.entries(variantValues).length > 0) accessoiresToUpdate[accessoire.basketId] = {
               accessoire: accessoire,
@@ -28290,11 +28400,11 @@ var DivaArticle = /*#__PURE__*/function () {
     value: function getGlobalOptions() {
       var ret = {};
       var opss = this.articleOptionStatesWithParents;
-      var _iterator23 = _createForOfIteratorHelper$6(opss),
-        _step23;
+      var _iterator24 = _createForOfIteratorHelper$7(opss),
+        _step24;
       try {
-        for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
-          var ops = _step23.value;
+        for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
+          var ops = _step24.value;
           var value = ops.option.isDefaultValueForOptions;
           if (value) {
             var entires = value.split(';');
@@ -28303,9 +28413,9 @@ var DivaArticle = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator23.e(err);
+        _iterator24.e(err);
       } finally {
-        _iterator23.f();
+        _iterator24.f();
       }
       return ret;
     }
@@ -28345,34 +28455,34 @@ var DivaArticle = /*#__PURE__*/function () {
         }
         if (Object.keys(ret.opt).length === 0) {
           //nicht gefunden - jetzt OCD kontrollieren
-          var _iterator24 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
-            _step24;
+          var _iterator25 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
+            _step25;
           try {
-            for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-              var _ops4 = _step24.value;
+            for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
+              var _ops4 = _step25.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
           } catch (err) {
-            _iterator24.e(err);
+            _iterator25.e(err);
           } finally {
-            _iterator24.f();
+            _iterator25.f();
           }
-          var _iterator25 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
-            _step25;
+          var _iterator26 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
+            _step26;
           try {
-            for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
-              var _ops5 = _step25.value;
+            for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
+              var _ops5 = _step26.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) {
-            _iterator25.e(err);
+            _iterator26.e(err);
           } finally {
-            _iterator25.f();
+            _iterator26.f();
           }
         }
       }
@@ -28388,26 +28498,26 @@ var DivaArticle = /*#__PURE__*/function () {
       }
       if (myOPT.hasOPG) {
         var myOPGs = myOPT.articleOptionValues;
-        var _iterator26 = _createForOfIteratorHelper$6(myOPGs),
-          _step26;
+        var _iterator27 = _createForOfIteratorHelper$7(myOPGs),
+          _step27;
         try {
-          for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
-            var _step26$value = _slicedToArray(_step26.value, 2),
-              iKey = _step26$value[0],
-              opg = _step26$value[1];
+          for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
+            var _step27$value = _slicedToArray(_step27.value, 2),
+              iKey = _step27$value[0],
+              opg = _step27$value[1];
             var myOPVs = opg.articleOptionValues;
             if (myOPVs && myOPVs.get(optionValueCodex)) {
               ret.opv = myOPVs.get(optionValueCodex);
               found = true;
             }
             if (!found) {
-              var _iterator27 = _createForOfIteratorHelper$6(myOPVs),
-                _step27;
+              var _iterator28 = _createForOfIteratorHelper$7(myOPVs),
+                _step28;
               try {
-                for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
-                  var _step27$value = _slicedToArray(_step27.value, 2),
-                    jKey = _step27$value[0],
-                    opv = _step27$value[1];
+                for (_iterator28.s(); !(_step28 = _iterator28.n()).done;) {
+                  var _step28$value = _slicedToArray(_step28.value, 2),
+                    jKey = _step28$value[0],
+                    opv = _step28$value[1];
                   if (opv.ocd == optionValueCodex || opv.codex == optionValueCodex || optionValueCodex === 'OPVOPV_NICHT_RELEVANT' && jKey.startsWith('OPVOPV_NICHT_RELEVANT')) {
                     ret.opv = opv;
                     found = true;
@@ -28415,19 +28525,19 @@ var DivaArticle = /*#__PURE__*/function () {
                   }
                 }
               } catch (err) {
-                _iterator27.e(err);
+                _iterator28.e(err);
               } finally {
-                _iterator27.f();
+                _iterator28.f();
               }
             }
             if (!found && myOPT.parentOptionCodex) {
-              var _iterator28 = _createForOfIteratorHelper$6(myOPVs),
-                _step28;
+              var _iterator29 = _createForOfIteratorHelper$7(myOPVs),
+                _step29;
               try {
-                for (_iterator28.s(); !(_step28 = _iterator28.n()).done;) {
-                  var _step28$value = _slicedToArray(_step28.value, 2),
-                    _jKey = _step28$value[0],
-                    _opv = _step28$value[1];
+                for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
+                  var _step29$value = _slicedToArray(_step29.value, 2),
+                    _jKey = _step29$value[0],
+                    _opv = _step29$value[1];
                   if (_opv.ocd && _opv.ocd.startsWith(optionValueCodex) || _opv.codex.startsWith(optionValueCodex)) {
                     ret.opv = _opv;
                     found = true;
@@ -28435,17 +28545,17 @@ var DivaArticle = /*#__PURE__*/function () {
                   }
                 }
               } catch (err) {
-                _iterator28.e(err);
+                _iterator29.e(err);
               } finally {
-                _iterator28.f();
+                _iterator29.f();
               }
             }
             if (ret.opv && Object.entries(ret.opv).length != 0) break;
           }
         } catch (err) {
-          _iterator26.e(err);
+          _iterator27.e(err);
         } finally {
-          _iterator26.f();
+          _iterator27.f();
         }
       } else {
         var _myOPVs = myOPT.articleOptionValues;
@@ -28454,13 +28564,13 @@ var DivaArticle = /*#__PURE__*/function () {
           found = true;
         }
         if (!found) {
-          var _iterator29 = _createForOfIteratorHelper$6(_myOPVs),
-            _step29;
+          var _iterator30 = _createForOfIteratorHelper$7(_myOPVs),
+            _step30;
           try {
-            for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
-              var _step29$value = _slicedToArray(_step29.value, 2),
-                _jKey2 = _step29$value[0],
-                _opv2 = _step29$value[1];
+            for (_iterator30.s(); !(_step30 = _iterator30.n()).done;) {
+              var _step30$value = _slicedToArray(_step30.value, 2),
+                _jKey2 = _step30$value[0],
+                _opv2 = _step30$value[1];
               if (_opv2.ocd == optionValueCodex || optionValueCodex === 'OPVOPV_NICHT_RELEVANT' && _jKey2.startsWith('OPVOPV_NICHT_RELEVANT')) {
                 ret.opv = _opv2;
                 found = true;
@@ -28468,9 +28578,9 @@ var DivaArticle = /*#__PURE__*/function () {
               }
             }
           } catch (err) {
-            _iterator29.e(err);
+            _iterator30.e(err);
           } finally {
-            _iterator29.f();
+            _iterator30.f();
           }
         }
       }
@@ -28480,11 +28590,11 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "getArticleJsonVariantValues",
     value: function getArticleJsonVariantValues() {
       var retval = {};
-      var _iterator30 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
-        _step30;
+      var _iterator31 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
+        _step31;
       try {
-        for (_iterator30.s(); !(_step30 = _iterator30.n()).done;) {
-          var ops = _step30.value;
+        for (_iterator31.s(); !(_step31 = _iterator31.n()).done;) {
+          var ops = _step31.value;
           if (ops.valCodex) {
             retval[ops.optionCodex] = ops.valCodex;
             var opsVal = this.getArticleOptionStateFlat(ops.optionCodex + '_val');
@@ -28497,9 +28607,9 @@ var DivaArticle = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator30.e(err);
+        _iterator31.e(err);
       } finally {
-        _iterator30.f();
+        _iterator31.f();
       }
       return retval;
     }
@@ -28592,38 +28702,38 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "findFreeTextOpv",
     value: function findFreeTextOpv(ops) {
-      var _iterator31 = _createForOfIteratorHelper$6(ops.visibleOptionValues),
-        _step31;
+      var _iterator32 = _createForOfIteratorHelper$7(ops.visibleOptionValues),
+        _step32;
       try {
-        for (_iterator31.s(); !(_step31 = _iterator31.n()).done;) {
-          var _step31$value = _slicedToArray(_step31.value, 2),
-            key = _step31$value[0],
-            opv = _step31$value[1];
+        for (_iterator32.s(); !(_step32 = _iterator32.n()).done;) {
+          var _step32$value = _slicedToArray(_step32.value, 2),
+            key = _step32$value[0],
+            opv = _step32$value[1];
           if (opv.isFreeText) {
             return opv;
           }
         }
       } catch (err) {
-        _iterator31.e(err);
+        _iterator32.e(err);
       } finally {
-        _iterator31.f();
+        _iterator32.f();
       }
       return undefined;
     }
   }, {
     key: "defineAllOptions",
     value: function defineAllOptions() {
-      var _iterator32 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
-        _step32;
+      var _iterator33 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
+        _step33;
       try {
-        for (_iterator32.s(); !(_step32 = _iterator32.n()).done;) {
-          var ops = _step32.value;
+        for (_iterator33.s(); !(_step33 = _iterator33.n()).done;) {
+          var ops = _step33.value;
           ops.isDefined = true;
         }
       } catch (err) {
-        _iterator32.e(err);
+        _iterator33.e(err);
       } finally {
-        _iterator32.f();
+        _iterator33.f();
       }
     }
   }, {
@@ -28635,13 +28745,13 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "getDefaultOpv",
     value: function getDefaultOpv(visibleOptionValues) {
-      var _iterator33 = _createForOfIteratorHelper$6(visibleOptionValues),
-        _step33;
+      var _iterator34 = _createForOfIteratorHelper$7(visibleOptionValues),
+        _step34;
       try {
-        for (_iterator33.s(); !(_step33 = _iterator33.n()).done;) {
-          var _step33$value = _slicedToArray(_step33.value, 2),
-            iKey = _step33$value[0],
-            opv = _step33$value[1];
+        for (_iterator34.s(); !(_step34 = _iterator34.n()).done;) {
+          var _step34$value = _slicedToArray(_step34.value, 2),
+            iKey = _step34$value[0],
+            opv = _step34$value[1];
           if (opv.isOPVG) {
             var _opv$articleOptionVal, _opv$articleOptionVal2;
             var defaultOPV = Array.from((_opv$articleOptionVal = (_opv$articleOptionVal2 = opv.articleOptionValues) === null || _opv$articleOptionVal2 === void 0 ? void 0 : _opv$articleOptionVal2.values()) !== null && _opv$articleOptionVal !== void 0 ? _opv$articleOptionVal : []).find(function (opv) {
@@ -28656,9 +28766,9 @@ var DivaArticle = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator33.e(err);
+        _iterator34.e(err);
       } finally {
-        _iterator33.f();
+        _iterator34.f();
       }
       return Array.from(visibleOptionValues.values())[0];
     }
@@ -28766,7 +28876,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return import('./ShelfPlanner-017fd47a.js');
+              return import('./ShelfPlanner-3706474c.js');
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -28855,19 +28965,19 @@ var DivaArticle = /*#__PURE__*/function () {
     value: function afterInit() {
       if (!this.CatalogData.useDiomexConfigLogic) return {};
       var variantValues = {};
-      var _iterator34 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
-        _step34;
+      var _iterator35 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
+        _step35;
       try {
-        for (_iterator34.s(); !(_step34 = _iterator34.n()).done;) {
-          var ops = _step34.value;
+        for (_iterator35.s(); !(_step35 = _iterator35.n()).done;) {
+          var ops = _step35.value;
           if (ops.val === undefined && ops.visibleOPVKeys.length && !ops.isInvisible) {
             variantValues[ops.optionCodex] = ops.visibleOPVKeys[0];
           }
         }
       } catch (err) {
-        _iterator34.e(err);
+        _iterator35.e(err);
       } finally {
-        _iterator34.f();
+        _iterator35.f();
       }
       return variantValues;
     }
@@ -28907,13 +29017,13 @@ var DivaArticle = /*#__PURE__*/function () {
         var catalogopv = ops.option.articleOptionValues.get(myValues[_key]);
         if (catalogopv !== null && catalogopv !== void 0 && catalogopv.sameopv) {
           var opvs = ops.option.articleOptionValues;
-          var _iterator35 = _createForOfIteratorHelper$6(opvs),
-            _step35;
+          var _iterator36 = _createForOfIteratorHelper$7(opvs),
+            _step36;
           try {
-            for (_iterator35.s(); !(_step35 = _iterator35.n()).done;) {
-              var _step35$value = _slicedToArray(_step35.value, 2),
-                opvKey = _step35$value[0],
-                checkingOpv = _step35$value[1];
+            for (_iterator36.s(); !(_step36 = _iterator36.n()).done;) {
+              var _step36$value = _slicedToArray(_step36.value, 2),
+                opvKey = _step36$value[0],
+                checkingOpv = _step36$value[1];
               if (opvKey === catalogopv.codex) continue;
               if (checkingOpv !== null && checkingOpv !== void 0 && checkingOpv.sameopv && catalogopv.sameopv == checkingOpv.sameopv) {
                 if (!ops.visibleOptionValues.get(catalogopv.codex) && ops.visibleOptionValues.get(checkingOpv.codex)) {
@@ -28922,9 +29032,9 @@ var DivaArticle = /*#__PURE__*/function () {
               }
             }
           } catch (err) {
-            _iterator35.e(err);
+            _iterator36.e(err);
           } finally {
-            _iterator35.f();
+            _iterator36.f();
           }
         }
       }
@@ -28935,20 +29045,20 @@ var DivaArticle = /*#__PURE__*/function () {
         } else if (_key2.endsWith('_val') && this.getArticleOptionState(_key2.replace(/_val/g, ''))) {
           validValues[_key2] = myValues[_key2];
         } else {
-          var _iterator36 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
-            _step36;
+          var _iterator37 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
+            _step37;
           try {
-            for (_iterator36.s(); !(_step36 = _iterator36.n()).done;) {
-              var _ops7 = _step36.value;
+            for (_iterator37.s(); !(_step37 = _iterator37.n()).done;) {
+              var _ops7 = _step37.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) {
-            _iterator36.e(err);
+            _iterator37.e(err);
           } finally {
-            _iterator36.f();
+            _iterator37.f();
           }
         }
         //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
@@ -29012,17 +29122,17 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "addOptionStateFromArticleToPlannerData",
     value: function addOptionStateFromArticleToPlannerData(ret, alternateRenderInfo) {
       var articleOptions = this.getArticleOptionStatesWithOptionsForPrint();
-      var _iterator37 = _createForOfIteratorHelper$6(articleOptions.values()),
-        _step37;
+      var _iterator38 = _createForOfIteratorHelper$7(articleOptions.values()),
+        _step38;
       try {
-        for (_iterator37.s(); !(_step37 = _iterator37.n()).done;) {
-          var ops = _step37.value;
+        for (_iterator38.s(); !(_step38 = _iterator38.n()).done;) {
+          var ops = _step38.value;
           this.addOptionStateToPlannerData(ret, ops, alternateRenderInfo);
         }
       } catch (err) {
-        _iterator37.e(err);
+        _iterator38.e(err);
       } finally {
-        _iterator37.f();
+        _iterator38.f();
       }
       for (var key in this.article.partlistArticles) {
         var partlistArticle = this.article.partlistArticles[key];
@@ -29074,11 +29184,11 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "getAccessoireMATData",
     value: function getAccessoireMATData(onString) {
       var MAT = [];
-      var _iterator38 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
-        _step38;
+      var _iterator39 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
+        _step39;
       try {
-        for (_iterator38.s(); !(_step38 = _iterator38.n()).done;) {
-          var ops = _step38.value;
+        for (_iterator39.s(); !(_step39 = _iterator39.n()).done;) {
+          var ops = _step39.value;
           var opt = void 0;
           if (!ops.val) continue;
           opt = ops.optionCodex;
@@ -29091,9 +29201,9 @@ var DivaArticle = /*#__PURE__*/function () {
           });
         }
       } catch (err) {
-        _iterator38.e(err);
+        _iterator39.e(err);
       } finally {
-        _iterator38.f();
+        _iterator39.f();
       }
       return MAT;
     }
@@ -29135,11 +29245,11 @@ var DivaArticle = /*#__PURE__*/function () {
     value: function getVariantBasketData() {
       var variantBasketData = [];
       var articleOptions = this.getArticleOptionStatesWithOptionsForPrint();
-      var _iterator39 = _createForOfIteratorHelper$6(articleOptions.values()),
-        _step39;
+      var _iterator40 = _createForOfIteratorHelper$7(articleOptions.values()),
+        _step40;
       try {
-        for (_iterator39.s(); !(_step39 = _iterator39.n()).done;) {
-          var ops = _step39.value;
+        for (_iterator40.s(); !(_step40 = _iterator40.n()).done;) {
+          var ops = _step40.value;
           var OP = ops.optionCodex;
           if (ops) {
             var _ops$idmVariantenArt2;
@@ -29206,9 +29316,9 @@ var DivaArticle = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator39.e(err);
+        _iterator40.e(err);
       } finally {
-        _iterator39.f();
+        _iterator40.f();
       }
       return variantBasketData;
     }
@@ -29450,17 +29560,17 @@ var DivaArticle = /*#__PURE__*/function () {
     value: function cloneArticle(set) {
       var clonedArticle = new DivaArticle(set, this.basketId, _objectSpread$e({}, this.article), this.article.catalogArticle, set.CatalogData);
       clonedArticle.articleOptionStatesData = new Map();
-      var _iterator40 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
-        _step40;
+      var _iterator41 = _createForOfIteratorHelper$7(this.articleOptionStates.values()),
+        _step41;
       try {
-        for (_iterator40.s(); !(_step40 = _iterator40.n()).done;) {
-          var ops = _step40.value;
+        for (_iterator41.s(); !(_step41 = _iterator41.n()).done;) {
+          var ops = _step41.value;
           clonedArticle.articleOptionStatesData.set(ops.optionCodex, ops.cloneOptionState(clonedArticle.getIsConfigSingle));
         }
       } catch (err) {
-        _iterator40.e(err);
+        _iterator41.e(err);
       } finally {
-        _iterator40.f();
+        _iterator41.f();
       }
       clonedArticle.initEngine();
       clonedArticle.hasDecisionsInitialized = true;
@@ -29475,9 +29585,9 @@ var DivaArticle = /*#__PURE__*/function () {
   }]);
 }();
 
-function _createForOfIteratorHelper$5(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$5(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray$5(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$5(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$5(r, a) : void 0; } }
-function _arrayLikeToArray$5(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _createForOfIteratorHelper$6(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$6(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray$6(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$6(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$6(r, a) : void 0; } }
+function _arrayLikeToArray$6(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function ownKeys$d(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$d(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$d(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$d(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$d = DivaUtils.initLog('Planner', 'WEB-PLANNER-LOGIC');
@@ -29974,7 +30084,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
         for (var key in articles) {
           var checkArticle = articles[key];
           //und jetzt in allen Optionsbäumen nach GroupedUsedOPVs suchen
-          var _iterator = _createForOfIteratorHelper$5(checkArticle.articleOptionStates.values()),
+          var _iterator = _createForOfIteratorHelper$6(checkArticle.articleOptionStates.values()),
             _step;
           try {
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -30023,7 +30133,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
       for (var i = keys.length - 1; i >= 0; i--) {
         var article = articles[keys[i]];
         if (article.hasArticleOptionStates) {
-          var _iterator2 = _createForOfIteratorHelper$5(article.articleOptionStates.values()),
+          var _iterator2 = _createForOfIteratorHelper$6(article.articleOptionStates.values()),
             _step2;
           try {
             for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -30098,7 +30208,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               }
 
               //defaultValues for FreeText
-              _iterator3 = _createForOfIteratorHelper$5(article.articleOptionStates.values());
+              _iterator3 = _createForOfIteratorHelper$6(article.articleOptionStates.values());
               _context10.prev = 5;
               _iterator3.s();
             case 7:
@@ -30536,13 +30646,13 @@ var DivaArticleHandler = /*#__PURE__*/function () {
                   }
                 }
               }
-              _iterator4 = _createForOfIteratorHelper$5(article.articleOptionStates.values());
+              _iterator4 = _createForOfIteratorHelper$6(article.articleOptionStates.values());
               try {
                 for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
                   ops = _step4.value;
                   if (ops.optionCodex.toUpperCase().endsWith('OPTCONSTRUCTIONRULES')) {
                     myOPVs = ops.option.articleOptionValues;
-                    _iterator5 = _createForOfIteratorHelper$5(myOPVs);
+                    _iterator5 = _createForOfIteratorHelper$6(myOPVs);
                     try {
                       for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
                         _step5$value = _slicedToArray(_step5.value, 2), key2 = _step5$value[0], opv = _step5$value[1];
@@ -30996,7 +31106,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     value: function getOptiontreeAccessoiresArr(setId, article) {
       var s = 0;
       var accessoires = [];
-      var _iterator6 = _createForOfIteratorHelper$5(article.articleOptionStates.values()),
+      var _iterator6 = _createForOfIteratorHelper$6(article.articleOptionStates.values()),
         _step6;
       try {
         for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
@@ -32057,9 +32167,9 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
   }]);
 }();
 
-function _createForOfIteratorHelper$4(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$4(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray$4(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$4(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$4(r, a) : void 0; } }
-function _arrayLikeToArray$4(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _createForOfIteratorHelper$5(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$5(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray$5(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$5(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$5(r, a) : void 0; } }
+function _arrayLikeToArray$5(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function ownKeys$c(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$c(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$c(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$c(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$b = DivaUtils.initLog('Planner', 'WEB-PLANNER-LOGIC');
@@ -32835,7 +32945,7 @@ var DivaSet = /*#__PURE__*/function () {
             case 0:
               dims = [];
               dimensions = [];
-              _iterator = _createForOfIteratorHelper$4(this.getArticleVariantValues());
+              _iterator = _createForOfIteratorHelper$5(this.getArticleVariantValues());
               _context4.prev = 3;
               _iterator.s();
             case 5:
@@ -32844,7 +32954,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               article = _step.value;
-              _iterator2 = _createForOfIteratorHelper$4(article.headerDimensions);
+              _iterator2 = _createForOfIteratorHelper$5(article.headerDimensions);
               _context4.prev = 8;
               _iterator2.s();
             case 10:
@@ -32934,7 +33044,7 @@ var DivaSet = /*#__PURE__*/function () {
       var cleanedDimensions = [];
       for (var basketId in articles) {
         var artice = articles[basketId];
-        var _iterator3 = _createForOfIteratorHelper$4(artice.articleOptionStates.values()),
+        var _iterator3 = _createForOfIteratorHelper$5(artice.articleOptionStates.values()),
           _step3;
         try {
           var _loop2 = function _loop2() {
@@ -33151,7 +33261,7 @@ var DivaSet = /*#__PURE__*/function () {
       var options = [];
       for (var key in this.divaArticles) {
         var article = this.divaArticles[key];
-        var _iterator4 = _createForOfIteratorHelper$4(article.articleOptionStates.values()),
+        var _iterator4 = _createForOfIteratorHelper$5(article.articleOptionStates.values()),
           _step4;
         try {
           for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
@@ -33412,7 +33522,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context5.next = 3;
-              return import('./DoorPlanner-4972c3b8.js');
+              return import('./DoorPlanner-f3b00f17.js');
             case 3:
               _yield$import = _context5.sent;
               DoorPlanner = _yield$import["default"];
@@ -33616,9 +33726,9 @@ var DivaSet = /*#__PURE__*/function () {
   }]);
 }();
 
-function _createForOfIteratorHelper$3(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$3(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray$3(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$3(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$3(r, a) : void 0; } }
-function _arrayLikeToArray$3(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _createForOfIteratorHelper$4(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$4(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray$4(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$4(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$4(r, a) : void 0; } }
+function _arrayLikeToArray$4(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var SummaryHandler = /*#__PURE__*/function () {
   function SummaryHandler() {
     _classCallCheck(this, SummaryHandler);
@@ -33633,7 +33743,7 @@ var SummaryHandler = /*#__PURE__*/function () {
         return !a.relatedToBasketId;
       }).length;
       var summaryTabItems = {};
-      var _iterator = _createForOfIteratorHelper$3(articles),
+      var _iterator = _createForOfIteratorHelper$4(articles),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -33651,7 +33761,7 @@ var SummaryHandler = /*#__PURE__*/function () {
   }, {
     key: "getSummaryItemsofArticle",
     value: function getSummaryItemsofArticle(article, set, summaryTabItems, baseArticlesCount) {
-      var _iterator2 = _createForOfIteratorHelper$3(article.articleOptionStates.values()),
+      var _iterator2 = _createForOfIteratorHelper$4(article.articleOptionStates.values()),
         _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -33740,7 +33850,7 @@ var SummaryHandler = /*#__PURE__*/function () {
   }, {
     key: "addAccessoires",
     value: function addAccessoires(articles, summaryTabItems, set, articlesPosNrs, baseArticlesCount) {
-      var _iterator3 = _createForOfIteratorHelper$3(articles),
+      var _iterator3 = _createForOfIteratorHelper$4(articles),
         _step3;
       try {
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -35215,9 +35325,9 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
 }();
 var favoritesHandlerInstance = new DivaFavoritesHandler();
 
-function _createForOfIteratorHelper$2(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$2(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray$2(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$2(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$2(r, a) : void 0; } }
-function _arrayLikeToArray$2(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _createForOfIteratorHelper$3(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$3(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray$3(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$3(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$3(r, a) : void 0; } }
+function _arrayLikeToArray$3(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 
 //Diese Klasse beinhaltet die Logik wie eine aktuelle Konfiguration mit allen möglicheen Ausprägungen mit Preisen in einem Set aussieht.
 //Der in einem Set gemergte Optionsbaum
@@ -35314,7 +35424,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       for (var basketId in optionStatesOfArticles) {
         //hier evtl. die Article mit einer gewissen reihenfolge durchlaufen!
         var optionsStates = optionStatesOfArticles[basketId];
-        var _iterator = _createForOfIteratorHelper$2(optionsStates.values()),
+        var _iterator = _createForOfIteratorHelper$3(optionsStates.values()),
           _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -35653,7 +35763,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                 _context3.next = 36;
                 break;
               }
-              _iterator5 = _createForOfIteratorHelper$2(retValues.configItems.keys());
+              _iterator5 = _createForOfIteratorHelper$3(retValues.configItems.keys());
               _context3.prev = 13;
               _iterator5.s();
             case 15:
@@ -35738,7 +35848,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
               selectedOpv = ops.valCodex;
               originalVariantValues = targetArticle.VariantValues;
               variantValues = {};
-              _iterator6 = _createForOfIteratorHelper$2(opg.visibleOptionValues.keys());
+              _iterator6 = _createForOfIteratorHelper$3(opg.visibleOptionValues.keys());
               _context3.prev = 58;
               _iterator6.s();
             case 60:
@@ -35890,7 +36000,8 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
           freeTextValue = undefined,
           freeTextLang = undefined,
           notTotallyMatichingOPVs = false,
-          myOptionState = undefined;
+          myOptionState = undefined,
+          isHeaderPosVariationTypeV = false;
         for (var i = 0; i < configStep.targetArticles.length; i++) {
           var _myOptionState, _myOptionState$idmVar;
           var article = articles[configStep.targetArticles[i]];
@@ -35905,20 +36016,27 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
             freeTextLang = myOptionState.freeTextLang;
           }
           if (myOptionState.headerPosVariationType == 'V' || [35, 1035].includes((_myOptionState$idmVar = myOptionState.idmVariantenArt) !== null && _myOptionState$idmVar !== void 0 ? _myOptionState$idmVar : 0)) {
+            isHeaderPosVariationTypeV = true;
             // 35 is the seatingheight. Articles should not be albe to have different seatheight
             //get schnittmenge of all the articles
             if (i === 0) {
               constructionRules = myOptionState.constructionRules;
               configItems = new Map(myOptionState.visibleOptionValues);
             } else {
-              var _iterator7 = _createForOfIteratorHelper$2(configItems.keys()),
+              var _iterator7 = _createForOfIteratorHelper$3(configItems.keys()),
                 _step7;
               try {
-                for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-                  var _key2 = _step7.value;
-                  if (!myOptionState.visibleOptionValues.get(_key2)) {
-                    configItems["delete"](_key2);
+                var _loop6 = function _loop6() {
+                  var key = _step7.value;
+                  if (!myOptionState.visibleOptionValues.get(key) && !myOptionState.visibleOptionValues.values().find(function (v) {
+                    var _configItems$get;
+                    return v.sameopv && v.sameopv == ((_configItems$get = configItems.get(key)) === null || _configItems$get === void 0 ? void 0 : _configItems$get.sameopv);
+                  })) {
+                    configItems["delete"](key);
                   }
+                };
+                for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+                  _loop6();
                 }
               } catch (err) {
                 _iterator7.e(err);
@@ -35933,11 +36051,22 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
             visibleOptionValuesOfArticles.push(myOptionState.visibleOptionValues);
           }
         }
+        if (isHeaderPosVariationTypeV) {
+          //die unterschiedlichen article schlißene da sie nichts gemeinsam habe alles aus.
+
+          if (visibleOptionValuesOfArticles.length == 0) {
+            var _article = articles[configStep.targetArticles[0]];
+            var _myOptionState2 = _article.getArticleOptionState(configStep.option);
+            if (!_myOptionState2) throw new Error('myOptionState ' + configStep.option + ' is undefined');
+            visibleOptionValuesOfArticles.push(_myOptionState2.visibleOptionValues);
+          }
+        }
         if (visibleOptionValuesOfArticles.length > 0) {
           configItems = new Map(visibleOptionValuesOfArticles[0]);
-          var _loop6 = function _loop6(_i2) {
-            var _articles$configStep$;
-            if ((_articles$configStep$ = articles[configStep.targetArticles[_i2]].getArticleOptionStateFlat(configStep.option)) !== null && _articles$configStep$ !== void 0 && _articles$configStep$.definedBySetFeatureFixed) return 1; // continue
+          var _loop7 = function _loop7(_i2) {
+            var _article$getArticleOp2;
+            var article = articles[configStep.targetArticles[_i2]];
+            if ((_article$getArticleOp2 = article.getArticleOptionStateFlat(configStep.option)) !== null && _article$getArticleOp2 !== void 0 && _article$getArticleOp2.definedBySetFeatureFixed) return 1; // continue
             var keys = Array.from(configItems.keys());
             var newKeys = Array.from(visibleOptionValuesOfArticles[_i2].keys());
             var opvsOnlyInA = keys.filter(function (x) {
@@ -35947,7 +36076,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
               return !keys.includes(x);
             });
             if (opvsOnlyInA.length && opvsOnlyInB.length) {
-              var _loop7 = function _loop7() {
+              var _loop8 = function _loop8() {
                 var opva = configItems.get(opvsOnlyInA[j]);
                 if (!opva) return 1; // continue
                 var sameOPVExists = opvsOnlyInB.find(function (opvb) {
@@ -35960,10 +36089,10 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                 }
               };
               for (var j = opvsOnlyInA.length - 1; j >= 0; j--) {
-                if (_loop7()) continue;
+                if (_loop8()) continue;
               }
             } else if (opvsOnlyInA.length) {
-              var _loop8 = function _loop8() {
+              var _loop9 = function _loop9() {
                 var opva = configItems.get(opvsOnlyInA[_j]);
                 if (!opva) return 1; // continue
                 var sameOPVExists = newKeys.find(function (opvb) {
@@ -35975,10 +36104,10 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                 }
               };
               for (var _j = opvsOnlyInA.length - 1; _j >= 0; _j--) {
-                if (_loop8()) continue;
+                if (_loop9()) continue;
               }
             } else if (opvsOnlyInB.length) {
-              var _loop9 = function _loop9() {
+              var _loop10 = function _loop10() {
                 var opva = configItems.get(opvsOnlyInB[_j2]);
                 if (!opva) return 1; // continue
                 var sameOPVExists = keys.find(function (opvb) {
@@ -35990,16 +36119,16 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                 }
               };
               for (var _j2 = opvsOnlyInB.length - 1; _j2 >= 0; _j2--) {
-                if (_loop9()) continue;
+                if (_loop10()) continue;
               }
             }
             var differentOPVs = opvsOnlyInA.concat(opvsOnlyInB);
-            if (!isOPG && differentOPVs.length) {
+            if (!isOPG && differentOPVs.length && (!article.isPartListArticle || configItems.size == 0)) {
               notTotallyMatichingOPVs = true;
             }
           };
           for (var _i2 = 1; _i2 < visibleOptionValuesOfArticles.length; _i2++) {
-            if (_loop6(_i2)) continue;
+            if (_loop7(_i2)) continue;
           }
         }
         return {
@@ -36028,7 +36157,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
         ret = false;
       var articles = set.getDivaArticles();
       for (var basketId in articles) {
-        var _iterator8 = _createForOfIteratorHelper$2(articles[basketId].articleOptionStates.values()),
+        var _iterator8 = _createForOfIteratorHelper$3(articles[basketId].articleOptionStates.values()),
           _step8;
         try {
           for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
@@ -36061,8 +36190,8 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       var myConfigItemsForView = [];
       var objectKeys = Array.from(myConfigItems.keys());
       var groupContentItemIdObject = this.getGroupContentItemIdObject(Array.from(myConfigItems.values()), idmOpgGroupName);
-      var _loop10 = function _loop10() {
-        var _ops$optionOcd3, _item$images, _item$colorGroups, _item$pdfUrl, _item$url;
+      var _loop11 = function _loop11() {
+        var _ops$optionOcd3, _item$images, _item$colorGroups, _item$pdfUrl, _item$url, _ops$option$checkForR;
         var item = myConfigItems.get(objectKeys[i]);
         if (!item) throw new Error('item ' + objectKeys[i] + ' not found in myConfigItems');
         var key = objectKeys[i];
@@ -36130,11 +36259,12 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
           url: (_item$url = item.url) !== null && _item$url !== void 0 ? _item$url : ops.option.url,
           isFav: !!isFav,
           doShowFav: isFav !== undefined,
-          metaData: item.metaDataView
+          metaData: item.metaDataView,
+          checkForReversingChanges: (_ops$option$checkForR = ops.option.checkForReversed) === null || _ops$option$checkForR === void 0 ? void 0 : _ops$option$checkForR.checkForReversingChanges
         });
       };
       for (var i = 0; i < objectKeys.length; i++) {
-        if (_loop10()) continue;
+        if (_loop11()) continue;
       }
       return {
         myConfigItemsForView: myConfigItemsForView
@@ -36168,7 +36298,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       for (var iKey in optionStatesOfArticles) {
         //hier evtl. die Article mit einer gewissen reihenfolge durchlaufen!
         var optionsStates = optionStatesOfArticles[iKey];
-        var _iterator9 = _createForOfIteratorHelper$2(optionsStates.values()),
+        var _iterator9 = _createForOfIteratorHelper$3(optionsStates.values()),
           _step9;
         try {
           for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
@@ -36192,6 +36322,9 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
 }();
 var configTreeHandler = new DivaConfigTreeHandler();
 
+function _createForOfIteratorHelper$2(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$2(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray$2(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$2(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$2(r, a) : void 0; } }
+function _arrayLikeToArray$2(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function ownKeys$a(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$a(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$a(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$a(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$9 = DivaUtils.initLog('Planner', 'DIVA-SET-HANDLER');
@@ -38192,7 +38325,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
     value: (function () {
       var _variantsEvaluator = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee24(set, configItems, configStepKey, paletteType, hidePricePreview) {
         var _configItems$0$option, _set$api$ReturnToFrom, _set$CatalogData$show, _set$CatalogData$hide;
-        var opt, previewType, targetArticles, variants, pricesVisible;
+        var opt, previewType, _opt$checkForReversed, targetArticles, variants, pricesVisible;
         return _regeneratorRuntime.wrap(function _callee24$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
@@ -38214,7 +38347,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 _context26.next = 9;
                 break;
               }
-              if (set.logTotalStateForVariants) {
+              if (!(!set.logTotalStateForVariants && !((_opt$checkForReversed = opt.checkForReversed) !== null && _opt$checkForReversed !== void 0 && _opt$checkForReversed.checkForReversingChanges))) {
                 _context26.next = 9;
                 break;
               }
@@ -38222,7 +38355,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
             case 9:
               targetArticles = set.configTree.getTargetArticles(configStepKey);
               _context26.next = 12;
-              return this.calcVariants(set, configItems, targetArticles, opt.codex);
+              return this.calcVariants(set, configItems, targetArticles, opt);
             case 12:
               variants = _context26.sent;
               if (previewType) {
@@ -38249,38 +38382,37 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "calcVariants",
     value: function () {
-      var _calcVariants = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee25(realSet, configItems, targetArticles, optionCodex) {
-        var variantInfo, set, articles, origPrice, articleConfigs, i, basketId, totalConfig, key, parentNames, _i5, configItem, _ref, _ref2;
+      var _calcVariants = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee25(realSet, configItems, targetArticles, option) {
+        var variantInfo, articles, origPrice, articleConfigs, i, basketId, totalConfig, key, parentNames, _i5, configItem, _ref, _ref2;
         return _regeneratorRuntime.wrap(function _callee25$(_context27) {
           while (1) switch (_context27.prev = _context27.next) {
             case 0:
               variantInfo = [];
-              set = realSet.cloneSet();
-              articles = set.getDivaArticles(true, true);
-              origPrice = set.getSetPrice();
+              articles = realSet.getDivaArticles(true, true);
+              origPrice = realSet.getSetPrice();
               articleConfigs = {};
               i = 0;
-            case 6:
+            case 5:
               if (!(i < targetArticles.length)) {
-                _context27.next = 14;
+                _context27.next = 13;
                 break;
               }
               basketId = targetArticles[i];
               if (articles[basketId]) {
-                _context27.next = 10;
+                _context27.next = 9;
                 break;
               }
-              return _context27.abrupt("continue", 11);
-            case 10:
+              return _context27.abrupt("continue", 10);
+            case 9:
               articleConfigs[basketId] = {
                 config: articles[basketId].VisibleVariantValues,
                 articleCodex: articles[basketId].articleCodex
               };
-            case 11:
+            case 10:
               i++;
-              _context27.next = 6;
+              _context27.next = 5;
               break;
-            case 14:
+            case 13:
               totalConfig = {};
               for (key in articles) {
                 totalConfig[key] = {
@@ -38290,33 +38422,33 @@ var DivaSetHandler = /*#__PURE__*/function () {
               }
               parentNames = [];
               _i5 = 0;
-            case 18:
+            case 17:
               if (!(_i5 < configItems.length)) {
-                _context27.next = 31;
+                _context27.next = 30;
                 break;
               }
               configItem = configItems[_i5];
               if (!(configItem.isParentOPVG || configItem.idmOpgValCodex)) {
-                _context27.next = 27;
+                _context27.next = 26;
                 break;
               }
               if (!parentNames.includes((_ref = configItem.isParentOPVG ? configItem.parentName : configItem.idmOpgValCodex) !== null && _ref !== void 0 ? _ref : '')) {
-                _context27.next = 26;
+                _context27.next = 25;
                 break;
               }
               variantInfo.push(variantInfo[_i5 - 1]);
-              return _context27.abrupt("continue", 28);
-            case 26:
+              return _context27.abrupt("continue", 27);
+            case 25:
               parentNames.push((_ref2 = configItem.isParentOPVG ? configItem.parentName : configItem.idmOpgValCodex) !== null && _ref2 !== void 0 ? _ref2 : '');
+            case 26:
+              variantInfo.push(this.getVariant(realSet.cloneSet(), configItem, articleConfigs, totalConfig, targetArticles, option, origPrice, _i5, variantInfo[_i5 - 1]));
             case 27:
-              variantInfo.push(this.getVariant(set, configItem, articleConfigs, totalConfig, targetArticles, optionCodex, origPrice, _i5, variantInfo[_i5 - 1]));
-            case 28:
               _i5++;
-              _context27.next = 18;
+              _context27.next = 17;
               break;
-            case 31:
+            case 30:
               return _context27.abrupt("return", variantInfo);
-            case 32:
+            case 31:
             case "end":
               return _context27.stop();
           }
@@ -38330,8 +38462,8 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "getVariant",
     value: function () {
-      var _getVariant = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee26(set, item, origConfigs, totalConfig, targetArticles, optionCodex, origPrice, index, previousPromise) {
-        var firstPrice, prevProm, startTime, doUseConfigs, hashVariantValues, variantValues, i, basketId, origConfig, key, hash, dataHash, _i6, endTime, calcTime, price, priceObj;
+      var _getVariant = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee26(set, item, origConfigs, totalConfig, targetArticles, option, origPrice, index, previousPromise) {
+        var firstPrice, prevProm, startTime, doUseConfigs, hashVariantValues, variantValues, i, basketId, origConfig, key, hash, dataHash, _i6, reversingCheck, ret, endTime, calcTime, price, priceObj;
         return _regeneratorRuntime.wrap(function _callee26$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
@@ -38389,7 +38521,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 _context28.next = 24;
                 break;
               }
-              LOG$9.debug('calcingVariant from Option:' + optionCodex + ' and index: ' + index + ' hash hit!', dataHash, [].concat(hashVariantValues, _toConsumableArray(Object.values(totalConfig))), targetArticles);
+              LOG$9.debug('calcingVariant from Option:' + option.codex + ' and index: ' + index + ' hash hit!', dataHash, [].concat(hashVariantValues, _toConsumableArray(Object.values(totalConfig))), targetArticles);
               return _context28.abrupt("return", _objectSpread$a(_objectSpread$a({}, dataHash), {}, {
                 origPrice: origPrice,
                 firstPrice: firstPrice
@@ -38408,12 +38540,28 @@ var DivaSetHandler = /*#__PURE__*/function () {
               _context28.next = 25;
               break;
             case 31:
+              reversingCheck = undefined;
+              if (!option.checkForReversed) {
+                _context28.next = 37;
+                break;
+              }
+              _context28.next = 35;
+              return this.checkForReversingChanges(set, origConfigs, option, option.checkForReversed.checkOnlyForOptions);
+            case 35:
+              ret = _context28.sent;
+              reversingCheck = {
+                checkingForReversingChanges: option.checkForReversed.checkForReversingChanges,
+                hasReversingChanges: ret.hasReversingChanges,
+                reversingVariantValues: ret.reversingVariantValues
+              };
+            case 37:
               endTime = new Date();
               calcTime = endTime.getTime() - startTime.getTime();
-              LOG$9.debug('calcingVariant Time from Option:' + optionCodex + ' and index: ' + index + ' time is: ' + calcTime + 'ms' + targetArticles.join(';'), [].concat(hashVariantValues, _toConsumableArray(Object.values(totalConfig))));
+              LOG$9.debug('calcingVariant Time from Option:' + option.codex + ' and index: ' + index + ' time is: ' + calcTime + 'ms' + targetArticles.join(';'), [].concat(hashVariantValues, _toConsumableArray(Object.values(totalConfig))));
               price = set.getSetPrice();
               priceObj = {
                 price: price,
+                reversingCheck: reversingCheck,
                 opt: item.op,
                 opv: item.codex,
                 origPrice: origPrice,
@@ -38425,7 +38573,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               };
               set.CatalogData.setVariantsPriceByHash(hash, priceObj);
               return _context28.abrupt("return", priceObj);
-            case 38:
+            case 44:
             case "end":
               return _context28.stop();
           }
@@ -38490,6 +38638,93 @@ var DivaSetHandler = /*#__PURE__*/function () {
       }
       return checkIfPriceDiffers;
     }()
+  }, {
+    key: "checkForReversingChanges",
+    value: function () {
+      var _checkForReversingChanges = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee28(set, origConfigs, option, checkOnlyForOptions) {
+        var hasReversingChanges, reversingVariantValues, basketId, origConfig, article, variantValues, _iterator, _step, ops, _ops$valCodex;
+        return _regeneratorRuntime.wrap(function _callee28$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
+            case 0:
+              hasReversingChanges = false;
+              reversingVariantValues = {};
+              _context30.t0 = _regeneratorRuntime.keys(origConfigs);
+            case 3:
+              if ((_context30.t1 = _context30.t0()).done) {
+                _context30.next = 32;
+                break;
+              }
+              basketId = _context30.t1.value;
+              origConfig = origConfigs[basketId].config;
+              article = set.getArticleByBasketId(basketId);
+              if (article) {
+                _context30.next = 9;
+                break;
+              }
+              throw new Error('Article not found for basketId: ' + basketId);
+            case 9:
+              variantValues = article.VisibleVariantValues;
+              _iterator = _createForOfIteratorHelper$2(article.articleOptionStates.values());
+              _context30.prev = 11;
+              _iterator.s();
+            case 13:
+              if ((_step = _iterator.n()).done) {
+                _context30.next = 22;
+                break;
+              }
+              ops = _step.value;
+              if (!(ops.optionCodex == option.codex)) {
+                _context30.next = 17;
+                break;
+              }
+              return _context30.abrupt("break", 22);
+            case 17:
+              if (!(checkOnlyForOptions !== null && checkOnlyForOptions !== void 0 && checkOnlyForOptions.length && !checkOnlyForOptions.includes(ops.optionCodex))) {
+                _context30.next = 19;
+                break;
+              }
+              return _context30.abrupt("continue", 20);
+            case 19:
+              if (ops && origConfig[ops.optionCodex] && (!ops.visibleCount || variantValues[ops.optionCodex] != origConfig[ops.optionCodex]) && (!ops.isInvisible || ops.visibleCount == 0)) {
+                hasReversingChanges = true;
+                reversingVariantValues[ops.optionCodex] = {
+                  codex: (_ops$valCodex = ops.valCodex) !== null && _ops$valCodex !== void 0 ? _ops$valCodex : '',
+                  label: ops.optionName
+                };
+              }
+            case 20:
+              _context30.next = 13;
+              break;
+            case 22:
+              _context30.next = 27;
+              break;
+            case 24:
+              _context30.prev = 24;
+              _context30.t2 = _context30["catch"](11);
+              _iterator.e(_context30.t2);
+            case 27:
+              _context30.prev = 27;
+              _iterator.f();
+              return _context30.finish(27);
+            case 30:
+              _context30.next = 3;
+              break;
+            case 32:
+              return _context30.abrupt("return", {
+                hasReversingChanges: hasReversingChanges,
+                reversingVariantValues: reversingVariantValues
+              });
+            case 33:
+            case "end":
+              return _context30.stop();
+          }
+        }, _callee28, null, [[11, 24, 27, 30]]);
+      }));
+      function checkForReversingChanges(_x107, _x108, _x109, _x110) {
+        return _checkForReversingChanges.apply(this, arguments);
+      }
+      return checkForReversingChanges;
+    }()
     /**
      * This function updates the option values of the articles
      * @param myValues
@@ -38499,11 +38734,11 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "updateArticlesOptionStatesOfActSet",
     value: (function () {
-      var _updateArticlesOptionStatesOfActSet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee28(set, myValues, targetArticlesWithNewValues, ignorePlanner, from, partlistDiff) {
+      var _updateArticlesOptionStatesOfActSet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee29(set, myValues, targetArticlesWithNewValues, ignorePlanner, from, partlistDiff) {
         var _resultPlannerUpdate;
         var elementsToDeleteById, targetArticlesToUpdateOnly, previousValues, articles, article, optState, retValues, diff, resultPlannerUpdate, targetElementIds, i, articleToDel, index, result, articleCopyRelation, newArticle, rpu, copyIndex;
-        return _regeneratorRuntime.wrap(function _callee28$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+        return _regeneratorRuntime.wrap(function _callee29$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
               elementsToDeleteById = [];
               targetArticlesToUpdateOnly = [];
@@ -38522,55 +38757,55 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 optState = article === null || article === void 0 ? void 0 : article.getArticleJsonVariantValues();
                 previousValues = structuredClone(optState);
               }
-              _context30.next = 8;
+              _context31.next = 8;
               return articleHandlerInstance.updateArticlesOptionStates(myValues, targetArticlesWithNewValues, targetArticlesToUpdateOnly, set.getDivaArticles(true), from);
             case 8:
-              retValues = _context30.sent;
+              retValues = _context31.sent;
               targetArticlesWithNewValues = retValues.targetArticlesToUpdate;
               if (!(retValues.partlistArticlesToLoad.length > 0)) {
-                _context30.next = 19;
+                _context31.next = 19;
                 break;
               }
               diff = targetArticlesToUpdateOnly.length - Object.keys(set.getDivaArticles()).length;
               if (!(diff == 0 || partlistDiff == diff)) {
-                _context30.next = 17;
+                _context31.next = 17;
                 break;
               }
-              _context30.next = 15;
+              _context31.next = 15;
               return articleHandlerInstance.correctPartlistArticlesByGlobalRules(set, retValues.partlistArticlesToLoad, set.CatalogData.bundleRules, {
                 doChange: false
               });
             case 15:
-              _context30.next = 19;
+              _context31.next = 19;
               break;
             case 17:
-              _context30.next = 19;
+              _context31.next = 19;
               return this.updateArticlesOptionStatesOfActSet(set, {}, targetArticlesWithNewValues, ignorePlanner, from, diff);
             case 19:
               if (!(from !== 'initializingPartlist')) {
-                _context30.next = 22;
+                _context31.next = 22;
                 break;
               }
-              _context30.next = 22;
+              _context31.next = 22;
               return this.updateEdoArticles(set, retValues.newEDOExtraArticles);
             case 22:
               if (set.CatalogData.hasAlternateRenderings) set.CatalogData.updateAlternativeRenderings(set.getDivaArticles());
 
               //Update Planner - check if planner data changed
               if (!(!ignorePlanner && from != 'calcVariant')) {
-                _context30.next = 64;
+                _context31.next = 64;
                 break;
               }
               targetElementIds = this.getElementIdsOfArticles(set, targetArticlesWithNewValues);
-              _context30.next = 27;
+              _context31.next = 27;
               return set.plannerHandler.updatePlanner(set.getSetId(), myValues, targetElementIds);
             case 27:
-              resultPlannerUpdate = _context30.sent;
+              resultPlannerUpdate = _context31.sent;
               if (!resultPlannerUpdate.failed) {
-                _context30.next = 31;
+                _context31.next = 31;
                 break;
               }
-              _context30.next = 31;
+              _context31.next = 31;
               return articleHandlerInstance.updateArticlesOptionStates(previousValues, targetArticlesWithNewValues, targetArticlesToUpdateOnly, set.getDivaArticles(true), from);
             case 31:
               elementsToDeleteById = resultPlannerUpdate.elemIdsToDelete;
@@ -38582,35 +38817,35 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 }
               }
               if (!resultPlannerUpdate.doDeleteBackGrid) {
-                _context30.next = 40;
+                _context31.next = 40;
                 break;
               }
-              _context30.next = 36;
+              _context31.next = 36;
               return this.deleteElementFromSetByElemId(set, resultPlannerUpdate.elemIdsToDelete[0], false, resultPlannerUpdate.deletionType);
             case 36:
-              result = _context30.sent;
+              result = _context31.sent;
               //Others are deleted recursive
               if (result.selectElementId) {
                 resultPlannerUpdate.elementIdsToUpdateSelection = [result.selectElementId];
               }
-              _context30.next = 47;
+              _context31.next = 47;
               break;
             case 40:
               i = 0;
             case 41:
               if (!(i < resultPlannerUpdate.elemIdsToDelete.length)) {
-                _context30.next = 47;
+                _context31.next = 47;
                 break;
               }
-              _context30.next = 44;
+              _context31.next = 44;
               return this.deleteElementFromSetByElemId(set, resultPlannerUpdate.elemIdsToDelete[i], false, resultPlannerUpdate.deletionType);
             case 44:
               i++;
-              _context30.next = 41;
+              _context31.next = 41;
               break;
             case 47:
               if (!(resultPlannerUpdate.elementIdToCopy && resultPlannerUpdate.elementIdToCopy.length > 0)) {
-                _context30.next = 63;
+                _context31.next = 63;
                 break;
               }
               //Todo copy these elements
@@ -38618,20 +38853,20 @@ var DivaSetHandler = /*#__PURE__*/function () {
               i = 0;
             case 50:
               if (!(i < resultPlannerUpdate.elementIdToCopy.length)) {
-                _context30.next = 58;
+                _context31.next = 58;
                 break;
               }
-              _context30.next = 53;
+              _context31.next = 53;
               return this.copyArticleByElementId(set, resultPlannerUpdate.elementIdToCopy[i], resultPlannerUpdate.ignoreOptionsToCopy);
             case 53:
-              newArticle = _context30.sent;
+              newArticle = _context31.sent;
               articleCopyRelation.push({
                 key: resultPlannerUpdate.elementIdToCopy[i],
                 value: newArticle.basketId
               });
             case 55:
               i++;
-              _context30.next = 50;
+              _context31.next = 50;
               break;
             case 58:
               rpu = resultPlannerUpdate;
@@ -38641,10 +38876,10 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 z: rpu.copyType == 'BoxPlanner_backside' ? -1 : 0
               };
               if (!(resultPlannerUpdate.copyType == 'BoxPlanner_backside')) {
-                _context30.next = 63;
+                _context31.next = 63;
                 break;
               }
-              _context30.next = 63;
+              _context31.next = 63;
               return set.plannerHandler.copyPlannerElements(set.getSetId(), articleCopyRelation, {
                 copyIndex: copyIndex,
                 copyType: resultPlannerUpdate.copyType,
@@ -38654,18 +38889,18 @@ var DivaSetHandler = /*#__PURE__*/function () {
             case 63:
               this.updatePosNrOfAccessoiresOfTargetArticles(set, targetArticlesWithNewValues);
             case 64:
-              return _context30.abrupt("return", {
+              return _context31.abrupt("return", {
                 articleCountChanged: elementsToDeleteById.length > 0,
                 elementIdsToUpdateSelection: (_resultPlannerUpdate = resultPlannerUpdate) === null || _resultPlannerUpdate === void 0 ? void 0 : _resultPlannerUpdate.elementIdsToUpdateSelection,
                 setId: set.getSetId()
               });
             case 65:
             case "end":
-              return _context30.stop();
+              return _context31.stop();
           }
-        }, _callee28, this);
+        }, _callee29, this);
       }));
-      function updateArticlesOptionStatesOfActSet(_x107, _x108, _x109, _x110, _x111, _x112) {
+      function updateArticlesOptionStatesOfActSet(_x111, _x112, _x113, _x114, _x115, _x116) {
         return _updateArticlesOptionStatesOfActSet.apply(this, arguments);
       }
       return updateArticlesOptionStatesOfActSet;
@@ -38702,32 +38937,32 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "updateEdoArticles",
     value: function () {
-      var _updateEdoArticles = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee29(set, edoArticlesToLoad) {
+      var _updateEdoArticles = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee30(set, edoArticlesToLoad) {
         var oldBasketIds, i, article, newArticles, _i7, _i8;
-        return _regeneratorRuntime.wrap(function _callee29$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+        return _regeneratorRuntime.wrap(function _callee30$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
             case 0:
               if (!(set.edoExtraArticles.length > 0 || edoArticlesToLoad.length > 0)) {
-                _context31.next = 22;
+                _context32.next = 22;
                 break;
               }
               oldBasketIds = _toConsumableArray(set.edoExtraArticles);
               i = 0;
             case 3:
               if (!(i < set.edoExtraArticles.length)) {
-                _context31.next = 11;
+                _context32.next = 11;
                 break;
               }
               article = set.getArticleByBasketId(set.edoExtraArticles[i]);
               if (!article) {
-                _context31.next = 8;
+                _context32.next = 8;
                 break;
               }
-              _context31.next = 8;
+              _context32.next = 8;
               return this.deleteElementFromSet(set, article);
             case 8:
               i++;
-              _context31.next = 3;
+              _context32.next = 3;
               break;
             case 11:
               set.edoExtraArticles = [];
@@ -38735,18 +38970,18 @@ var DivaSetHandler = /*#__PURE__*/function () {
               _i7 = 0;
             case 14:
               if (!(_i7 < edoArticlesToLoad.length)) {
-                _context31.next = 21;
+                _context32.next = 21;
                 break;
               }
-              _context31.next = 17;
+              _context32.next = 17;
               return this.addArticleToActSet(set, edoArticlesToLoad[_i7].ArticleCodex, _objectSpread$a(_objectSpread$a({}, edoArticlesToLoad[_i7]), {}, {
                 basketId: oldBasketIds[_i7]
               }), true);
             case 17:
-              newArticles[_i7] = _context31.sent;
+              newArticles[_i7] = _context32.sent;
             case 18:
               _i7++;
-              _context31.next = 14;
+              _context32.next = 14;
               break;
             case 21:
               for (_i8 = 0; _i8 < newArticles.length; _i8++) {
@@ -38754,11 +38989,11 @@ var DivaSetHandler = /*#__PURE__*/function () {
               }
             case 22:
             case "end":
-              return _context31.stop();
+              return _context32.stop();
           }
-        }, _callee29, this);
+        }, _callee30, this);
       }));
-      function updateEdoArticles(_x113, _x114) {
+      function updateEdoArticles(_x117, _x118) {
         return _updateEdoArticles.apply(this, arguments);
       }
       return updateEdoArticles;
@@ -38924,11 +39159,11 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "fillOrderLinesAndOrderSets",
     value: function () {
-      var _fillOrderLinesAndOrderSets = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee30(sets, divaBasketHandler, repairOnly, setPlanner, returnTo) {
+      var _fillOrderLinesAndOrderSets = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee31(sets, divaBasketHandler, repairOnly, setPlanner, returnTo) {
         var _set$getMatchingProdu2, _set$getMatchingProdu3;
         var orderSets, basketData, set, _set$getMatchingProdu, key, _set$basketConfigVari, _OrderLinesOfActSet$, _set, catalogData, articles, newOrderSet, customDimensions, OrderLinesOfActSet, ret, _key2, i, _basketData$OrderSets, _basketData$SetPlanne, oderSetsIsInActPlanning, setId, j;
-        return _regeneratorRuntime.wrap(function _callee30$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+        return _regeneratorRuntime.wrap(function _callee31$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
             case 0:
               orderSets = [];
               basketData = divaBasketHandler.actBasket;
@@ -38940,32 +39175,32 @@ var DivaSetHandler = /*#__PURE__*/function () {
               }
               basketData.MatchingProductId = set === null || set === void 0 || (_set$getMatchingProdu2 = set.getMatchingProduct()) === null || _set$getMatchingProdu2 === void 0 ? void 0 : _set$getMatchingProdu2._id;
               basketData.MatchingProductRetailerArticleNr = set === null || set === void 0 || (_set$getMatchingProdu3 = set.getMatchingProduct()) === null || _set$getMatchingProdu3 === void 0 || (_set$getMatchingProdu3 = _set$getMatchingProdu3.retailerArticleNr) === null || _set$getMatchingProdu3 === void 0 ? void 0 : _set$getMatchingProdu3.toString();
-              _context32.t0 = _regeneratorRuntime.keys(sets);
+              _context33.t0 = _regeneratorRuntime.keys(sets);
             case 8:
-              if ((_context32.t1 = _context32.t0()).done) {
-                _context32.next = 32;
+              if ((_context33.t1 = _context33.t0()).done) {
+                _context33.next = 32;
                 break;
               }
-              key = _context32.t1.value;
+              key = _context33.t1.value;
               _set = sets[key];
               catalogData = _set.CatalogData;
               articles = _set.getDivaArticles();
-              _context32.next = 15;
+              _context33.next = 15;
               return this.getOrderSet(_set, catalogData, divaBasketHandler.actDivaNr, repairOnly, returnTo);
             case 15:
-              newOrderSet = _context32.sent;
+              newOrderSet = _context33.sent;
               basketData.setIsPlanning(_set.SetType == 'PLANNING' ? '1' : '0');
-              _context32.next = 19;
+              _context33.next = 19;
               return _set.getCustomDimensionsOfActSet();
             case 19:
-              customDimensions = _context32.sent;
+              customDimensions = _context33.sent;
               OrderLinesOfActSet = articleHandlerInstance.getOrderLinesOfArticles(articles, customDimensions, repairOnly, !!((_set$basketConfigVari = _set.basketConfigVariants) !== null && _set$basketConfigVari !== void 0 && _set$basketConfigVari.length));
               articleHandlerInstance.checkForRoundingError(OrderLinesOfActSet, _set);
               if (OrderLinesOfActSet.length) {
-                _context32.next = 24;
+                _context33.next = 24;
                 break;
               }
-              return _context32.abrupt("continue", 8);
+              return _context33.abrupt("continue", 8);
             case 24:
               OrderLinesOfActSet = divaBasketHandler.divaWWSHandler.repairWWSFlags(articles, OrderLinesOfActSet);
               if (newOrderSet.SetImage == '' && (_OrderLinesOfActSet$ = OrderLinesOfActSet[0]) !== null && _OrderLinesOfActSet$ !== void 0 && _OrderLinesOfActSet$.Image && _set.PlannerMode == 'No') {
@@ -38987,7 +39222,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               }
               newOrderSet.setOrderLines(OrderLinesOfActSet);
               orderSets.push(newOrderSet);
-              _context32.next = 8;
+              _context33.next = 8;
               break;
             case 32:
               //fill diva3DProject for renderings & AR Converter
@@ -38995,7 +39230,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               i = 0;
             case 34:
               if (!(i < ((_basketData$OrderSets = basketData.OrderSets) === null || _basketData$OrderSets === void 0 ? void 0 : _basketData$OrderSets.length))) {
-                _context32.next = 49;
+                _context33.next = 49;
                 break;
               }
               oderSetsIsInActPlanning = false;
@@ -39003,18 +39238,18 @@ var DivaSetHandler = /*#__PURE__*/function () {
               j = 0;
             case 38:
               if (!(j < orderSets.length)) {
-                _context32.next = 45;
+                _context33.next = 45;
                 break;
               }
               if (!(orderSets[j].SetID == setId)) {
-                _context32.next = 42;
+                _context33.next = 42;
                 break;
               }
               oderSetsIsInActPlanning = true;
-              return _context32.abrupt("break", 45);
+              return _context33.abrupt("break", 45);
             case 42:
               j++;
-              _context32.next = 38;
+              _context33.next = 38;
               break;
             case 45:
               if (!oderSetsIsInActPlanning && !((_basketData$SetPlanne = basketData.SetPlannerInfos) !== null && _basketData$SetPlanne !== void 0 && _basketData$SetPlanne.InvolvedSetIds.includes(setId))) {
@@ -39022,7 +39257,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               }
             case 46:
               i++;
-              _context32.next = 34;
+              _context33.next = 34;
               break;
             case 49:
               basketData.SetPlannerInfos = setPlanner ? this.getSetPlannerInfos(Object.keys(sets), orderSets) : undefined;
@@ -39034,14 +39269,14 @@ var DivaSetHandler = /*#__PURE__*/function () {
               } else {
                 basketData.setOrderSets(orderSets);
               }
-              return _context32.abrupt("return", basketData);
+              return _context33.abrupt("return", basketData);
             case 53:
             case "end":
-              return _context32.stop();
+              return _context33.stop();
           }
-        }, _callee30, this);
+        }, _callee31, this);
       }));
-      function fillOrderLinesAndOrderSets(_x115, _x116, _x117, _x118, _x119) {
+      function fillOrderLinesAndOrderSets(_x119, _x120, _x121, _x122, _x123) {
         return _fillOrderLinesAndOrderSets.apply(this, arguments);
       }
       return fillOrderLinesAndOrderSets;
@@ -39131,11 +39366,11 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "getOrderSet",
     value: function () {
-      var _getOrderSet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee31(set, catalogData, divaNr, repairOnly, returnTo) {
+      var _getOrderSet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee32(set, catalogData, divaNr, repairOnly, returnTo) {
         var _Object$values$, _set$getDivaArticles, _hqRenderScript, _urlToAiImages, _alternateSetImages, _set$basketConfigVari2, _set$basketConfigVari3;
         var dontGenerateImages, orderSet, GroupType, plannerData, setImage, urlToPlanning2D, urlToAiImages, alternateSetImages, hqRenderScript, dimensions, promise3D, promise2D, promiseAiImages, promise3DAlternate, _yield$Promise$all, _yield$Promise$all2, _yield$Promise$all2$, plannerWarnings, bruttoPrice;
-        return _regeneratorRuntime.wrap(function _callee31$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+        return _regeneratorRuntime.wrap(function _callee32$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
               dontGenerateImages = repairOnly || returnTo == 'DONT_SAVE_BASKET' || returnTo == 'TEST_CONFIGURATORLOGIC';
               DivaUtils.startSpanOfApm('GetSet3D und 2D Image');
@@ -39148,7 +39383,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               hqRenderScript = undefined;
               dimensions = {};
               if (dontGenerateImages) {
-                _context33.next = 26;
+                _context34.next = 26;
                 break;
               }
               promise3D = this.getSetImage(set, typeof window === 'undefined');
@@ -39159,10 +39394,10 @@ var DivaSetHandler = /*#__PURE__*/function () {
               if (!catalogData.dontSaveAlternativeRenderings && set.CatalogData.alternateRenderingsForSummary.length) {
                 promise3DAlternate = this.getAlternateSetImages(set);
               }
-              _context33.next = 17;
+              _context34.next = 17;
               return Promise.all([promise3D, promise2D, promiseAiImages, promise3DAlternate, this.getHQRenderScript(set, divaNr)]);
             case 17:
-              _yield$Promise$all = _context33.sent;
+              _yield$Promise$all = _context34.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 5);
               _yield$Promise$all2$ = _yield$Promise$all2[0];
               setImage = _yield$Promise$all2$.url;
@@ -39237,14 +39472,14 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 MetaData: !((_set$basketConfigVari2 = set.basketConfigVariants) !== null && _set$basketConfigVari2 !== void 0 && _set$basketConfigVari2.length) ? set.MetaData : undefined,
                 MetaData_locales: !((_set$basketConfigVari3 = set.basketConfigVariants) !== null && _set$basketConfigVari3 !== void 0 && _set$basketConfigVari3.length) ? set.MetaData_locales : undefined
               });
-              return _context33.abrupt("return", orderSet);
+              return _context34.abrupt("return", orderSet);
             case 32:
             case "end":
-              return _context33.stop();
+              return _context34.stop();
           }
-        }, _callee31, this);
+        }, _callee32, this);
       }));
-      function getOrderSet(_x120, _x121, _x122, _x123, _x124) {
+      function getOrderSet(_x124, _x125, _x126, _x127, _x128) {
         return _getOrderSet.apply(this, arguments);
       }
       return getOrderSet;
@@ -39257,31 +39492,31 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "getSetImage",
     value: (function () {
-      var _getSetImage = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee32(set, overwriteLastSavedRendering) {
+      var _getSetImage = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee33(set, overwriteLastSavedRendering) {
         var is3D, _yield$set$plannerHan, dimensions, url;
-        return _regeneratorRuntime.wrap(function _callee32$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+        return _regeneratorRuntime.wrap(function _callee33$(_context35) {
+          while (1) switch (_context35.prev = _context35.next) {
             case 0:
               is3D = ['3DImage', '3DCOMB', 'BoxPlanner', 'RTViewer'].includes(set.getPlannerMode());
               if (!is3D) {
-                _context34.next = 10;
+                _context35.next = 10;
                 break;
               }
-              _context34.next = 4;
+              _context35.next = 4;
               return set.plannerHandler.saveSetImage(overwriteLastSavedRendering);
             case 4:
-              _context34.next = 6;
+              _context35.next = 6;
               return set.plannerHandler.getSetImageAsUrl(set.getSetId());
             case 6:
-              _yield$set$plannerHan = _context34.sent;
+              _yield$set$plannerHan = _context35.sent;
               dimensions = _yield$set$plannerHan.dimensions;
               url = _yield$set$plannerHan.url;
-              return _context34.abrupt("return", {
+              return _context35.abrupt("return", {
                 dimensions: dimensions,
                 url: url
               });
             case 10:
-              return _context34.abrupt("return", {
+              return _context35.abrupt("return", {
                 dimensions: {
                   w: undefined,
                   h: undefined,
@@ -39290,11 +39525,11 @@ var DivaSetHandler = /*#__PURE__*/function () {
               });
             case 11:
             case "end":
-              return _context34.stop();
+              return _context35.stop();
           }
-        }, _callee32);
+        }, _callee33);
       }));
-      function getSetImage(_x125, _x126) {
+      function getSetImage(_x129, _x130) {
         return _getSetImage.apply(this, arguments);
       }
       return getSetImage;
@@ -39302,45 +39537,45 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "getHQRenderScript",
     value: function () {
-      var _getHQRenderScript = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee33(set, divaNr) {
+      var _getHQRenderScript = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee34(set, divaNr) {
         var is3D, hqRenderScript, createdHQRenderScript;
-        return _regeneratorRuntime.wrap(function _callee33$(_context35) {
-          while (1) switch (_context35.prev = _context35.next) {
+        return _regeneratorRuntime.wrap(function _callee34$(_context36) {
+          while (1) switch (_context36.prev = _context36.next) {
             case 0:
               //if not 3d
               is3D = ['3DImage', '3DCOMB', 'BoxPlanner', 'RTViewer'].includes(set.getPlannerMode());
               if (is3D) {
-                _context35.next = 3;
+                _context36.next = 3;
                 break;
               }
-              return _context35.abrupt("return");
+              return _context36.abrupt("return");
             case 3:
-              _context35.next = 5;
+              _context36.next = 5;
               return set.plannerHandler.saveSetHQRenderScript();
             case 5:
               hqRenderScript = set.plannerHandler.getSetHQRenderScript();
               if (hqRenderScript) {
-                _context35.next = 8;
+                _context36.next = 8;
                 break;
               }
-              return _context35.abrupt("return");
+              return _context36.abrupt("return");
             case 8:
-              _context35.next = 10;
+              _context36.next = 10;
               return set.api.postHQRenderScript({
                 divaNr: divaNr,
                 hqRenderscript: hqRenderScript,
                 organization: set.api.OrganizationId
               });
             case 10:
-              createdHQRenderScript = _context35.sent;
-              return _context35.abrupt("return", createdHQRenderScript);
+              createdHQRenderScript = _context36.sent;
+              return _context36.abrupt("return", createdHQRenderScript);
             case 12:
             case "end":
-              return _context35.stop();
+              return _context36.stop();
           }
-        }, _callee33);
+        }, _callee34);
       }));
-      function getHQRenderScript(_x127, _x128) {
+      function getHQRenderScript(_x131, _x132) {
         return _getHQRenderScript.apply(this, arguments);
       }
       return getHQRenderScript;
@@ -39354,34 +39589,34 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "getAlternateSetImages",
     value: (function () {
-      var _getAlternateSetImages = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee34(set) {
+      var _getAlternateSetImages = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee35(set) {
         var is2D, catalogData, setImages;
-        return _regeneratorRuntime.wrap(function _callee34$(_context36) {
-          while (1) switch (_context36.prev = _context36.next) {
+        return _regeneratorRuntime.wrap(function _callee35$(_context37) {
+          while (1) switch (_context37.prev = _context37.next) {
             case 0:
               is2D = !['3DImage', '3DCOMB', 'BoxPlanner'].includes(set.getPlannerMode());
               if (!(is2D || set.onlyRunLogic)) {
-                _context36.next = 3;
+                _context37.next = 3;
                 break;
               }
-              return _context36.abrupt("return", []);
+              return _context37.abrupt("return", []);
             case 3:
               catalogData = set.CatalogData;
-              _context36.next = 6;
+              _context37.next = 6;
               return set.plannerHandler.saveAlternateSetImages(catalogData.catalogCodex, catalogData.catalogGuid);
             case 6:
-              _context36.next = 8;
+              _context37.next = 8;
               return set.plannerHandler.getAlternateSetImagesAsSetImageData(set.getSetId());
             case 8:
-              setImages = _context36.sent;
-              return _context36.abrupt("return", setImages);
+              setImages = _context37.sent;
+              return _context37.abrupt("return", setImages);
             case 10:
             case "end":
-              return _context36.stop();
+              return _context37.stop();
           }
-        }, _callee34);
+        }, _callee35);
       }));
-      function getAlternateSetImages(_x129) {
+      function getAlternateSetImages(_x133) {
         return _getAlternateSetImages.apply(this, arguments);
       }
       return getAlternateSetImages;
@@ -39389,30 +39624,30 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "get2DSetImage",
     value: function () {
-      var _get2DSetImage = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee35(set) {
+      var _get2DSetImage = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee36(set) {
         var urlToPlanning2D, planning2DAsJPGBase64;
-        return _regeneratorRuntime.wrap(function _callee35$(_context37) {
-          while (1) switch (_context37.prev = _context37.next) {
+        return _regeneratorRuntime.wrap(function _callee36$(_context38) {
+          while (1) switch (_context38.prev = _context38.next) {
             case 0:
               urlToPlanning2D = undefined;
               planning2DAsJPGBase64 = set.getPlanning2DAsJpg();
               if (!(planning2DAsJPGBase64 != undefined && planning2DAsJPGBase64 != '' && planning2DAsJPGBase64 != 'data:,')) {
-                _context37.next = 6;
+                _context38.next = 6;
                 break;
               }
-              _context37.next = 5;
+              _context38.next = 5;
               return set.plannerHandler.saveSet2DImage(set.CatalogData.catalogCodex, set.CatalogData.catalogGuid, planning2DAsJPGBase64);
             case 5:
-              urlToPlanning2D = _context37.sent;
+              urlToPlanning2D = _context38.sent;
             case 6:
-              return _context37.abrupt("return", urlToPlanning2D);
+              return _context38.abrupt("return", urlToPlanning2D);
             case 7:
             case "end":
-              return _context37.stop();
+              return _context38.stop();
           }
-        }, _callee35);
+        }, _callee36);
       }));
-      function get2DSetImage(_x130) {
+      function get2DSetImage(_x134) {
         return _get2DSetImage.apply(this, arguments);
       }
       return get2DSetImage;
@@ -39420,29 +39655,29 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "getAiImages",
     value: function () {
-      var _getAiImages = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee36(set) {
+      var _getAiImages = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee37(set) {
         var catalogData, aiImages, savedImages;
-        return _regeneratorRuntime.wrap(function _callee36$(_context38) {
-          while (1) switch (_context38.prev = _context38.next) {
+        return _regeneratorRuntime.wrap(function _callee37$(_context39) {
+          while (1) switch (_context39.prev = _context39.next) {
             case 0:
               catalogData = set.CatalogData;
               aiImages = set.getAiImagesAsJpg(); // Save all AI images in parallel
-              _context38.next = 4;
+              _context39.next = 4;
               return Promise.all(aiImages.map(function (_ref3) {
                 var promptId = _ref3.promptId,
                   base64 = _ref3.base64;
                 return set.plannerHandler.saveAiImage(promptId, catalogData.catalogCodex, catalogData.catalogGuid, base64);
               }));
             case 4:
-              savedImages = _context38.sent;
-              return _context38.abrupt("return", savedImages);
+              savedImages = _context39.sent;
+              return _context39.abrupt("return", savedImages);
             case 6:
             case "end":
-              return _context38.stop();
+              return _context39.stop();
           }
-        }, _callee36);
+        }, _callee37);
       }));
-      function getAiImages(_x131) {
+      function getAiImages(_x135) {
         return _getAiImages.apply(this, arguments);
       }
       return getAiImages;
@@ -39450,31 +39685,31 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "getAiImage",
     value: function () {
-      var _getAiImage = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee37(set) {
+      var _getAiImage = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee38(set) {
         var aiImages, catalogData, _aiImages$, promptId, base64;
-        return _regeneratorRuntime.wrap(function _callee37$(_context39) {
-          while (1) switch (_context39.prev = _context39.next) {
+        return _regeneratorRuntime.wrap(function _callee38$(_context40) {
+          while (1) switch (_context40.prev = _context40.next) {
             case 0:
               aiImages = set.getAiImagesAsJpg();
               if (!(aiImages.length === 0)) {
-                _context39.next = 3;
+                _context40.next = 3;
                 break;
               }
-              return _context39.abrupt("return", undefined);
+              return _context40.abrupt("return", undefined);
             case 3:
               catalogData = set.CatalogData;
               _aiImages$ = aiImages[0], promptId = _aiImages$.promptId, base64 = _aiImages$.base64;
-              _context39.next = 7;
+              _context40.next = 7;
               return set.plannerHandler.saveAiImage(promptId, catalogData.catalogCodex, catalogData.catalogGuid, base64);
             case 7:
-              return _context39.abrupt("return", _context39.sent);
+              return _context40.abrupt("return", _context40.sent);
             case 8:
             case "end":
-              return _context39.stop();
+              return _context40.stop();
           }
-        }, _callee37);
+        }, _callee38);
       }));
-      function getAiImage(_x132) {
+      function getAiImage(_x136) {
         return _getAiImage.apply(this, arguments);
       }
       return getAiImage;
@@ -39514,25 +39749,25 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "addOrderSetArticlesToExistingSet",
     value: function () {
-      var _addOrderSetArticlesToExistingSet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee38(set, orderSet, lastSetToInitialize) {
-        return _regeneratorRuntime.wrap(function _callee38$(_context40) {
-          while (1) switch (_context40.prev = _context40.next) {
+      var _addOrderSetArticlesToExistingSet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee39(set, orderSet, lastSetToInitialize) {
+        return _regeneratorRuntime.wrap(function _callee39$(_context41) {
+          while (1) switch (_context41.prev = _context41.next) {
             case 0:
               //TODO: GLOBAL STUFF
               //this.updateActSet(set);
               orderSet.changeBasketIds();
-              _context40.next = 3;
+              _context41.next = 3;
               return this.initOrderLineArticles(set, orderSet);
             case 3:
-              _context40.next = 5;
+              _context41.next = 5;
               return set.plannerHandler.extendSet(set, orderSet.SetPlanData, lastSetToInitialize);
             case 5:
             case "end":
-              return _context40.stop();
+              return _context41.stop();
           }
-        }, _callee38, this);
+        }, _callee39, this);
       }));
-      function addOrderSetArticlesToExistingSet(_x133, _x134, _x135) {
+      function addOrderSetArticlesToExistingSet(_x137, _x138, _x139) {
         return _addOrderSetArticlesToExistingSet.apply(this, arguments);
       }
       return addOrderSetArticlesToExistingSet;
@@ -39577,6 +39812,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     _defineProperty(this, "_basketHandler", void 0);
     _defineProperty(this, "startProductId", void 0);
     _defineProperty(this, "initializationType", void 0);
+    _defineProperty(this, "analyticsRelevantData", {});
     _defineProperty(this, "hasConfiguratorSessionId", false);
     //Only helper variable
     _defineProperty(this, "origConfiguration", {});
@@ -39613,6 +39849,11 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     get: function get() {
       return this.initializationType;
     }
+  }, {
+    key: "analyticsRelevantDataGetter",
+    get: function get() {
+      return this.analyticsRelevantData;
+    }
   }, {
     key: "actDivaNr",
     get: function get() {
@@ -40285,12 +40526,18 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               }));
               return _context8.abrupt("return", false);
             case 9:
+              if (variantData.productHierarchy) {
+                this.analyticsRelevantData.productHierarchy = variantData.productHierarchy;
+              }
+              if (variantData.productGroup) {
+                this.analyticsRelevantData.productGroup = variantData.productGroup;
+              }
               return _context8.abrupt("return", this.initBasket(api, variantData.basket.DivaNr, variantData, undefined, productId));
-            case 10:
-              _context8.next = 16;
-              break;
             case 12:
-              _context8.prev = 12;
+              _context8.next = 18;
+              break;
+            case 14:
+              _context8.prev = 14;
               _context8.t0 = _context8["catch"](0);
               LOG$8.error(new DivaError('Error while fetching product data', {
                 code: 'WC_0005',
@@ -40299,11 +40546,11 @@ var DivaBasketHandler = /*#__PURE__*/function () {
                 }
               }));
               return _context8.abrupt("return", false);
-            case 16:
+            case 18:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[0, 12]]);
+        }, _callee8, this, [[0, 14]]);
       }));
       function loadBasketByCustomProductId(_x14, _x15, _x16, _x17) {
         return _loadBasketByCustomProductId.apply(this, arguments);
@@ -40605,7 +40852,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context12.next = 5;
-              return import('./PfisterWWSHandler-4d4f47e1.js');
+              return import('./PfisterWWSHandler-01b35a05.js');
             case 5:
               _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -40613,7 +40860,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 9:
               _context12.next = 11;
-              return import('./LiviqueWWSHandler-9adb0151.js');
+              return import('./LiviqueWWSHandler-ab94c5fe.js');
             case 11:
               _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -40621,7 +40868,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 15:
               _context12.next = 17;
-              return import('./SeriousBasketHandler-9798abe7.js');
+              return import('./SeriousBasketHandler-d37b6c7f.js');
             case 17:
               _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -40629,7 +40876,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 21:
               _context12.next = 23;
-              return import('./StandardWWSHandler-b34da6e5.js');
+              return import('./StandardWWSHandler-4df74a93.js');
             case 23:
               _yield$import4 = _context12.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -42053,7 +42300,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _context3.next = 2;
-              return import('./Host3DSignalR-caa4f6e9.js');
+              return import('./Host3DSignalR-55d50416.js');
             case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -43711,7 +43958,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context4.next = 10;
-              return import('./DivaStandardPlanner-cb741118.js');
+              return import('./DivaStandardPlanner-6a3a3e24.js');
             case 10:
               _yield$import = _context4.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -43722,7 +43969,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context4.abrupt("break", 21);
             case 15:
               _context4.next = 17;
-              return import('./DivaBoxPlanner-f5f99ba6.js');
+              return import('./DivaBoxPlanner-997f1fe9.js');
             case 17:
               _yield$import2 = _context4.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -45459,7 +45706,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _context12.next = 21;
               return _this.fillBaksetforOnWebPlanerConfigChange(myValues, undefined, eventKey);
             case 21:
-              _this.configuratorChangeLog('onConfiguratorStep', myValues);
+              _this.configuratorChangeLog('onConfigurationChange', myValues);
             case 22:
             case "end":
               return _context12.stop();
@@ -45637,7 +45884,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     value: function () {
       var _initializeSets = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee15(loadSuccessful, viewReadyPromise) {
         var _this$actions17, _set$getDivaArticles, _catalogData$catalogM, _catalogData$catalogM2;
-        var _this$actions16, _this$actions16$toggl, initSetState, set, oldProductId, result, _this$actions18, catalogData, initializationId, _this$plannerConfig$a, initializationType;
+        var _this$actions16, _this$actions16$toggl, initSetState, set, oldProductId, _result$customData, _result$customData2, result, _this$actions18, catalogData, initializationId, _this$plannerConfig$a, initializationType;
         return _regeneratorRuntime.wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
@@ -45668,29 +45915,31 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               set = this.actSet();
               oldProductId = this.divaBasketHandler.actBasket.MatchingProductId || this.divaBasketHandler.actBasket.OrigProductId;
               if (!(oldProductId && set && set !== null && set !== void 0 && set.api.doCheckForProductsPrice())) {
-                _context15.next = 23;
+                _context15.next = 27;
                 break;
               }
-              _context15.next = 19;
+              _context15.next = 21;
               return this.divaBasketHandler.getProduct(this.api, oldProductId);
-            case 19:
+            case 21:
               result = _context15.sent;
               if (result) productHandlerInstance.handleFountMatchingProducts(set, [result], set.setHash);
-              _context15.next = 24;
+              result === null || result === void 0 || (_result$customData = result.customData) === null || _result$customData === void 0 ? void 0 : _result$customData.SAP_MARA_MATKL;
+              result === null || result === void 0 || (_result$customData2 = result.customData) === null || _result$customData2 === void 0 ? void 0 : _result$customData2.SAP_MARA_PRDHA;
+              _context15.next = 28;
               break;
-            case 23:
+            case 27:
               if (typeof loadSuccessful != 'boolean' && set !== null && set !== void 0 && set.api.doCheckForProductsPrice()) {
                 if (loadSuccessful.type != 'ProductList') {
                   productHandlerInstance.handleFountMatchingProducts(set, [loadSuccessful], set.setHash);
                 }
               }
-            case 24:
-              _context15.next = 26;
+            case 28:
+              _context15.next = 30;
               return viewReadyPromise;
-            case 26:
-              _context15.next = 28;
+            case 30:
+              _context15.next = 32;
               return this.initView();
-            case 28:
+            case 32:
               (_this$actions17 = this.actions) === null || _this$actions17 === void 0 || _this$actions17.onEvent({
                 type: 'onConfiguratorReady'
               });
@@ -45722,20 +45971,20 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 accountName: catalogData === null || catalogData === void 0 ? void 0 : catalogData.accountName,
                 supplierId: catalogData === null || catalogData === void 0 ? void 0 : catalogData.accountGuid,
                 plannerInitialization: initializationType,
-                productGroup: catalogData === null || catalogData === void 0 ? void 0 : catalogData.mainCategory,
                 hasPlannerInitialization: this.initMode ? false : true,
                 initializationType: initializationType,
                 initializationId: initializationId,
                 originalProductId: oldProductId,
-                maskId: (_catalogData$catalogM = catalogData === null || catalogData === void 0 || (_catalogData$catalogM2 = catalogData.catalogMask) === null || _catalogData$catalogM2 === void 0 ? void 0 : _catalogData$catalogM2.packageId) !== null && _catalogData$catalogM !== void 0 ? _catalogData$catalogM : undefined
+                maskId: (_catalogData$catalogM = catalogData === null || catalogData === void 0 || (_catalogData$catalogM2 = catalogData.catalogMask) === null || _catalogData$catalogM2 === void 0 ? void 0 : _catalogData$catalogM2.packageId) !== null && _catalogData$catalogM !== void 0 ? _catalogData$catalogM : undefined,
+                analyticsRelevantData: this.divaBasketHandler.analyticsRelevantDataGetter //ForExample ProductGroup and ProductHierarchy, extracted form product object
               }, false);
-              this.configuratorChangeLog('onInitOptions', undefined, true);
+              this.configuratorChangeLog('onConfigurationInit', undefined, true);
               this.plannerChangeLog('onInitPlanner', true);
-              _context15.next = 40;
+              _context15.next = 44;
               return this.fillBaksetforOnWebPlanerConfigChange(undefined, true);
-            case 40:
+            case 44:
               return _context15.abrupt("return", true);
-            case 41:
+            case 45:
             case "end":
               return _context15.stop();
           }
@@ -48127,96 +48376,60 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     value: function configuratorChangeLog(action, myValues) {
       var isInit = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var set = this.actSet();
-      var configuration = [];
-      var allOpt = [];
-      var allOpv = [];
-      var latestOpv = {};
-      var latestOpt = {};
-      var latestColor = [];
       var actualBasketvalue = 0;
+      //handle Price
       if (set) {
         actualBasketvalue = set === null || set === void 0 ? void 0 : set.getSetPrice();
-        if (myValues) {
-          var _set$CatalogData$getO, _set$CatalogData$getO2, _set$CatalogData$getO3;
-          latestOpt = {
-            codex: Object.keys(myValues)[0],
-            name: (_set$CatalogData$getO = set.CatalogData.getOption(Object.keys(myValues)[0])) === null || _set$CatalogData$getO === void 0 ? void 0 : _set$CatalogData$getO.name
-          };
-          latestOpv = {
-            codex: Object.values(myValues)[0],
-            name: (_set$CatalogData$getO2 = set.CatalogData.getOptionValue(Object.values(myValues)[0])) === null || _set$CatalogData$getO2 === void 0 ? void 0 : _set$CatalogData$getO2.name
-          };
-          latestColor = ((_set$CatalogData$getO3 = set.CatalogData.getOptionValue(Object.values(myValues)[0])) === null || _set$CatalogData$getO3 === void 0 ? void 0 : _set$CatalogData$getO3.colorGroups) || [];
+      }
+
+      //handle user selected
+      var explicitlySetConfiguration = undefined;
+      if (myValues && set) {
+        var _set$CatalogData$getO, _set$CatalogData$getO2, _set$CatalogData$getO3;
+        explicitlySetConfiguration = {
+          optCodex: Object.keys(myValues)[0],
+          optName: (set === null || set === void 0 || (_set$CatalogData$getO = set.CatalogData.getOption(Object.keys(myValues)[0])) === null || _set$CatalogData$getO === void 0 ? void 0 : _set$CatalogData$getO.name) || '',
+          opvCodex: Object.values(myValues)[0],
+          opvName: (set === null || set === void 0 || (_set$CatalogData$getO2 = set.CatalogData.getOptionValue(Object.values(myValues)[0])) === null || _set$CatalogData$getO2 === void 0 ? void 0 : _set$CatalogData$getO2.name) || '',
+          stage: 'USER_CHANGE'
+        };
+        var latestColor = ((_set$CatalogData$getO3 = set.CatalogData.getOptionValue(Object.values(myValues)[0])) === null || _set$CatalogData$getO3 === void 0 ? void 0 : _set$CatalogData$getO3.colorGroups) || [];
+        if (latestColor.length > 0) {
+          explicitlySetConfiguration.optClassification = 'COLOR';
+          explicitlySetConfiguration.opvClassification = latestColor;
         }
+      }
+
+      //handle final configuration
+      var finalConfiguration = [];
+      if (set) {
         for (var _i2 = 0, _Object$values2 = Object.values(set.getDivaArticles()); _i2 < _Object$values2.length; _i2++) {
           var article = _Object$values2[_i2];
           var variantValues = article.AllVariantValues;
-          if (!configuration) {
-            configuration = [{
-              varientValues: variantValues,
-              basketId: article.basketId,
-              opt: Object.keys(variantValues).map(function (key) {
-                var _set$CatalogData$getO4;
-                return {
-                  codex: key,
-                  name: (_set$CatalogData$getO4 = set.CatalogData.getOption(key)) === null || _set$CatalogData$getO4 === void 0 ? void 0 : _set$CatalogData$getO4.name
-                };
-              }),
-              opv: Object.values(variantValues).map(function (value) {
-                var _set$CatalogData$getO5;
-                return {
-                  codex: value,
-                  name: (_set$CatalogData$getO5 = set.CatalogData.getOption(value)) === null || _set$CatalogData$getO5 === void 0 ? void 0 : _set$CatalogData$getO5.name
-                };
-              })
-            }];
-          } else {
-            configuration.push({
-              varientValues: variantValues,
-              basketId: article.basketId,
-              opt: Object.keys(variantValues).map(function (key) {
-                var _set$CatalogData$getO6;
-                return {
-                  codex: key,
-                  name: (_set$CatalogData$getO6 = set.CatalogData.getOption(key)) === null || _set$CatalogData$getO6 === void 0 ? void 0 : _set$CatalogData$getO6.name
-                };
-              }),
-              opv: Object.values(variantValues).map(function (value) {
-                var _set$CatalogData$getO7;
-                return {
-                  codex: value,
-                  name: (_set$CatalogData$getO7 = set.CatalogData.getOptionValue(value)) === null || _set$CatalogData$getO7 === void 0 ? void 0 : _set$CatalogData$getO7.name
-                };
-              })
-            });
-          }
           for (var _i3 = 0, _Object$entries = Object.entries(variantValues); _i3 < _Object$entries.length; _i3++) {
-            var _set$CatalogData$getO8, _set$CatalogData$getO9;
+            var _set$CatalogData$getO4, _set$CatalogData$getO5, _set$CatalogData$getO6;
             var _Object$entries$_i = _slicedToArray(_Object$entries[_i3], 2),
               opt = _Object$entries$_i[0],
               opv = _Object$entries$_i[1];
-            allOpt.push({
-              codex: opt,
-              name: (_set$CatalogData$getO8 = set.CatalogData.getOption(opt)) === null || _set$CatalogData$getO8 === void 0 ? void 0 : _set$CatalogData$getO8.name
-            });
-            allOpv.push({
-              codex: opv,
-              name: (_set$CatalogData$getO9 = set.CatalogData.getOptionValue(opv)) === null || _set$CatalogData$getO9 === void 0 ? void 0 : _set$CatalogData$getO9.name
-            });
+            var finalConfigurationItem = {
+              optCodex: opt,
+              optName: ((_set$CatalogData$getO4 = set.CatalogData.getOption(opt)) === null || _set$CatalogData$getO4 === void 0 ? void 0 : _set$CatalogData$getO4.name) || '',
+              opvCodex: opv,
+              opvName: ((_set$CatalogData$getO5 = set.CatalogData.getOptionValue(opv)) === null || _set$CatalogData$getO5 === void 0 ? void 0 : _set$CatalogData$getO5.name) || '',
+              stage: action == 'onConfigurationChange' ? 'FINAL' : 'INITIAL'
+            };
+            var color = ((_set$CatalogData$getO6 = set.CatalogData.getOptionValue(opv)) === null || _set$CatalogData$getO6 === void 0 ? void 0 : _set$CatalogData$getO6.colorGroups) || [];
+            if (color.length > 0) {
+              finalConfigurationItem.optClassification = 'COLOR';
+              finalConfigurationItem.opvClassification = color;
+            }
+            finalConfiguration.push(finalConfigurationItem);
           }
         }
       }
       LOG$1.businessEvent(action, 'Planner', 'Configurator wurde verändert', {
-        configuration: {
-          latest: {
-            opv: latestOpv,
-            opt: latestOpt,
-            color: latestColor
-          },
-          opt: allOpt,
-          opv: allOpv,
-          configuration_nested: configuration
-        }
+        explicitlySetConfiguration: explicitlySetConfiguration,
+        wholeConfiguration: finalConfiguration
       });
       LOG$1.businessEvent('onActualBasketValue', 'Planner', 'Aktueller Basket Value:' + actualBasketvalue, {
         basketValue: actualBasketvalue,
@@ -50210,15 +50423,18 @@ var PlannerElementData = /*#__PURE__*/function () {
   }, {
     key: "getWorld2DBBoxOutline",
     value: function getWorld2DBBoxOutline() {
-      var bboxPoints = [];
-      bboxPoints.push(new Vector2(this.WorldPosCorner.x, this.WorldPosCorner.z));
-      var helper = Vector2.rotateOrigin(new Vector2(this.getGlobalWidth(), 0), this.RotDeg);
-      bboxPoints.push(new Vector2(this.WorldPosCorner.x + helper.x, this.WorldPosCorner.z + helper.y));
-      helper = Vector2.rotateOrigin(new Vector2(this.getGlobalWidth(), this.getGlobalDepth()), this.RotDeg);
-      bboxPoints.push(new Vector2(this.WorldPosCorner.x + helper.x, this.WorldPosCorner.z + helper.y));
-      helper = Vector2.rotateOrigin(new Vector2(0, this.getGlobalDepth()), this.RotDeg);
-      bboxPoints.push(new Vector2(this.WorldPosCorner.x + helper.x, this.WorldPosCorner.z + helper.y));
-      return bboxPoints;
+      var polygonWorld = this.HasOLFPolygon ? this.getOLFPolygonWorldPos() : this.getOLTPolygonWorldPos();
+      var xs = polygonWorld.map(function (p) {
+        return p.x;
+      });
+      var zs = polygonWorld.map(function (p) {
+        return p.y;
+      });
+      var minX = Math.min.apply(Math, _toConsumableArray(xs));
+      var maxX = Math.max.apply(Math, _toConsumableArray(xs));
+      var minZ = Math.min.apply(Math, _toConsumableArray(zs));
+      var maxZ = Math.max.apply(Math, _toConsumableArray(zs));
+      return [new Vector2(minX, minZ), new Vector2(maxX, minZ), new Vector2(maxX, maxZ), new Vector2(minX, maxZ)];
     }
   }, {
     key: "RotDeg",