@crystaldesign/web-planner-logic 26.5.0-beta.8 → 26.5.0-rc.0

package/build/cjs/{index-a8cd3c1d.js → index-9145fe80.js}

@@ -43,8 +43,8 @@ var _typeof__default = /*#__PURE__*/_interopDefaultLegacy(_typeof);
 })();
 
 var _excluded = ["type"];
-function ownKeys$n(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$n(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$n(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$n(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$m(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$m(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$m(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$m(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 // Import types from AI service
 
 var LOG$p = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
@@ -285,8 +285,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$n;
-              _context2.t1 = _objectSpread$n({}, init.config.headers);
+              _context2.t0 = _objectSpread$m;
+              _context2.t1 = _objectSpread$m({}, init.config.headers);
               _context2.t2 = {};
               _context2.next = 21;
               return this.getSessionGuid('V', undefined, this.OrganizationId, api2Url);
@@ -598,10 +598,11 @@ var DivaApiHandler = /*#__PURE__*/function () {
     value: function getPrintOptions() {
       var _this$divaWebConfigDa11;
       var reportConfig = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : (_this$divaWebConfigDa11 = this.divaWebConfigData) === null || _this$divaWebConfigDa11 === void 0 ? void 0 : _this$divaWebConfigDa11.reportConfig;
-      var arReady = arguments.length > 1 ? arguments[1] : undefined;
+      var has3D = arguments.length > 1 ? arguments[1] : undefined;
+      var arReady = arguments.length > 2 ? arguments[2] : undefined;
       return {
         Gdpr: !!(reportConfig !== null && reportConfig !== void 0 && reportConfig.printWithGDPR),
-        PlanningSketch: !!(reportConfig !== null && reportConfig !== void 0 && reportConfig.printWithPlanningSketch),
+        PlanningSketch: !!(reportConfig !== null && reportConfig !== void 0 && reportConfig.printWithPlanningSketch) && has3D,
         Remark: !!(reportConfig !== null && reportConfig !== void 0 && reportConfig.printWithRemark),
         Prices: !!(reportConfig !== null && reportConfig !== void 0 && reportConfig.printWithPrices),
         AllPrices: !!(reportConfig !== null && reportConfig !== void 0 && reportConfig.printWithAllPrices),
@@ -1103,57 +1104,63 @@ var DivaApiHandler = /*#__PURE__*/function () {
     }
 
     /******************IDM Service CALLs */
+  }, {
+    key: "isSeller",
+    get: function get() {
+      return !this.useEnricherService && !this.useIDMService;
+    }
   }, {
     key: "idmPrefix",
     get: function get() {
       if (this.useEnricherService && !this.packageId) throw new Error('packageId as parameter not missing');
-      return this.useEnricherService ? '/wysiwyg/' + this.packageId : this.useIDMService ? '' : '/live';
+      return this.useEnricherService ? '/wysiwyg/' + this.packageId : this.useIDMService ? '' : '/live/' + this.organization._id;
     }
   }, {
     key: "getIDMCatalog",
     value: function getIDMCatalog(catalogId) {
+      if (this.isSeller) return this.idmPrefix + '/packages' + (!this.useEnricherService ? '/' + catalogId + '/catalog' : '');
       return this.idmPrefix + '/catalogs' + (!this.useEnricherService ? '/' + catalogId : '');
     }
   }, {
     key: "getIDMSerieByNo",
-    value: function getIDMSerieByNo(catalogId, serieId, serieNo) {
-      return this.idmPrefix + '/catalogs/' + catalogId + '/series/' + (this.useIDMService ? serieId : serieNo);
+    value: function getIDMSerieByNo(packageId, serieId, serieNo) {
+      return this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/series/' + (this.useIDMService ? serieId : serieNo);
     }
   }, {
     key: "getIDMItems",
-    value: function getIDMItems(catalogId, serieId, serieNo, typeNos) {
-      return this.idmPrefix + '/catalogs/' + catalogId + '/series/' + (this.useIDMService ? serieId : serieNo) + '/items' + (typeNos !== null && typeNos !== void 0 && typeNos.length ? '?filter=' + typeNos.map(function (t) {
+    value: function getIDMItems(packageId, serieId, serieNo, typeNos) {
+      return this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/series/' + (this.useIDMService ? serieId : serieNo) + '/items' + (typeNos !== null && typeNos !== void 0 && typeNos.length ? '?filter=' + typeNos.map(function (t) {
         return encodeURIComponent('typeNo==' + t);
-      }).join(' || ') : '?fields=properties;serieNo;featureClassRefNo;priceTypeRef;itemIdentification;catalogPage;weightBrutto;weightNetto;volume;minimumDeliveryTime;widthBasicShapeNominalValue;widthBasicShapeFrom;widthBasicShapeTo;widthBasicShapeStepSize;heightBasicShapeNominalValue;heightBasicShapeFrom;heightBasicShapeTo;heightBasicShapeStepSize;depthBasicShapeNominalValue;depthBasicShapeFrom;depthBasicShapeTo;depthBasicShapeStepSize;typeKey;eClassNo;detailInfoRefs;detailInfos;partListExclusive;partListRef;decisionRefs;typeNo;sequenceNo;edpNumber;eanNumber;shortText;fullText;planningAdvice;salesNumber;avrFilter;avlFilter');
+      }).join(' || ') : '?fields=properties;serieNo;featureClassRefNo;priceTypeRef;itemIdentification;catalogPage;weightBrutto;weightNetto;volume;minimumDeliveryTime;widthBasicShapeNominalValue;widthBasicShapeFrom;widthBasicShapeTo;widthBasicShapeStepSize;heightBasicShapeNominalValue;heightBasicShapeFrom;heightBasicShapeTo;heightBasicShapeStepSize;depthBasicShapeNominalValue;depthBasicShapeFrom;depthBasicShapeTo;depthBasicShapeStepSize;typeKey;eClassNo;detailInfoRefs;detailInfos;partListExclusive;partListRef;decisionRefs;typeNo;sequenceNo;edpNumber;eanNumber;shortText;fullText;planningAdvice;salesNumber;avrFilter;avlFilter;images;svgs');
     }
   }, {
     key: "getIDMFeatures",
-    value: function getIDMFeatures(catalogId, features) {
-      return this.idmPrefix + '/catalogs/' + catalogId + '/features' + '?featureNos=' + features.join(';') + (this.smSupplierNr ? '&supplierNo=' + this.smSupplierNr : '');
+    value: function getIDMFeatures(packageId, features) {
+      return this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/features' + '?featureNos=' + features.join(';') + (this.smSupplierNr ? '&supplierNo=' + this.smSupplierNr : '');
     }
   }, {
     key: "getIDMDecisions",
-    value: function getIDMDecisions(catalogId, decisions) {
-      return this.idmPrefix + '/catalogs/' + catalogId + '/decisions' + '?decisionNos=' + decisions.join(';') + (this.smSupplierNr ? '&supplierNo=' + this.smSupplierNr : '');
+    value: function getIDMDecisions(packageId, decisions) {
+      return this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/decisions' + '?decisionNos=' + decisions.join(';') + (this.smSupplierNr ? '&supplierNo=' + this.smSupplierNr : '');
     }
   }, {
     key: "getIDMDetailInfos",
-    value: function getIDMDetailInfos(catalogId, detailinfos) {
-      return this.idmPrefix + '/catalogs/' + catalogId + '/detailinfos' + '?filter=' + detailinfos.map(function (d) {
+    value: function getIDMDetailInfos(packageId, detailinfos) {
+      return this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/detailinfos' + '?filter=' + detailinfos.map(function (d) {
         return encodeURIComponent('featureClassNo==' + d);
       }).join(' || ');
     }
   }, {
     key: "getIDMFeatureClass",
-    value: function getIDMFeatureClass(catalogId, featureclasses) {
-      return this.idmPrefix + '/catalogs/' + catalogId + '/featureclasses' + '?filter=' + featureclasses.map(function (f) {
+    value: function getIDMFeatureClass(packageId, featureclasses) {
+      return this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/featureclasses' + '?filter=' + featureclasses.map(function (f) {
         return encodeURIComponent('featureClassNo==' + f);
       }).join(' || ');
     }
   }, {
     key: "getIDMPriceFeatureGroups",
-    value: function getIDMPriceFeatureGroups(catalogId, pricefeaturegroups) {
-      return this.idmPrefix + '/catalogs/' + catalogId + '/pricefeaturegroups' + '?filter=' + pricefeaturegroups.map(function (p) {
+    value: function getIDMPriceFeatureGroups(packageId, pricefeaturegroups) {
+      return this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/pricefeaturegroups' + '?filter=' + pricefeaturegroups.map(function (p) {
         return encodeURIComponent('priceFeatureGroupNo==' + p);
       }).join(' || ');
     }
@@ -1241,11 +1248,11 @@ var DivaApiHandler = /*#__PURE__*/function () {
               headers = this.getAiServiceAuthHeaders(leadKey);
               _context9.next = 4;
               return this.fetchData(url, {
-                data: _objectSpread$n(_objectSpread$n({}, data), {}, {
+                data: _objectSpread$m(_objectSpread$m({}, data), {}, {
                   organizationId: this.OrganizationId
                 }),
                 config: {
-                  headers: _objectSpread$n(_objectSpread$n({}, headers), {}, {
+                  headers: _objectSpread$m(_objectSpread$m({}, headers), {}, {
                     'X-Session-Id': DivaUtils__default["default"].SessionId,
                     'X-Configurator-Id': (_DivaUtils$Configurat = DivaUtils__default["default"].ConfigurationId) !== null && _DivaUtils$Configurat !== void 0 ? _DivaUtils$Configurat : ''
                   })
@@ -16391,7 +16398,11 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
       return undefined;
     });
     this.opv = opv;
-    opv.colorGroups = this.mapRALColorToGroup();
+    if (opv.imagePaletteColor) {
+      this.opv.colorGroups = [opv.imagePaletteColor];
+    } else {
+      opv.colorGroups = this.mapRALColorToGroup();
+    }
     var metaDatas = setOptionValueProperties(catalogData, this.opv.propertyObj, (_this$opv$property = this.opv.property) !== null && _this$opv$property !== void 0 ? _this$opv$property : []);
     this.opv.metaData = metaDatas;
   }
@@ -16492,27 +16503,32 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
   }, {
     key: "isFreeText",
     get: function get() {
-      return this.opv.isFreeText;
+      var _this$opv$propertyObj;
+      return (_this$opv$propertyObj = this.opv.propertyObj.optionFreeText) !== null && _this$opv$propertyObj !== void 0 ? _this$opv$propertyObj : this.opv.isFreeText;
     }
   }, {
     key: "measureUnit",
     get: function get() {
-      return this.opv.measureUnit;
+      var _this$opv$propertyObj2;
+      return (_this$opv$propertyObj2 = this.opv.propertyObj.measureUnit) !== null && _this$opv$propertyObj2 !== void 0 ? _this$opv$propertyObj2 : this.opv.measureUnit;
     }
   }, {
     key: "measureMinimum",
     get: function get() {
-      return this.opv.measureMinimum;
+      var _this$opv$propertyObj3;
+      return (_this$opv$propertyObj3 = this.opv.propertyObj.measureMinimum) !== null && _this$opv$propertyObj3 !== void 0 ? _this$opv$propertyObj3 : this.opv.measureMinimum;
     }
   }, {
     key: "measureMaximum",
     get: function get() {
-      return this.opv.measureMaximum;
+      var _this$opv$propertyObj4;
+      return (_this$opv$propertyObj4 = this.opv.propertyObj.measureMaximum) !== null && _this$opv$propertyObj4 !== void 0 ? _this$opv$propertyObj4 : this.opv.measureMaximum;
     }
   }, {
     key: "measureStep",
     get: function get() {
-      return this.opv.measureStep;
+      var _this$opv$propertyObj5;
+      return (_this$opv$propertyObj5 = this.opv.propertyObj.measureStep) !== null && _this$opv$propertyObj5 !== void 0 ? _this$opv$propertyObj5 : this.opv.measureStep;
     }
   }, {
     key: "hideSubarticleDescription",
@@ -16527,7 +16543,8 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
   }, {
     key: "priceUnit",
     get: function get() {
-      return this.opv.priceUnit;
+      var _this$opv$propertyObj6;
+      return (_this$opv$propertyObj6 = this.opv.propertyObj.priceUnit) !== null && _this$opv$propertyObj6 !== void 0 ? _this$opv$propertyObj6 : this.opv.priceUnit;
     }
   }, {
     key: "value",
@@ -16759,6 +16776,24 @@ var setOptionValueProperties = function setOptionValueProperties(catalogData, op
       case 'IsVariantAttribute':
         opv.isVariantAttribute = prop.Value == '1';
         break;
+      case 'OPTION_FREE_TEXT':
+        opv.optionFreeText = !!prop.Value;
+        break;
+      case 'MEASURE_UNIT':
+        opv.measureUnit = prop.Value;
+        break;
+      case 'MEASURE_MINIMUM':
+        opv.measureMinimum = prop.Value;
+        break;
+      case 'MEASURE_MAXIMUM':
+        opv.measureMaximum = prop.Value;
+        break;
+      case 'MEASURE_STEP':
+        opv.measureStep = prop.Value;
+        break;
+      case 'PRICE_UNIT':
+        opv.priceUnit = prop.Value;
+        break;
       case 'ION_COMMENT_TEXT':
       case 'EshopCategoryMapping':
       case 'TopFilterAttribute':
@@ -17896,6 +17931,7 @@ function getCatalogOptionValueDataType(codex, jsonOPV, catalogData) {
     isOPVG: jsonOPV.IsOPVG && jsonOPV.IsOPVG == '1' ? true : false,
     isFreeText: jsonOPV.FreeText && jsonOPV.FreeText == 'True' ? true : false,
     rals: jsonOPV.RALs,
+    imagePaletteColor: jsonOPV.ImagePaletteColor,
     isCustomAttribute: jsonOPV.IsCustomAttribute,
     measureMinimum: jsonOPV.MeasureMinimum,
     measureMaximum: jsonOPV.MeasureMaximum,
@@ -19442,11 +19478,9 @@ function initDecisions(catalog, catalogArticleData, decisionRefs) {
             catalogArticle.decisions.splice(i, 1);
             i--;
           }
-          if (!catalog.useDiomexConfigLogic) {
-            myDecision.Options.sort(function (a, b) {
-              return myOptOrder.indexOf(a) < myOptOrder.indexOf(b) ? -1 : 1;
-            });
-          }
+          myDecision.Options.sort(function (a, b) {
+            return myOptOrder.indexOf(a) < myOptOrder.indexOf(b) ? -1 : 1;
+          });
         }
       }
       if (myDecision.Type == '3') {
@@ -19589,20 +19623,20 @@ function getArticleOptionValueType(set, codex, jsonOPV, catalogOPV, myArticle, i
   return opv;
 }
 
-function ownKeys$m(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$m(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$m(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$m(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__default["default"](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; }
 var LOG$k = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 function loadMoreFromIDMArticles(_x, _x2) {
   return _loadMoreFromIDMArticles.apply(this, arguments);
 }
 function _loadMoreFromIDMArticles() {
   _loadMoreFromIDMArticles = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(catalogArticleDatas, set) {
-    var items, _loop3, i, toLoadDecisionIds, toLoadPFGroups, toLoadFeatureClassRefNo, promises, _yield$Promise$all, _yield$Promise$all2, featureClasses, priceFeatureGroups, decisions, _i4, _i5, _i6, _catalogArticleData$d2, catalogArticleData, toLoadFeatures, features, _loop4, _i7, _loop6, _i8;
+    var items, _loop3, i, toLoadDecisionIds, toLoadPFGroups, toLoadFeatureClassRefNo, promises, _yield$Promise$all, _yield$Promise$all2, featureClasses, priceFeatureGroups, decisions, _i4, _decisions$map, loadedIds, missingIds, _i5, _i6, _catalogArticleData$d2, catalogArticleData, toLoadFeatures, features, _loop4, _i7, _loop6, _i8;
     return _regeneratorRuntime__default["default"].wrap(function _callee$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
           _context5.next = 2;
-          return set.api.getDataCache(set.api.getIDMItems(set.CatalogData.catalogGuid, set.CatalogData.serieId, set.CatalogData.catalogCodex, catalogArticleDatas.map(function (a) {
+          return set.api.getDataCache(set.api.getIDMItems(set.CatalogData.accountGuid, set.CatalogData.serieId, set.CatalogData.catalogCodex, catalogArticleDatas.map(function (a) {
             return a.articleCodex;
           })), undefined, undefined, 'enricher');
         case 2:
@@ -19652,7 +19686,7 @@ function _loadMoreFromIDMArticles() {
           }).map(function (a) {
             return a.featureClassRefNo;
           })));
-          promises = [set.api.getDataCache(set.api.getIDMFeatureClass(set.CatalogData.catalogGuid, toLoadFeatureClassRefNo), undefined, undefined, 'enricher'), toLoadPFGroups.length ? set.api.getDataCache(set.api.getIDMPriceFeatureGroups(set.CatalogData.catalogGuid, toLoadPFGroups), undefined, undefined, 'enricher') : undefined, toLoadDecisionIds.length ? set.api.getDataCache(set.api.getIDMDecisions(set.CatalogData.catalogGuid, toLoadDecisionIds), undefined, undefined, 'enricher') : undefined];
+          promises = [set.api.getDataCache(set.api.getIDMFeatureClass(set.CatalogData.accountGuid, toLoadFeatureClassRefNo), undefined, undefined, 'enricher'), toLoadPFGroups.length ? set.api.getDataCache(set.api.getIDMPriceFeatureGroups(set.CatalogData.accountGuid, toLoadPFGroups), undefined, undefined, 'enricher') : undefined, toLoadDecisionIds.length ? set.api.getDataCache(set.api.getIDMDecisions(set.CatalogData.accountGuid, toLoadDecisionIds), undefined, undefined, 'enricher') : undefined];
           _context5.next = 16;
           return Promise.all(promises);
         case 16:
@@ -19667,11 +19701,17 @@ function _loadMoreFromIDMArticles() {
             }
           }
           if (!(toLoadDecisionIds.length !== 0 && toLoadDecisionIds.length != (decisions === null || decisions === void 0 ? void 0 : decisions.length))) {
-            _context5.next = 24;
+            _context5.next = 26;
             break;
           }
-          throw new Error('loading decisions failed');
-        case 24:
+          loadedIds = new Set((_decisions$map = decisions === null || decisions === void 0 ? void 0 : decisions.map(function (d) {
+            return d.decisionNo;
+          })) !== null && _decisions$map !== void 0 ? _decisions$map : []);
+          missingIds = toLoadDecisionIds.filter(function (id) {
+            return !loadedIds.has(id);
+          });
+          throw new Error("loading decisions failed \u2013 missing: [".concat(missingIds.join(', '), "]"));
+        case 26:
           if (priceFeatureGroups) {
             for (_i5 = 0; _i5 < priceFeatureGroups.length; _i5++) {
               set.CatalogData.loadedPriceFeaturegroups.push(initializePriceFeatureGroups(priceFeatureGroups[_i5], set.CatalogData.idmOptionGroups));
@@ -19688,12 +19728,12 @@ function _loadMoreFromIDMArticles() {
           });
           toLoadFeatures = getFeatures(set, featureClasses);
           if (!toLoadFeatures.length) {
-            _context5.next = 39;
+            _context5.next = 41;
             break;
           }
-          _context5.next = 31;
-          return set.api.getDataCache(set.api.getIDMFeatures(set.CatalogData.catalogGuid, toLoadFeatures), undefined, undefined, 'enricher');
-        case 31:
+          _context5.next = 33;
+          return set.api.getDataCache(set.api.getIDMFeatures(set.CatalogData.accountGuid, toLoadFeatures), undefined, undefined, 'enricher');
+        case 33:
           features = _context5.sent;
           _loop4 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop4() {
             var feature, insertIndex, k, _loop5, j;
@@ -19775,17 +19815,17 @@ function _loadMoreFromIDMArticles() {
             }, _loop4);
           });
           _i7 = 0;
-        case 34:
+        case 36:
           if (!(_i7 < features.length)) {
-            _context5.next = 39;
+            _context5.next = 41;
             break;
           }
-          return _context5.delegateYield(_loop4(), "t1", 36);
-        case 36:
+          return _context5.delegateYield(_loop4(), "t1", 38);
+        case 38:
           _i7++;
-          _context5.next = 34;
+          _context5.next = 36;
           break;
-        case 39:
+        case 41:
           _loop6 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop6() {
             var catalogArticleData, featureClass, features, j;
             return _regeneratorRuntime__default["default"].wrap(function _loop6$(_context4) {
@@ -19812,21 +19852,21 @@ function _loadMoreFromIDMArticles() {
             }, _loop6);
           });
           _i8 = 0;
-        case 41:
+        case 43:
           if (!(_i8 < catalogArticleDatas.length)) {
-            _context5.next = 46;
+            _context5.next = 48;
             break;
           }
-          return _context5.delegateYield(_loop6(), "t2", 43);
-        case 43:
+          return _context5.delegateYield(_loop6(), "t2", 45);
+        case 45:
           _i8++;
-          _context5.next = 41;
+          _context5.next = 43;
           break;
-        case 46:
+        case 48:
           catalogArticleDatas.map(function (c) {
             return c.areOptionsLoaded = true;
           });
-        case 47:
+        case 49:
         case "end":
           return _context5.stop();
       }
@@ -19914,11 +19954,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$m(_objectSpread$m({}, c), {}, {
+    return _objectSpread$l(_objectSpread$l({}, c), {}, {
       projectOptionsSetRefs: parseOptionSetRef(c.projectOptionsSetRefs, idmOptionGroups)
     });
   });
-  return _objectSpread$m(_objectSpread$m({}, decision), {}, {
+  return _objectSpread$l(_objectSpread$l({}, decision), {}, {
     optionCombinations: optionCombinations === null || optionCombinations === void 0 ? void 0 : optionCombinations.sort(function (a, b) {
       return a.sequence - b.sequence;
     })
@@ -19927,16 +19967,16 @@ var initializeDecision = function initializeDecision(decision, idmOptionGroups)
 var initializePriceFeatureGroups = function initializePriceFeatureGroups(priceFeatureGroup, idmOptionGroups) {
   var _priceFeatureGroup$pr, _priceFeatureGroup$pr2;
   var finishes = (_priceFeatureGroup$pr = priceFeatureGroup.projectFinishes) === null || _priceFeatureGroup$pr === void 0 ? void 0 : _priceFeatureGroup$pr.map(function (c) {
-    return _objectSpread$m(_objectSpread$m({}, c), {}, {
+    return _objectSpread$l(_objectSpread$l({}, c), {}, {
       projectOptionsSetRefs: c.optionsSetRef ? parseOptionSetRef(c.optionsSetRef, idmOptionGroups) : []
     });
   });
   var percentageSurcharges = (_priceFeatureGroup$pr2 = priceFeatureGroup.projectPercentageSurcharges) === null || _priceFeatureGroup$pr2 === void 0 ? void 0 : _priceFeatureGroup$pr2.map(function (c) {
-    return _objectSpread$m(_objectSpread$m({}, c), {}, {
+    return _objectSpread$l(_objectSpread$l({}, c), {}, {
       optionsSetRefs: c.optionsSetRef ? parseOptionSetRef(c.optionsSetRef, idmOptionGroups) : []
     });
   });
-  return _objectSpread$m(_objectSpread$m({}, priceFeatureGroup), {}, {
+  return _objectSpread$l(_objectSpread$l({}, priceFeatureGroup), {}, {
     projectFinishes: finishes === null || finishes === void 0 ? void 0 : finishes.sort(function (a, b) {
       return a.sequence - b.sequence;
     }),
@@ -20206,19 +20246,18 @@ function rgbToHex(r, g, b) {
   return '#' + componentToHex(r) + componentToHex(g) + componentToHex(b);
 }
 
-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__default["default"](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; }
 var LOG$j = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 function initIDMCatalogData(serie, orderSet, api) {
-  var _serie$catalogId, _serie$decisions, _serie$decisions2;
+  var _serie$decisions, _serie$decisions2;
   var catalog = serie.catalogData;
   var catalogData = {
-    accountGuid: (_serie$catalogId = serie.catalogId) !== null && _serie$catalogId !== void 0 ? _serie$catalogId : orderSet.AccountGUID,
+    accountGuid: orderSet.AccountGUID,
     serieId: serie._id,
     accountName: '',
     accountLogo: '',
     collectionGuid: serie.catalogId,
-    catalogGuid: serie.catalogId,
+    catalogGuid: '',
+    //serie.enricherPackageId,
     catalogCodex: serie.serieNo.toString(),
     catalogName: DivaUtils__default["default"].getLocals(serie.seriesName, api.getLanguageLowercase()),
     //                                      name des Kataloges
@@ -20275,18 +20314,19 @@ function initIDMArticles(jsonItems, catalogData) {
   }
 }
 function getCatalogArticle(article, catalogData) {
-  var _catalogData$catalogM, _ref, _articleMask$name, _article$fullText, _article$fullText2, _article$fullText3, _articleMask$properti, _article$depthBasicSh, _article$depthBasicSh2, _article$depthBasicSh3, _article$widthBasicSh, _article$widthBasicSh2, _article$widthBasicSh3, _article$heightBasicS, _article$heightBasicS2, _article$heightBasicS3, _article$weightNetto, _article$detailInfos, _article$detailInfos2, _article$detailInfos3, _articleMask$groupnam, _articleMask$groupnam2;
+  var _catalogData$catalogM, _article$images, _article$typeKey, _ref, _articleMask$name, _article$fullText, _article$fullText2, _article$fullText3, _articleMask$properti, _article$depthBasicSh, _article$depthBasicSh2, _article$depthBasicSh3, _article$widthBasicSh, _article$widthBasicSh2, _article$widthBasicSh3, _article$heightBasicS, _article$heightBasicS2, _article$heightBasicS3, _article$weightNetto, _images$, _article$svgs, _articleMask$groupnam, _articleMask$groupnam2;
   var articleMask = (_catalogData$catalogM = catalogData.catalogMask) === null || _catalogData$catalogM === void 0 || (_catalogData$catalogM = _catalogData$catalogM.articles) === null || _catalogData$catalogM === void 0 ? void 0 : _catalogData$catalogM[article.typeNo];
   var lang = catalogData.api.getLanguageLowercase();
   var featureProperties = convertProperties(article.properties, lang, 'featureNos');
   var optionProperties = convertProperties(article.properties, lang, 'optionKeys');
+  var images = (_article$images = article.images) === null || _article$images === void 0 ? void 0 : _article$images.map(mapIDMMediaItem);
   return {
     areOptionsLoaded: false,
     arePricesLoaded: false,
     articleCodex: article.typeNo,
     articleOptions: {},
     partListExclusive: article.partListExclusive,
-    guid: article.typeKey,
+    guid: (_article$typeKey = article.typeKey) === null || _article$typeKey === void 0 ? void 0 : _article$typeKey.toString(),
     articleEAN: article.eanNumber,
     typeNr: article.eanNumber,
     retailArticleNr: article.salesNumber,
@@ -20326,34 +20366,12 @@ function getCatalogArticle(article, catalogData) {
     heightTo: article.heightBasicShapeTo !== undefined ? Math.floor(((_article$heightBasicS3 = article.heightBasicShapeTo) !== null && _article$heightBasicS3 !== void 0 ? _article$heightBasicS3 : 0) / 10) : undefined,
     volume: article.volume,
     weight: (_article$weightNetto = article.weightNetto) !== null && _article$weightNetto !== void 0 ? _article$weightNetto : article.weightBrutto,
-    image: getLowResUrl((_article$detailInfos = article.detailInfos) === null || _article$detailInfos === void 0 || (_article$detailInfos = _article$detailInfos.find(function (d) {
-      return d.functionType == 'CAT_ART';
-    })) === null || _article$detailInfos === void 0 ? void 0 : _article$detailInfos.url),
-    images: (_article$detailInfos2 = article.detailInfos) === null || _article$detailInfos2 === void 0 || (_article$detailInfos2 = _article$detailInfos2.filter(function (d) {
-      return d.functionType == 'CAT_ART';
-    })) === null || _article$detailInfos2 === void 0 ? void 0 : _article$detailInfos2.map(function (d) {
-      var _getLowResUrl, _article$detailInfoRe, _article$detailInfoRe2;
-      return {
-        url: (_getLowResUrl = getLowResUrl(d.url)) !== null && _getLowResUrl !== void 0 ? _getLowResUrl : '',
-        detailInfoNo: d.detailInfoNo,
-        decisionNos: (_article$detailInfoRe = (_article$detailInfoRe2 = article.detailInfoRefs) === null || _article$detailInfoRe2 === void 0 || (_article$detailInfoRe2 = _article$detailInfoRe2[d.detailInfoNo]) === null || _article$detailInfoRe2 === void 0 ? void 0 : _article$detailInfoRe2.filter(function (n) {
-          return n !== null;
-        })) !== null && _article$detailInfoRe !== void 0 ? _article$detailInfoRe : []
-      };
-    }),
+    image: images === null || images === void 0 || (_images$ = images[0]) === null || _images$ === void 0 ? void 0 : _images$.url,
+    images: images,
     idmPrices: article.prices,
     idmPartlist: article.partlist,
     articleRelations: [],
-    svgs: (_article$detailInfos3 = article.detailInfos) === null || _article$detailInfos3 === void 0 ? void 0 : _article$detailInfos3.filter(function (d) {
-      return d.classification == 'SVG';
-    }).map(function (d) {
-      var _article$detailInfoRe3, _article$detailInfoRe4;
-      return _objectSpread$l(_objectSpread$l({}, d), {}, {
-        decisionNos: (_article$detailInfoRe3 = (_article$detailInfoRe4 = article.detailInfoRefs) === null || _article$detailInfoRe4 === void 0 || (_article$detailInfoRe4 = _article$detailInfoRe4[d.detailInfoNo]) === null || _article$detailInfoRe4 === void 0 ? void 0 : _article$detailInfoRe4.filter(function (n) {
-          return n !== null;
-        })) !== null && _article$detailInfoRe3 !== void 0 ? _article$detailInfoRe3 : []
-      });
-    }),
+    svgs: (_article$svgs = article.svgs) === null || _article$svgs === void 0 ? void 0 : _article$svgs.map(mapIDMMediaItem),
     groupName: (_articleMask$groupnam = articleMask === null || articleMask === void 0 || (_articleMask$groupnam2 = articleMask.groupname) === null || _articleMask$groupnam2 === void 0 ? void 0 : _articleMask$groupnam2[catalogData.api.getLanguage()]) !== null && _articleMask$groupnam !== void 0 ? _articleMask$groupnam : article.typeKey
   };
 }
@@ -20370,6 +20388,14 @@ function getCatalogArticle(article, catalogData) {
 function getLowResUrl(url) {
   return url === null || url === void 0 ? void 0 : url.replace('.jpg', '_low.jpg').replace('.jpeg', '_low.jpeg').replace('.png', '_low.png');
 }
+function mapIDMMediaItem(mediaItem) {
+  var _getLowResUrl;
+  return {
+    url: (_getLowResUrl = getLowResUrl(mediaItem.url)) !== null && _getLowResUrl !== void 0 ? _getLowResUrl : '',
+    detailInfoNo: mediaItem.detailInfoNo,
+    decisionNos: mediaItem.decisionNo ? [mediaItem.decisionNo] : []
+  };
+}
 function convertProperties() {
   var properties = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var lang = arguments.length > 1 ? arguments[1] : undefined;
@@ -20403,8 +20429,8 @@ function mapProp() {
   });
 }
 function getCatalogPlanner(article, catalogArticle, catalogData) {
-  var _article$detailInfos4, _article$avlFilter, _article$avrFilter, _article$depthBasicSh4, _article$depthBasicSh5, _article$depthBasicSh6, _article$widthBasicSh4, _article$widthBasicSh5, _article$widthBasicSh6, _article$heightBasicS4, _article$heightBasicS5, _article$heightBasicS6, _svg$avc, _svg$avn, _svg$avo, _svg$avs, _svg$avu, _svg$hasAVL, _svg$hasAVR, _catalogArticle$svgs;
-  var svg = (_article$detailInfos4 = article.detailInfos) === null || _article$detailInfos4 === void 0 ? void 0 : _article$detailInfos4.find(function (d) {
+  var _article$detailInfos, _article$avlFilter, _article$avrFilter, _article$depthBasicSh4, _article$depthBasicSh5, _article$depthBasicSh6, _article$widthBasicSh4, _article$widthBasicSh5, _article$widthBasicSh6, _article$heightBasicS4, _article$heightBasicS5, _article$heightBasicS6, _svg$avc, _svg$avn, _svg$avo, _svg$avs, _svg$avu, _svg$hasAVL, _svg$hasAVR, _catalogArticle$svgs;
+  var svg = (_article$detailInfos = article.detailInfos) === null || _article$detailInfos === void 0 ? void 0 : _article$detailInfos.find(function (d) {
     return d.classification == 'SVG';
   });
 
@@ -23217,6 +23243,7 @@ var DivaEngine = /*#__PURE__*/function () {
     _classCallCheck__default["default"](this, DivaEngine);
     _defineProperty__default["default"](this, "article", void 0);
     _defineProperty__default["default"](this, "decisionDebugStack", []);
+    _defineProperty__default["default"](this, "catalogDecisionsByNumber", void 0);
     this.article = article;
   }
   return _createClass__default["default"](DivaEngine, [{
@@ -23700,13 +23727,20 @@ var DivaEngine = /*#__PURE__*/function () {
     key: "evalAllDecisions",
     value: function evalAllDecisions() {
       var myDecisions = this.article.catalogArticle.articleReferencedDecisions;
-      for (var i = myDecisions.length - 1; i >= 0; i--) {
-        if (myDecisions[i].addedViaDisableEnableRef) {
-          myDecisions.splice(i, 1);
+      var writeIdx = 0;
+      for (var i = 0; i < myDecisions.length; i++) {
+        if (!myDecisions[i].addedViaDisableEnableRef) {
+          myDecisions[writeIdx++] = myDecisions[i];
         }
       }
+      myDecisions.length = writeIdx;
       //add the partlist spesific decisions to the normal decisions
-      if (this.article.initDecisions) myDecisions = myDecisions.concat(this.article.initDecisions);
+      if (this.article.initDecisions) {
+        var sortedInitDecisions = _toConsumableArray__default["default"](this.article.initDecisions).sort(function (a, b) {
+          return Number(a.Prio) - Number(b.Prio);
+        });
+        myDecisions = myDecisions.concat(sortedInitDecisions);
+      }
       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;
@@ -23727,6 +23761,9 @@ var DivaEngine = /*#__PURE__*/function () {
       } finally {
         _iterator7.f();
       }
+      this.catalogDecisionsByNumber = new Map(this.article.catalogArticle.articleDecisions.map(function (d) {
+        return [d.Number, d];
+      }));
       this.decisionDebugStack = [];
       var beforeSnapshot = this.article.set.logDecisions ? this.article.snapshot : undefined;
       for (var m = 0; m < myDecisions.length; m++) {
@@ -23939,10 +23976,10 @@ var DivaEngine = /*#__PURE__*/function () {
                 case 'SET_FEATURE_DEFAULT_NULL':
                   break;
                 case 'DISABLE_DECISION':
-                  this.disableDecision(myDecision, myDoc, myDecisions);
+                  this.disableDecision(myDecision, myDA.DecisionNr, myDecisions);
                   break;
                 case 'ENABLE_DECISION':
-                  this.enableDecision(myDecision, myDoc, myDecisions);
+                  this.enableDecision(myDecision, myDA.DecisionNr, myDecisions);
                   break;
                 default:
                   LOG$g.error(new DivaUtils.DivaError('Action type not supported in DecisionOptionCombination', {
@@ -24002,114 +24039,63 @@ 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++) {
-        var decisionAction = myDoc.DA[m];
-        if (decisionAction.Type == 'DISABLE_DECISION') {
-          SearchDecNumber.push(Number(decisionAction.DecisionNr));
-        }
-      }
-      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$h(_objectSpread$h({}, 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);
-      });
+    value: function disableDecision(myDecision, targetDecisionNr, myDecisions) {
+      this.toggleDecisionEnabled(myDecision, targetDecisionNr, myDecisions, false);
     }
   }, {
     key: "enableDecision",
-    value: function enableDecision(myDecision, myDoc, myDecisions) {
-      var _this3 = this;
+    value: function enableDecision(myDecision, targetDecisionNr, myDecisions) {
+      this.toggleDecisionEnabled(myDecision, targetDecisionNr, myDecisions, true);
+    }
+  }, {
+    key: "toggleDecisionEnabled",
+    value: function toggleDecisionEnabled(myDecision, targetDecisionNr, myDecisions, enabled) {
+      var _this$catalogDecision, _this$catalogDecision2;
       if (myDecision.activeCombination == -1) return;
-      var SearchDecNumber = [];
-      if (myDoc.DA) {
-        for (var m = 0; m < myDoc.DA.length; m++) {
-          var decisionAction = myDoc.DA[m];
-          if (decisionAction.Type == 'ENABLE_DECISION') {
-            SearchDecNumber.push(Number(decisionAction.DecisionNr));
-          }
-        }
+      var verb = enabled ? 'enabled' : 'disabled';
+      var existing = myDecisions.find(function (d) {
+        return d.Number == targetDecisionNr;
+      });
+      if (existing) {
+        var _existing$disableHist;
+        existing.enabled = enabled;
+        (_existing$disableHist = existing.disableHistory) === null || _existing$disableHist === void 0 || _existing$disableHist.push("".concat(verb, " By ").concat(myDecision.Number));
+        return;
       }
-      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$h(_objectSpread$h({}, 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);
+      var decision = (_this$catalogDecision = (_this$catalogDecision2 = this.catalogDecisionsByNumber) === null || _this$catalogDecision2 === void 0 ? void 0 : _this$catalogDecision2.get(targetDecisionNr)) !== null && _this$catalogDecision !== void 0 ? _this$catalogDecision : this.article.catalogArticle.articleDecisions.find(function (d) {
+        return d.Number == targetDecisionNr;
       });
+      if (!decision) {
+        LOG$g.warn("Decision ".concat(targetDecisionNr, " that is referenced in ").concat(verb.replace('d', ''), " decision ").concat(myDecision.Number, " not found."));
+        return;
+      }
+      var decisionPrio = Number(decision.Prio);
+      if (decisionPrio <= Number(myDecision.Prio)) {
+        LOG$g.warn("Decision ".concat(targetDecisionNr, " that is referenced in enable decision ").concat(myDecision.Number, " has a lower prio than the enable decision."));
+      }
+      var insertIndex = 0;
+      for (var i = 0; i < myDecisions.length; i++) {
+        if (Number(myDecisions[i].Prio) >= decisionPrio) {
+          insertIndex = i;
+          break;
+        }
+      }
+      myDecisions.splice(insertIndex, 0, _objectSpread$h(_objectSpread$h({}, decision), {}, {
+        enabled: enabled,
+        disableHistory: ["referenced and ".concat(verb, " By ").concat(myDecision.Number)],
+        addedViaDisableEnableRef: true
+      }));
     }
   }, {
     key: "evalType1Decision",
     value: function evalType1Decision(myDecision) {
-      var _this4 = this;
+      var _this2 = this;
       var validOPVs = {};
       var doAlsoCheckOPTs = [];
       if (myDecision.Options && myDecision.DOC) {
         var _loop2 = function _loop2() {
           var OPT = myDecision.Options[p];
-          var ops = _this4.article.getArticleOptionStateFlat(OPT);
+          var ops = _this2.article.getArticleOptionStateFlat(OPT);
           if (!ops) return 1; // break
           if (!validOPVs[OPT]) validOPVs[OPT] = new Map();
           var possibleOPVs = new Map(ops.visibleOptionValues);
@@ -24120,7 +24106,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 = _this4.checkIfDocIsValid(myDoc, doAlsoCheckOPTs);
+            var doUseDoc = _this2.checkIfDocIsValid(myDoc, doAlsoCheckOPTs);
             if (doUseDoc) {
               var _myDoc$Row;
               myDecision.activeCombination = j;
@@ -24198,10 +24184,10 @@ var DivaEngine = /*#__PURE__*/function () {
           ops.updateVisibleOptionValues(new Map(schnittmenge));
           var valCodex = ops.valCodex;
           if ((!valCodex || !schnittmenge.get(valCodex)) && ops.visibleOPVKeys.length > 0) {
-            if (_this4.article.CatalogData.useDiomexConfigLogic) {
-              _this4.clearOP(OPT, true);
+            if (_this2.article.CatalogData.useDiomexConfigLogic) {
+              _this2.clearOP(OPT, true);
             } else {
-              _this4.updateArtOPV(_this4.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
+              _this2.updateArtOPV(_this2.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
             }
           }
           doAlsoCheckOPTs.push(OPT);
@@ -24238,13 +24224,13 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "evalType0Decision",
     value: function evalType0Decision(myDecision) {
-      var _this5 = this;
+      var _this3 = this;
       var invalidOPVs = {},
         doAlsoCheckOPTs = [];
       if (myDecision.Options && myDecision.Options.length > 1 && myDecision.DOC) {
         var _loop3 = function _loop3() {
           var OPT = myDecision.Options[p];
-          var ops = _this5.article.getArticleOptionStateFlat(OPT);
+          var ops = _this3.article.getArticleOptionStateFlat(OPT);
           if (!ops) return 1; // break
           if (!invalidOPVs[OPT]) invalidOPVs[OPT] = new Map();
           var possibleOPVs = ops.visibleOptionValues;
@@ -24261,7 +24247,7 @@ var DivaEngine = /*#__PURE__*/function () {
                 for (var f = 0; f < doAlsoCheckOPTs.length; f++) {
                   var _myDoc$Row3;
                   var checkOptX = doAlsoCheckOPTs[f];
-                  var _ops3 = _this5.article.getArticleOptionState(checkOptX);
+                  var _ops3 = _this3.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;
@@ -24289,10 +24275,10 @@ var DivaEngine = /*#__PURE__*/function () {
             ops.updateVisibleOptionValues(schnittmenge);
             var valCodex = ops.valCodex;
             if ((!valCodex || !schnittmenge.get(valCodex)) && ops.visibleOPVKeys.length > 0) {
-              if (_this5.article.CatalogData.useDiomexConfigLogic) {
-                _this5.clearOP(OPT, true);
+              if (_this3.article.CatalogData.useDiomexConfigLogic) {
+                _this3.clearOP(OPT, true);
               } else {
-                _this5.updateArtOPV(_this5.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
+                _this3.updateArtOPV(_this3.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
               }
             }
           } else if (p < myDecision.Options.length - 1) {
@@ -24620,7 +24606,7 @@ var DivaEngine = /*#__PURE__*/function () {
     key: "addPartilstToPartlistArticlesToLoad",
     value: function addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, partlistGroup, newConfigValues, myDecisionVal, groupDecisionVal, decisionNumber, partlistGroupPrefix, loadReason) {
       var _myPartListPos$Option,
-        _this6 = this;
+        _this4 = 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(';');
@@ -24631,9 +24617,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 != '' && _this6.article.CatalogData.doUseRuleDescForPartListArticles() || myPartListPos.RetailArticleNr == 'CUST')) {
-          myRuleDesc = DivaUtils__default["default"].getRuleDescription(myDecisionVal.Rule, _this6.article.articleOptionStates, _this6.article.set.api.ruleDescSeperator());
-          myRuleDesc_locales = DivaUtils__default["default"].getRuleDescription_locales(myDecisionVal.Rule, _this6.article.articleOptionStates, _this6.article.set.api.ruleDescSeperator());
+        if (myDecisionVal && (myDecisionVal.Rule && myDecisionVal.Rule != '' && _this4.article.CatalogData.doUseRuleDescForPartListArticles() || myPartListPos.RetailArticleNr == 'CUST')) {
+          myRuleDesc = DivaUtils__default["default"].getRuleDescription(myDecisionVal.Rule, _this4.article.articleOptionStates, _this4.article.set.api.ruleDescSeperator());
+          myRuleDesc_locales = DivaUtils__default["default"].getRuleDescription_locales(myDecisionVal.Rule, _this4.article.articleOptionStates, _this4.article.set.api.ruleDescSeperator());
         }
         var initDecisions = decisions.filter(function (decision) {
           return decision.RelationType !== 'PosCount';
@@ -24643,7 +24629,7 @@ var DivaEngine = /*#__PURE__*/function () {
           });
         });
         var quanitity = 1;
-        if (_this6.article.CatalogData.useDecisionPosCountValue) {
+        if (_this4.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) {
@@ -24658,12 +24644,12 @@ 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 (_this6.article.CatalogData.usePosCountValue) {
+        } else if (_this4.article.CatalogData.usePosCountValue) {
           quanitity = myPartListPos.PosCountValue;
         }
-        quanitity = quanitity * _this6.article.quantity;
-        var previousPartlistArticle = _this6.article.getPreviousPartlistArticle(articleCodex);
-        if (_this6.article.set.logDecisions) {
+        quanitity = quanitity * _this4.article.quantity;
+        var previousPartlistArticle = _this4.article.getPreviousPartlistArticle(articleCodex);
+        if (_this4.article.set.logDecisions) {
           var base = {
             articleCodex: articleCodex,
             catalogCodex: catalogCodex,
@@ -24671,7 +24657,7 @@ var DivaEngine = /*#__PURE__*/function () {
             sequenceNo: myPartListPos.SequenceNo
           };
           if (quanitity < 1) {
-            _this6.pushPartlistDebugEntry(base, {
+            _this4.pushPartlistDebugEntry(base, {
               loaded: false,
               reason: 'Quantity < 1',
               quantity: quanitity,
@@ -24679,7 +24665,7 @@ var DivaEngine = /*#__PURE__*/function () {
             });
             return 1; // continue
           }
-          _this6.pushPartlistDebugEntry(base, {
+          _this4.pushPartlistDebugEntry(base, {
             loaded: true,
             reason: loadReason !== null && loadReason !== void 0 ? loadReason : 'Loaded',
             decisionNo: decisionNumber,
@@ -24702,13 +24688,13 @@ var DivaEngine = /*#__PURE__*/function () {
         if (quanitity >= 1) {
           var _myDecisionVal$Rule;
           partlistArticlesToLoad.push({
-            CatalogCodex: catalogCodex !== null && catalogCodex !== void 0 ? catalogCodex : _this6.article.catalogCodex,
+            CatalogCodex: catalogCodex !== null && catalogCodex !== void 0 ? catalogCodex : _this4.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__default["default"].getOptionValuePairsByRule((_myDecisionVal$Rule = myDecisionVal === null || myDecisionVal === void 0 ? void 0 : myDecisionVal.Rule) !== null && _myDecisionVal$Rule !== void 0 ? _myDecisionVal$Rule : '', _this6.article.VariantValues) : undefined,
+            PartlistRule: (groupDecisionVal ? groupDecisionVal.Rule + ' && ' : '') + myDecisionVal ? DivaUtils__default["default"].getOptionValuePairsByRule((_myDecisionVal$Rule = myDecisionVal === null || myDecisionVal === void 0 ? void 0 : myDecisionVal.Rule) !== null && _myDecisionVal$Rule !== void 0 ? _myDecisionVal$Rule : '', _this4.article.VariantValues) : undefined,
             partlistDecisionNo: decisionNumber,
             SupplierOrderCodex: myPartListPos.SupplierOrderCodex,
             initDecisions: initDecisionsFiltered,
@@ -24717,7 +24703,7 @@ var DivaEngine = /*#__PURE__*/function () {
             RuleDesc_locales: myRuleDesc_locales,
             PosInvisibility: myPartListPos.PosInvisibility,
             ConfigurationMode: myPartListPos.ConfigurationMode,
-            VariantValues: _this6.article.variantValuesForPla(myPartListPos.ConfigurationMode, previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantValues, newConfigValues),
+            VariantValues: _this4.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,
@@ -24766,7 +24752,7 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "calcConfigPrice",
     value: function calcConfigPrice(maxPriceOfGroupCodex, digits) {
-      var _this7 = this,
+      var _this5 = this,
         _this$article$catalog5;
       //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
@@ -24900,7 +24886,7 @@ var DivaEngine = /*#__PURE__*/function () {
           if (!targetPPGPrefixes) continue;
           var _loop7 = function _loop7() {
             var targetPrefix = targetPPGPrefixes[_i8];
-            var priceRef = _this7.article.priceRefs.find(function (item) {
+            var priceRef = _this5.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;
             });
@@ -24925,11 +24911,11 @@ var DivaEngine = /*#__PURE__*/function () {
         var _loop6 = function _loop6() {
           var targetPrefix = basePriceRef.TargetPPGPrefixes[_j];
           var myArtOpv;
-          var priceRef = _this7.article.priceRefs.find(function (item) {
+          var priceRef = _this5.article.priceRefs.find(function (item) {
             return item.PPG && item.PPG.split('_')[0] == targetPrefix;
           });
           if (!priceRef) {
-            var _iterator13 = _createForOfIteratorHelper$a(_this7.article.articleOptionStates.values()),
+            var _iterator13 = _createForOfIteratorHelper$a(_this5.article.articleOptionStates.values()),
               _step13;
             try {
               for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
@@ -25173,7 +25159,7 @@ var DivaEngine = /*#__PURE__*/function () {
     value: function updateConfigDependentMedia() {
       var _this$article$catalog6,
         _this$article$catalog7,
-        _this8 = this;
+        _this6 = this;
       var catalogData = this.article.CatalogData;
       //articlebild berechnung
 
@@ -25300,7 +25286,7 @@ var DivaEngine = /*#__PURE__*/function () {
           var _plannerCatArt$topSvg;
           var custom = {
             formulas: (_plannerCatArt$topSvg = plannerCatArt.topSvgsWithFormula) === null || _plannerCatArt$topSvg === void 0 ? void 0 : _plannerCatArt$topSvg.map(function (item) {
-              return DivaUtils__default["default"].getRuleByFormula(item.JsFormula, _this8.article.catalogCodex, catalogData.multiselectOptions);
+              return DivaUtils__default["default"].getRuleByFormula(item.JsFormula, _this6.article.catalogCodex, catalogData.multiselectOptions);
             }),
             catalogName: catalogData.catalogName,
             catalogCodex: this.article.catalogCodex,
@@ -25646,7 +25632,7 @@ var IDMEngine = /*#__PURE__*/function () {
             });
             var ref = optionSetRef === null || optionSetRef === void 0 ? void 0 : optionSetRef.optionList;
             if (optionSetRef && !optionSetRef.optionList) throw new Error('optionSetRef not implemented: ' + JSON.stringify(optionSetRef));
-            var doUseDoc = !ref || !!_this3.evalValueWithOperator(ref.operator, ref.options, ops.valCodex);
+            var doUseDoc = true;
             if (doAlsoCheckFeature.length > 0) {
               var _loop4 = function _loop4() {
                 var _combination$projectO2;
@@ -26815,6 +26801,7 @@ var DivaArticle = /*#__PURE__*/function () {
       partlistDecisionNo: initParams.partlistDecisionNo,
       partListParentArticle: initParams.parentArticle,
       partlistArticleVisibleInTree: initParams.partlistArticleVisibleInTree,
+      dontAddToFinalOrderLine: initParams.dontAddToFinalOrderLine,
       partlistArticleStandalone: initParams.partlistArticleStandalone,
       partlistGroupPrefix: initParams.partlistGroupPrefix,
       hasPartlistArticle: initParams.hasPartlistArticle ? initParams.hasPartlistArticle : false,
@@ -28645,6 +28632,11 @@ var DivaArticle = /*#__PURE__*/function () {
       }
       return ret;
     }
+  }, {
+    key: "dontAddToFinalOrderLine",
+    get: function get() {
+      return this.article.dontAddToFinalOrderLine;
+    }
   }, {
     key: "areAllOptionsDefined",
     get: function get() {
@@ -29486,7 +29478,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-2a0fb19d.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-c4449795.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -31219,6 +31211,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
         supplierOrderCodex: doLoadItem.SupplierOrderCodex,
         initDecisions: doLoadItem.initDecisions,
         partlistArticleVisibleInTree: doLoadItem.PosInvisibility === 0,
+        dontAddToFinalOrderLine: doLoadItem.PosInvisibility === 1,
         partlistArticleStandalone: doLoadItem.ConfigurationMode,
         partlistGroupPrefix: doLoadItem.partlistGroupPrefix,
         optionsForPrint: doLoadItem.optionsForPrint,
@@ -31611,6 +31604,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           Width: article.width,
           Depth: article.depth,
           Height: article.height,
+          dontAddToFinalOrderLine: article.dontAddToFinalOrderLine,
           CatalogCodex: catalogData.catalogCodex,
           CatalogName: catalogData.catalogName,
           VKPrice: article.getVkPrice,
@@ -33117,10 +33111,10 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
     value: function getNewConfigStepKeyByBasketId(curConfigStepKey, basketId) {
       var steps = this.getAllByKey(curConfigStepKey);
       if (steps) {
-        var _Object$values$find;
-        return (_Object$values$find = Object.values(steps.optionStep.configSteps).find(function (step) {
+        var _Array$from$find;
+        return (_Array$from$find = Array.from(steps.optionStep.configSteps.values()).find(function (step) {
           return step.targetArticles.includes(basketId);
-        })) === null || _Object$values$find === void 0 ? void 0 : _Object$values$find.key;
+        })) === null || _Array$from$find === void 0 ? void 0 : _Array$from$find.key;
       }
       return undefined;
     }
@@ -34867,6 +34861,9 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       if (Object.values(articles).find(function (article) {
         return article.shelfPlanner;
       })) return;
+      if (Object.values(articles).find(function (article) {
+        return article.set.CatalogData.useBoxPlanner;
+      })) return;
       var _iterator3 = _createForOfIteratorHelper$4(configTree.tabGroups),
         _step3;
       try {
@@ -34879,6 +34876,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
             var hasSelectionMode2 = [];
             var hasSelectionMode3 = [];
             var basketIds = [];
+            var breakTabgroup = false;
             var _iterator4 = _createForOfIteratorHelper$4(tabGroup.options),
               _step4;
             try {
@@ -34886,6 +34884,10 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                 var _step4$value = _slicedToArray__default["default"](_step4.value, 2),
                   _optionCodex2 = _step4$value[0],
                   _option2 = _step4$value[1];
+                var configSteps = Array.from(_option2.configSteps.values());
+                if (configSteps.find(function (configStep) {
+                  return configStep.notDisplayedInMainConfigTree;
+                })) breakTabgroup = true;
                 switch (_option2.selectionmode) {
                   case 1:
                     hasSelectionMode1.push(_optionCodex2);
@@ -34928,6 +34930,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
             } finally {
               _iterator4.f();
             }
+            if (breakTabgroup) continue;
             if (hasSelectionMode2.length > 0 && hasSelectionMode3.length > 0 && hasSelectionMode1.length == 0) {
               //make the selectionmode 2 options -> selectionmode 3
               var _iterator5 = _createForOfIteratorHelper$4(hasSelectionMode2),
@@ -37414,7 +37417,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context5.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-d492a9d9.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-d9d820b2.js'); });
             case 3:
               _yield$import = _context5.sent;
               DoorPlanner = _yield$import["default"];
@@ -41446,6 +41449,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     key: "initProductId",
     value: function () {
       var _initProductId = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(api, productId) {
+        var _this$plannerConfig$c4;
         var result, successful;
         return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -41457,7 +41461,9 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               this.assignNewDivaNr = true;
               _context2.next = 6;
               return this.initBasket(api, result.divaNr, {
-                basket: result.configuration
+                basket: _objectSpread$9(_objectSpread$9({}, result.configuration), {}, {
+                  OrganizationId: (_this$plannerConfig$c4 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c4 === void 0 ? void 0 : _this$plannerConfig$c4._id
+                })
               }, false, productId);
             case 6:
               successful = _context2.sent;
@@ -41675,7 +41681,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               _context5.next = 36;
               break;
             case 44:
-              this.baskets[newDivaNr] = new basketModel.BasketData(basket);
+              this.baskets[newDivaNr] = new basketModel.BasketData(_objectSpread$9({}, basket));
               this.baskets[newDivaNr].clearRenderData();
               if (!keepOldDivaNr) this.divaNr = newDivaNr;
               if (this.assignNewDivaNr) {
@@ -41818,7 +41824,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     key: "loadBasketByCustomProductId",
     value: function () {
       var _loadBasketByCustomProductId = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee8(api, key, productId, fields) {
-        var variantData;
+        var variantData, _this$plannerConfig$c5;
         return _regeneratorRuntime__default["default"].wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -41848,7 +41854,11 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               if (variantData.productGroup) {
                 this.analyticsRelevantData.productGroup = variantData.productGroup;
               }
-              return _context8.abrupt("return", this.initBasket(api, variantData.basket.DivaNr, variantData, undefined, productId));
+              return _context8.abrupt("return", this.initBasket(api, variantData.basket.DivaNr, {
+                basket: _objectSpread$9(_objectSpread$9({}, variantData.basket), {}, {
+                  OrganizationId: (_this$plannerConfig$c5 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c5 === void 0 ? void 0 : _this$plannerConfig$c5._id
+                })
+              }, undefined, productId));
             case 12:
               _context8.next = 18;
               break;
@@ -41975,7 +41985,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     key: "saveToBasket",
     value: function () {
       var _saveToBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee11(api, actBasket, returnTo, arReady) {
-        var _this$plannerConfig$s10, _this$plannerConfig$c4, _this$_basketHandler, _api$getJwt, _URLSearchParams$get;
+        var _this$plannerConfig$s10, _this$plannerConfig$c6, _this$_basketHandler, _api$getJwt, _URLSearchParams$get;
         var response;
         return _regeneratorRuntime__default["default"].wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
@@ -41984,18 +41994,18 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               actBasket.ReturnTo = returnTo;
               actBasket.PDFDocumentURL = '';
               actBasket.ReportConfigIdentifier = api.getReportConfigIdentifier();
-              actBasket.PrintOptions = api.getPrintOptions(this.reportConfig, !!arReady);
+              actBasket.PrintOptions = api.getPrintOptions(this.reportConfig, !!actBasket.OrderSets[0].SetImage, !!arReady);
               actBasket.ClientLanguage = api.getLanguage();
               _context11.next = 8;
               return DivaUtils__default["default"].updateBasketOrgInfo(actBasket, this.plannerConfig.currentOrganization, this.plannerConfig.currentUser, (_this$plannerConfig$s10 = this.plannerConfig.settings) === null || _this$plannerConfig$s10 === void 0 ? void 0 : _this$plannerConfig$s10.keepSalesPersonDataInBasket);
             case 8:
               actBasket.UserLanguage = api.getLanguage();
-              actBasket.PrintRetailLogo = (_this$plannerConfig$c4 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c4 === void 0 ? void 0 : _this$plannerConfig$c4.logoUrl;
+              actBasket.PrintRetailLogo = (_this$plannerConfig$c6 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c6 === void 0 ? void 0 : _this$plannerConfig$c6.logoUrl;
               _context11.next = 12;
               return (_this$_basketHandler = this._basketHandler) === null || _this$_basketHandler === void 0 ? void 0 : _this$_basketHandler.saveBasket({
                 jwt: (_api$getJwt = api.getJwt()) !== null && _api$getJwt !== void 0 ? _api$getJwt : undefined,
                 basket: actBasket,
-                awaitPDF: true,
+                awaitPDF: returnTo == 'SAVE_BASKET_ASYNC' ? false : true,
                 utmCampaign: (_URLSearchParams$get = new URLSearchParams(window.location.search).get('utm_campaign')) !== null && _URLSearchParams$get !== void 0 ? _URLSearchParams$get : undefined,
                 saveToApi2: false,
                 apiKey: api.getApiKey()
@@ -42178,7 +42188,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context12.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-7eb044db.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-bf4b2af0.js'); });
             case 5:
               _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -42186,7 +42196,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 9:
               _context12.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-9b3939c8.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-1b4c240f.js'); });
             case 11:
               _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -42194,7 +42204,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 15:
               _context12.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-bbe6859a.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-e4e0835e.js'); });
             case 17:
               _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -42202,7 +42212,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 21:
               _context12.next = 23;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-3391c7ed.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-7d3feb60.js'); });
             case 23:
               _yield$import4 = _context12.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -43626,7 +43636,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-e8e59f7a.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-7a424c6f.js'); });
             case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -45379,7 +45389,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context4.next = 10;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-4bab9fb6.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-6839d35f.js'); });
             case 10:
               _yield$import = _context4.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -45390,7 +45400,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context4.abrupt("break", 21);
             case 15:
               _context4.next = 17;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-d378bbb7.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-a83ddf2d.js'); });
             case 17:
               _yield$import2 = _context4.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -47240,7 +47250,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               this.api.setState(this.state);
               this.ReturnTo = this.plannerConfig.returnTo;
               LOG$1.startTransaction({
-                event: 'onInitializeConfigurator',
+                event: cache !== undefined ? 'onReinitializeConfigurator' : 'onInitializeConfigurator',
                 message: 'Loading Basket',
                 eventId: 'LOADING_BASKET',
                 warningTime: 2000,
@@ -47255,11 +47265,13 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               return this.divaBasketHandler.initializeBasket(this.api);
             case 12:
               loadSuccessful = _context14.sent;
-              if (this.plannerConfig.configuratorSessionId === undefined && (!this.divaBasketHandler.hasConfiguratorSessionIdGetter || DivaUtils__default["default"].businessMetrics.getConfiguratorSessionId() === undefined)) {
-                DivaUtils__default["default"].businessMetrics.setConfiguratorSessionId();
-              } else if (this.plannerConfig.configuratorSessionId) {
+              if (this.plannerConfig.configuratorSessionId) {
                 //force new configurator session id - Landingpage case
                 DivaUtils__default["default"].businessMetrics.setConfiguratorSessionId(this.plannerConfig.configuratorSessionId);
+              } else {
+                // Only create a new configurator session if we don't already have one. This keeps the analytics
+                // session stable across re-inits (e.g. switching products inside the same catalog).
+                DivaUtils__default["default"].businessMetrics.setConfiguratorSessionId(undefined, true);
               }
               if (!loadSuccessful) {
                 _context14.next = 31;
@@ -47309,7 +47321,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     value: function () {
       var _initializeSets = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee15(loadSuccessful, viewReadyPromise) {
         var _this$actions17, _set$getDivaArticles, _catalogData$catalogM, _catalogData$catalogM2;
-        var _this$actions16, _this$actions16$toggl, initSetState, set, oldProductId, _result$customData, _result$customData2, result, _this$actions18, catalogData, initializationId, _this$plannerConfig$a, initializationType;
+        var _this$actions16, _this$actions16$toggl, initSetState, set, oldProductId, _result$customData$SA, _result$customData, _result$customData2, _result$customData$SA2, _result$customData3, _result$customData4, result, _this$actions18, catalogData, initializationId, _this$plannerConfig$a, initializationType;
         return _regeneratorRuntime__default["default"].wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
@@ -47348,8 +47360,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
             case 21:
               result = _context15.sent;
               if (result) productHandlerInstance.handleFountMatchingProducts(set, [result], set.setHash);
-              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;
+              (_result$customData$SA = result === null || result === void 0 || (_result$customData = result.customData) === null || _result$customData === void 0 || (_result$customData = _result$customData.SAP) === null || _result$customData === void 0 ? void 0 : _result$customData.SAP_MARA_MATKL) !== null && _result$customData$SA !== void 0 ? _result$customData$SA : result === null || result === void 0 || (_result$customData2 = result.customData) === null || _result$customData2 === void 0 || (_result$customData2 = _result$customData2.SAP_MARA_MATKL) === null || _result$customData2 === void 0 ? void 0 : _result$customData2.value;
+              (_result$customData$SA2 = result === null || result === void 0 || (_result$customData3 = result.customData) === null || _result$customData3 === void 0 || (_result$customData3 = _result$customData3.SAP) === null || _result$customData3 === void 0 ? void 0 : _result$customData3.SAP_MARA_PRDHA) !== null && _result$customData$SA2 !== void 0 ? _result$customData$SA2 : result === null || result === void 0 || (_result$customData4 = result.customData) === null || _result$customData4 === void 0 || (_result$customData4 = _result$customData4.SAP_MARA_PRDHA) === null || _result$customData4 === void 0 ? void 0 : _result$customData4.value;
               _context15.next = 28;
               break;
             case 27:
@@ -48502,7 +48514,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 break;
               }
               _context28.t3 = returnTo;
-              _context28.next = _context28.t3 === 'OPEN_SELLER_PRODUCTCREATOR' ? 27 : _context28.t3 === 'OPEN_SELLER_BASKET' ? 29 : _context28.t3 === 'OPEN_PDF' ? 32 : _context28.t3 === 'SAVE_BASKET_WITH_MODAL' ? 32 : _context28.t3 === 'SAVE_BASKET' ? 32 : _context28.t3 === 'SAVE_BASKET_SYNC' ? 32 : 52;
+              _context28.next = _context28.t3 === 'OPEN_SELLER_PRODUCTCREATOR' ? 27 : _context28.t3 === 'OPEN_SELLER_BASKET' ? 29 : _context28.t3 === 'OPEN_PDF' ? 32 : _context28.t3 === 'SAVE_BASKET_WITH_MODAL' ? 32 : _context28.t3 === 'SAVE_BASKET' ? 32 : _context28.t3 === 'SAVE_BASKET_SYNC' ? 32 : _context28.t3 === 'SAVE_BASKET_ASYNC' ? 32 : 52;
               break;
             case 27:
               (_this$actions34 = this.actions) === null || _this$actions34 === void 0 || _this$actions34.openComponent({
@@ -48861,8 +48873,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "doAllowSetPlanner",
     value: function doAllowSetPlanner() {
-      var _this$returnTo, _this$divaBasketHandl3;
-      return this.api.doAllowSetPlanner() || ((_this$returnTo = this.returnTo) === null || _this$returnTo === void 0 ? void 0 : _this$returnTo.startsWith('SETPLANNER')) || !!((_this$divaBasketHandl3 = this.divaBasketHandler) !== null && _this$divaBasketHandl3 !== void 0 && (_this$divaBasketHandl3 = _this$divaBasketHandl3.actBasket) !== null && _this$divaBasketHandl3 !== void 0 && _this$divaBasketHandl3.SetPlannerInfos);
+      var _this$api, _this$returnTo, _this$divaBasketHandl3;
+      return ((_this$api = this.api) === null || _this$api === void 0 ? void 0 : _this$api.doAllowSetPlanner()) || ((_this$returnTo = this.returnTo) === null || _this$returnTo === void 0 ? void 0 : _this$returnTo.startsWith('SETPLANNER')) || !!((_this$divaBasketHandl3 = this.divaBasketHandler) !== null && _this$divaBasketHandl3 !== void 0 && (_this$divaBasketHandl3 = _this$divaBasketHandl3.actBasket) !== null && _this$divaBasketHandl3 !== void 0 && _this$divaBasketHandl3.SetPlannerInfos);
     }
   }, {
     key: "doShow3DDimensionLines",
@@ -49204,8 +49216,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "clearCache",
     value: function clearCache() {
-      var _this$api;
-      (_this$api = this.api) === null || _this$api === void 0 || _this$api.clearCache();
+      var _this$api2;
+      (_this$api2 = this.api) === null || _this$api2 === void 0 || _this$api2.clearCache();
       this.divaCatalogs = {};
     }
   }, {