npm - @crystaldesign/web-planner-logic - Versions diffs - 24.15.0-beta.2 → 24.15.0-beta.21 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (54) hide show

package/build/cjs/{index-46a915c3.js → index-211be2e6.js} RENAMED Viewed

@@ -280,11 +280,12 @@ 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 myQS, url, init, addSession, _this$apiConfig3, _this$apiConfig4, api2Url, result;
+        var _this$divaWebConfigDa, _this$divaWebConfigDa2, _this$divaWebConfigDa3;
+        var myQS, url, init, addSession, cacheHit, _this$apiConfig3, _this$apiConfig4, api2Url, result;
         return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              myQS = DivaUtils.md5(queryString.toLowerCase()).toUpperCase();
+              myQS = DivaUtils.md5(queryString.toLowerCase() + ((_this$divaWebConfigDa = this.divaWebConfigData) !== null && _this$divaWebConfigDa !== void 0 && _this$divaWebConfigDa.addOrganizationIdToCacheKey ? this.OrganizationId : '')).toUpperCase();
               url = this.apiUrl(queryString, useWebServiceApi);
               init = {
                 method: method,
@@ -292,80 +293,82 @@ var DivaApiHandler = /*#__PURE__*/function () {
                 data: data !== null && data !== void 0 ? data : {}
               };
               addSession = true;
-              if (!(this.jsonDataCache.get(myQS) || cacheMD5 && this.jsonDataCache.get(cacheMD5))) {
-                _context3.next = 9;
+              cacheHit = this.jsonDataCache.get(myQS);
+              if (!cacheHit) {
+                _context3.next = 8;
                 break;
               }
               LOG$h.debug('getDataFromInternalCache: ' + queryString);
-              if (!this.jsonDataCache.get(myQS)) {
-                _context3.next = 8;
+              return _context3.abrupt("return", cacheHit);
+            case 8:
+              if (!(cacheMD5 && this.jsonDataCache.get(cacheMD5) && !((_this$divaWebConfigDa2 = this.divaWebConfigData) !== null && _this$divaWebConfigDa2 !== void 0 && _this$divaWebConfigDa2.addOrganizationIdToCacheKey))) {
+                _context3.next = 11;
                 break;
               }
-              return _context3.abrupt("return", this.jsonDataCache.get(myQS));
-            case 8:
+              LOG$h.debug('getDataFromInternalCache: ' + queryString);
               return _context3.abrupt("return", this.jsonDataCache.get(cacheMD5));
-            case 9:
+            case 11:
               if (!addSession) {
-                _context3.next = 31;
+                _context3.next = 33;
                 break;
               }
               if (!useWebServiceApi) {
-                _context3.next = 22;
+                _context3.next = 24;
                 break;
               }
               if (!this.jwt) {
-                _context3.next = 15;
+                _context3.next = 17;
                 break;
               }
               init.config.headers = {
                 Authorization: 'Bearer ' + this.jwt
               };
-              _context3.next = 20;
+              _context3.next = 22;
               break;
-            case 15:
+            case 17:
               if (!this.apiKey) {
-                _context3.next = 19;
+                _context3.next = 21;
                 break;
               }
               init.config.headers = {
                 'X-API-KEY': this.apiKey
               };
-              _context3.next = 20;
+              _context3.next = 22;
               break;
-            case 19:
+            case 21:
               throw new Error('not jwt or API Key Found');
-            case 20:
-              _context3.next = 31;
-              break;
             case 22:
+              _context3.next = 33;
+              break;
+            case 24:
               api2Url = (_this$apiConfig3 = this.apiConfig) === null || _this$apiConfig3 === void 0 ? void 0 : _this$apiConfig3.api2["default"];
               if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig4 = this.apiConfig) !== null && _this$apiConfig4 !== void 0 && _this$apiConfig4.api2.web) {
                 api2Url = this.apiConfig.api2.web;
               }
               _context3.t0 = accountSessionGuid;
               if (_context3.t0) {
-                _context3.next = 29;
+                _context3.next = 31;
                 break;
               }
-              _context3.next = 28;
+              _context3.next = 30;
               return this.getSessionGuid('V', undefined, this.OrganizationId, api2Url);
-            case 28:
+            case 30:
               _context3.t0 = _context3.sent;
-            case 29:
+            case 31:
               _context3.t1 = _context3.t0;
               init.config.headers = {
                 sessionGuid: _context3.t1
               };
-            case 31:
-              _context3.next = 33;
-              return this.fetchData(url, init);
             case 33:
+              _context3.next = 35;
+              return this.fetchData(url, init);
+            case 35:
               result = _context3.sent;
               if (method !== 'POST') this.jsonDataCache.set(myQS, result);
-              if (cacheMD5) this.jsonDataCache.set(cacheMD5, result);
+              if (cacheMD5 && !((_this$divaWebConfigDa3 = this.divaWebConfigData) !== null && _this$divaWebConfigDa3 !== void 0 && _this$divaWebConfigDa3.addOrganizationIdToCacheKey)) this.jsonDataCache.set(cacheMD5, result);
               LOG$h.debug('getDataFromApi: ' + queryString);
               return _context3.abrupt("return", result);
-            case 38:
+            case 40:
             case "end":
               return _context3.stop();
           }
@@ -449,7 +452,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
         dontLoadAdditionalModelInfos: data.dontLoadAdditionalModelInfos,
         arViewerUrl: data.arViewerUrl,
         useMask: data.useMask,
