@crystaldesign/web-planner-logic 25.8.0-beta.9 → 25.8.0-rc.0

package/build/cjs/{index-c3d1cedf.js → index-a83c6c71.js}

@@ -286,8 +286,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
     key: "getDataCache",
     value: function () {
       var _getDataCache = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(queryString, cacheMD5, accountSessionGuid, useWebServiceApi, method, data) {
-        var _this$divaWebConfigDa, _this$divaWebConfigDa2, _this$divaWebConfigDa3;
-        var myQS, url, init, addSession, cacheHit, _this$apiConfig3, _this$apiConfig4, api2Url, result;
+        var _this$divaWebConfigDa, _this$divaWebConfigDa2;
+        var myQS, url, init, addSession, cacheHit, _this$apiConfig3, _this$apiConfig4, api2Url, result, _this$divaWebConfigDa3;
         return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -378,11 +378,13 @@ var DivaApiHandler = /*#__PURE__*/function () {
               return this.fetchData(url, init);
             case 36:
               result = _context3.sent;
-              if (method !== 'POST') this.jsonDataCache.set(myQS, result);
-              if (cacheMD5 && !((_this$divaWebConfigDa3 = this.divaWebConfigData) !== null && _this$divaWebConfigDa3 !== void 0 && _this$divaWebConfigDa3.addOrganizationIdToCacheKey)) this.jsonDataCache.set(cacheMD5, result);
+              if (method !== 'POST') {
+                this.jsonDataCache.set(myQS, result);
+                if (cacheMD5 && !((_this$divaWebConfigDa3 = this.divaWebConfigData) !== null && _this$divaWebConfigDa3 !== void 0 && _this$divaWebConfigDa3.addOrganizationIdToCacheKey)) this.jsonDataCache.set(cacheMD5, result);
+              }
               LOG$p.debug('getDataFromApi: ' + queryString);
               return _context3.abrupt("return", result);
-            case 41:
+            case 40:
             case "end":
               return _context3.stop();
           }
@@ -17246,6 +17248,18 @@ var CatalogArticleData = /*#__PURE__*/function () {
       }
       return false;
     }
+  }, {
+    key: "getOptionCodexFromOptionsValue",
+    value: function getOptionCodexFromOptionsValue(opv) {
+      if (this._catalogArticle.articleOptions) {
+        for (var _key3 in this._catalogArticle.articleOptions) {
+          if (this._catalogArticle.articleOptions[_key3].articleOptionValues[opv]) {
+            return _key3;
+          }
+        }
+      }
+      return undefined;
+    }
   }]);
 }();
 