-        loadProductBasketParams: data.loadProductBasketParams
+        loadProductBasketParams: data.loadProductBasketParams,
+        addOrganizationIdToCacheKey: data.addOrganizationIdToCacheKey
       };
     }
   }, {
@@ -485,8 +489,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getLoadProductBasketParams",
     value: function getLoadProductBasketParams() {
-      var _this$divaWebConfigDa;
-      return (_this$divaWebConfigDa = this.divaWebConfigData) === null || _this$divaWebConfigDa === void 0 ? void 0 : _this$divaWebConfigDa.loadProductBasketParams;
+      var _this$divaWebConfigDa4;
+      return (_this$divaWebConfigDa4 = this.divaWebConfigData) === null || _this$divaWebConfigDa4 === void 0 ? void 0 : _this$divaWebConfigDa4.loadProductBasketParams;
     }
   }, {
     key: "get3DServerUrl",
@@ -497,26 +501,26 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "doCheckForProductsPrice",
     value: function doCheckForProductsPrice() {
-      var _this$divaWebConfigDa2;
-      return (_this$divaWebConfigDa2 = this.divaWebConfigData) === null || _this$divaWebConfigDa2 === void 0 ? void 0 : _this$divaWebConfigDa2.checkForProductsPrice;
+      var _this$divaWebConfigDa5;
+      return (_this$divaWebConfigDa5 = this.divaWebConfigData) === null || _this$divaWebConfigDa5 === void 0 ? void 0 : _this$divaWebConfigDa5.checkForProductsPrice;
     }
   }, {
     key: "doCheckForProductsMatch",
     value: function doCheckForProductsMatch() {
-      var _this$divaWebConfigDa3;
-      return (_this$divaWebConfigDa3 = this.divaWebConfigData) === null || _this$divaWebConfigDa3 === void 0 ? void 0 : _this$divaWebConfigDa3.checkForProductsMatch;
+      var _this$divaWebConfigDa6;
+      return (_this$divaWebConfigDa6 = this.divaWebConfigData) === null || _this$divaWebConfigDa6 === void 0 ? void 0 : _this$divaWebConfigDa6.checkForProductsMatch;
     }
   }, {
     key: "getReportConfigIdentifier",
     value: function getReportConfigIdentifier() {
-      var _this$divaWebConfigDa4;
-      return (_this$divaWebConfigDa4 = this.divaWebConfigData) === null || _this$divaWebConfigDa4 === void 0 ? void 0 : _this$divaWebConfigDa4.reportConfigIdentifier;
+      var _this$divaWebConfigDa7;
+      return (_this$divaWebConfigDa7 = this.divaWebConfigData) === null || _this$divaWebConfigDa7 === void 0 ? void 0 : _this$divaWebConfigDa7.reportConfigIdentifier;
     }
   }, {
     key: "getPrintOptions",
     value: function getPrintOptions() {
-      var _this$divaWebConfigDa5;
-      var reportConfig = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : (_this$divaWebConfigDa5 = this.divaWebConfigData) === null || _this$divaWebConfigDa5 === void 0 ? void 0 : _this$divaWebConfigDa5.reportConfig;
+      var _this$divaWebConfigDa8;
+      var reportConfig = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : (_this$divaWebConfigDa8 = this.divaWebConfigData) === null || _this$divaWebConfigDa8 === void 0 ? void 0 : _this$divaWebConfigDa8.reportConfig;
       return {
         Gdpr: !!(reportConfig !== null && reportConfig !== void 0 && reportConfig.printWithGDPR),
         PlanningSketch: !!(reportConfig !== null && reportConfig !== void 0 && reportConfig.printWithPlanningSketch),
@@ -536,8 +540,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "get3DRenderGroup",
     value: function get3DRenderGroup() {
-      var _this$divaWebConfigDa6, _this$divaWebConfigDa7;
-      return (_this$divaWebConfigDa6 = (_this$divaWebConfigDa7 = this.divaWebConfigData) === null || _this$divaWebConfigDa7 === void 0 ? void 0 : _this$divaWebConfigDa7.diva3dRenderGroup) !== null && _this$divaWebConfigDa6 !== void 0 ? _this$divaWebConfigDa6 : '';
+      var _this$divaWebConfigDa9, _this$divaWebConfigDa10;
+      return (_this$divaWebConfigDa9 = (_this$divaWebConfigDa10 = this.divaWebConfigData) === null || _this$divaWebConfigDa10 === void 0 ? void 0 : _this$divaWebConfigDa10.diva3dRenderGroup) !== null && _this$divaWebConfigDa9 !== void 0 ? _this$divaWebConfigDa9 : '';
     }
   }, {
     key: "getServerId",
@@ -574,73 +578,74 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getDiva3dStaticBGImage",
     value: function getDiva3dStaticBGImage() {
-      var _this$divaWebConfigDa8;
-      return (_this$divaWebConfigDa8 = this.divaWebConfigData) === null || _this$divaWebConfigDa8 === void 0 ? void 0 : _this$divaWebConfigDa8.diva3dStaticBGImage;
+      var _this$divaWebConfigDa11;
+      return (_this$divaWebConfigDa11 = this.divaWebConfigData) === null || _this$divaWebConfigDa11 === void 0 ? void 0 : _this$divaWebConfigDa11.diva3dStaticBGImage;
     }
   }, {
     key: "getDiva3dStaticBGImage_DefaultRoomList",
     value: function getDiva3dStaticBGImage_DefaultRoomList() {
-      var _this$divaWebConfigDa9, _this$divaWebConfigDa10;
-      return ((_this$divaWebConfigDa9 = this.divaWebConfigData) === null || _this$divaWebConfigDa9 === void 0 ? void 0 : _this$divaWebConfigDa9.diva3dStaticBGImage_DefaultRoomList) == '' ? '3D_STATBG_ROOMLIST' : (_this$divaWebConfigDa10 = this.divaWebConfigData) === null || _this$divaWebConfigDa10 === void 0 ? void 0 : _this$divaWebConfigDa10.diva3dStaticBGImage_DefaultRoomList;
+      var _this$divaWebConfigDa12, _this$divaWebConfigDa13;
+      return ((_this$divaWebConfigDa12 = this.divaWebConfigData) === null || _this$divaWebConfigDa12 === void 0 ? void 0 : _this$divaWebConfigDa12.diva3dStaticBGImage_DefaultRoomList) == '' ? '3D_STATBG_ROOMLIST' : (_this$divaWebConfigDa13 = this.divaWebConfigData) === null || _this$divaWebConfigDa13 === void 0 ? void 0 : _this$divaWebConfigDa13.diva3dStaticBGImage_DefaultRoomList;
     }
   }, {
     key: "getDiva3DAllowDefaultCatRoomList",
     value: function getDiva3DAllowDefaultCatRoomList() {
-      var _this$divaWebConfigDa11;
-      return (_this$divaWebConfigDa11 = this.divaWebConfigData) === null || _this$divaWebConfigDa11 === void 0 ? void 0 : _this$divaWebConfigDa11.diva3DAllowDefaultCatRoomList;
+      var _this$divaWebConfigDa14;
+      return (_this$divaWebConfigDa14 = this.divaWebConfigData) === null || _this$divaWebConfigDa14 === void 0 ? void 0 : _this$divaWebConfigDa14.diva3DAllowDefaultCatRoomList;
     }
   }, {
     key: "doAllowSetPlanner",
     value: function doAllowSetPlanner() {
-      var _this$divaWebConfigDa12;
-      return (_this$divaWebConfigDa12 = this.divaWebConfigData) === null || _this$divaWebConfigDa12 === void 0 ? void 0 : _this$divaWebConfigDa12.doAllowSetPlanner;
+      var _this$divaWebConfigDa15;
+      return (_this$divaWebConfigDa15 = this.divaWebConfigData) === null || _this$divaWebConfigDa15 === void 0 ? void 0 : _this$divaWebConfigDa15.doAllowSetPlanner;
     }
   }, {
     key: "getHidePlanner",
     value: function getHidePlanner() {
-      var _this$divaWebConfigDa13;
-      return !!((_this$divaWebConfigDa13 = this.divaWebConfigData) !== null && _this$divaWebConfigDa13 !== void 0 && (_this$divaWebConfigDa13 = _this$divaWebConfigDa13.viewConfig) !== null && _this$divaWebConfigDa13 !== void 0 && _this$divaWebConfigDa13.hidePlanner);
+      var _this$divaWebConfigDa16;
+      return !!((_this$divaWebConfigDa16 = this.divaWebConfigData) !== null && _this$divaWebConfigDa16 !== void 0 && (_this$divaWebConfigDa16 = _this$divaWebConfigDa16.viewConfig) !== null && _this$divaWebConfigDa16 !== void 0 && _this$divaWebConfigDa16.hidePlanner);
     }
   }, {
     key: "getEnableRTVUnityKombi",
     value: function getEnableRTVUnityKombi() {
-      return !!this.organization.settings.enableRTV;
+      var _this$organization$se;
+      return !!((_this$organization$se = this.organization.settings) !== null && _this$organization$se !== void 0 && _this$organization$se.enableRTV);
     }
   }, {
     key: "getDoDisablePlanner2D",
     value: function getDoDisablePlanner2D() {
-      var _this$divaWebConfigDa14;
-      return !!((_this$divaWebConfigDa14 = this.divaWebConfigData) !== null && _this$divaWebConfigDa14 !== void 0 && _this$divaWebConfigDa14.doDisablePlanner2D);
+      var _this$divaWebConfigDa17;
+      return !!((_this$divaWebConfigDa17 = this.divaWebConfigData) !== null && _this$divaWebConfigDa17 !== void 0 && _this$divaWebConfigDa17.doDisablePlanner2D);
     }
   }, {
     key: "getRoomListInProduct",
     value: function getRoomListInProduct() {
-      var _this$divaWebConfigDa15;
-      return !!((_this$divaWebConfigDa15 = this.divaWebConfigData) !== null && _this$divaWebConfigDa15 !== void 0 && (_this$divaWebConfigDa15 = _this$divaWebConfigDa15.viewConfig) !== null && _this$divaWebConfigDa15 !== void 0 && _this$divaWebConfigDa15.roomListInProduct);
+      var _this$divaWebConfigDa18;
+      return !!((_this$divaWebConfigDa18 = this.divaWebConfigData) !== null && _this$divaWebConfigDa18 !== void 0 && (_this$divaWebConfigDa18 = _this$divaWebConfigDa18.viewConfig) !== null && _this$divaWebConfigDa18 !== void 0 && _this$divaWebConfigDa18.roomListInProduct);
     }
   }, {
     key: "getPlannerType",
     value: function getPlannerType() {
-      var _this$divaWebConfigDa16;
-      return (_this$divaWebConfigDa16 = this.divaWebConfigData) === null || _this$divaWebConfigDa16 === void 0 || (_this$divaWebConfigDa16 = _this$divaWebConfigDa16.viewConfig) === null || _this$divaWebConfigDa16 === void 0 ? void 0 : _this$divaWebConfigDa16.plannerType;
+      var _this$divaWebConfigDa19;
+      return (_this$divaWebConfigDa19 = this.divaWebConfigData) === null || _this$divaWebConfigDa19 === void 0 || (_this$divaWebConfigDa19 = _this$divaWebConfigDa19.viewConfig) === null || _this$divaWebConfigDa19 === void 0 ? void 0 : _this$divaWebConfigDa19.plannerType;
     }
   }, {
     key: "getLoadSupplierColors",
     value: function getLoadSupplierColors() {
-      var _this$divaWebConfigDa17;
-      return !!((_this$divaWebConfigDa17 = this.divaWebConfigData) !== null && _this$divaWebConfigDa17 !== void 0 && _this$divaWebConfigDa17.loadSupplierColors);
+      var _this$divaWebConfigDa20;
+      return !!((_this$divaWebConfigDa20 = this.divaWebConfigData) !== null && _this$divaWebConfigDa20 !== void 0 && _this$divaWebConfigDa20.loadSupplierColors);
     }
   }, {
     key: "showSelectionModeZero",
     value: function showSelectionModeZero() {
-      var _this$divaWebConfigDa18;
-      return !!((_this$divaWebConfigDa18 = this.divaWebConfigData) !== null && _this$divaWebConfigDa18 !== void 0 && _this$divaWebConfigDa18.showSelectionModeZero);
+      var _this$divaWebConfigDa21;
+      return !!((_this$divaWebConfigDa21 = this.divaWebConfigData) !== null && _this$divaWebConfigDa21 !== void 0 && _this$divaWebConfigDa21.showSelectionModeZero);
     }
   }, {
     key: "ruleDescSeperator",
     value: function ruleDescSeperator() {
-      var _this$organization$se, _this$organization2;
-      var seperator = (_this$organization$se = (_this$organization2 = this.organization) === null || _this$organization2 === void 0 || (_this$organization2 = _this$organization2.settings) === null || _this$organization2 === void 0 ? void 0 : _this$organization2.ruleDescSeperator) !== null && _this$organization$se !== void 0 ? _this$organization$se : ', ';
+      var _this$organization$se2, _this$organization2;
+      var seperator = (_this$organization$se2 = (_this$organization2 = this.organization) === null || _this$organization2 === void 0 || (_this$organization2 = _this$organization2.settings) === null || _this$organization2 === void 0 ? void 0 : _this$organization2.ruleDescSeperator) !== null && _this$organization$se2 !== void 0 ? _this$organization$se2 : ', ';
       // \n is escaped in url and therefore needs to be set via keyword
       if (seperator == 'newLine') return '\n';
       return seperator;
@@ -742,50 +747,50 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getViewConfig",
     value: function getViewConfig() {
-      var _this$divaWebConfigDa19;
-      return (_this$divaWebConfigDa19 = this.divaWebConfigData) === null || _this$divaWebConfigDa19 === void 0 ? void 0 : _this$divaWebConfigDa19.viewConfig;
+      var _this$divaWebConfigDa22;
+      return (_this$divaWebConfigDa22 = this.divaWebConfigData) === null || _this$divaWebConfigDa22 === void 0 ? void 0 : _this$divaWebConfigDa22.viewConfig;
     }
   }, {
     key: "getEmailConfig",
     value: function getEmailConfig() {
-      var _this$divaWebConfigDa20;
-      return (_this$divaWebConfigDa20 = this.divaWebConfigData) === null || _this$divaWebConfigDa20 === void 0 ? void 0 : _this$divaWebConfigDa20.emailConfig;
+      var _this$divaWebConfigDa23;
+      return (_this$divaWebConfigDa23 = this.divaWebConfigData) === null || _this$divaWebConfigDa23 === void 0 ? void 0 : _this$divaWebConfigDa23.emailConfig;
     }
   }, {
     key: "getABTestCases",
     value: function getABTestCases() {
-      var _this$divaWebConfigDa21, _this$divaWebConfigDa22;
-      return (_this$divaWebConfigDa21 = (_this$divaWebConfigDa22 = this.divaWebConfigData) === null || _this$divaWebConfigDa22 === void 0 ? void 0 : _this$divaWebConfigDa22.abTestCases) !== null && _this$divaWebConfigDa21 !== void 0 ? _this$divaWebConfigDa21 : [];
+      var _this$divaWebConfigDa24, _this$divaWebConfigDa25;
+      return (_this$divaWebConfigDa24 = (_this$divaWebConfigDa25 = this.divaWebConfigData) === null || _this$divaWebConfigDa25 === void 0 ? void 0 : _this$divaWebConfigDa25.abTestCases) !== null && _this$divaWebConfigDa24 !== void 0 ? _this$divaWebConfigDa24 : [];
     }
   }, {
     key: "getBarrierConfig",
     value: function getBarrierConfig() {
-      var _this$divaWebConfigDa23;
-      return (_this$divaWebConfigDa23 = this.divaWebConfigData) === null || _this$divaWebConfigDa23 === void 0 ? void 0 : _this$divaWebConfigDa23.barrierConfig;
+      var _this$divaWebConfigDa26;
+      return (_this$divaWebConfigDa26 = this.divaWebConfigData) === null || _this$divaWebConfigDa26 === void 0 ? void 0 : _this$divaWebConfigDa26.barrierConfig;
     }
   }, {
     key: "getTemplateConfig",
     value: function getTemplateConfig() {
-      var _this$divaWebConfigDa24;
-      return (_this$divaWebConfigDa24 = this.divaWebConfigData) === null || _this$divaWebConfigDa24 === void 0 ? void 0 : _this$divaWebConfigDa24.templateConfig;
+      var _this$divaWebConfigDa27;
+      return (_this$divaWebConfigDa27 = this.divaWebConfigData) === null || _this$divaWebConfigDa27 === void 0 ? void 0 : _this$divaWebConfigDa27.templateConfig;
     }
   }, {
     key: "showDivaNr",
     value: function showDivaNr() {
-      var _this$divaWebConfigDa25;
-      return (_this$divaWebConfigDa25 = this.divaWebConfigData) === null || _this$divaWebConfigDa25 === void 0 ? void 0 : _this$divaWebConfigDa25.showDivaNr;
+      var _this$divaWebConfigDa28;
+      return (_this$divaWebConfigDa28 = this.divaWebConfigData) === null || _this$divaWebConfigDa28 === void 0 ? void 0 : _this$divaWebConfigDa28.showDivaNr;
     }
   }, {
     key: "onErrorHandling",
     value: function onErrorHandling() {
-      var _this$divaWebConfigDa26;
-      return (_this$divaWebConfigDa26 = this.divaWebConfigData) === null || _this$divaWebConfigDa26 === void 0 ? void 0 : _this$divaWebConfigDa26.onErrorHandling;
+      var _this$divaWebConfigDa29;
+      return (_this$divaWebConfigDa29 = this.divaWebConfigData) === null || _this$divaWebConfigDa29 === void 0 ? void 0 : _this$divaWebConfigDa29.onErrorHandling;
     }
   }, {
     key: "diva3DRenderingDefault",
     value: function diva3DRenderingDefault() {
-      var _this$divaWebConfigDa27;
-      return (_this$divaWebConfigDa27 = this.divaWebConfigData) === null || _this$divaWebConfigDa27 === void 0 ? void 0 : _this$divaWebConfigDa27.diva3DRenderingDefault;
+      var _this$divaWebConfigDa30;
+      return (_this$divaWebConfigDa30 = this.divaWebConfigData) === null || _this$divaWebConfigDa30 === void 0 ? void 0 : _this$divaWebConfigDa30.diva3DRenderingDefault;
     }
   }, {
     key: "getJwt",
@@ -800,8 +805,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getUseMask",
     value: function getUseMask() {
-      var _this$divaWebConfigDa28;
-      return (_this$divaWebConfigDa28 = this.divaWebConfigData) === null || _this$divaWebConfigDa28 === void 0 ? void 0 : _this$divaWebConfigDa28.useMask;
+      var _this$divaWebConfigDa31;
+      return (_this$divaWebConfigDa31 = this.divaWebConfigData) === null || _this$divaWebConfigDa31 === void 0 ? void 0 : _this$divaWebConfigDa31.useMask;
     }
   }, {
     key: "apiUrl",
@@ -1316,14 +1321,14 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "dontLoadAdditionalModelInfos",
     get: function get() {
-      var _this$divaWebConfigDa29;
-      return (_this$divaWebConfigDa29 = this.divaWebConfigData) === null || _this$divaWebConfigDa29 === void 0 ? void 0 : _this$divaWebConfigDa29.dontLoadAdditionalModelInfos;
+      var _this$divaWebConfigDa32;
+      return (_this$divaWebConfigDa32 = this.divaWebConfigData) === null || _this$divaWebConfigDa32 === void 0 ? void 0 : _this$divaWebConfigDa32.dontLoadAdditionalModelInfos;
     }
   }, {
     key: "dontLoadCatalogEditorLiteMask",
     get: function get() {
-      var _this$divaWebConfigDa30;
-      return (_this$divaWebConfigDa30 = this.divaWebConfigData) === null || _this$divaWebConfigDa30 === void 0 ? void 0 : _this$divaWebConfigDa30.dontLoadCatalogEditorLiteMask;
+      var _this$divaWebConfigDa33;
+      return (_this$divaWebConfigDa33 = this.divaWebConfigData) === null || _this$divaWebConfigDa33 === void 0 ? void 0 : _this$divaWebConfigDa33.dontLoadCatalogEditorLiteMask;
     }
   }, {
     key: "OrganizationId",
@@ -1758,7 +1763,8 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
   }, {
     key: "isNotRelevant",
     get: function get() {
-      return this.opv.catalogOPV.isNotRelevant;
+      var _this$opv$catalogOPV$, _this$ocd;
+      return (_this$opv$catalogOPV$ = this.opv.catalogOPV.isNotRelevant) !== null && _this$opv$catalogOPV$ !== void 0 ? _this$opv$catalogOPV$ : ['OPVNR', 'OPVNRR', 'OPVNR_0'].includes((_this$ocd = this.ocd) !== null && _this$ocd !== void 0 ? _this$ocd : this.codex);
     }
   }, {
     key: "vCodex",
@@ -2009,11 +2015,11 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
   }, {
     key: "metaDataView",
     get: function get() {
-      var _this$ocd;
+      var _this$ocd2;
       return [].concat(_toConsumableArray__default["default"](this.opv.catalogOPV.metaDataView), [{
         codex: 'codex',
         name: '',
-        values: [((_this$ocd = this.ocd) !== null && _this$ocd !== void 0 ? _this$ocd : this.codex).replace('OPVOPV_', 'OPV_')],
+        values: [((_this$ocd2 = this.ocd) !== null && _this$ocd2 !== void 0 ? _this$ocd2 : this.codex).replace('OPVOPV_', 'OPV_')],
         values_locales: []
       }]);
     }
@@ -17092,6 +17098,7 @@ var CatalogArticleData = /*#__PURE__*/function () {
     key: "initArticleRelations",
     value: function initArticleRelations(articleRelations, catalog) {
       //ein schönes Object mappen und z.B. nachschauen ob der Acc ein SVG hat
+      if (catalog.ignoreArticleRelations) return;
       this.catalogArticle.articleRelations = [];
       if (articleRelations[0].Articles.length > 0) {
         this.catalogArticle.hasArticleRelations = true;
@@ -18301,6 +18308,8 @@ var DivaCatalogData = /*#__PURE__*/function () {
       //                                    accessories sind direkt configurierbar im Accessorie Schritt. kommen aber trozdem auch im Optionsbaum raus
       configOnlyAccessoires: false,
       //                                accessories sind direkt configurierbar nur im Accessoires Schritt
+      ignoreArticleRelations: false,
+      //                               jegliche artikle Realtions welche von den Daten kommen werden ignoriert
       repairVariantValues: undefined,
       //                              Mapping von OPT und OPV um beim öffnen von BK's die variantValues zu updaten
       showPricePreviewOnlyOnOptions: [],
@@ -18320,6 +18329,8 @@ var DivaCatalogData = /*#__PURE__*/function () {
       usePosCountValue: false,
       // old tag
       useDecisionPosCountValue: false,
+      ignoreIsDefinedCheck: false,
+      //                                 if true, on summary click does not check and show the dialob that some articles have options that were not visited
       useShelfPlannerRTV: false,
       notificationsRules: [{
         rules: [{
@@ -18608,6 +18619,8 @@ var DivaCatalogData = /*#__PURE__*/function () {
           _this.catalogData.configAccessoires = item.Value == '1';
         } else if (item.Codex == 'CONFIG_ONLY_ACCESSOIRES') {
           _this.catalogData.configOnlyAccessoires = item.Value == '1';
+        } else if (item.Codex == 'IGNORE_ARTICLERELATIONS') {
+          _this.catalogData.ignoreArticleRelations = item.Value == '1';
         } else if (item.Codex == 'REPAIR_VARIANT_VALUES') {
           var entries = item.Value.split(';;');
           _this.catalogData.repairVariantValues = {};
@@ -18661,6 +18674,8 @@ var DivaCatalogData = /*#__PURE__*/function () {
           _this.catalogData.ignoreMaxPriceAsBP = item.Value == '1';
         } else if (item.Codex == 'DONT_USE_VCODEX_FOR_BASKET') {
           _this.catalogData.dontUseVCodexInBasket = item.Value == '1';
+        } else if (item.Codex == 'IGNORE_ISDEFINED_CHECK') {
+          _this.catalogData.ignoreIsDefinedCheck = item.Value == '1';
         }
         //HOTFIX wied später ausgebaut Philipp mus Properties in der Artikelliste ausgeben
@@ -19214,6 +19229,11 @@ var DivaCatalogData = /*#__PURE__*/function () {
     get: function get() {
       return this.catalogData.configOnlyAccessoires;
     }
+  }, {
+    key: "ignoreArticleRelations",
+    get: function get() {
+      return this.catalogData.ignoreArticleRelations;
+    }
   }, {
     key: "startFilterParams",
     get: function get() {
@@ -19418,6 +19438,11 @@ var DivaCatalogData = /*#__PURE__*/function () {
     get: function get() {
       return this.catalogData.useBoxPlanner;
     }
+  }, {
+    key: "ignoreIsDefinedCheck",
+    get: function get() {
+      return this.catalogData.ignoreIsDefinedCheck;
+    }
   }, {
     key: "startPlannerArticle",
     get: function get() {
@@ -19998,9 +20023,9 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
     key: "multiselectValCodex",
     get: function get() {
       var _this$multiSelects$ma, _this$multiSelects2;
-      return (_this$multiSelects$ma = (_this$multiSelects2 = this.multiSelects) === null || _this$multiSelects2 === void 0 ? void 0 : _this$multiSelects2.map(function (v) {
+      return [this.valCodex].concat(_toConsumableArray__default["default"]((_this$multiSelects$ma = (_this$multiSelects2 = this.multiSelects) === null || _this$multiSelects2 === void 0 ? void 0 : _this$multiSelects2.map(function (v) {
         return v.codex;
-      })) !== null && _this$multiSelects$ma !== void 0 ? _this$multiSelects$ma : [];
+      })) !== null && _this$multiSelects$ma !== void 0 ? _this$multiSelects$ma : []));
     }
   }, {
     key: "measureValue",
@@ -21972,6 +21997,7 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "areAllOptionsDefined",
     get: function get() {
+      if (this.CatalogData.ignoreIsDefinedCheck) return true;
       for (var key in this.articleOptionStates) {
         if (!this.articleOptionStates[key].isDefined) {
           return false;
@@ -23698,7 +23724,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-ce137022.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-331dca24.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -24091,7 +24117,7 @@ var DivaArticle = /*#__PURE__*/function () {
         }
       }
       for (var _key3 in myValues) {
-        var ops = this.articleOptionStates[_key3];
+        var ops = this.getArticleOptionState(_key3);
         var opv = ops === null || ops === void 0 ? void 0 : ops.visibleOptionValues[myValues[_key3]];
         if (opv) {
           var value = opv.setConfig;
@@ -24123,7 +24149,7 @@ var DivaArticle = /*#__PURE__*/function () {
         var _ops7 = this.getArticleOptionState(_key4);
         if (_ops7) {
           validValues[_key4] = myValues[_key4];
-        } else if (_key4.endsWith('_val') && this.articleOptionStates[_key4.replace(/_val/g, '')]) {
+        } else if (_key4.endsWith('_val') && this.getArticleOptionState(_key4.replace(/_val/g, ''))) {
           validValues[_key4] = myValues[_key4];
         } else {
           for (var _opt in this.articleOptionStates) {
@@ -26676,14 +26702,16 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
     }
   }, {
     key: "getCurPaletteType",
-    value: function getCurPaletteType(set, configStepKey, articles) {
+    value: function getCurPaletteType(set, configStepKey) {
+      var _set$api$ReturnToFrom;
       var step = this.getAllByKey(configStepKey);
       var configStep = step === null || step === void 0 ? void 0 : step.configStep;
       var optionStep = step === null || step === void 0 ? void 0 : step.optionStep;
       var paletteType = 'SMALL';
       if (configStep && optionStep) {
-        var optionState = articles[configStep.targetArticles[0]][configStep.option];
-        if (configStep.option == 'OPTVINYL' || configStep.option == 'OPTVINYL_1' || configStep.option == 'OPTFABRIC' || configStep.option == 'OPTBE' || configStep.option == 'OPTBE_AUSSEN' || configStep.option == 'OPTBE_INNEN' || configStep.option == 'OPTBE_PANEELE' || configStep.option == 'OPTMATRATZE_BE' || configStep.option == 'OPTBE_UG' || configStep.option == 'OPTBEZUG' || configStep.option == 'OPTKO' || configStep.option == 'OPTFR' || configStep.option == 'OPTNI' || configStep.option == 'OPTUF_FA' || configStep.option == 'OPTBE_NETZ' || configStep.option == 'OPTBE_AL' || configStep.option == 'OPTKISSEN_BE' || configStep.option == 'OPTKP_BE' || configStep.option == 'OPTARM_BE' || configStep.option == 'OPTBE_KT' || configStep.option == 'OPT3' || configStep.option == 'OPT5' || configStep.option == 'OPTBE_KNOEPFE' || configStep.option == 'OPTSK_FARBE' || configStep.option == 'OPTBANDFARBE' || configStep.option == 'OPTBE_BOX' || configStep.option == 'OPTMA_AF_BE' || configStep.option == 'OPTTOPPER_BE' || optionState.option.hasOPG && optionState.hasImages || optionStep.mergesToOPG) {
+        var _set$getDivaArticles$;
+        var optionState = (_set$getDivaArticles$ = set.getDivaArticles()[configStep.targetArticles[0]]) === null || _set$getDivaArticles$ === void 0 ? void 0 : _set$getDivaArticles$.getArticleOptionState(configStep.option);
+        if (configStep.option == 'OPTVINYL' || configStep.option == 'OPTVINYL_1' || configStep.option == 'OPTFABRIC' || configStep.option == 'OPTBE' || configStep.option == 'OPTBE_AUSSEN' || configStep.option == 'OPTBE_INNEN' || configStep.option == 'OPTBE_PANEELE' || configStep.option == 'OPTMATRATZE_BE' || configStep.option == 'OPTBE_UG' || configStep.option == 'OPTBEZUG' || configStep.option == 'OPTKO' || configStep.option == 'OPTFR' || configStep.option == 'OPTNI' || configStep.option == 'OPTUF_FA' || configStep.option == 'OPTBE_NETZ' || configStep.option == 'OPTBE_AL' || configStep.option == 'OPTKISSEN_BE' || configStep.option == 'OPTKP_BE' || configStep.option == 'OPTARM_BE' || configStep.option == 'OPTBE_KT' || configStep.option == 'OPT3' || configStep.option == 'OPT5' || configStep.option == 'OPTBE_KNOEPFE' || configStep.option == 'OPTSK_FARBE' || configStep.option == 'OPTBANDFARBE' || configStep.option == 'OPTBE_BOX' || configStep.option == 'OPTMA_AF_BE' || configStep.option == 'OPTTOPPER_BE' || optionState !== null && optionState !== void 0 && optionState.option.hasOPG && optionState.hasImages || optionStep.mergesToOPG) {
           paletteType = 'GAL';
         }
         if (configStep.option == 'OPTBA' && !optionState.option.layout) {
@@ -26710,11 +26738,14 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
           paletteType = 'GAL';
         }
       }
+      if ((_set$api$ReturnToFrom = set.api.ReturnToFromParams) !== null && _set$api$ReturnToFrom !== void 0 && _set$api$ReturnToFrom.includes('FAVORITS')) if (paletteType == 'DROPDOWN_IMAGE' || paletteType == 'DROPDOWN_TEXT' || paletteType == 'TOGGLE_NAME' || paletteType == 'TOGGLE') {
+        paletteType = 'SMALL';
+      }
       return paletteType;
     }
   }, {
     key: "getStepInfo",
-    value: function getStepInfo(configStepKey, optionStatesOfArticle) {
+    value: function getStepInfo(configStepKey) {
       var allSteps = this.getAllByKey(configStepKey);
       if (allSteps !== null && allSteps !== void 0 && allSteps.optionStep) ;
       if (allSteps !== null && allSteps !== void 0 && allSteps.configStep.warning) return allSteps.configStep.warning;
@@ -26746,7 +26777,7 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
     }
   }, {
     key: "getCurFilterType",
-    value: function getCurFilterType(configStepKey, articles, confgiItems) {
+    value: function getCurFilterType(configStepKey, confgiItems) {
       var configStep = this.getConfigStepByKey(configStepKey);
       var filterType = '';
       if (configStep) {
@@ -27037,7 +27068,6 @@ var DivaSet = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "setId", void 0);
     _defineProperty__default["default"](this, "_isActSet", false);
     _defineProperty__default["default"](this, "setData", void 0);
-    _defineProperty__default["default"](this, "_onlyCalcVariants", void 0);
     _defineProperty__default["default"](this, "divaArticles", void 0);
     //Schlüssel ist basketId
     _defineProperty__default["default"](this, "configSingleData", void 0);
@@ -27828,16 +27858,6 @@ var DivaSet = /*#__PURE__*/function () {
     value: function addArticle(newArticle) {
       this.divaArticles[newArticle.basketId] = newArticle;
     }
-  }, {
-    key: "getOptionStatesOfArticles",
-    value: function getOptionStatesOfArticles() {
-      var articles = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.divaArticles;
-      var ret = {};
-      for (var key in articles) {
-        ret[key] = articles[key].articleOptionStates;
-      }
-      return ret;
-    }
   }, {
     key: "sortDivaArticlesByArticlePosNr",
     value: function sortDivaArticlesByArticlePosNr() {
@@ -28221,7 +28241,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context4.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-e98cc91c.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-f6c4843f.js'); });
             case 3:
               _yield$import = _context4.sent;
               DoorPlanner = _yield$import["default"];
@@ -28286,14 +28306,6 @@ var DivaSet = /*#__PURE__*/function () {
     get: function get() {
       return this.setState;
     }
-  }, {
-    key: "onlyCalcVariants",
-    get: function get() {
-      return this._onlyCalcVariants;
-    },
-    set: function set(val) {
-      this._onlyCalcVariants = val;
-    }
     /**
      *
@@ -29745,7 +29757,7 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
     key: "getValidVariants",
     value: function () {
       var _getValidVariants = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(set, useCache) {
-        var allvariants, validVariants, i, _set$onlyCalcVariants;
+        var allvariants, validVariants, i;
         return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -29765,11 +29777,7 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
               allvariants = _context4.t0;
               validVariants = [];
               for (i = 0; i < allvariants.length; i++) {
-                if (!set.disabledVariants.includes(allvariants[i].id)) {
-                  if (!((_set$onlyCalcVariants = set.onlyCalcVariants) !== null && _set$onlyCalcVariants !== void 0 && _set$onlyCalcVariants.length) || set.onlyCalcVariants.includes(allvariants[i].id)) {
-                    validVariants.push(allvariants[i]);
-                  }
-                }
+                if (!set.disabledVariants.includes(allvariants[i].id)) validVariants.push(allvariants[i]);
               }
               return _context4.abrupt("return", validVariants);
             case 11:
@@ -30431,25 +30439,24 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
     key: "getConifgItemsForView",
     value: function () {
       var _getConifgItemsForView = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(set, configStepKey) {
-        var optionStatesOfArticles, articles, step, retValues, optionCodex, configItems, selectedItems, optionState, key, _configItem$parent$oc, configItem, configItemsInOPG, retVal, _retVal, configStepOPG, configStepOPV, targetArticle, opg, ops, selectedOpv, originalVariantValues, seomethingChanged, variantValues, _key, _set$favorites$Varian, _set$favorites, alreadyCalcedVisibleOPVs, i, _ops$optionOcd2, _retVal2, clonedConfigItemsForView, _i, _configItems;
+        var articles, step, retValues, optionCodex, configItems, selectedItems, optionState, key, _configItem$parent$oc, configItem, configItemsInOPG, retVal, _retVal, configStepOPG, configStepOPV, targetArticle, opg, ops, selectedOpv, originalVariantValues, seomethingChanged, variantValues, _key, _set$favorites$Varian, _set$favorites, alreadyCalcedVisibleOPVs, i, _ops$optionOcd2, _retVal2, clonedConfigItemsForView, _i, _configItems;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              optionStatesOfArticles = set.getOptionStatesOfArticles(set.getDivaArticles(true));
               articles = set.getDivaArticles(true);
               step = set.configTree.getAllByKey(configStepKey);
               retValues = this.getConfigItems(configStepKey, articles, set.configTree);
               optionCodex = undefined;
               if (!(retValues && step != null)) {
-                _context.next = 55;
+                _context.next = 54;
                 break;
               }
               configItems = [];
               selectedItems = retValues.selectedVals;
-              optionState = optionStatesOfArticles[retValues.targetArticles[0]][retValues.optionCodex];
+              optionState = articles[retValues.targetArticles[0]].getArticleOptionState(retValues.optionCodex);
               optionCodex = optionState.optionCodex;
               if (!retValues.isOPG) {
-                _context.next = 14;
+                _context.next = 13;
                 break;
               }
               for (key in retValues.configItems) {
@@ -30461,26 +30468,26 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                   configItems = configItems.concat(retVal.myConfigItemsForView);
                 }
               }
-              _context.next = 52;
+              _context.next = 51;
               break;
-            case 14:
+            case 13:
               if (!(step.optionStep.mergesToOPG == undefined)) {
-                _context.next = 19;
+                _context.next = 18;
                 break;
               }
               _retVal = this.prepareConfigItemsForView(set, optionState, retValues.configItems, retValues.constructionRules, selectedItems, step.configStep.targetArticles, undefined, undefined, undefined, undefined, retValues.freeTextValue, retValues.freeTextLang);
               configItems = _retVal.myConfigItemsForView;
-              _context.next = 52;
+              _context.next = 51;
               break;
-            case 19:
+            case 18:
               if (!(typeof step.optionStep.mergesToOPG == 'string' && step.tabGroup.options[step.optionStep.mergesToOPG])) {
-                _context.next = 52;
+                _context.next = 51;
                 break;
               }
               //IDM Bezugschritte werden zusammengefasst zu OPG und OPV
               configStepOPG = step.configStep, configStepOPV = set.configTree.getConfigStepBasketIdAndOptionCodex(configStepOPG.targetArticles[0], step.optionStep.mergesToOPG); //falls mehrere Artikel im Schritt sind werden trotzdem nur die Values des erster verwendet um die z.B. OPT2 und OPT3 zu vereinen
               if (!configStepOPV) {
-                _context.next = 52;
+                _context.next = 51;
                 break;
               }
               targetArticle = articles[configStepOPG.targetArticles[0]];
@@ -30491,9 +30498,9 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
               seomethingChanged = false;
               variantValues = {};
               _context.t0 = _regeneratorRuntime__default["default"].keys(opg.visibleOptionValues);
-            case 30:
+            case 29:
               if ((_context.t1 = _context.t0()).done) {
-                _context.next = 48;
+                _context.next = 47;
                 break;
               }
               _key = _context.t1.value;
@@ -30501,7 +30508,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
               variantValues[opg.optionCodex] = opg.visibleOptionValues[_key].codex;
               alreadyCalcedVisibleOPVs = targetArticle.getMergesToOPG(opg.optionCodex + '_' + opg.visibleOptionValues[_key].codex, JSON.stringify(targetArticle.getVariantValuesTillOPT(opg.optionCodex)));
               if (!(alreadyCalcedVisibleOPVs != undefined && Object.keys((_set$favorites$Varian = (_set$favorites = set.favorites) === null || _set$favorites === void 0 ? void 0 : _set$favorites.VariantValues) !== null && _set$favorites$Varian !== void 0 ? _set$favorites$Varian : {}).length == 0)) {
-                _context.next = 39;
+                _context.next = 38;
                 break;
               }
               //die merged OPG wurde bereist ausgerechnet und kann wiederverwendet werden. nur die Selected value muss repariert werden
@@ -30513,35 +30520,35 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                 }
               }
               configItems = configItems.concat(alreadyCalcedVisibleOPVs);
-              _context.next = 46;
+              _context.next = 45;
               break;
-            case 39:
+            case 38:
               seomethingChanged = true;
-              _context.next = 42;
+              _context.next = 41;
               return articleHandlerInstance.updateCfgValues(targetArticle, variantValues, {}, true, true, true);
-            case 42:
+            case 41:
               _retVal2 = this.prepareConfigItemsForView(set, optionState, targetArticle.getArticleOptionState(ops.optionCodex).visibleOptionValues, retValues.constructionRules, [], step.configStep.targetArticles, (_ops$optionOcd2 = ops.optionOcd) !== null && _ops$optionOcd2 !== void 0 ? _ops$optionOcd2 : ops.optionCodex, opg.visibleOptionValues[_key].name, opg.visibleOptionValues[_key].codex, opg.optionCodex);
               configItems = configItems.concat(_retVal2.myConfigItemsForView);
               clonedConfigItemsForView = JSON.parse(JSON.stringify(_retVal2.myConfigItemsForView));
               targetArticle.addMergesToOPG(opg.optionCodex + '_' + opg.visibleOptionValues[_key].codex, JSON.stringify(targetArticle.getVariantValuesTillOPT(opg.optionCodex)), clonedConfigItemsForView);
-            case 46:
-              _context.next = 30;
+            case 45:
+              _context.next = 29;
               break;
-            case 48:
+            case 47:
               if (!seomethingChanged) {
-                _context.next = 51;
+                _context.next = 50;
                 break;
               }
-              _context.next = 51;
+              _context.next = 50;
               return setHandlerInstance.updateArticlesOptionStatesOfActSet(set, originalVariantValues, [targetArticle.basketId], true, 'calcVariant');
-            case 51:
+            case 50:
               for (_i = 0; _i < configItems.length; _i++) {
                 if (configItems[_i].codex == (selectedOpv === null || selectedOpv === void 0 ? void 0 : selectedOpv.codex)) {
                   selectedItems = [selectedOpv.codex];
                   configItems[_i].sel = true;
                 }
               }
-            case 52:
+            case 51:
               return _context.abrupt("return", {
                 configItems: configItems,
                 option: optionCodex ? set.CatalogData.getOption(optionCodex) : undefined,
@@ -30552,13 +30559,13 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                 }),
                 notTotallyMatichingOPVs: !set.CatalogData.articleConfigAll ? retValues.notTotallyMatichingOPVs : undefined
               });
-            case 55:
+            case 54:
               _configItems = [];
               return _context.abrupt("return", {
                 configItems: _configItems,
                 selectedItems: []
               });
-            case 57:
+            case 56:
             case "end":
               return _context.stop();
           }
@@ -30585,10 +30592,10 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
           notTotallyMatichingOPVs = false,
           myOptionState = undefined;
         for (var i = 0; i < configStep.targetArticles.length; i++) {
+          var _myOptionState;
           var article = articles[configStep.targetArticles[i]];
-          var myOptions = article.articleOptionStates;
-          myOptionState = myOptions[configStep.option];
-          if (myOptionState.option.hasOPG) isOPG = true;
+          myOptionState = article.getArticleOptionState(configStep.option);
+          if ((_myOptionState = myOptionState) !== null && _myOptionState !== void 0 && (_myOptionState = _myOptionState.option) !== null && _myOptionState !== void 0 && _myOptionState.hasOPG) isOPG = true;
           selectedVals = selectedVals.concat(myOptionState.getSelectedVals);
           if (myOptionState.isFreeText && myOptionState.freeText) {
             freeTextValue = myOptionState.freeText;
@@ -30701,12 +30708,13 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
      */
   }, {
     key: "checkIfLoadedArticlesAreConfigSingle",
-    value: function checkIfLoadedArticlesAreConfigSingle(optionStatesOfArticles) {
+    value: function checkIfLoadedArticlesAreConfigSingle(set) {
       var optionValues = {},
         ret = false;
-      for (var ikey in optionStatesOfArticles) {
-        for (var jKey in optionStatesOfArticles[ikey]) {
-          var optionState = optionStatesOfArticles[ikey][jKey];
+      var articles = set.getDivaArticles();
+      for (var basketId in articles) {
+        for (var jKey in articles[basketId].articleOptionStates) {
+          var optionState = articles[basketId].articleOptionStates[jKey];
           if (optionState.headerPosVariationType == 'K') {
             if (optionValues[optionState.optionCodex] == undefined) {
               optionValues[optionState.optionCodex] = optionState.valCodex ? optionState.valCodex : null;
@@ -30730,7 +30738,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       var myConfigItemsForView = [],
         objectKeys = Object.keys(myConfigItems);
       var _loop8 = function _loop8() {
-        var _ops$optionOcd3, _item$colorGroups, _item$pdfUrl, _item$url;
+        var _ops$optionOcd3, _item$images, _item$colorGroups, _item$pdfUrl, _item$url;
         var item = myConfigItems[objectKeys[i]];
         var key = objectKeys[i];
         var groupName = item.groupName ? item.groupName : idmOpgGroupName;
@@ -30759,7 +30767,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
           codex: item.codex,
           ocd: item.ocd,
           vCodex: item.vCodex,
-          layout: item.isTexture ? 'TEXTURE' : item.image ? 'IMAGE' : 'TEXT',
+          layout: item.isTexture ? 'TEXTURE' : item.image || (_item$images = item.images) !== null && _item$images !== void 0 && _item$images.length ? 'IMAGE' : 'TEXT',
           image: image,
           zoomImage: zoomImage,
           hexColor: item.hexColor,
@@ -31151,7 +31159,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               _context4.next = 72;
               break;
             case 85:
-              set.configSingle = configTreeHandler.checkIfLoadedArticlesAreConfigSingle(set.getOptionStatesOfArticles());
+              set.configSingle = configTreeHandler.checkIfLoadedArticlesAreConfigSingle(set);
               _context4.next = 88;
               return this.updateArticlesOptionStatesOfActSet(set, {}, [], undefined, 'initializing');
             case 88:
@@ -32627,23 +32635,22 @@ var DivaSetHandler = /*#__PURE__*/function () {
     value: function () {
       var _loadConfigItemsOfActSetByConfigStepKey = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee22(set, configStepKey, visible) {
         var _configItems$option;
-        var optionStatesOfArticle, configItems, paletteType, filterType, stepInfo, contentItemId;
+        var configItems, paletteType, filterType, stepInfo, contentItemId;
         return _regeneratorRuntime__default["default"].wrap(function _callee22$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
             case 0:
-              optionStatesOfArticle = set.getOptionStatesOfArticles(set.getDivaArticles(true));
-              _context24.next = 3;
+              _context24.next = 2;
               return configTreeHandler.getConifgItemsForView(set, configStepKey);
-            case 3:
+            case 2:
               configItems = _context24.sent;
-              paletteType = set.configTree.getCurPaletteType(set, configStepKey, optionStatesOfArticle);
+              paletteType = set.configTree.getCurPaletteType(set, configStepKey);
               configItems.configItems = this.removeDockingInfluencableconfigItems(set, configItems.configItems, configStepKey);
-              _context24.next = 8;
+              _context24.next = 7;
               return this.variantsEvaluator(set, configItems.configItems, configStepKey, paletteType);
-            case 8:
+            case 7:
               configItems.configItems = _context24.sent;
-              filterType = set.configTree.getCurFilterType(configStepKey, optionStatesOfArticle, configItems.configItems);
-              stepInfo = set.configTree.getStepInfo(configStepKey, optionStatesOfArticle);
+              filterType = set.configTree.getCurFilterType(configStepKey, configItems.configItems);
+              stepInfo = set.configTree.getStepInfo(configStepKey);
               contentItemId = (_configItems$option = configItems.option) === null || _configItems$option === void 0 ? void 0 : _configItems$option.contentItemId;
               return _context24.abrupt("return", _objectSpread$9(_objectSpread$9(_objectSpread$9({
                 isRenderedNotInSettingPalette: set.configTree.isRenderedNotInSettingPalette(configStepKey),
@@ -32656,7 +32663,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               }, set.configTree.getOptionStuff(configStepKey, set)), {}, {
                 contentItemId: contentItemId
               }));
-            case 13:
+            case 12:
             case "end":
               return _context24.stop();
           }
@@ -34847,7 +34854,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context12.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-4a6d833a.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-9c9dd41d.js'); });
             case 5:
               _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -34855,7 +34862,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 9:
               _context12.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-e144ed04.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-5976147e.js'); });
             case 11:
               _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -34863,7 +34870,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 15:
               _context12.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-8530c15f.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-99a76472.js'); });
             case 17:
               _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -34871,7 +34878,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 21:
               _context12.next = 23;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-cd08ca46.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-3def2f67.js'); });
             case 23:
               _yield$import4 = _context12.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -35686,6 +35693,7 @@ var Rendering = /*#__PURE__*/function () {
   }, {
     key: "hasUIInfosOfElement",
     value: function hasUIInfosOfElement(setId, elementid) {
+      if (this.hasStaticBackground) return false; //when the rendering has static background, no UI Info is loaded d
       if (this.uiInfo[setId] == undefined && this.uiInfo['S1'] != undefined) {
         return this.uiInfo['S1']['E' + elementid] != undefined;
       } else {
@@ -36384,7 +36392,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-b507198e.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-ceb795ca.js'); });
             case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -37943,7 +37951,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context4.next = 10;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-64e0b280.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-4feff250.js'); });
             case 10:
               _yield$import = _context4.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -37954,7 +37962,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context4.abrupt("break", 21);
             case 15:
               _context4.next = 17;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-a902a2b5.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-8df05a27.js'); });
             case 17:
               _yield$import2 = _context4.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -39711,7 +39719,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
             case 29:
               set = this.actSet();
               oldProductId = this.divaBasketHandler.actBasket.MatchingProductId || this.divaBasketHandler.actBasket.OrigProductId;
-              if (!(oldProductId && set)) {
+              if (!(oldProductId && set && set !== null && set !== void 0 && set.api.doCheckForProductsPrice())) {
                 _context13.next = 38;
                 break;
               }
@@ -40600,6 +40608,12 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     value: function eventIsManagedByClient(event) {
       return this.api.eventIsManagedByClient(event);
     }
+  }, {
+    key: "showModal",
+    value: function showModal(data) {
+      var _this$actions21;
+      (_this$actions21 = this.actions) === null || _this$actions21 === void 0 || _this$actions21.openModal(data);
+    }
   }, {
     key: "logGA",
     value: function logGA(action) {
@@ -40617,25 +40631,25 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "callEvent",
     value: function callEvent(event, param) {
-      var _this$actions21, _this$actions22, _this$actions23, _this$actions24;
+      var _this$actions22, _this$actions23, _this$actions24, _this$actions25;
       switch (event) {
         case 'onFullscreenClose':
-          (_this$actions21 = this.actions) === null || _this$actions21 === void 0 || _this$actions21.onEvent({
+          (_this$actions22 = this.actions) === null || _this$actions22 === void 0 || _this$actions22.onEvent({
             type: 'onFullscreenClose'
           });
           break;
         case 'onWebPlanerClose':
-          (_this$actions22 = this.actions) === null || _this$actions22 === void 0 || _this$actions22.onEvent({
+          (_this$actions23 = this.actions) === null || _this$actions23 === void 0 || _this$actions23.onEvent({
             type: 'onWebPlanerClose'
           });
           break;
         case 'onWebPlanerHelp':
-          (_this$actions23 = this.actions) === null || _this$actions23 === void 0 || _this$actions23.onEvent({
+          (_this$actions24 = this.actions) === null || _this$actions24 === void 0 || _this$actions24.onEvent({
             type: 'onWebPlanerHelp'
           });
           break;
         case 'onWebPlanerZoomClick':
-          (_this$actions24 = this.actions) === null || _this$actions24 === void 0 || _this$actions24.onEvent({
+          (_this$actions25 = this.actions) === null || _this$actions25 === void 0 || _this$actions25.onEvent({
             type: 'onWebPlanerZoomClick',
             data: param
           });
@@ -40646,14 +40660,14 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "saveToBasketWrapper",
     value: function () {
       var _saveToBasketWrapper = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee25(event, repairOnly, force) {
-        var _this$actions26,
-          _this$actions26$toggl,
-          _this$actions27,
+        var _this$actions27,
           _this$actions27$toggl,
+          _this$actions28,
+          _this$actions28$toggl,
           _this2 = this,
-          _this$actions31,
+          _this$actions32,
           _this$i18n14;
-        var returnTo, finalEvent, _this$api$getBarrierC, _this$openLeafeltBarr, product, _this$actSet9, url, _result, _this$actions25, result, _this$actions28, _this$i18n8, _this$i18n9, _this$actions29, _this$i18n10, _this$i18n11, _this$actions30, _this$i18n12, _this$i18n13, _this$updatePlannerMs2;
+        var returnTo, finalEvent, _this$api$getBarrierC, _this$openLeafeltBarr, product, _this$actSet9, url, _result, _this$actions26, result, _this$actions29, _this$i18n8, _this$i18n9, _this$actions30, _this$i18n10, _this$i18n11, _this$actions31, _this$i18n12, _this$i18n13, _this$updatePlannerMs2;
         return _regeneratorRuntime__default["default"].wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -40692,25 +40706,25 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 _context25.next = 20;
                 break;
               }
-              (_this$actions25 = this.actions) === null || _this$actions25 === void 0 || _this$actions25.onEvent({
+              (_this$actions26 = this.actions) === null || _this$actions26 === void 0 || _this$actions26.onEvent({
                 type: finalEvent.event
               });
               return _context25.abrupt("return", 'canceled');
             case 20:
               returnTo = finalEvent.event == 'onAddToBasket' ? 'OPEN_PDF' : returnTo;
             case 21:
-              (_this$actions26 = this.actions) === null || _this$actions26 === void 0 || (_this$actions26$toggl = _this$actions26.toggleLoading) === null || _this$actions26$toggl === void 0 || _this$actions26$toggl.call(_this$actions26, 'Planner_Saving', false, true);
+              (_this$actions27 = this.actions) === null || _this$actions27 === void 0 || (_this$actions27$toggl = _this$actions27.toggleLoading) === null || _this$actions27$toggl === void 0 || _this$actions27$toggl.call(_this$actions27, 'Planner_Saving', false, true);
               _context25.next = 24;
               return this.saveToBasket(finalEvent.event, repairOnly, force);
             case 24:
               result = _context25.sent;
-              (_this$actions27 = this.actions) === null || _this$actions27 === void 0 || (_this$actions27$toggl = _this$actions27.toggleLoading) === null || _this$actions27$toggl === void 0 || _this$actions27$toggl.call(_this$actions27, 'Planner_Saving', false, false);
+              (_this$actions28 = this.actions) === null || _this$actions28 === void 0 || (_this$actions28$toggl = _this$actions28.toggleLoading) === null || _this$actions28$toggl === void 0 || _this$actions28$toggl.call(_this$actions28, 'Planner_Saving', false, false);
               if (!(result === 'canceled')) {
                 _context25.next = 30;
                 break;
               }
               LOG$1.error(new DivaUtils.DivaError('failed to save Basket'));
-              (_this$actions28 = this.actions) === null || _this$actions28 === void 0 || _this$actions28.openModal({
+              (_this$actions29 = this.actions) === null || _this$actions29 === void 0 || _this$actions29.openModal({
                 text: ((_this$i18n8 = this.i18n()) === null || _this$i18n8 === void 0 ? void 0 : _this$i18n8.t('modal.general_error')) + ' --- ' + DivaUtils__default["default"].formatDate(new Date(), true, undefined, true) + ' --- ' + DivaUtils__default["default"].getCurrentTraceId() ? ((_this$i18n9 = this.i18n()) === null || _this$i18n9 === void 0 ? void 0 : _this$i18n9.t('modal.errorcode')) + ': ' + DivaUtils__default["default"].getCurrentTraceId() : '',
                 accept: true
               });
@@ -40724,12 +40738,12 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 LOG$1.error(new DivaUtils.DivaError('PDF url is missing in basket', {
                   code: 'WC_0010'
                 }));
-                (_this$actions29 = this.actions) === null || _this$actions29 === void 0 || _this$actions29.openModal({
+                (_this$actions30 = this.actions) === null || _this$actions30 === void 0 || _this$actions30.openModal({
                   text: ((_this$i18n10 = this.i18n()) === null || _this$i18n10 === void 0 ? void 0 : _this$i18n10.t('modal.general_error')) + ' --- ' + DivaUtils__default["default"].formatDate(new Date(), true, undefined, true) + ' --- ' + DivaUtils__default["default"].getCurrentTraceId() ? ((_this$i18n11 = this.i18n()) === null || _this$i18n11 === void 0 ? void 0 : _this$i18n11.t('modal.errorcode')) + ': ' + DivaUtils__default["default"].getCurrentTraceId() : '',
                   accept: true
                 });
               } else {
-                (_this$actions30 = this.actions) === null || _this$actions30 === void 0 || _this$actions30.openModal({
+                (_this$actions31 = this.actions) === null || _this$actions31 === void 0 || _this$actions31.openModal({
                   text: (_this$i18n12 = this.i18n()) === null || _this$i18n12 === void 0 ? void 0 : _this$i18n12.t(this.divaBasketHandler.actBasket.Status === 'ORDER' ? 'modal.open_order_pdf_now' : 'modal.open_leaflet_pdf_now'),
                   accept: (_this$i18n13 = this.i18n()) === null || _this$i18n13 === void 0 ? void 0 : _this$i18n13.t('modals.open_now'),
                   callback: function callback() {
@@ -40739,7 +40753,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               }
               return _context25.abrupt("break", 36);
             case 35:
-              (_this$actions31 = this.actions) === null || _this$actions31 === void 0 || _this$actions31.openModal({
+              (_this$actions32 = this.actions) === null || _this$actions32 === void 0 || _this$actions32.openModal({
                 text: (_this$i18n14 = this.i18n()) === null || _this$i18n14 === void 0 ? void 0 : _this$i18n14.t('modal.planning_saved'),
                 accept: true
               });
@@ -40767,7 +40781,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "saveToBasket",
     value: function () {
       var _saveToBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee26(event, repairOnly, force) {
-        var _returnTo, _returnTo2, _returnTo3, _this$actions32, _this$actions33, _this$actions34, _this$divaBasketHandl2;
+        var _returnTo, _returnTo2, _returnTo3, _this$actions33, _this$actions34, _this$actions35, _this$divaBasketHandl2;
         var set, actBasket, returnTo, oldReturnTo, result, newDivaNr, _result2, product;
         return _regeneratorRuntime__default["default"].wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
@@ -40824,8 +40838,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _context26.next = _context26.t3 === 'OPEN_SELLER_PRODUCTCREATOR' ? 28 : _context26.t3 === 'OPEN_SELLER_BASKET' ? 31 : _context26.t3 === 'OPEN_PDF' ? 33 : _context26.t3 === 'SAVE_BASKET_WITH_MODAL' ? 33 : _context26.t3 === 'SAVE_BASKET' ? 33 : _context26.t3 === 'SAVE_BASKET_SYNC' ? 33 : _context26.t3 === 'OPEN_LEAFLET_BARRIER' ? 33 : 52;
               break;
             case 28:
-              (_this$actions32 = this.actions) === null || _this$actions32 === void 0 || _this$actions32.toggleLoading('buildScene', false, false);
-              (_this$actions33 = this.actions) === null || _this$actions33 === void 0 || _this$actions33.openComponent({
+              (_this$actions33 = this.actions) === null || _this$actions33 === void 0 || _this$actions33.toggleLoading('buildScene', false, false);
+              (_this$actions34 = this.actions) === null || _this$actions34 === void 0 || _this$actions34.openComponent({
                 type: 'SELLER',
                 parameters: {
                   module: 'PCreator',
@@ -40837,7 +40851,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               });
               return _context26.abrupt("break", 52);
             case 31:
-              (_this$actions34 = this.actions) === null || _this$actions34 === void 0 || _this$actions34.openComponent({
+              (_this$actions35 = this.actions) === null || _this$actions35 === void 0 || _this$actions35.openComponent({
                 type: 'SELLER',
                 parameters: {
                   module: 'Basket',
@@ -40951,7 +40965,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
         }
       }
       if (plannerType === 'JUMP_OVER_PLANNER') {
-        ret = 'PLANNER';
+        if (doShowPlanner) ret = 'PLANNER';
         plannerType = undefined;
       }
       if (plannerType === 'CUSTOMER_OPTIMIZED_PLANNER') {
@@ -40975,7 +40989,6 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       }
       if (plannerType) return plannerType;
       if (doShowPlanner) {
-        // deprected; plannerType should only be used
         ret = 'PLANNER';
       }
       return ret;
@@ -41161,17 +41174,17 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "addToBasket",
     value: function () {
       var _addToBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee28(actBasket) {
-        var _this$actions35,
-          _this$actions36,
+        var _this$actions36,
           _this$actions37,
           _this$actions38,
           _this$actions39,
+          _this$actions40,
           _this$divaBasketHandl4,
           _this3 = this,
-          _this$actions40,
           _this$actions41,
           _this$actions42,
-          _this$actions43;
+          _this$actions43,
+          _this$actions44;
         var event,
           emailConfig,
           _emailConfig$to$split,
@@ -41188,31 +41201,31 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _context28.next = _context28.t0 === 'onWebPlanerPrint' ? 5 : _context28.t0 === 'onWebPlanerSave' ? 7 : _context28.t0 === 'onWebPlanerShare' ? 9 : _context28.t0 === 'onRequestConsulation' ? 11 : _context28.t0 === 'onSave' ? 13 : _context28.t0 === 'onSendEmail' ? 15 : _context28.t0 === 'onSaveProduct' ? 20 : _context28.t0 === 'dontSaveBasket' ? 27 : _context28.t0 === 'onAddToBasket' ? 28 : 30;
               break;
             case 5:
-              (_this$actions35 = this.actions) === null || _this$actions35 === void 0 || _this$actions35.onEvent({
+              (_this$actions36 = this.actions) === null || _this$actions36 === void 0 || _this$actions36.onEvent({
                 type: 'onWebPlanerPrint',
                 data: actBasket.getAsJson()
               });
               return _context28.abrupt("break", 32);
             case 7:
-              (_this$actions36 = this.actions) === null || _this$actions36 === void 0 || _this$actions36.onEvent({
+              (_this$actions37 = this.actions) === null || _this$actions37 === void 0 || _this$actions37.onEvent({
                 type: 'onWebPlanerSave',
                 data: actBasket.getAsJson()
               });
               return _context28.abrupt("break", 32);
             case 9:
-              (_this$actions37 = this.actions) === null || _this$actions37 === void 0 || _this$actions37.onEvent({
+              (_this$actions38 = this.actions) === null || _this$actions38 === void 0 || _this$actions38.onEvent({
                 type: 'onWebPlanerShare',
                 data: actBasket.getAsJson()
               });
               return _context28.abrupt("break", 32);
             case 11:
-              (_this$actions38 = this.actions) === null || _this$actions38 === void 0 || _this$actions38.onEvent({
+              (_this$actions39 = this.actions) === null || _this$actions39 === void 0 || _this$actions39.onEvent({
                 type: 'onRequestConsulation',
                 data: actBasket.getAsJson()
               });
               return _context28.abrupt("break", 32);
             case 13:
-              (_this$actions39 = this.actions) === null || _this$actions39 === void 0 || _this$actions39.onEvent({
+              (_this$actions40 = this.actions) === null || _this$actions40 === void 0 || _this$actions40.onEvent({
                 type: 'onSave',
                 data: actBasket.getAsJson()
               });
@@ -41247,7 +41260,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                   });
                 });
               }
-              (_this$actions40 = this.actions) === null || _this$actions40 === void 0 || _this$actions40.onEvent({
+              (_this$actions41 = this.actions) === null || _this$actions41 === void 0 || _this$actions41.onEvent({
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
@@ -41258,7 +41271,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               return this.api.saveAsProduct(this.sets, actBasket);
             case 23:
               products = _context28.sent;
-              (_this$actions41 = this.actions) === null || _this$actions41 === void 0 || _this$actions41.onEvent({
+              (_this$actions42 = this.actions) === null || _this$actions42 === void 0 || _this$actions42.onEvent({
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
@@ -41269,13 +41282,13 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               return _context28.abrupt("return", products[0]);
             case 27:
             case 28:
-              (_this$actions42 = this.actions) === null || _this$actions42 === void 0 || _this$actions42.onEvent({
+              (_this$actions43 = this.actions) === null || _this$actions43 === void 0 || _this$actions43.onEvent({
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
               return _context28.abrupt("break", 32);
             case 30:
-              (_this$actions43 = this.actions) === null || _this$actions43 === void 0 || _this$actions43.onEvent({
+              (_this$actions44 = this.actions) === null || _this$actions44 === void 0 || _this$actions44.onEvent({
                 type: event,
                 data: actBasket.getAsJson()
               });
@@ -41296,8 +41309,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "openPDFpostAsEvent",
     value: function openPDFpostAsEvent(mongoDBId) {
-      var _this$actions44, _this$actions45, _this$actions46;
-      (_this$actions44 = this.actions) === null || _this$actions44 === void 0 || _this$actions44.updateBreadcrumbs({
+      var _this$actions45, _this$actions46, _this$actions47;
+      (_this$actions45 = this.actions) === null || _this$actions45 === void 0 || _this$actions45.updateBreadcrumbs({
         type: 'update',
         param: {
           groupId: 'SHOWROOM',
@@ -41311,7 +41324,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }
       });
-      (_this$actions45 = this.actions) === null || _this$actions45 === void 0 || _this$actions45.updateBreadcrumbs({
+      (_this$actions46 = this.actions) === null || _this$actions46 === void 0 || _this$actions46.updateBreadcrumbs({
         type: 'update',
         param: {
           groupId: 'SHOWROOM',
@@ -41325,7 +41338,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }
       });
-      (_this$actions46 = this.actions) === null || _this$actions46 === void 0 || _this$actions46.openComponent({
+      (_this$actions47 = this.actions) === null || _this$actions47 === void 0 || _this$actions47.openComponent({
         type: 'REPORT',
         parameters: {
           id: mongoDBId
@@ -41545,14 +41558,14 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "subscribeToWebPlannerEvents",
     value: function subscribeToWebPlannerEvents() {
-      var _this$actions47;
-      (_this$actions47 = this.actions) === null || _this$actions47 === void 0 || _this$actions47.subscribeEvents(this.addToBasketEventFunction);
+      var _this$actions48;
+      (_this$actions48 = this.actions) === null || _this$actions48 === void 0 || _this$actions48.subscribeEvents(this.addToBasketEventFunction);
     }
   }, {
     key: "unsubscribeFromWebPlannerEvents",
     value: function unsubscribeFromWebPlannerEvents() {
-      var _this$actions48;
-      (_this$actions48 = this.actions) === null || _this$actions48 === void 0 || _this$actions48.unSubscribeEvents(this.addToBasketEventFunction);
+      var _this$actions49;
+      (_this$actions49 = this.actions) === null || _this$actions49 === void 0 || _this$actions49.unSubscribeEvents(this.addToBasketEventFunction);
     }
   }, {
     key: "initApiForLogicOnly",
@@ -41620,7 +41633,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "initBasket",
     value: function () {
-      var _initBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee31(init3D, ignoreFavorites, onlyCalcVariants) {
+      var _initBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee31(init3D, ignoreFavorites) {
         var initSetState, set, basket;
         return _regeneratorRuntime__default["default"].wrap(function _callee31$(_context31) {
           while (1) switch (_context31.prev = _context31.next) {
@@ -41633,27 +41646,26 @@ var DivaWebPlanner = /*#__PURE__*/function () {
             case 5:
               //TODO check if when basket gets repaired the product match gets called
               set = this.actSet();
-              if (set) set.onlyCalcVariants = onlyCalcVariants;
               setHandlerInstance.loadConfigStructureOfActSet(set, this.getCurPlannerType());
               if (!(favoritesHandlerInstance.FavoritesDefined(set) && !ignoreFavorites)) {
-                _context31.next = 11;
+                _context31.next = 10;
                 break;
               }
-              _context31.next = 11;
+              _context31.next = 10;
               return this.handleFavorites(init3D ? 'CALC' : 'REPAIR');
-            case 11:
-              _context31.next = 13;
+            case 10:
+              _context31.next = 12;
               return setHandlerInstance.fillOrderLinesAndOrderSets(this.sets, this.divaBasketHandler, !init3D, this.doAllowSetPlanner(), this.ReturnTo);
-            case 13:
+            case 12:
               basket = _context31.sent;
               return _context31.abrupt("return", basket);
-            case 15:
+            case 14:
             case "end":
               return _context31.stop();
           }
         }, _callee31, this);
       }));
-      function initBasket(_x79, _x80, _x81) {
+      function initBasket(_x79, _x80) {
         return _initBasket.apply(this, arguments);
       }
       return initBasket;
@@ -41730,7 +41742,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }, _callee33, this);
       }));
-      function handleFavorites(_x82) {
+      function handleFavorites(_x81) {
         return _handleFavorites.apply(this, arguments);
       }
       return handleFavorites;
@@ -41784,7 +41796,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }, _callee34, this);
       }));
-      function initSapOrderLinesFromBasket(_x83, _x84, _x85) {
+      function initSapOrderLinesFromBasket(_x82, _x83, _x84) {
         return _initSapOrderLinesFromBasket.apply(this, arguments);
       }
       return initSapOrderLinesFromBasket;
@@ -41851,7 +41863,9 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       var articleCodex = [];
       var accesoriesCodex = [];
       var articles = [];
+      var actualBasketvalue = 0;
       if (set) {
+        actualBasketvalue = set === null || set === void 0 ? void 0 : set.getSetPrice();
         for (var _i = 0, _Object$values = Object.values(set.getDivaArticles()); _i < _Object$values.length; _i++) {
           var article = _Object$values[_i];
           if (article.relatedToBasketId) {
@@ -41889,8 +41903,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           article_nested: articles
         }
       });
-      LOG$1.businessEvent('onActualBasketValue', 'Planner', 'Aktueller Basket Value:' + this.getCurSetPrice(), {
-        basketValue: this.getCurSetPrice()
+      LOG$1.businessEvent('onActualBasketValue', 'Planner', 'Aktueller Basket Value:' + actualBasketvalue, {
+        basketValue: actualBasketvalue
       });
     }
   }, {
@@ -41902,7 +41916,9 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       var allOpv = [];
       var latestOpv = {};
       var latestOpt = {};
+      var actualBasketvalue = 0;
       if (set) {
+        actualBasketvalue = set === null || set === void 0 ? void 0 : set.getSetPrice();
         if (myValues) {
           var _set$CatalogData$getO, _set$CatalogData$getO2;
           latestOpt = {
@@ -41982,8 +41998,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           configuration_nested: configuration
         }
       });
-      LOG$1.businessEvent('onActualBasketValue', 'Planner', 'Aktueller Basket Value:' + this.getCurSetPrice(), {
-        basketValue: this.getCurSetPrice()
+      LOG$1.businessEvent('onActualBasketValue', 'Planner', 'Aktueller Basket Value:' + actualBasketvalue, {
+        basketValue: actualBasketvalue
       });
     }
   }, {