@@ -18710,7 +18724,7 @@ function loadArticleOptions(json, catalogArticleData, set, onlyRunLogic) {
           var tmpOPG = myOPT.OPG[j],
             catOPG = set.CatalogData.getOptionValue(tmpOPG.OCD ? tmpOPG.OCD : tmpOPG.Codex);
           if (catOPG) {
-            var newOPG = new ArticleOptionValueData(getArticleOptionValueType(tmpOPG.Codex, tmpOPG, catOPG, catalogArticleData, false, newOPT));
+            var newOPG = new ArticleOptionValueData(getArticleOptionValueType(tmpOPG.Codex, tmpOPG, catOPG, catalogArticleData, false, newOPT, multiselectOptions));
             allOPVsOfOPT[tmpOPG.Codex] = newOPG;
             for (var m = 0; m < tmpOPG.OPV.length; m++) {
               var tmpOPV = tmpOPG.OPV[m],
@@ -21457,22 +21471,30 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
         return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              promises = [state.api.getDataCache(state.api.getCatalogDataQS(catalogCodex), state.api.getCatalogDataCacheKey(catalogCodex), orderSet.AccountSessionGUID), state.api.getDataCache(state.api.getJsonArticleListQS(catalogCodex), state.api.getJsonArticleListCacheKey(catalogCodex), orderSet.AccountSessionGUID), state.api.getDataCache(state.api.getJsonPlannerElementsQS(catalogCodex), state.api.getJsonPlannerElementsCacheKey(catalogCodex), orderSet.AccountSessionGUID)];
+              promises = [state.api.getDataCache(state.api.getCatalogDataQS(catalogCodex), state.api.getCatalogDataCacheKey(catalogCodex), orderSet.AccountSessionGUID), state.api.getDataCache(state.api.getJsonArticleListQS(catalogCodex), state.api.getJsonArticleListCacheKey(catalogCodex), orderSet.AccountSessionGUID), state.api.getDataCache(state.api.getJsonPlannerElementsQS(catalogCodex), state.api.getJsonPlannerElementsCacheKey(catalogCodex), orderSet.AccountSessionGUID)].concat([this.loadAdditionalModelInfos(state, orderSet.AccountGUID, orderSet.CatalogGUID)], _toConsumableArray__default["default"](state.onlyRunLogic ? [] : _toConsumableArray__default["default"](new Map(orderSet.OrderLines.filter(function (ol) {
+                var _ol$VariantBasketData;
+                return (_ol$VariantBasketData = ol.VariantBasketDatas) === null || _ol$VariantBasketData === void 0 ? void 0 : _ol$VariantBasketData.length;
+              }).map(function (os) {
+                return [os.ArticleCodex + os.CatalogCodex, os];
+              })).values()).map(function (ol) {
+                var _ol$CatalogCodex;
+                return state.api.getArticleJson(ol.ArticleCodex, (_ol$CatalogCodex = ol.CatalogCodex) !== null && _ol$CatalogCodex !== void 0 ? _ol$CatalogCodex : orderSet.CatalogCodex, orderSet.AccountSessionGUID);
+              })));
               _context2.next = 3;
               return Promise.all(promises);
             case 3:
               _yield$Promise$all = _context2.sent;
-              _yield$Promise$all2 = _slicedToArray__default["default"](_yield$Promise$all, 3);
+              _yield$Promise$all2 = _slicedToArray__default["default"](_yield$Promise$all, 4);
               catalogApiData = _yield$Promise$all2[0];
               catalogArticleListData = _yield$Promise$all2[1];
               catalogArticlePlannerListData = _yield$Promise$all2[2];
+              additionalModelInfos = _yield$Promise$all2[3];
               if (!catalogApiData.Error) {
-                _context2.next = 10;
+                _context2.next = 11;
                 break;
               }
               throw new Error(catalogApiData.Error);
-            case 10:
-              additionalModelInfos = undefined;
+            case 11:
               mask = undefined;
               _context2.prev = 12;
               if (state.api.dontLoadCatalogEditorLiteMask) {
@@ -21491,23 +21513,15 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
               _context2.t0 = _context2["catch"](12);
               LOG$h.debug('no mask found: ' + _context2.t0);
             case 22:
-              _context2.prev = 22;
-              if (!(!state.api.dontLoadAdditionalModelInfos && catalogApiData.AccountGuid)) {
-                _context2.next = 27;
+              if (additionalModelInfos) {
+                _context2.next = 26;
                 break;
               }
-              _context2.next = 26;
-              return state.api.getDataCache(state.api.getAdditionalModelInfosQS(catalogApiData.AccountGuid, catalogApiData.GUID), undefined, undefined, 'catalog');
-            case 26:
+              _context2.next = 25;
+              return this.loadAdditionalModelInfos(state, catalogApiData.accountGuid, catalogApiData.GUID);
+            case 25:
               additionalModelInfos = _context2.sent;
-            case 27:
-              _context2.next = 32;
-              break;
-            case 29:
-              _context2.prev = 29;
-              _context2.t1 = _context2["catch"](22);
-              LOG$h.debug('no additionalModelInfos found: ' + _context2.t1);
-            case 32:
+            case 26:
               if (state.catalogMask || mask) {
                 if (!additionalModelInfos) additionalModelInfos = {
                   _id: ''
@@ -21516,11 +21530,11 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
               }
               catalogData = new DivaCatalogData(catalogApiData, catalogCodex, orderSet, state.api, catalogArticleListData, catalogArticlePlannerListData, false, additionalModelInfos);
               return _context2.abrupt("return", catalogData);
-            case 35:
+            case 29:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, null, [[12, 19], [22, 29]]);
+        }, _callee2, this, [[12, 19]]);
       }));
       function loadDivaCatalog(_x4, _x5, _x6) {
         return _loadDivaCatalog.apply(this, arguments);
@@ -21528,34 +21542,82 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
       return loadDivaCatalog;
     }()
   }, {
-    key: "loadIDMCatalog",
+    key: "loadAdditionalModelInfos",
     value: function () {
-      var _loadIDMCatalog = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(state, serieNo, serieId, accountId, orderSet) {
-        var promises, _yield$Promise$all3, _yield$Promise$all4, catalogApiData, serieData, itemsList, additionalModelInfos, catalogData;
+      var _loadAdditionalModelInfos = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(state, accountGuid, guid) {
         return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              if (!(!guid || !accountGuid)) {
+                _context3.next = 2;
+                break;
+              }
+              return _context3.abrupt("return");
+            case 2:
+              _context3.prev = 2;
+              if (!(!state.api.dontLoadAdditionalModelInfos && accountGuid)) {
+                _context3.next = 7;
+                break;
+              }
+              _context3.next = 6;
+              return state.api.getDataCache(state.api.getAdditionalModelInfosQS(accountGuid, guid), undefined, undefined, 'catalog');
+            case 6:
+              return _context3.abrupt("return", _context3.sent);
+            case 7:
+              _context3.next = 12;
+              break;
+            case 9:
+              _context3.prev = 9;
+              _context3.t0 = _context3["catch"](2);
+              LOG$h.debug('no additionalModelInfos found: ' + _context3.t0);
+            case 12:
+              return _context3.abrupt("return", undefined);
+            case 13:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, null, [[2, 9]]);
+      }));
+      function loadAdditionalModelInfos(_x7, _x8, _x9) {
+        return _loadAdditionalModelInfos.apply(this, arguments);
+      }
+      return loadAdditionalModelInfos;
+    }()
+  }, {
+    key: "loadIDMCatalog",
+    value: function () {
+      var _loadIDMCatalog = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee4(state, serieNo, serieId, accountId, orderSet) {
+        var promises, _yield$Promise$all3, _yield$Promise$all4, catalogApiData, serieData, itemsList, additionalModelInfos, catalogData;
+        return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               promises = [state.api.getDataCache(state.api.getIDMCatalog(accountId), undefined, undefined, 'enricher'), state.api.getDataCache(state.api.getIDMSerieByNo(accountId, serieNo), undefined, undefined, 'enricher'), state.api.getDataCache(state.api.getIDMItems(accountId, serieId), undefined, undefined, 'enricher'), !state.api.dontLoadAdditionalModelInfos ? this.getAdditionalModeInfos(state, serieId, accountId) : undefined];
-              _context3.next = 3;
+              _context4.next = 3;
               return Promise.all(promises);
             case 3:
-              _yield$Promise$all3 = _context3.sent;
+              _yield$Promise$all3 = _context4.sent;
               _yield$Promise$all4 = _slicedToArray__default["default"](_yield$Promise$all3, 4);
               catalogApiData = _yield$Promise$all4[0];
               serieData = _yield$Promise$all4[1];
               itemsList = _yield$Promise$all4[2];
               additionalModelInfos = _yield$Promise$all4[3];
+              if (serieData !== null && serieData !== void 0 && serieData.length) {
+                _context4.next = 11;
+                break;
+              }
+              throw new Error('Serie not found: ' + serieNo);
+            case 11:
               catalogData = new DivaCatalogData(_objectSpread$i(_objectSpread$i({}, serieData[0]), {}, {
                 catalogData: catalogApiData
               }), serieNo, orderSet, state.api, itemsList, undefined, true, additionalModelInfos);
-              return _context3.abrupt("return", catalogData);
-            case 11:
+              return _context4.abrupt("return", catalogData);
+            case 13:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
-      function loadIDMCatalog(_x7, _x8, _x9, _x10, _x11) {
+      function loadIDMCatalog(_x10, _x11, _x12, _x13, _x14) {
         return _loadIDMCatalog.apply(this, arguments);
       }
       return loadIDMCatalog;
@@ -21563,27 +21625,27 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
   }, {
     key: "getAdditionalModeInfos",
     value: function () {
-      var _getAdditionalModeInfos = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee4(state, serieId, accountId) {
-        return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _getAdditionalModeInfos = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(state, serieId, accountId) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context4.prev = 0;
-              _context4.next = 3;
+              _context5.prev = 0;
+              _context5.next = 3;
               return state.api.getDataCache(state.api.getAdditionalModelInfosQS(accountId, serieId), undefined, undefined, 'catalog');
             case 3:
-              return _context4.abrupt("return", _context4.sent);
+              return _context5.abrupt("return", _context5.sent);
             case 6:
-              _context4.prev = 6;
-              _context4.t0 = _context4["catch"](0);
+              _context5.prev = 6;
+              _context5.t0 = _context5["catch"](0);
               LOG$h.debug('additional ModelInfo not found');
-              return _context4.abrupt("return", undefined);
+              return _context5.abrupt("return", undefined);
             case 10:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, null, [[0, 6]]);
+        }, _callee5, null, [[0, 6]]);
       }));
-      function getAdditionalModeInfos(_x12, _x13, _x14) {
+      function getAdditionalModeInfos(_x15, _x16, _x17) {
         return _getAdditionalModeInfos.apply(this, arguments);
       }
       return getAdditionalModeInfos;
@@ -22339,25 +22401,24 @@ var DivaEngine = /*#__PURE__*/function () {
           var OP = ops.optionCodex;
           ops.calcPrice = 0;
           ops.usedCalcPrice = 0;
-          var visibleItems = {},
-            firstVisibleItem = null;
-
+          var firstVisibleItem = null;
+          var visibleItems = {};
           //Sichtbarkeit prüfen
 
-          var nItems = 0; //wird jetzt neu berechnet
           var foundFirstItem = false;
           var setDefaultOPV = ops.defaultOPV;
           ops.updateVisibleOptionValues({});
+          var visibleOptionValues = {};
           if (myOpt.hasOPG) {
             var myOPGs = myOpt.articleOptionValues;
             for (var lKey in myOPGs) {
               var myOPVsInOPG = myOPGs[lKey].articleOptionValues;
               if (this.checkItemVisibility(myOPGs[lKey], ops) && myOPVsInOPG) {
+                visibleOptionValues[myOPGs[lKey].codex] = myOPGs[lKey];
                 for (var opvCodex in myOPVsInOPG) {
                   var tmpOPV = myOPVsInOPG[opvCodex];
                   if (tmpOPV.hiddenByMask) continue;
                   visibleItems[OP + '#' + opvCodex] = tmpOPV;
-                  nItems += 1;
                   if (!ops.getConstructionRulesIsDisablingByOPVCodex(opvCodex)) {
                     if (setDefaultOPV && setDefaultOPV == opvCodex) {
                       firstVisibleItem = tmpOPV;
@@ -22376,8 +22437,8 @@ var DivaEngine = /*#__PURE__*/function () {
               for (var opvCodex in myOPVs) {
                 var tmpOPV = myOPVs[opvCodex];
                 if (!tmpOPV.hiddenByMask && this.checkItemVisibility(tmpOPV, ops)) {
+                  visibleOptionValues[tmpOPV.codex] = tmpOPV;
                   visibleItems[OP + '#' + opvCodex] = tmpOPV;
-                  nItems += 1;
                   if (!ops.getConstructionRulesIsDisablingByOPVCodex(opvCodex)) {
                     if (setDefaultOPV && setDefaultOPV == opvCodex) {
                       firstVisibleItem = tmpOPV;
@@ -22391,20 +22452,21 @@ var DivaEngine = /*#__PURE__*/function () {
               }
             }
           }
+          ops.updateVisibleOptionValues(visibleOptionValues);
 
           //nItems - Anzahl gültiger OPVs pro Option
 
           //FirstVisibleItem - Erste gültige wert
           //visibleItems ist ein Dictionary, das alle gültigen OPVs enthält
           //kein Optionswert aktiv - Am Ende alle Optionen nochmal initialisieren - kann sein, dass OPV von nachfolgender Option abhängig ist
-          if (nItems == 0) {
+          if (ops.visibleCount == 0) {
             this.updateArtOPV(null, OP, ops);
           } else {
             var myItem = null;
 
             //sonst myItem aus dem aktuellen Wert OPV Codex bestimmen
             if (myItem == null && ops.val) {
-              myItem = visibleItems[OP + '#' + ops.valCodex]; //zuerst aktuellen Wert bei sichtbaren Elementen suchen
+              myItem = visibleItems[OP + '#' + ops.valCodex];
               if (myItem && ops.getConstructionRulesIsDisablingByOPVCodex(myItem.codex)) {
                 myItem = null;
               }
@@ -22490,7 +22552,6 @@ var DivaEngine = /*#__PURE__*/function () {
       if (rul) doShow = this.article.evalRule(rul, articleOPV.ruleActionType); //eher langsam
 
       if (articleOPV.showOnlyWhenHasPrice && ops.price == 0) doShow = false;
-      if (doShow) ops.updateVisibleOptionValues(_objectSpread$g(_objectSpread$g({}, ops.visibleOptionValues), {}, _defineProperty__default["default"]({}, articleOPV.codex, articleOPV)));
       return doShow;
     }
   }, {
@@ -23600,6 +23661,7 @@ var DivaEngine = /*#__PURE__*/function () {
             partlistDecisionNo: decisionNumber,
             SupplierOrderCodex: myPartListPos.SupplierOrderCodex,
             initDecisions: initDecisionsFiltered,
+            sequenceNo: myPartListPos.SequenceNo,
             RuleDesc: myRuleDesc,
             RuleDesc_locales: myRuleDesc_locales,
             PosInvisibility: myPartListPos.PosInvisibility,
@@ -23974,14 +24036,14 @@ var DivaEngine = /*#__PURE__*/function () {
     }
   }, {
     key: "getValuesInfluencingOPT",
-    value: function getValuesInfluencingOPT(featureNo) {
+    value: function getValuesInfluencingOPT(opt, opv) {
       var decisions = this.article.catalogArticle.articleDecisions;
       //add the partlist spesific decisions to the normal decisions
       if (this.article.initDecisions) decisions = decisions.concat(this.article.initDecisions);
       var variantValuesArr = [];
       var relevantDecisions = decisions.filter(function (d) {
         var _d$Options;
-        return (_d$Options = d.Options) === null || _d$Options === void 0 ? void 0 : _d$Options.includes(featureNo);
+        return (_d$Options = d.Options) === null || _d$Options === void 0 ? void 0 : _d$Options.includes(opt);
       });
       for (var i = 0; i < relevantDecisions.length; i++) {
         var decision = relevantDecisions[i];
@@ -23991,11 +24053,17 @@ var DivaEngine = /*#__PURE__*/function () {
             var oc = decision.DOC[j];
             var variantValues = {};
             if (!Object.values((_oc$Row = oc.Row) !== null && _oc$Row !== void 0 ? _oc$Row : {}).length) continue;
+            var useVVs = true;
             for (var key in oc.Row) {
-              if (key == featureNo) continue;
+              if (key == opt) {
+                if (opv && !oc.Row[key].includes(opv)) {
+                  useVVs = false;
+                }
+                break;
+              }
               variantValues[key] = oc.Row[key][0];
             }
-            variantValuesArr.push(variantValues);
+            if (useVVs && Object.keys(variantValues).length) variantValuesArr.push(variantValues);
           }
         }
       }
@@ -24953,6 +25021,7 @@ var IDMEngine = /*#__PURE__*/function () {
           RuleDesc: myRuleDesc,
           RuleDesc_locales: myRuleDesc_locales,
           PosInvisibility: myPartListPos.posInvisibility,
+          sequenceNo: myPartListPos.sequenceNo,
           ConfigurationMode: myPartListPos.configurationMode,
           VariantValues: this.article.variantValuesForPla(myPartListPos.configurationMode, previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantValues, newConfigValues),
           VariantItemData: previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantItemData
@@ -25103,7 +25172,7 @@ var IDMEngine = /*#__PURE__*/function () {
     }
   }, {
     key: "getValuesInfluencingOPT",
-    value: function getValuesInfluencingOPT(featureNo) {
+    value: function getValuesInfluencingOPT(featureNo, optionKey) {
       var variantValuesArr = [];
       var decisions = this.decisions;
       var relevantDecisions = decisions.filter(function (d) {
@@ -25116,21 +25185,28 @@ var IDMEngine = /*#__PURE__*/function () {
           for (var j = 0; j < decision.optionCombinations.length; j++) {
             var oc = decision.optionCombinations[j];
             var variantValues = {};
+            var useVVs = true;
             var _iterator7 = _createForOfIteratorHelper$7(oc.projectOptionsSetRefs),
               _step7;
             try {
               for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-                var _optionSetRef$optionL, _optionSetRef$optionL2;
+                var _optionSetRef$optionL2, _optionSetRef$optionL3;
                 var optionSetRef = _step7.value;
-                if (optionSetRef.featureNo.toString() == featureNo) continue;
-                variantValues[optionSetRef.featureNo.toString()] = (_optionSetRef$optionL = (_optionSetRef$optionL2 = optionSetRef.optionList) === null || _optionSetRef$optionL2 === void 0 || (_optionSetRef$optionL2 = _optionSetRef$optionL2.optionRef) === null || _optionSetRef$optionL2 === void 0 || (_optionSetRef$optionL2 = _optionSetRef$optionL2[0]) === null || _optionSetRef$optionL2 === void 0 ? void 0 : _optionSetRef$optionL2.optionKey) !== null && _optionSetRef$optionL !== void 0 ? _optionSetRef$optionL : '';
+                if (optionSetRef.featureNo.toString() == featureNo) {
+                  var _optionSetRef$optionL;
+                  if (optionKey && !((_optionSetRef$optionL = optionSetRef.optionList) !== null && _optionSetRef$optionL !== void 0 && _optionSetRef$optionL.options.includes(optionKey))) {
+                    useVVs = false;
+                  }
+                  break;
+                }
+                variantValues[optionSetRef.featureNo.toString()] = (_optionSetRef$optionL2 = (_optionSetRef$optionL3 = optionSetRef.optionList) === null || _optionSetRef$optionL3 === void 0 || (_optionSetRef$optionL3 = _optionSetRef$optionL3.optionRef) === null || _optionSetRef$optionL3 === void 0 || (_optionSetRef$optionL3 = _optionSetRef$optionL3[0]) === null || _optionSetRef$optionL3 === void 0 ? void 0 : _optionSetRef$optionL3.optionKey) !== null && _optionSetRef$optionL2 !== void 0 ? _optionSetRef$optionL2 : '';
               }
             } catch (err) {
               _iterator7.e(err);
             } finally {
               _iterator7.f();
             }
-            variantValuesArr.push(variantValues);
+            if (useVVs && Object.keys(variantValues).length) variantValuesArr.push(variantValues);
           }
         }
       }
@@ -27826,17 +27902,39 @@ var DivaArticle = /*#__PURE__*/function () {
       return visibleOptionValues[Object.keys(visibleOptionValues)[0]];
     }
   }, {
-    key: "getVariantValuesInfluencingAVLAVRFilter",
-    value: function getVariantValuesInfluencingAVLAVRFilter() {
-      var filterOptions = [(!this.CatalogData.isIDMFormat ? 'OPT' : '') + '89', (!this.CatalogData.isIDMFormat ? 'OPT' : '') + '90'];
+    key: "getVariantValuesInfluencingOptions",
+    value: function getVariantValuesInfluencingOptions(filterOptions, opv) {
       var variantValues = [];
       for (var i = 0; i < filterOptions.length; i++) {
         if (this.getArticleOptionState(filterOptions[i])) {
-          variantValues = [].concat(_toConsumableArray__default["default"](this.engine.getValuesInfluencingOPT(filterOptions[i])), _toConsumableArray__default["default"](variantValues));
+          variantValues = [].concat(_toConsumableArray__default["default"](this.getVariantValuesInfluencingOption(filterOptions[i], opv)), _toConsumableArray__default["default"](variantValues));
         }
       }
       return variantValues;
     }
+  }, {
+    key: "getVariantValuesInfluencingOption",
+    value: function getVariantValuesInfluencingOption(filterOption, opv) {
+      var vvs = this.engine.getValuesInfluencingOPT(filterOption, opv);
+      var newVvs = [];
+      if (opv) {
+        for (var i = 0; i < vvs.length; i++) {
+          var vv = vvs[i];
+          for (var key in vv) {
+            var _this$getArticleOptio5;
+            if (!((_this$getArticleOptio5 = this.getArticleOptionState(key)) !== null && _this$getArticleOptio5 !== void 0 && _this$getArticleOptio5.visibleOPVKeys.includes(vv[key]))) {
+              var newVvs2 = this.engine.getValuesInfluencingOPT(key, vv[key]);
+              if (newVvs2.length) {
+                for (var j = 0; j < newVvs2.length; j++) {
+                  newVvs[j] = _objectSpread$e(_objectSpread$e({}, vv), newVvs2[j]);
+                }
+              }
+            }
+          }
+        }
+      }
+      return newVvs.length ? newVvs : vvs;
+    }
   }, {
     key: "updateOptionsWithAddToMeasure",
     value: function updateOptionsWithAddToMeasure(optionCodex) {
@@ -27847,9 +27945,9 @@ var DivaArticle = /*#__PURE__*/function () {
         var _result2;
         var addToMeasureOps = opsWithAddToMeasure[i];
         for (var j = 0; j < addToMeasureOps.addToMeasure.length; j++) {
-          var _Number, _this$getArticleOptio5;
+          var _Number, _this$getArticleOptio6;
           var addToMeasure = addToMeasureOps.addToMeasure[j];
-          var value = optionsUsedFreetext[addToMeasure.opt] ? 0 : (_Number = Number((_this$getArticleOptio5 = this.getArticleOptionState(addToMeasure.opt)) === null || _this$getArticleOptio5 === void 0 ? void 0 : _this$getArticleOptio5.freeText)) !== null && _Number !== void 0 ? _Number : 0;
+          var value = optionsUsedFreetext[addToMeasure.opt] ? 0 : (_Number = Number((_this$getArticleOptio6 = this.getArticleOptionState(addToMeasure.opt)) === null || _this$getArticleOptio6 === void 0 ? void 0 : _this$getArticleOptio6.freeText)) !== null && _Number !== void 0 ? _Number : 0;
           optionsUsedFreetext[addToMeasure.opt] = true;
           if (!addToMeasureOps.val) continue;
           if (isNaN(value)) {
@@ -27907,7 +28005,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-6a677da3.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-73d48df0.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -29200,7 +29298,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               _iterator3.f();
               return _context11.finish(30);
             case 33:
-              if (article.plannerData) article.plannerData.varaintValuesInfluencingAVLAVRFilter = article.getVariantValuesInfluencingAVLAVRFilter();
+              if (article.plannerData) article.plannerData.varaintValuesInfluencingAVLAVRFilter = article.getVariantValuesInfluencingOptions([(!article.CatalogData.isIDMFormat ? 'OPT' : '') + '89', (!article.CatalogData.isIDMFormat ? 'OPT' : '') + '90']);
             case 34:
             case "end":
               return _context11.stop();
@@ -29405,26 +29503,30 @@ var DivaArticleHandler = /*#__PURE__*/function () {
             case 0:
               partlistArticlesToLoad = [];
               if (!article.hasPartlistArticle) {
-                _context15.next = 8;
+                _context15.next = 9;
                 break;
               }
               article.deletePartlistArticles(); //alle aktellen PartlistArticles des Articles löschen!
               partlistArticlesToLoad = article.engine.evalPartlist(newConfigValues);
+              partlistArticlesToLoad.sort(function (a, b) {
+                var _a$sequenceNo2, _b$sequenceNo2;
+                return ((_a$sequenceNo2 = a.sequenceNo) !== null && _a$sequenceNo2 !== void 0 ? _a$sequenceNo2 : 0) - ((_b$sequenceNo2 = b.sequenceNo) !== null && _b$sequenceNo2 !== void 0 ? _b$sequenceNo2 : 0);
+              });
               if (dontLoadPartlist) {
-                _context15.next = 8;
+                _context15.next = 9;
                 break;
               }
-              _context15.next = 7;
+              _context15.next = 8;
               return this.loadPartlistArticles(partlistArticlesToLoad, article, article.VariantValues);
-            case 7:
-              partlistArticlesToLoad = [];
             case 8:
+              partlistArticlesToLoad = [];
+            case 9:
               if (article.bundleRules) {
                 partlistArticlesToLoad = this.bundlePartlistArticles(partlistArticlesToLoad, article.bundleRules, _defineProperty__default["default"]({}, article.basketId, article));
               }
               article.hasPartlistArticleInitialized = true;
               return _context15.abrupt("return", partlistArticlesToLoad);
-            case 11:
+            case 12:
             case "end":
               return _context15.stop();
           }
@@ -32384,7 +32486,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context5.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-025a8a15.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-30772645.js'); });
             case 3:
               _yield$import = _context5.sent;
               DoorPlanner = _yield$import["default"];
@@ -37810,6 +37912,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           origOrderSet.OrderLines = actOrderSet.OrderLines;
           origOrderSet.OrderSetDesc = actOrderSet.OrderSetDesc;
           origOrderSet.OrigZKATNr = actOrderSet.OrigZKATNr;
+          origOrderSet.IsIDMFormat = actOrderSet.IsIDMFormat;
           origOrderSet.SetArticleNr = actOrderSet.SetArticleNr;
           origOrderSet.SetArticleNrPrefix = actOrderSet.SetArticleNrPrefix;
           origOrderSet.SetHash = actOrderSet.SetHash;
@@ -37855,7 +37958,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
     value: function () {
       var _getOrderSet = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee30(set, catalogData, divaNr, repairOnly, returnTo) {
         var _Object$values$, _set$getDivaArticles, _hqRenderScript, _set$basketConfigVari2, _set$basketConfigVari3;
-        var dontGenerateImages, orderSet, GroupType, plannerData, setImage, urlToPlanning2D, alternateSetImages, hqRenderScript, dimensions, promise3D, promise2D, promise3DAlternate, _yield$Promise$all, _yield$Promise$all2, _yield$Promise$all2$, promiseHQRenderScript, _yield$Promise$all3, _yield$Promise$all4, plannerWarnings, bruttoPrice;
+        var dontGenerateImages, orderSet, GroupType, plannerData, setImage, urlToPlanning2D, alternateSetImages, hqRenderScript, dimensions, promise3D, promise2D, promise3DAlternate, _yield$Promise$all, _yield$Promise$all2, _yield$Promise$all2$, plannerWarnings, bruttoPrice;
         return _regeneratorRuntime__default["default"].wrap(function _callee30$(_context32) {
           while (1) switch (_context32.prev = _context32.next) {
             case 0:
@@ -37869,7 +37972,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               hqRenderScript = undefined;
               dimensions = {};
               if (dontGenerateImages) {
-                _context32.next = 28;
+                _context32.next = 23;
                 break;
               }
               promise3D = this.getSetImage(set, typeof window === 'undefined');
@@ -37878,23 +37981,17 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 promise3DAlternate = this.getAlternateSetImages(set);
               }
               _context32.next = 15;
-              return Promise.all([promise3D, promise2D, promise3DAlternate]);
+              return Promise.all([promise3D, promise2D, promise3DAlternate, this.getHQRenderScript(set, divaNr)]);
             case 15:
               _yield$Promise$all = _context32.sent;
-              _yield$Promise$all2 = _slicedToArray__default["default"](_yield$Promise$all, 3);
+              _yield$Promise$all2 = _slicedToArray__default["default"](_yield$Promise$all, 4);
               _yield$Promise$all2$ = _yield$Promise$all2[0];
               setImage = _yield$Promise$all2$.url;
               dimensions = _yield$Promise$all2$.dimensions;
               urlToPlanning2D = _yield$Promise$all2[1];
               alternateSetImages = _yield$Promise$all2[2];
-              promiseHQRenderScript = this.getHQRenderScript(set, divaNr);
-              _context32.next = 25;
-              return Promise.all([promiseHQRenderScript]);
-            case 25:
-              _yield$Promise$all3 = _context32.sent;
-              _yield$Promise$all4 = _slicedToArray__default["default"](_yield$Promise$all3, 1);
-              hqRenderScript = _yield$Promise$all4[0];
-            case 28:
+              hqRenderScript = _yield$Promise$all2[3];
+            case 23:
               plannerWarnings = [];
               if (!this.getPlanningIsComplete(set)) plannerWarnings.push('INCOMPLETE');
               DivaUtils__default["default"].endSpanOfApm('GetSet3D und 2D Image');
@@ -37903,6 +38000,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 AccountGUID: catalogData.accountGuid,
                 AccountSessionGUID: set.getAccountSessionGuid(),
                 CollectionGUID: catalogData.collectionGuid,
+                IsIDMFormat: catalogData.isIDMFormat,
                 OrderSetDesc: catalogData.longDescription,
                 CatalogGUID: catalogData.catalogGuid,
                 AccountName: catalogData.accountName,
@@ -37957,7 +38055,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 MetaData_locales: !((_set$basketConfigVari3 = set.basketConfigVariants) !== null && _set$basketConfigVari3 !== void 0 && _set$basketConfigVari3.length) ? set.MetaData_locales : undefined
               });
               return _context32.abrupt("return", orderSet);
-            case 34:
+            case 29:
             case "end":
               return _context32.stop();
           }
@@ -38665,7 +38763,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     value: function () {
       var _initBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(api, divaNr, dataFromApi, keepOldDivaNr, origProductId) {
         var _dataFromApi$basket;
-        var basketFromAPI, basket, i, _basket$SetPlannerInf, oldSetId, newSetId, foundIndex, newDivaNr, _this$plannerConfig$s7, _dataFromApi$NewestDo, _i;
+        var basketFromAPI, basket, i, _basket$SetPlannerInf, oldSetId, newSetId, foundIndex, newDivaNr, _this$plannerConfig$s7, _dataFromApi$NewestDo, _i, os;
         return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -38673,7 +38771,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               if (origProductId) basketFromAPI.OrigProductId = origProductId;
               basket = _objectSpread$8({}, basketFromAPI);
               if (!basketFromAPI) {
-                _context5.next = 48;
+                _context5.next = 50;
                 break;
               }
               LOG$8.debug('divaNr: ' + divaNr + ' was loaded successfully from server!');
@@ -38747,26 +38845,31 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               if (!(this.plannerConfig.loginMode != 'offline' || basket.OrderSets.find(function (os) {
                 return !os.AccountSessionGUID;
               }))) {
-                _context5.next = 41;
+                _context5.next = 43;
                 break;
               }
               _i = 0;
             case 35:
               if (!(_i < basket.OrderSets.length)) {
-                _context5.next = 41;
+                _context5.next = 43;
                 break;
               }
-              _context5.next = 38;
+              os = basket.OrderSets[_i];
+              if (os.IsIDMFormat) {
+                _context5.next = 40;
+                break;
+              }
+              _context5.next = 40;
               return api.setAccountSessionGuid({
-                os: basket.OrderSets[_i],
-                catalogGuid: basket.OrderSets[_i].CatalogGUID,
-                accountGuid: basket.OrderSets[_i].AccountGUID
+                os: os,
+                catalogGuid: os.CatalogGUID,
+                accountGuid: os.AccountGUID
               });
-            case 38:
+            case 40:
               _i++;
               _context5.next = 35;
               break;
-            case 41:
+            case 43:
               this.baskets[newDivaNr] = new basketModel.BasketData(basket);
               this.baskets[newDivaNr].clearRenderData();
               if (!keepOldDivaNr) this.divaNr = newDivaNr;
@@ -38775,9 +38878,9 @@ var DivaBasketHandler = /*#__PURE__*/function () {
                 this.baskets[newDivaNr].ProductSetName = '';
               }
               return _context5.abrupt("return", true);
-            case 48:
+            case 50:
               return _context5.abrupt("return", false);
-            case 49:
+            case 51:
             case "end":
               return _context5.stop();
           }
@@ -39252,7 +39355,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context12.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-3591c212.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-62e0fe82.js'); });
             case 5:
               _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -39260,7 +39363,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 9:
               _context12.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-71443118.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-5d4efbde.js'); });
             case 11:
               _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -39268,7 +39371,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 15:
               _context12.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-8bc4e9b0.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-bbb84f9a.js'); });
             case 17:
               _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -39276,7 +39379,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 21:
               _context12.next = 23;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-cf9cc6ab.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-3a11c8c2.js'); });
             case 23:
               _yield$import4 = _context12.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -40704,7 +40807,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _context3.next = 2;
-              return Promise.resolve().then(function () { return require('./Host3DSignalR-e1be9c3d.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-4f965a92.js'); });
             case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -42262,7 +42365,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context4.next = 10;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-0fdda83c.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-6044aefa.js'); });
             case 10:
               _yield$import = _context4.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -42273,7 +42376,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context4.abrupt("break", 21);
             case 15:
               _context4.next = 17;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-6b556c8e.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-e662adcd.js'); });
             case 17:
               _yield$import2 = _context4.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -44175,7 +44278,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 initializationId = this.plannerConfig.customProductId;
               }
               initializationType = this.divaBasketHandler.initializationTypeGetter;
-              if (oldProductId) {
+              if (oldProductId && !initializationId) {
                 initializationId = oldProductId;
                 initializationType = 'OLD_PRODUCT_ID';
               }
@@ -47321,8 +47424,8 @@ var Grid = /*#__PURE__*/function () {
               return _context5.abrupt("return");
             case 2:
               isIDM = this.article.CatalogData.isIDMFormat;
-              mitCodex = (!isIDM ? 'OPT' : '') + 'MIT';
-              ohneCodex = (!isIDM ? 'OPT' : '') + 'OHNE';
+              mitCodex = (!isIDM ? 'OPV' : '') + 'MIT';
+              ohneCodex = (!isIDM ? 'OPV' : '') + 'OHNE';
               dontOverwriteOptions = [];
               _loop = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop() {
                 var option, inUseCell, specificAccessoire, options, j, optionCodex, montageOptionState, _this$article$shelfAc, rest;