@crystaldesign/web-planner-logic 24.10.0-beta.1 → 24.10.0-beta.11

package/build/cjs/{index-0cf8efc1.js → index-7cfee1da.js}

@@ -43,8 +43,8 @@ var _typeof__default = /*#__PURE__*/_interopDefaultLegacy(_typeof);
 })();
 
 var _excluded = ["type"];
-function ownKeys$f(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$f(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$f(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$f(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$e(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$e(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$e(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$e(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$g = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var JsonDataCache = /*#__PURE__*/function () {
   function JsonDataCache() {
@@ -250,8 +250,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$f;
-              _context2.t1 = _objectSpread$f({}, init.config.headers);
+              _context2.t0 = _objectSpread$e;
+              _context2.t1 = _objectSpread$e({}, init.config.headers);
               _context2.t2 = {};
               _context2.next = 20;
               return this.getSessionGuid('V', undefined, this.OrganizationId, api2Url);
@@ -281,7 +281,7 @@ 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, cacheUrl, _this$apiConfig3, _this$apiConfig4, api2Url, result;
+        var myQS, url, init, addSession, _this$apiConfig3, _this$apiConfig4, api2Url, result;
         return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -294,7 +294,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
               };
               addSession = true;
               if (!(this.jsonDataCache.get(myQS) || cacheMD5 && this.jsonDataCache.get(cacheMD5))) {
-                _context3.next = 11;
+                _context3.next = 9;
                 break;
               }
               LOG$g.debug('getDataFromInternalCache: ' + queryString);
@@ -305,77 +305,68 @@ var DivaApiHandler = /*#__PURE__*/function () {
               return _context3.abrupt("return", this.jsonDataCache.get(myQS));
             case 8:
               return _context3.abrupt("return", this.jsonDataCache.get(cacheMD5));
-            case 11:
-              if (cacheMD5) {
-                cacheUrl = DivaUtils__default["default"].getCacheData(cacheMD5, queryString);
-                if (cacheUrl) {
-                  LOG$g.debug('getDataFromCDNCache: ' + queryString);
-                  url = cacheUrl;
-                  addSession = false;
-                }
-              }
-            case 12:
+            case 9:
               if (!addSession) {
-                _context3.next = 34;
+                _context3.next = 31;
                 break;
               }
               if (!useWebServiceApi) {
-                _context3.next = 25;
+                _context3.next = 22;
                 break;
               }
               if (!this.jwt) {
-                _context3.next = 18;
+                _context3.next = 15;
                 break;
               }
               init.config.headers = {
                 Authorization: 'Bearer ' + this.jwt
               };
-              _context3.next = 23;
+              _context3.next = 20;
               break;
-            case 18:
+            case 15:
               if (!this.apiKey) {
-                _context3.next = 22;
+                _context3.next = 19;
                 break;
               }
               init.config.headers = {
                 'X-API-KEY': this.apiKey
               };
-              _context3.next = 23;
+              _context3.next = 20;
               break;
-            case 22:
+            case 19:
               throw new Error('not jwt or API Key Found');
-            case 23:
-              _context3.next = 34;
+            case 20:
+              _context3.next = 31;
               break;
-            case 25:
+            case 22:
               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 = 32;
+                _context3.next = 29;
                 break;
               }
-              _context3.next = 31;
+              _context3.next = 28;
               return this.getSessionGuid('V', undefined, this.OrganizationId, api2Url);
-            case 31:
+            case 28:
               _context3.t0 = _context3.sent;
-            case 32:
+            case 29:
               _context3.t1 = _context3.t0;
               init.config.headers = {
                 sessionGuid: _context3.t1
               };
-            case 34:
-              _context3.next = 36;
+            case 31:
+              _context3.next = 33;
               return this.fetchData(url, init);
-            case 36:
+            case 33:
               result = _context3.sent;
               this.jsonDataCache.set(myQS, result);
               if (cacheMD5) this.jsonDataCache.set(cacheMD5, result);
               LOG$g.debug('getDataFromApi: ' + queryString);
               return _context3.abrupt("return", result);
-            case 41:
+            case 38:
             case "end":
               return _context3.stop();
           }
@@ -438,9 +429,6 @@ var DivaApiHandler = /*#__PURE__*/function () {
         diva3dServerMode: data.diva3dServerMode != undefined ? data.diva3dServerMode : 'SignalR',
         diva3dRenderGroup: data.diva3dRenderGroup != undefined ? data.diva3dRenderGroup : 'MYCC7',
         mediaServiceApiKey: data.divaMediaServiceApiKey,
-        diva3dUseImageCache: data.diva3dUseImageCache != undefined ? data.diva3dUseImageCache : false,
-        diva3dSuppressCacheCreation: data.diva3dSuppressCacheCreation != undefined ? data.diva3dSuppressCacheCreation : false,
-        diva3dUseSirvViewer: data.diva3dUseSirvViewer != undefined ? data.diva3dUseSirvViewer : false,
         language: lang !== null && lang !== void 0 ? lang : this.getLanguage(),
         abTestCases: data.abTestCases !== undefined ? data.abTestCases : [],
         checkForProductsInStock: data.checkForProductsInStock,
@@ -559,24 +547,6 @@ var DivaApiHandler = /*#__PURE__*/function () {
       var _this$divaWebConfigDa8, _this$divaWebConfigDa9;
       return (_this$divaWebConfigDa8 = (_this$divaWebConfigDa9 = this.divaWebConfigData) === null || _this$divaWebConfigDa9 === void 0 ? void 0 : _this$divaWebConfigDa9.diva3dRenderGroup) !== null && _this$divaWebConfigDa8 !== void 0 ? _this$divaWebConfigDa8 : '';
     }
-  }, {
-    key: "getDiva3dUseImageCache",
-    value: function getDiva3dUseImageCache() {
-      var _this$divaWebConfigDa10;
-      return !!((_this$divaWebConfigDa10 = this.divaWebConfigData) !== null && _this$divaWebConfigDa10 !== void 0 && _this$divaWebConfigDa10.diva3dUseImageCache);
-    }
-  }, {
-    key: "getDiva3DSuppressCacheCreation",
-    value: function getDiva3DSuppressCacheCreation() {
-      var _this$divaWebConfigDa11;
-      return !!((_this$divaWebConfigDa11 = this.divaWebConfigData) !== null && _this$divaWebConfigDa11 !== void 0 && _this$divaWebConfigDa11.diva3dSuppressCacheCreation);
-    }
-  }, {
-    key: "getDiva3dUseSirvViewer",
-    value: function getDiva3dUseSirvViewer() {
-      var _this$divaWebConfigDa12;
-      return !!((_this$divaWebConfigDa12 = this.divaWebConfigData) !== null && _this$divaWebConfigDa12 !== void 0 && _this$divaWebConfigDa12.diva3dUseSirvViewer);
-    }
   }, {
     key: "getServerId",
     value: function getServerId() {
@@ -612,80 +582,80 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getDiva3dStaticBGImage",
     value: function getDiva3dStaticBGImage() {
-      var _this$divaWebConfigDa13;
-      return (_this$divaWebConfigDa13 = this.divaWebConfigData) === null || _this$divaWebConfigDa13 === void 0 ? void 0 : _this$divaWebConfigDa13.diva3dStaticBGImage;
+      var _this$divaWebConfigDa10;
+      return (_this$divaWebConfigDa10 = this.divaWebConfigData) === null || _this$divaWebConfigDa10 === void 0 ? void 0 : _this$divaWebConfigDa10.diva3dStaticBGImage;
     }
   }, {
     key: "getDiva3dStaticBGImage_DefaultRoomList",
     value: function getDiva3dStaticBGImage_DefaultRoomList() {
-      var _this$divaWebConfigDa14, _this$divaWebConfigDa15;
-      return ((_this$divaWebConfigDa14 = this.divaWebConfigData) === null || _this$divaWebConfigDa14 === void 0 ? void 0 : _this$divaWebConfigDa14.diva3dStaticBGImage_DefaultRoomList) == '' ? '3D_STATBG_ROOMLIST' : (_this$divaWebConfigDa15 = this.divaWebConfigData) === null || _this$divaWebConfigDa15 === void 0 ? void 0 : _this$divaWebConfigDa15.diva3dStaticBGImage_DefaultRoomList;
+      var _this$divaWebConfigDa11, _this$divaWebConfigDa12;
+      return ((_this$divaWebConfigDa11 = this.divaWebConfigData) === null || _this$divaWebConfigDa11 === void 0 ? void 0 : _this$divaWebConfigDa11.diva3dStaticBGImage_DefaultRoomList) == '' ? '3D_STATBG_ROOMLIST' : (_this$divaWebConfigDa12 = this.divaWebConfigData) === null || _this$divaWebConfigDa12 === void 0 ? void 0 : _this$divaWebConfigDa12.diva3dStaticBGImage_DefaultRoomList;
     }
   }, {
     key: "getDiva3DAllowDefaultCatRoomList",
     value: function getDiva3DAllowDefaultCatRoomList() {
-      var _this$divaWebConfigDa16;
-      return (_this$divaWebConfigDa16 = this.divaWebConfigData) === null || _this$divaWebConfigDa16 === void 0 ? void 0 : _this$divaWebConfigDa16.diva3DAllowDefaultCatRoomList;
+      var _this$divaWebConfigDa13;
+      return (_this$divaWebConfigDa13 = this.divaWebConfigData) === null || _this$divaWebConfigDa13 === void 0 ? void 0 : _this$divaWebConfigDa13.diva3DAllowDefaultCatRoomList;
     }
   }, {
     key: "doAllowSetPlanner",
     value: function doAllowSetPlanner() {
-      var _this$divaWebConfigDa17;
-      return (_this$divaWebConfigDa17 = this.divaWebConfigData) === null || _this$divaWebConfigDa17 === void 0 ? void 0 : _this$divaWebConfigDa17.doAllowSetPlanner;
+      var _this$divaWebConfigDa14;
+      return (_this$divaWebConfigDa14 = this.divaWebConfigData) === null || _this$divaWebConfigDa14 === void 0 ? void 0 : _this$divaWebConfigDa14.doAllowSetPlanner;
     }
   }, {
     key: "getHidePlanner",
     value: function getHidePlanner() {
-      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.hidePlanner);
+      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.hidePlanner);
     }
   }, {
     key: "getDoShowAR",
     value: function getDoShowAR() {
-      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.enableAR;
+      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.enableAR;
     }
   }, {
     key: "getDoShowRTV",
     value: function getDoShowRTV() {
-      var _this$divaWebConfigDa20;
-      return (_this$divaWebConfigDa20 = this.divaWebConfigData) === null || _this$divaWebConfigDa20 === void 0 || (_this$divaWebConfigDa20 = _this$divaWebConfigDa20.viewConfig) === null || _this$divaWebConfigDa20 === void 0 ? void 0 : _this$divaWebConfigDa20.enableRTV;
+      var _this$divaWebConfigDa17;
+      return (_this$divaWebConfigDa17 = this.divaWebConfigData) === null || _this$divaWebConfigDa17 === void 0 || (_this$divaWebConfigDa17 = _this$divaWebConfigDa17.viewConfig) === null || _this$divaWebConfigDa17 === void 0 ? void 0 : _this$divaWebConfigDa17.enableRTV;
     }
   }, {
     key: "getEnableRTVUnityKombi",
     value: function getEnableRTVUnityKombi() {
-      var _this$divaWebConfigDa21;
-      return !!((_this$divaWebConfigDa21 = this.divaWebConfigData) !== null && _this$divaWebConfigDa21 !== void 0 && _this$divaWebConfigDa21.viewConfig.enableRtvUnityKombi);
+      var _this$divaWebConfigDa18;
+      return !!((_this$divaWebConfigDa18 = this.divaWebConfigData) !== null && _this$divaWebConfigDa18 !== void 0 && _this$divaWebConfigDa18.viewConfig.enableRtvUnityKombi);
     }
   }, {
     key: "getDoDisablePlanner2D",
     value: function getDoDisablePlanner2D() {
-      var _this$divaWebConfigDa22;
-      return !!((_this$divaWebConfigDa22 = this.divaWebConfigData) !== null && _this$divaWebConfigDa22 !== void 0 && _this$divaWebConfigDa22.doDisablePlanner2D);
+      var _this$divaWebConfigDa19;
+      return !!((_this$divaWebConfigDa19 = this.divaWebConfigData) !== null && _this$divaWebConfigDa19 !== void 0 && _this$divaWebConfigDa19.doDisablePlanner2D);
     }
   }, {
     key: "getRoomListInProduct",
     value: function getRoomListInProduct() {
-      var _this$divaWebConfigDa23;
-      return !!((_this$divaWebConfigDa23 = this.divaWebConfigData) !== null && _this$divaWebConfigDa23 !== void 0 && (_this$divaWebConfigDa23 = _this$divaWebConfigDa23.viewConfig) !== null && _this$divaWebConfigDa23 !== void 0 && _this$divaWebConfigDa23.roomListInProduct);
+      var _this$divaWebConfigDa20;
+      return !!((_this$divaWebConfigDa20 = this.divaWebConfigData) !== null && _this$divaWebConfigDa20 !== void 0 && (_this$divaWebConfigDa20 = _this$divaWebConfigDa20.viewConfig) !== null && _this$divaWebConfigDa20 !== void 0 && _this$divaWebConfigDa20.roomListInProduct);
     }
   }, {
     key: "getPlannerType",
     value: function getPlannerType() {
-      var _this$divaWebConfigDa24;
-      return (_this$divaWebConfigDa24 = this.divaWebConfigData) === null || _this$divaWebConfigDa24 === void 0 || (_this$divaWebConfigDa24 = _this$divaWebConfigDa24.viewConfig) === null || _this$divaWebConfigDa24 === void 0 ? void 0 : _this$divaWebConfigDa24.plannerType;
+      var _this$divaWebConfigDa21;
+      return (_this$divaWebConfigDa21 = this.divaWebConfigData) === null || _this$divaWebConfigDa21 === void 0 || (_this$divaWebConfigDa21 = _this$divaWebConfigDa21.viewConfig) === null || _this$divaWebConfigDa21 === void 0 ? void 0 : _this$divaWebConfigDa21.plannerType;
     }
   }, {
     key: "getLoadSupplierColors",
     value: function getLoadSupplierColors() {
-      var _this$divaWebConfigDa25;
-      return !!((_this$divaWebConfigDa25 = this.divaWebConfigData) !== null && _this$divaWebConfigDa25 !== void 0 && _this$divaWebConfigDa25.loadSupplierColors);
+      var _this$divaWebConfigDa22;
+      return !!((_this$divaWebConfigDa22 = this.divaWebConfigData) !== null && _this$divaWebConfigDa22 !== void 0 && _this$divaWebConfigDa22.loadSupplierColors);
     }
   }, {
     key: "showSelectionModeZero",
     value: function showSelectionModeZero() {
-      var _this$divaWebConfigDa26;
-      return !!((_this$divaWebConfigDa26 = this.divaWebConfigData) !== null && _this$divaWebConfigDa26 !== void 0 && _this$divaWebConfigDa26.showSelectionModeZero);
+      var _this$divaWebConfigDa23;
+      return !!((_this$divaWebConfigDa23 = this.divaWebConfigData) !== null && _this$divaWebConfigDa23 !== void 0 && _this$divaWebConfigDa23.showSelectionModeZero);
     }
   }, {
     key: "ruleDescSeperator",
@@ -705,8 +675,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getDoCheckVariantData",
     value: function getDoCheckVariantData() {
-      var _this$divaWebConfigDa27;
-      return (_this$divaWebConfigDa27 = this.divaWebConfigData) === null || _this$divaWebConfigDa27 === void 0 ? void 0 : _this$divaWebConfigDa27.doCheckVariantData;
+      var _this$divaWebConfigDa24;
+      return (_this$divaWebConfigDa24 = this.divaWebConfigData) === null || _this$divaWebConfigDa24 === void 0 ? void 0 : _this$divaWebConfigDa24.doCheckVariantData;
     }
   }, {
     key: "setI18n",
@@ -799,50 +769,50 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getViewConfig",
     value: function getViewConfig() {
-      var _this$divaWebConfigDa28;
-      return (_this$divaWebConfigDa28 = this.divaWebConfigData) === null || _this$divaWebConfigDa28 === void 0 ? void 0 : _this$divaWebConfigDa28.viewConfig;
+      var _this$divaWebConfigDa25;
+      return (_this$divaWebConfigDa25 = this.divaWebConfigData) === null || _this$divaWebConfigDa25 === void 0 ? void 0 : _this$divaWebConfigDa25.viewConfig;
     }
   }, {
     key: "getEmailConfig",
     value: function getEmailConfig() {
-      var _this$divaWebConfigDa29;
-      return (_this$divaWebConfigDa29 = this.divaWebConfigData) === null || _this$divaWebConfigDa29 === void 0 ? void 0 : _this$divaWebConfigDa29.emailConfig;
+      var _this$divaWebConfigDa26;
+      return (_this$divaWebConfigDa26 = this.divaWebConfigData) === null || _this$divaWebConfigDa26 === void 0 ? void 0 : _this$divaWebConfigDa26.emailConfig;
     }
   }, {
     key: "getABTestCases",
     value: function getABTestCases() {
-      var _this$divaWebConfigDa30, _this$divaWebConfigDa31;
-      return (_this$divaWebConfigDa30 = (_this$divaWebConfigDa31 = this.divaWebConfigData) === null || _this$divaWebConfigDa31 === void 0 ? void 0 : _this$divaWebConfigDa31.abTestCases) !== null && _this$divaWebConfigDa30 !== void 0 ? _this$divaWebConfigDa30 : [];
+      var _this$divaWebConfigDa27, _this$divaWebConfigDa28;
+      return (_this$divaWebConfigDa27 = (_this$divaWebConfigDa28 = this.divaWebConfigData) === null || _this$divaWebConfigDa28 === void 0 ? void 0 : _this$divaWebConfigDa28.abTestCases) !== null && _this$divaWebConfigDa27 !== void 0 ? _this$divaWebConfigDa27 : [];
     }
   }, {
     key: "getBarrierConfig",
     value: function getBarrierConfig() {
-      var _this$divaWebConfigDa32;
-      return (_this$divaWebConfigDa32 = this.divaWebConfigData) === null || _this$divaWebConfigDa32 === void 0 ? void 0 : _this$divaWebConfigDa32.barrierConfig;
+      var _this$divaWebConfigDa29;
+      return (_this$divaWebConfigDa29 = this.divaWebConfigData) === null || _this$divaWebConfigDa29 === void 0 ? void 0 : _this$divaWebConfigDa29.barrierConfig;
     }
   }, {
     key: "getTemplateConfig",
     value: function getTemplateConfig() {
-      var _this$divaWebConfigDa33;
-      return (_this$divaWebConfigDa33 = this.divaWebConfigData) === null || _this$divaWebConfigDa33 === void 0 ? void 0 : _this$divaWebConfigDa33.templateConfig;
+      var _this$divaWebConfigDa30;
+      return (_this$divaWebConfigDa30 = this.divaWebConfigData) === null || _this$divaWebConfigDa30 === void 0 ? void 0 : _this$divaWebConfigDa30.templateConfig;
     }
   }, {
     key: "showDivaNr",
     value: function showDivaNr() {
-      var _this$divaWebConfigDa34;
-      return (_this$divaWebConfigDa34 = this.divaWebConfigData) === null || _this$divaWebConfigDa34 === void 0 ? void 0 : _this$divaWebConfigDa34.showDivaNr;
+      var _this$divaWebConfigDa31;
+      return (_this$divaWebConfigDa31 = this.divaWebConfigData) === null || _this$divaWebConfigDa31 === void 0 ? void 0 : _this$divaWebConfigDa31.showDivaNr;
     }
   }, {
     key: "onErrorHandling",
     value: function onErrorHandling() {
-      var _this$divaWebConfigDa35;
-      return (_this$divaWebConfigDa35 = this.divaWebConfigData) === null || _this$divaWebConfigDa35 === void 0 ? void 0 : _this$divaWebConfigDa35.onErrorHandling;
+      var _this$divaWebConfigDa32;
+      return (_this$divaWebConfigDa32 = this.divaWebConfigData) === null || _this$divaWebConfigDa32 === void 0 ? void 0 : _this$divaWebConfigDa32.onErrorHandling;
     }
   }, {
     key: "diva3DRenderingDefault",
     value: function diva3DRenderingDefault() {
-      var _this$divaWebConfigDa36;
-      return (_this$divaWebConfigDa36 = this.divaWebConfigData) === null || _this$divaWebConfigDa36 === void 0 ? void 0 : _this$divaWebConfigDa36.diva3DRenderingDefault;
+      var _this$divaWebConfigDa33;
+      return (_this$divaWebConfigDa33 = this.divaWebConfigData) === null || _this$divaWebConfigDa33 === void 0 ? void 0 : _this$divaWebConfigDa33.diva3DRenderingDefault;
     }
   }, {
     key: "getJwt",
@@ -857,13 +827,13 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getUseMask",
     value: function getUseMask() {
-      var _this$divaWebConfigDa37;
-      return (_this$divaWebConfigDa37 = this.divaWebConfigData) === null || _this$divaWebConfigDa37 === void 0 ? void 0 : _this$divaWebConfigDa37.useMask;
+      var _this$divaWebConfigDa34;
+      return (_this$divaWebConfigDa34 = this.divaWebConfigData) === null || _this$divaWebConfigDa34 === void 0 ? void 0 : _this$divaWebConfigDa34.useMask;
     }
   }, {
     key: "apiUrl",
     value: function apiUrl(queryString, useWebServiceApi) {
-      var _this$apiConfig19, _this$apiConfig20;
+      var _this$apiConfig21, _this$apiConfig22;
       if (useWebServiceApi == 'catalog') {
         var _this$apiConfig13, _this$apiConfig14;
         if (!((_this$apiConfig13 = this.apiConfig) !== null && _this$apiConfig13 !== void 0 && _this$apiConfig13.catalogService)) throw new Error('No catalog Service defined');
@@ -879,8 +849,13 @@ var DivaApiHandler = /*#__PURE__*/function () {
         if (!((_this$apiConfig17 = this.apiConfig) !== null && _this$apiConfig17 !== void 0 && _this$apiConfig17.reportService)) throw new Error('No report Service defined');
         return ((_this$apiConfig18 = this.apiConfig) === null || _this$apiConfig18 === void 0 ? void 0 : _this$apiConfig18.reportService) + queryString;
       }
-      var url = (_this$apiConfig19 = this.apiConfig) === null || _this$apiConfig19 === void 0 ? void 0 : _this$apiConfig19.api2["default"];
-      if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig20 = this.apiConfig) !== null && _this$apiConfig20 !== void 0 && _this$apiConfig20.api2.web) {
+      if (useWebServiceApi == 'enricher') {
+        var _this$apiConfig19, _this$apiConfig20;
+        if (!((_this$apiConfig19 = this.apiConfig) !== null && _this$apiConfig19 !== void 0 && _this$apiConfig19.enricherService)) throw new Error('No report Service defined');
+        return ((_this$apiConfig20 = this.apiConfig) === null || _this$apiConfig20 === void 0 ? void 0 : _this$apiConfig20.enricherService) + queryString;
+      }
+      var url = (_this$apiConfig21 = this.apiConfig) === null || _this$apiConfig21 === void 0 ? void 0 : _this$apiConfig21.api2["default"];
+      if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig22 = this.apiConfig) !== null && _this$apiConfig22 !== void 0 && _this$apiConfig22.api2.web) {
         url = this.apiConfig.api2.web;
       }
       if (!url) throw new Error('No API2 defined');
@@ -944,7 +919,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getCatalogProductUrl",
     value: function getCatalogProductUrl(catalogCodex) {
-      var search = '{catCodex,contains,' + catalogCodex + '},{available,eq,true}';
+      var search = '{catCodex,contains,' + catalogCodex + "},{availableForOrganizations,eq,".concat(this.organization._id, "}");
       return '/v1/products?' + 'search=' + encodeURIComponent('[' + search + ']') + '&organizationIds=' + this.organization._id + '&fields=' + encodeURIComponent('{divaNr,addedPrice,discountedPrice,shortDescription,image,dockingPoints,articles,originDivaNr,variantId,affiliate,retailerArticleNr,minQuantity,increments,calculatedPrice}');
     }
   }, {
@@ -983,6 +958,11 @@ var DivaApiHandler = /*#__PURE__*/function () {
     value: function getAdditionalModelInfosQS(accountGuid, catalogGuid) {
       return '/additionalModelInfos/one?' + '&accountGuid=' + accountGuid + '&catalogGuid=' + catalogGuid;
     }
+  }, {
+    key: "getCatalogMaskQS",
+    value: function getCatalogMaskQS(catalogGuid, organizationId) {
+      return '/live/mask/' + catalogGuid + '/mask?organizationId=' + organizationId;
+    }
   }, {
     key: "getAdditionalModelInfosPostMaskQS",
     value: function getAdditionalModelInfosPostMaskQS(id) {
@@ -1140,12 +1120,6 @@ var DivaApiHandler = /*#__PURE__*/function () {
     value: function getImageURL(image, mediaURL) {
       var ret = '';
       if (image != '' && image != null) {
-        if (DivaUtils__default["default"].CacheIsEnabled) {
-          ret = DivaUtils__default["default"].getCacheData(image.toUpperCase(), '');
-          if (ret) {
-            return ret;
-          }
-        }
         var header = image.substring(0, 4).toLowerCase();
         if (header == 'http' || header == 'data') {
           ret = image;
@@ -1252,12 +1226,12 @@ var DivaApiHandler = /*#__PURE__*/function () {
     key: "getDimensionbyId",
     value: function () {
       var _getDimensionbyId = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee11(id, iln, catalogCodex, plannedOptions) {
-        var _this$apiConfig21;
+        var _this$apiConfig23;
         var fullUrl, res, headers;
         return _regeneratorRuntime__default["default"].wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              fullUrl = this.getConstructorServiceUrl() + '/dimension/' + id + '?iln=' + iln + '&catalogCodex=' + catalogCodex + '&debug=' + ((_this$apiConfig21 = this.apiConfig) === null || _this$apiConfig21 === void 0 ? void 0 : _this$apiConfig21.useDebugUrl);
+              fullUrl = this.getConstructorServiceUrl() + '/dimension/' + id + '?iln=' + iln + '&catalogCodex=' + catalogCodex + '&debug=' + ((_this$apiConfig23 = this.apiConfig) === null || _this$apiConfig23 === void 0 ? void 0 : _this$apiConfig23.useDebugUrl);
               headers = {};
               if (this.jwt) headers = {
                 Authorization: 'Bearer ' + this.jwt
@@ -1386,8 +1360,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "dontLoadAdditionalModelInfos",
     get: function get() {
-      var _this$divaWebConfigDa38;
-      return (_this$divaWebConfigDa38 = this.divaWebConfigData) === null || _this$divaWebConfigDa38 === void 0 ? void 0 : _this$divaWebConfigDa38.dontLoadAdditionalModelInfos;
+      var _this$divaWebConfigDa35;
+      return (_this$divaWebConfigDa35 = this.divaWebConfigData) === null || _this$divaWebConfigDa35 === void 0 ? void 0 : _this$divaWebConfigDa35.dontLoadAdditionalModelInfos;
     }
   }, {
     key: "OrganizationId",
@@ -1698,7 +1672,6 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
       catalogOPV: catalogOPV,
       pac: jsonOPV.PAC,
       pgr: jsonOPV.PGR,
-      isRendered: jsonOPV.IsRendered != undefined ? jsonOPV.IsRendered : true,
       subArticleCodex: jsonOPV.SubArticleCodex && jsonOPV.SubArticleCodex != '' ? jsonOPV.SubArticleCodex : undefined,
       subArticleTypeNr: jsonOPV.SubArticleTypeNr && jsonOPV.SubArticleTypeNr != '' ? jsonOPV.SubArticleTypeNr : undefined,
       subRetailArticleNr: jsonOPV.SubRetailArticleNr && jsonOPV.SubRetailArticleNr != '' ? jsonOPV.SubRetailArticleNr : undefined,
@@ -2035,11 +2008,6 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
     get: function get() {
       return this.opv.catalogOPV.value;
     }
-  }, {
-    key: "isDigitalized",
-    get: function get() {
-      return this.opv.isRendered;
-    }
   }, {
     key: "metaData",
     get: function get() {
@@ -16043,7 +16011,7 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
       showOnlyWhenHasPrice: jsonOPV.ShowOnlyWhenHasPrice && jsonOPV.ShowOnlyWhenHasPrice == 'True' ? true : false,
       priceUnit: jsonOPV.PriceUnit,
       value: jsonOPV.Value,
-      property: [].concat(_toConsumableArray__default["default"]((_jsonOPV$Metadatas = jsonOPV.Metadatas) !== null && _jsonOPV$Metadatas !== void 0 ? _jsonOPV$Metadatas : []), _toConsumableArray__default["default"]((_mask$properties = mask === null || mask === void 0 ? void 0 : mask.properties) !== null && _mask$properties !== void 0 ? _mask$properties : [])),
+      property: [].concat(_toConsumableArray__default["default"]((_jsonOPV$Metadatas = jsonOPV.Metadatas) !== null && _jsonOPV$Metadatas !== void 0 ? _jsonOPV$Metadatas : []), _toConsumableArray__default["default"](Object.values((_mask$properties = mask === null || mask === void 0 ? void 0 : mask.properties) !== null && _mask$properties !== void 0 ? _mask$properties : {}))),
       textbausteine: jsonOPV.Textbausteine
     };
     this.opv.colorGroups = this.mapRALColorToGroup();
@@ -16425,7 +16393,7 @@ var CatalogArticleData = /*#__PURE__*/function () {
       arePricesLoaded: false,
       articleOptions: {},
       decisions: [],
-      properties: [].concat(_toConsumableArray__default["default"]((_jsonArticle$Metadata = jsonArticle.Metadatas) !== null && _jsonArticle$Metadata !== void 0 ? _jsonArticle$Metadata : []), _toConsumableArray__default["default"]((_articleMask$properti = articleMask === null || articleMask === void 0 ? void 0 : articleMask.properties) !== null && _articleMask$properti !== void 0 ? _articleMask$properti : [])),
+      properties: [].concat(_toConsumableArray__default["default"]((_jsonArticle$Metadata = jsonArticle.Metadatas) !== null && _jsonArticle$Metadata !== void 0 ? _jsonArticle$Metadata : []), _toConsumableArray__default["default"](Object.values((_articleMask$properti = articleMask === null || articleMask === void 0 ? void 0 : articleMask.properties) !== null && _articleMask$properti !== void 0 ? _articleMask$properti : {}))),
       image: jsonArticle.Image && jsonArticle.Image != '' ? jsonArticle.Image : undefined,
       imageWidth: jsonArticle.ImageWidth ? jsonArticle.ImageWidth : undefined,
       imageHeight: jsonArticle.ImageHeight ? jsonArticle.ImageHeight : undefined,
@@ -17829,10 +17797,11 @@ var CatalogPlannerArticleData = /*#__PURE__*/function () {
 
 var OptionCatalogData = /*#__PURE__*/function () {
   function OptionCatalogData(codex, jsonOPT, catalogData) {
-    var _catalogData$catalogM, _catalogData$catalogM2, _catalogData$catalogM3, _optionMask$name$cata, _optionMask$name, _catalogData$api$getL, _optionMask$name2, _optionMask$hidden, _optionMask$tabGroup, _catalogData$api$getL2, _ref, _optionMask$layout, _optionMask$propertie, _jsonOPT$showOPVAsArt, _jsonOPT$Properties, _optionMask$propertie2;
+    var _catalogData$catalogM, _catalogData$catalogM2, _catalogData$catalogM3, _jsonOPT$Properties, _optionMask$propertie, _optionMask$name$cata, _optionMask$name, _catalogData$api$getL, _optionMask$name2, _optionMask$hidden, _optionMask$tabGroup, _catalogData$api$getL2, _ref, _optionMask$layout, _properties$find, _jsonOPT$showOPVAsArt;
     _classCallCheck__default["default"](this, OptionCatalogData);
     _defineProperty__default["default"](this, "opt", void 0);
     var optionMask = (_catalogData$catalogM = (_catalogData$catalogM2 = catalogData.catalogMask) === null || _catalogData$catalogM2 === void 0 || (_catalogData$catalogM2 = _catalogData$catalogM2.options) === null || _catalogData$catalogM2 === void 0 ? void 0 : _catalogData$catalogM2[codex]) !== null && _catalogData$catalogM !== void 0 ? _catalogData$catalogM : codex.startsWith('OPT') ? (_catalogData$catalogM3 = catalogData.catalogMask) === null || _catalogData$catalogM3 === void 0 || (_catalogData$catalogM3 = _catalogData$catalogM3.options) === null || _catalogData$catalogM3 === void 0 ? void 0 : _catalogData$catalogM3[codex.substring(3)] : undefined;
+    var properties = [].concat(_toConsumableArray__default["default"]((_jsonOPT$Properties = jsonOPT.Properties) !== null && _jsonOPT$Properties !== void 0 ? _jsonOPT$Properties : []), _toConsumableArray__default["default"](Object.values((_optionMask$propertie = optionMask === null || optionMask === void 0 ? void 0 : optionMask.properties) !== null && _optionMask$propertie !== void 0 ? _optionMask$propertie : {})));
     this.opt = {
       codex: codex,
       name: (_optionMask$name$cata = optionMask === null || optionMask === void 0 || (_optionMask$name = optionMask.name) === null || _optionMask$name === void 0 ? void 0 : _optionMask$name[(_catalogData$api$getL = catalogData.api.getLanguage()) === null || _catalogData$api$getL === void 0 ? void 0 : _catalogData$api$getL.toLowerCase()]) !== null && _optionMask$name$cata !== void 0 ? _optionMask$name$cata : jsonOPT.Name,
@@ -17843,9 +17812,9 @@ var OptionCatalogData = /*#__PURE__*/function () {
       image: jsonOPT.Image ? jsonOPT.Image : undefined,
       invisible: (_optionMask$hidden = optionMask === null || optionMask === void 0 ? void 0 : optionMask.hidden) !== null && _optionMask$hidden !== void 0 ? _optionMask$hidden : jsonOPT.Invisible != undefined ? jsonOPT.Invisible : false,
       maskTabgroup: optionMask === null || optionMask === void 0 || (_optionMask$tabGroup = optionMask.tabGroup) === null || _optionMask$tabGroup === void 0 ? void 0 : _optionMask$tabGroup[(_catalogData$api$getL2 = catalogData.api.getLanguage()) === null || _catalogData$api$getL2 === void 0 ? void 0 : _catalogData$api$getL2.toLowerCase()],
-      layout: (_ref = (_optionMask$layout = optionMask === null || optionMask === void 0 ? void 0 : optionMask.layout) !== null && _optionMask$layout !== void 0 ? _optionMask$layout : optionMask === null || optionMask === void 0 || (_optionMask$propertie = optionMask.properties) === null || _optionMask$propertie === void 0 || (_optionMask$propertie = _optionMask$propertie.find(function (p) {
+      layout: (_ref = (_optionMask$layout = optionMask === null || optionMask === void 0 ? void 0 : optionMask.layout) !== null && _optionMask$layout !== void 0 ? _optionMask$layout : properties === null || properties === void 0 || (_properties$find = properties.find(function (p) {
         return p.Codex == 'LAYOUT';
-      })) === null || _optionMask$propertie === void 0 ? void 0 : _optionMask$propertie.Value) !== null && _ref !== void 0 ? _ref : jsonOPT.Layout != undefined ? jsonOPT.Layout : 'IMAGE',
+      })) === null || _properties$find === void 0 ? void 0 : _properties$find.Value) !== null && _ref !== void 0 ? _ref : jsonOPT.Layout != undefined ? jsonOPT.Layout : 'IMAGE',
       multiselect: jsonOPT.Multiselect != undefined ? jsonOPT.Multiselect == 'True' : false,
       sendToPIM: !!jsonOPT.SendToPIM,
       useMaxPriceOfGroup: jsonOPT.UseMaxPriceOfGroup != undefined ? Number(jsonOPT.UseMaxPriceOfGroup) : undefined,
@@ -17854,7 +17823,7 @@ var OptionCatalogData = /*#__PURE__*/function () {
       hideInOrderText: jsonOPT.hideInOrderText != undefined ? jsonOPT.hideInOrderText == 'True' : false,
       showOPVCodex: jsonOPT.showOPVCodex != undefined ? jsonOPT.showOPVCodex == 'True' : false,
       showOPVAsArticleNr: typeof jsonOPT.showOPVAsArticleNr == 'boolean' ? jsonOPT.showOPVAsArticleNr : ((_jsonOPT$showOPVAsArt = jsonOPT.showOPVAsArticleNr) === null || _jsonOPT$showOPVAsArt === void 0 ? void 0 : _jsonOPT$showOPVAsArt.toLowerCase()) == 'true',
-      property: [].concat(_toConsumableArray__default["default"]((_jsonOPT$Properties = jsonOPT.Properties) !== null && _jsonOPT$Properties !== void 0 ? _jsonOPT$Properties : []), _toConsumableArray__default["default"]((_optionMask$propertie2 = optionMask === null || optionMask === void 0 ? void 0 : optionMask.properties) !== null && _optionMask$propertie2 !== void 0 ? _optionMask$propertie2 : [])),
+      property: properties,
       parentOptionCodex: jsonOPT.ParentOptionCodex,
       articlePlaceholder: jsonOPT.ArticlePlaceholder && jsonOPT.ArticlePlaceholder == 'True' ? true : false,
       isMultiselect: jsonOPT.Multiselect != undefined ? jsonOPT.Multiselect == 'True' : false
@@ -18289,7 +18258,28 @@ var DivaCatalogData = /*#__PURE__*/function () {
       // old tag
       useDecisionPosCountValue: false,
       useShelfPlannerRTV: false,
-      notificationsRules: [],
+      notificationsRules: [{
+        rules: [{
+          visitedOptions: ['SHELFARTICLE_1'],
+          articles: [''],
+          jsFormula: '',
+          variantValues: {}
+        }],
+        checkOnEvents: {
+          option: 'GR',
+          articleCodex: '',
+          optionValue: ''
+        },
+        type: 'notification',
+        showInModal: true,
+        onlyShowOnce: true,
+        messageTitle: {
+          DE: 'ospele'
+        },
+        message: {
+          DE: 'Achtung alle änderungen gehen verlohren... Bist du sicher?'
+        }
+      }],
       warningRule: [],
       summaryTabGroupPosition: undefined,
       onConfigSingleDontGeneralize: false,
@@ -18335,7 +18325,7 @@ var DivaCatalogData = /*#__PURE__*/function () {
         var _this$catalogMask$cat;
         if ((_this$catalogMask$cat = this.catalogMask.catalog.name) !== null && _this$catalogMask$cat !== void 0 && _this$catalogMask$cat[this.api.getLanguage()]) this.catalogData.catalogName = this.catalogMask.catalog.name[this.api.getLanguage()];
         if (this.catalogMask.catalog.name) this.catalogData.name_locales = this.catalogMask.catalog.name;
-        if (this.catalogMask.catalog.properties) this.initProperties([].concat(_toConsumableArray__default["default"](this.origProperties), _toConsumableArray__default["default"](this.catalogMask.catalog.properties)));
+        if (this.catalogMask.catalog.properties) this.initProperties([].concat(_toConsumableArray__default["default"](this.origProperties), _toConsumableArray__default["default"](Object.values(this.catalogMask.catalog.properties))));
       }
     }
   }, {
@@ -18593,6 +18583,8 @@ var DivaCatalogData = /*#__PURE__*/function () {
           _this.catalogData.bundleRules = JSON.parse(item.Value);
         } else if (item.Codex == 'NOTIFICATIONS') {
           _this.catalogData.notificationsRules = JSON.parse(item.Value);
+        } else if (item.Codex == 'WARNINGS') {
+          _this.catalogData.warningRule = JSON.parse(item.Value);
         } else if (item.Codex == 'IGNORE_MAX_PRICE_AS_BASEPRICE') {
           _this.catalogData.ignoreMaxPriceAsBP = item.Value == '1';
         } else if (item.Codex == 'DONT_USE_VCODEX_FOR_BASKET') {
@@ -19614,7 +19606,7 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
     key: "getCatalogData",
     value: function () {
       var _getCatalogData = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(state, catalogCodex, orderSet) {
-        var catalogKey, promises, _yield$Promise$all, _yield$Promise$all2, catalogApiData, catalogArticleListData, catalogArticlePlannerListData, additionalModelInfos, catalogData, _state$actions;
+        var catalogKey, promises, _yield$Promise$all, _yield$Promise$all2, catalogApiData, catalogArticleListData, catalogArticlePlannerListData, additionalModelInfos, mask, _state$catalogMask, catalogData, _state$actions;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -19626,7 +19618,7 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
               return _context.abrupt("return", state.divaCatalogs[catalogKey]);
             case 5:
               if (!orderSet) {
-                _context.next = 42;
+                _context.next = 46;
                 break;
               }
               // ab hier parallell laden
@@ -19647,43 +19639,49 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
               throw new Error(catalogApiData.Error);
             case 17:
               additionalModelInfos = undefined;
+              mask = undefined;
+              _context.prev = 19;
+              _context.next = 22;
+              return state.api.getDataCache(state.api.getCatalogMaskQS(catalogApiData.GUID, state.api.OrganizationId), undefined, undefined, 'enricher');
+            case 22:
+              mask = _context.sent;
               if (!(!state.api.dontLoadAdditionalModelInfos && catalogApiData.AccountGuid)) {
-                _context.next = 28;
+                _context.next = 27;
                 break;
               }
-              _context.prev = 19;
-              _context.next = 22;
+              _context.next = 26;
               return state.api.getDataCache(state.api.getAdditionalModelInfosQS(catalogApiData.AccountGuid, catalogApiData.GUID), undefined, undefined, 'catalog');
-            case 22:
+            case 26:
               additionalModelInfos = _context.sent;
-              _context.next = 28;
+            case 27:
+              _context.next = 32;
               break;
-            case 25:
-              _context.prev = 25;
+            case 29:
+              _context.prev = 29;
               _context.t0 = _context["catch"](19);
               LOG$d.debug('no additionalModelInfos found: ' + _context.t0);
-            case 28:
-              if (state.catalogMask) {
+            case 32:
+              if (state.catalogMask || mask) {
                 if (!additionalModelInfos) additionalModelInfos = {
                   _id: ''
                 };
-                additionalModelInfos.catalogMask = state.catalogMask;
+                additionalModelInfos.catalogMask = (_state$catalogMask = state.catalogMask) !== null && _state$catalogMask !== void 0 ? _state$catalogMask : mask;
               }
               catalogData = new DivaCatalogData(catalogApiData, orderSet, state.api, additionalModelInfos);
               if (!(catalogArticleListData.Articles && catalogArticleListData.Articles.length > 0)) {
-                _context.next = 34;
+                _context.next = 38;
                 break;
               }
               catalogData.initCatalogArticles(catalogArticleListData.Articles);
-              _context.next = 37;
+              _context.next = 41;
               break;
-            case 34:
+            case 38:
               DivaUtils__default["default"].endSpanOfApm('Catalog initialize');
               LOG$d.error(new DivaUtils.DivaError('Catalog ' + catalogData.catalogName + ' not listed', {
                 code: 'WC_0002'
               }));
               throw new Error('Articles of Catalog: ' + catalogData.catalogCodex + ' are empty');
-            case 37:
+            case 41:
               if (catalogArticlePlannerListData.PlannerElements && catalogArticlePlannerListData.PlannerElements.length > 0) {
                 catalogData.initCatalogPlannerArticles(catalogArticlePlannerListData.PlannerElements);
               }
@@ -19700,16 +19698,16 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
 
               DivaUtils__default["default"].endSpanOfApm('Catalog initialize');
               return _context.abrupt("return", state.divaCatalogs[catalogKey]);
-            case 42:
+            case 46:
               LOG$d.error(new DivaUtils.DivaError('Catalog: ' + catalogCodex + ' not initialized! and orderSet not set', {
                 code: 'WC_0007'
               }));
               return _context.abrupt("return", state.divaCatalogs[catalogKey]);
-            case 44:
+            case 48:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[19, 25]]);
+        }, _callee, null, [[19, 29]]);
       }));
       function getCatalogData(_x, _x2, _x3) {
         return _getCatalogData.apply(this, arguments);
@@ -20219,12 +20217,6 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
     set: function set(val) {
       this.articleOptionState.freeTextLang = val;
     }
-  }, {
-    key: "isNotVisualized",
-    get: function get() {
-      var _this$val20;
-      return ((_this$val20 = this.val) === null || _this$val20 === void 0 ? void 0 : _this$val20.isDigitalized) == false && this.val.isTexture;
-    }
   }, {
     key: "onlyVisibleIfNotUndock",
     get: function get() {
@@ -20252,8 +20244,8 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
   }, {
     key: "warning",
     get: function get() {
-      var _this$val21;
-      if ((_this$val21 = this.val) !== null && _this$val21 !== void 0 && _this$val21.isFreeText) {
+      var _this$val20;
+      if ((_this$val20 = this.val) !== null && _this$val20 !== void 0 && _this$val20.isFreeText) {
         if (this.val.measureMaximum && Number(this.freeText) > Number(this.val.measureMaximum) || this.val.measureMinimum && Number(this.freeText) < Number(this.val.measureMinimum)) {
           return 'measureWarning';
         }
@@ -20351,8 +20343,8 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
   }]);
 }();
 
-function ownKeys$e(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$e(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$e(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$e(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$d(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$d(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$d(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$d(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$c = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var DivaArticle = /*#__PURE__*/function () {
   //Hier steht die aktuelle Konfiguration
@@ -20562,7 +20554,7 @@ var DivaArticle = /*#__PURE__*/function () {
         var partlistArticle = this.partlistArticles[basketId];
         if (!onlyVisible || partlistArticle.partlistArticleVisibleInTree) partlistArticles[basketId] = partlistArticle;
         if (partlistArticle.hasPartlistArticle) {
-          partlistArticles = _objectSpread$e(_objectSpread$e({}, partlistArticles), partlistArticle.getRecursivePartlistArticles(onlyVisible));
+          partlistArticles = _objectSpread$d(_objectSpread$d({}, partlistArticles), partlistArticle.getRecursivePartlistArticles(onlyVisible));
         }
       }
       return partlistArticles;
@@ -20649,17 +20641,6 @@ var DivaArticle = /*#__PURE__*/function () {
     set: function set(val) {
       this.article.toDeleteAfterInit = val;
     }
-  }, {
-    key: "articleHasNotVisualizedValues",
-    get: function get() {
-      if (!this.model3DName) return false;
-      for (var key in this.articleOptionStates) {
-        if (!this.articleOptionStates[key].isNotVisualized) {
-          return true;
-        }
-      }
-      return false;
-    }
   }, {
     key: "actSizeText",
     get: function get() {
@@ -21034,13 +21015,13 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "articleOptionStatesWithParents",
     get: function get() {
-      return _objectSpread$e(_objectSpread$e({}, this.getReqursiveArticleOptionStates()), this.articleOptionStatesData);
+      return _objectSpread$d(_objectSpread$d({}, this.getReqursiveArticleOptionStates()), this.articleOptionStatesData);
     }
   }, {
     key: "getReqursiveArticleOptionStates",
     value: function getReqursiveArticleOptionStates() {
       var _this$partListParentA6, _this$partListParentA7, _this$partListParentA8, _this$partListParentA9, _this$accessoireParen3, _this$accessoireParen4, _this$accessoireParen5, _this$accessoireParen6;
-      return _objectSpread$e(_objectSpread$e(_objectSpread$e(_objectSpread$e({}, (_this$partListParentA6 = (_this$partListParentA7 = this.partListParentArticle) === null || _this$partListParentA7 === void 0 ? void 0 : _this$partListParentA7.articleOptionStatesData) !== null && _this$partListParentA6 !== void 0 ? _this$partListParentA6 : {}), (_this$partListParentA8 = (_this$partListParentA9 = this.partListParentArticle) === null || _this$partListParentA9 === void 0 ? void 0 : _this$partListParentA9.getReqursiveArticleOptionStates()) !== null && _this$partListParentA8 !== void 0 ? _this$partListParentA8 : {}), (_this$accessoireParen3 = (_this$accessoireParen4 = this.accessoireParentArticle) === null || _this$accessoireParen4 === void 0 ? void 0 : _this$accessoireParen4.articleOptionStatesData) !== null && _this$accessoireParen3 !== void 0 ? _this$accessoireParen3 : {}), (_this$accessoireParen5 = (_this$accessoireParen6 = this.accessoireParentArticle) === null || _this$accessoireParen6 === void 0 ? void 0 : _this$accessoireParen6.getReqursiveArticleOptionStates()) !== null && _this$accessoireParen5 !== void 0 ? _this$accessoireParen5 : {});
+      return _objectSpread$d(_objectSpread$d(_objectSpread$d(_objectSpread$d({}, (_this$partListParentA6 = (_this$partListParentA7 = this.partListParentArticle) === null || _this$partListParentA7 === void 0 ? void 0 : _this$partListParentA7.articleOptionStatesData) !== null && _this$partListParentA6 !== void 0 ? _this$partListParentA6 : {}), (_this$partListParentA8 = (_this$partListParentA9 = this.partListParentArticle) === null || _this$partListParentA9 === void 0 ? void 0 : _this$partListParentA9.getReqursiveArticleOptionStates()) !== null && _this$partListParentA8 !== void 0 ? _this$partListParentA8 : {}), (_this$accessoireParen3 = (_this$accessoireParen4 = this.accessoireParentArticle) === null || _this$accessoireParen4 === void 0 ? void 0 : _this$accessoireParen4.articleOptionStatesData) !== null && _this$accessoireParen3 !== void 0 ? _this$accessoireParen3 : {}), (_this$accessoireParen5 = (_this$accessoireParen6 = this.accessoireParentArticle) === null || _this$accessoireParen6 === void 0 ? void 0 : _this$accessoireParen6.getReqursiveArticleOptionStates()) !== null && _this$accessoireParen5 !== void 0 ? _this$accessoireParen5 : {});
     }
   }, {
     key: "clearArticleOptionStates",
@@ -22803,7 +22784,7 @@ var DivaArticle = /*#__PURE__*/function () {
             RuleDesc: myRuleDesc,
             RuleDesc_locales: myRuleDesc_locales,
             PosInvisibility: myPartListPos.PosInvisibility,
-            VariantValues: _objectSpread$e(_objectSpread$e({}, (_previousPartlistArti = previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantValues) !== null && _previousPartlistArti !== void 0 ? _previousPartlistArti : {}), newConfigValues !== null && newConfigValues !== void 0 ? newConfigValues : {}),
+            VariantValues: _objectSpread$d(_objectSpread$d({}, (_previousPartlistArti = previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantValues) !== null && _previousPartlistArti !== void 0 ? _previousPartlistArti : {}), newConfigValues !== null && newConfigValues !== void 0 ? newConfigValues : {}),
             VariantItemData: previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantItemData,
             optionImgForPrint: optionImgForPrint,
             optionsForPrint: optionsForPrint
@@ -22877,7 +22858,7 @@ var DivaArticle = /*#__PURE__*/function () {
       }
       for (var key in this.articleOptionStates) {
         var myOPS = this.articleOptionStates[key];
-        myOPS.visibleOptionValues = _objectSpread$e({}, myOPS.option.articleOptionValues);
+        myOPS.visibleOptionValues = _objectSpread$d({}, myOPS.option.articleOptionValues);
         myOPS.visibleCount = Object.keys(myOPS.option.articleOptionValues).length;
         myOPS.definedBySetFeatureFixed = false;
       }
@@ -23108,7 +23089,7 @@ var DivaArticle = /*#__PURE__*/function () {
                   }
                   if (ruleValid) {
                     ruleWasValidOnce = true;
-                    if (m == 0) validOPVs[OPT] = _objectSpread$e({}, possibleOPVs);
+                    if (m == 0) validOPVs[OPT] = _objectSpread$d({}, possibleOPVs);
                     opvCodex = opvCodex.slice(1);
                     if (possibleOPVs[opvCodex] != null) delete validOPVs[OPT][opvCodex];
                   }
@@ -23504,7 +23485,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-63df1fef.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-0329c88f.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -23568,6 +23549,7 @@ var DivaArticle = /*#__PURE__*/function () {
         calcUnitPrice = 0,
         calcUnit2Price = 0,
         firstUnit2Param = 0,
+        secondUnit2Param = 0,
         idmPriceMeasureFactor = 1;
       //CalcPreise berechnen
       for (var i = 0; i < maxPriceOfGroupCodex.length; i++) {
@@ -23598,76 +23580,82 @@ var DivaArticle = /*#__PURE__*/function () {
         if (myArtOPS.replaceMainArtNr) {
           this.configArticleCodex = myArtOPS.replaceMainArtNr;
         }
+        var name = myArtOPS.name;
+        console.log('name', name);
         if (!tmpOPT.useMaxPriceOfGroup) {
           myArtOPS.calcPrice = myArtOPS.price * myArtOPS.quantity;
         }
-        switch (pUnit) {
-          case 'm':
-            calcUnitPrice += myArtOPS.calcPrice / 100;
-            break;
-          case 'cm':
-            calcUnitPrice += myArtOPS.calcPrice;
-            break;
-          case 'm2':
-            calcUnit2Price += myArtOPS.calcPrice / 10000;
-            break;
-          case 'cm2':
-            calcUnit2Price += myArtOPS.calcPrice;
-            break;
-          default:
-            if (myArtOPS.isPercentage) {
-              //hier myArtOPS.TargetOption auswerten
-              if (myArtOPS.targetOption && myArtOPS.targetOption != '') ; else {
-                myArtOPS.usedCalcPrice = myArtOPS.calcPrice;
-              }
-            } else {
-              myArtOPS.usedCalcPrice = DivaUtils__default["default"].decimalAdjust('round', myArtOPS.calcPrice, digits);
-            }
-            break;
-        }
-        if (mUnit || OP == 'OPTUMFANG' || OP == 'OPTUMFANG_KREIS') {
-          var freeTextMeasure = parseFloat(myArtOPS.freeText ? myArtOPS.freeText : '');
-          if (freeTextMeasure || OP == 'OPTUMFANG' || OP == 'OPTUMFANG_KREIS') {
-            if (calcUnitPrice != 0) {
-              var quantity = 0;
-              if (OP == 'OPTUMFANG') {
-                mUnit = 'cm';
-                quantity = this.calcWidth * 2 + this.calcDepth * 2;
-              } else if (OP == 'OPTUMFANG_KREIS') {
-                mUnit = 'cm';
-                quantity = this.calcWidth * Math.PI;
+        if (pUnit !== null && pUnit !== void 0 && pUnit.includes('2') && calcUnit2Price && firstUnit2Param && secondUnit2Param) {
+          var unit2Price = this.getCalcPerUnit(pUnit, myArtOPS.calcPrice);
+          myArtOPS.usedCalcPrice = unit2Price * firstUnit2Param * secondUnit2Param;
+        } else {
+          switch (pUnit) {
+            case 'm':
+              calcUnitPrice += myArtOPS.calcPrice / 100;
+              break;
+            case 'cm':
+              calcUnitPrice += myArtOPS.calcPrice;
+              break;
+            case 'm2':
+              calcUnit2Price += myArtOPS.calcPrice / 10000;
+              break;
+            case 'cm2':
+              calcUnit2Price += myArtOPS.calcPrice;
+              break;
+            default:
+              if (myArtOPS.isPercentage) {
+                //hier myArtOPS.TargetOption auswerten
+                if (myArtOPS.targetOption && myArtOPS.targetOption != '') ; else {
+                  myArtOPS.usedCalcPrice = myArtOPS.calcPrice;
+                }
               } else {
-                quantity = freeTextMeasure;
+                myArtOPS.usedCalcPrice = DivaUtils__default["default"].decimalAdjust('round', myArtOPS.calcPrice, digits);
               }
-              if (mUnit == 'cm') myArtOPS.usedCalcPrice = calcUnitPrice * quantity;else if (mUnit == 'm') myArtOPS.usedCalcPrice = calcUnitPrice * quantity * 100;
-            } else if (calcUnit2Price != 0) {
-              //for diamter option
-              if (myArtOPS.option.diameter) {
-                myArtOPS.usedCalcPrice = calcUnit2Price * this.calcWidth * this.calcDepth;
-              } else {
-                if (firstUnit2Param == 0) {
-                  firstUnit2Param = freeTextMeasure;
-                  if (mUnit == 'm') firstUnit2Param = firstUnit2Param * 100;
+              break;
+          }
+          if (mUnit || OP == 'OPTUMFANG' || OP == 'OPTUMFANG_KREIS') {
+            var freeTextMeasure = parseFloat(myArtOPS.freeText ? myArtOPS.freeText : '');
+            if (freeTextMeasure || (OP == 'OPTUMFANG' || OP == 'OPTUMFANG_KREIS') && calcUnitPrice != 0) {
+              if (calcUnitPrice != 0) {
+                var quantity = 0;
+                if (OP == 'OPTUMFANG') {
+                  mUnit = 'cm';
+                  quantity = this.calcWidth * 2 + this.calcDepth * 2;
+                } else if (OP == 'OPTUMFANG_KREIS') {
+                  mUnit = 'cm';
+                  quantity = this.calcWidth * Math.PI;
+                } else {
+                  quantity = freeTextMeasure;
+                }
+                if (mUnit == 'cm') myArtOPS.usedCalcPrice = calcUnitPrice * quantity;else if (mUnit == 'm') myArtOPS.usedCalcPrice = calcUnitPrice * quantity * 100;
+              } else if (calcUnit2Price != 0) {
+                //for diamter option
+                if (myArtOPS.option.diameter) {
+                  myArtOPS.usedCalcPrice = calcUnit2Price * this.calcWidth * this.calcDepth;
                 } else {
-                  var secondUnit2Param = freeTextMeasure;
-                  if (mUnit == 'm') secondUnit2Param = secondUnit2Param * 100;
-                  myArtOPS.usedCalcPrice = calcUnit2Price * firstUnit2Param * secondUnit2Param;
+                  if (firstUnit2Param == 0) {
+                    firstUnit2Param = freeTextMeasure;
+                    if (mUnit == 'm') firstUnit2Param = firstUnit2Param * 100;
+                  } else {
+                    secondUnit2Param = freeTextMeasure;
+                    if (mUnit == 'm') secondUnit2Param = secondUnit2Param * 100;
+                    myArtOPS.usedCalcPrice = calcUnit2Price * firstUnit2Param * secondUnit2Param;
+                  }
                 }
               }
             }
           }
-        }
-        if (OP == 'OPT95' && !!this.catalogArticle.widthHasPrice) {
-          idmPriceMeasureFactor = idmPriceMeasureFactor * this.calcWidth;
-        }
-        if (OP == 'OPT96' && !!this.catalogArticle.depthHasPrice) {
-          idmPriceMeasureFactor = idmPriceMeasureFactor * this.calcDepth;
-        }
-        if (OP == 'OPT97' && !!this.catalogArticle.heightHasPrice) {
-          idmPriceMeasureFactor = idmPriceMeasureFactor * this.calcHeight;
+          if (OP == 'OPT95' && !!this.catalogArticle.widthHasPrice) {
+            idmPriceMeasureFactor = idmPriceMeasureFactor * this.calcWidth;
+          }
+          if (OP == 'OPT96' && !!this.catalogArticle.depthHasPrice) {
+            idmPriceMeasureFactor = idmPriceMeasureFactor * this.calcDepth;
+          }
+          if (OP == 'OPT97' && !!this.catalogArticle.heightHasPrice) {
+            idmPriceMeasureFactor = idmPriceMeasureFactor * this.calcHeight;
+          }
         }
       }
-
       //jetzt nochmal prozentuelle Preise mit TargetOption berechnen
       for (var _iKey3 in myArtOPSs) {
         var _myArtOPS = myArtOPSs[_iKey3];
@@ -23763,6 +23751,21 @@ var DivaArticle = /*#__PURE__*/function () {
       }
       this.article.price = articleUsedCalcPrice;
     }
+  }, {
+    key: "getCalcPerUnit",
+    value: function getCalcPerUnit(unit, calcPrice) {
+      switch (unit) {
+        case 'm':
+          return calcPrice / 100;
+        case 'cm':
+          return calcPrice;
+        case 'm2':
+          return calcPrice / 10000;
+        case 'cm2':
+          return calcPrice;
+      }
+      return 0;
+    }
   }, {
     key: "getOptionPrice",
     value: function getOptionPrice(calculatedPrice, optItem, digits) {
@@ -24085,7 +24088,7 @@ var DivaArticle = /*#__PURE__*/function () {
      */
   }, {
     key: "getPlannerConfigData",
-    value: function getPlannerConfigData(accessoireArticles, excludeInvalidCacheOptions, alternateRenderInfo) {
+    value: function getPlannerConfigData(accessoireArticles, alternateRenderInfo) {
       var _this$doorPlanner2, _this$doorPlanner3;
       var ret = {
         N: this.name,
@@ -24093,8 +24096,8 @@ var DivaArticle = /*#__PURE__*/function () {
         ArtNr: this.article.catalogArticle.articleCodex,
         CFG: []
       };
-      var containsTextureNotDigitalized = this.addOptionStateFromArticleToPlannerData(ret, alternateRenderInfo);
-      if (!excludeInvalidCacheOptions) ret.CFG.push({
+      this.addOptionStateFromArticleToPlannerData(ret, alternateRenderInfo);
+      ret.CFG.push({
         OPT: 'QUANTITY',
         OPV: this.quantity.toString()
       });
@@ -24123,41 +24126,32 @@ var DivaArticle = /*#__PURE__*/function () {
         ret['MOVE'] = doorInfo;
       }
       return {
-        config: ret,
-        containsTextureNotDigitalized: containsTextureNotDigitalized
+        config: ret
       };
     }
   }, {
     key: "addOptionStateFromArticleToPlannerData",
     value: function addOptionStateFromArticleToPlannerData(ret, alternateRenderInfo) {
-      var containsTextureNotDigitalized = false;
       for (var key in this.articleOptionStates) {
-        if (this.addOptionStateToPlannerData(ret, this.articleOptionStates[key], alternateRenderInfo)) {
-          containsTextureNotDigitalized = true;
-        }
+        this.addOptionStateToPlannerData(ret, this.articleOptionStates[key], alternateRenderInfo);
       }
       for (var _key5 in this.article.partlistArticles) {
         var partlistArticle = this.article.partlistArticles[_key5];
         if (!partlistArticle.hasOptionsThatParentDoesNotHave) continue;
-        if (partlistArticle.addOptionStateFromArticleToPlannerData(ret, alternateRenderInfo)) {
-          containsTextureNotDigitalized = true;
-        }
+        partlistArticle.addOptionStateFromArticleToPlannerData(ret, alternateRenderInfo);
       }
-      return containsTextureNotDigitalized;
     }
   }, {
     key: "addOptionStateToPlannerData",
     value: function addOptionStateToPlannerData(ret, ops, alternateRenderInfo) {
       var opv;
       var opt;
-      var containsTextureNotDigitalized = false;
       if (ops.val) {
         var _ops$val$ocd, _ops$option$ocd;
         opv = (_ops$val$ocd = ops.val.ocd) !== null && _ops$val$ocd !== void 0 ? _ops$val$ocd : ops.val.codex;
         if (this.CatalogData.isIDM3DCat && ops.val.vCodex) opv = 'OPV' + ops.idmVariantenArt + '_' + ops.val.vCodex;
         opt = (_ops$option$ocd = ops.option.ocd) !== null && _ops$option$ocd !== void 0 ? _ops$option$ocd : ops.optionCodex;
         if (alternateRenderInfo != undefined && alternateRenderInfo.hideOptionsIn3DImage.includes(opt)) return;
-        if (!ops.val.isDigitalized && ops.val.isTexture) containsTextureNotDigitalized = true;
         ret.CFG.push({
           OPT: opt,
           OPV: opv
@@ -24182,7 +24176,6 @@ var DivaArticle = /*#__PURE__*/function () {
           });
         }
       }
-      return containsTextureNotDigitalized;
     }
   }, {
     key: "getAccessoireMATData",
@@ -24244,7 +24237,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "getVariantBasketData",
     value: function getVariantBasketData() {
       var variantBasketData = [];
-      var opsObj = _objectSpread$e({}, this.articleOptionStates);
+      var opsObj = _objectSpread$d({}, this.articleOptionStates);
       if (this.article.optionsForPrint) {
         for (var i = 0; i < this.article.optionsForPrint.length; i++) {
           var ops = this.getArticleOptionState(this.article.optionsForPrint[i]);
@@ -24430,8 +24423,8 @@ var DivaArticle = /*#__PURE__*/function () {
   }]);
 }();
 
-function ownKeys$d(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$d(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$d(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$d(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$c(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$c(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$c(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$c(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$b = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 
 //Diese Klasse verwaltet den Optionsbaum und ladelogik etc. eines Artikels
@@ -24650,7 +24643,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               return _context5.abrupt("continue", 37);
             case 11:
               if (targetArticlesWithNewValues.includes(targetArticlesToUpdate[i])) {
-                valuesArray[i] = actArticle.getValidValues(_objectSpread$d({}, myValues), actArticle.CatalogData.mergeOptionsToSameOption);
+                valuesArray[i] = actArticle.getValidValues(_objectSpread$c({}, myValues), actArticle.CatalogData.mergeOptionsToSameOption);
               }
               if (!(Object.entries(valuesArray[i]).length > 0 || from !== null && from !== void 0 && from.startsWith('initializing'))) {
                 _context5.next = 32;
@@ -25284,7 +25277,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               }
               doLoadItem.BasketID = nArticle.basketId;
               _context14.next = 9;
-              return this.toDoAfterArticleLoaded(nArticle, {}, _objectSpread$d(_objectSpread$d({}, doLoadItem.VariantValues), newConfigValues), 'initializingPartlist', doLoadItem.VariantItemData);
+              return this.toDoAfterArticleLoaded(nArticle, {}, _objectSpread$c(_objectSpread$c({}, doLoadItem.VariantValues), newConfigValues), 'initializingPartlist', doLoadItem.VariantItemData);
             case 9:
               article.addPartlistArticle(nArticle);
             case 10:
@@ -25428,7 +25421,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           if (ruleValid) break;
         }
         if (ruleValid) {
-          returnValue.push(_objectSpread$d(_objectSpread$d({}, entry), {}, {
+          returnValue.push(_objectSpread$c(_objectSpread$c({}, entry), {}, {
             index: i
           }));
           break;
@@ -26410,7 +26403,6 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
       var optionStep = step === null || step === void 0 ? void 0 : step.optionStep;
       var paletteType = 'SMALL';
       if (configStep && optionStep) {
-        var _set$api$ReturnToFrom;
         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) {
           paletteType = 'GAL';
@@ -26438,31 +26430,15 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
         if (paletteType == 'GALLERY') {
           paletteType = 'GAL';
         }
-        //TODO correct with franz
-        if ((!set.api.getDiva3DSuppressCacheCreation() && set.api.getDiva3dUseImageCache() || (_set$api$ReturnToFrom = set.api.ReturnToFromParams) !== null && _set$api$ReturnToFrom !== void 0 && _set$api$ReturnToFrom.startsWith('FAVORITS')) && paletteType == 'DROPDOWN_TEXT') paletteType = 'VERY_SMALL';
       }
       return paletteType;
     }
   }, {
     key: "getStepInfo",
     value: function getStepInfo(configStepKey, optionStatesOfArticle) {
-      var isNotVisualized = false;
-      var targetArticles = this.getTargetArticles(configStepKey),
-        allSteps = this.getAllByKey(configStepKey);
-      if (allSteps !== null && allSteps !== void 0 && allSteps.optionStep) {
-        for (var i = 0; i < targetArticles.length; i++) {
-          if (optionStatesOfArticle[targetArticles[i]][allSteps.optionStep.codex].isNotVisualized) {
-            isNotVisualized = true;
-            break;
-          }
-        }
-      }
-      if (isNotVisualized) {
-        return 'SHOW_NOT_VISUALIZED_WARNINIG';
-      }
-      if (allSteps !== null && allSteps !== void 0 && allSteps.configStep.warning) {
-        return allSteps.configStep.warning;
-      }
+      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;
       return undefined;
     }
   }, {
@@ -26770,8 +26746,8 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
 function _createForOfIteratorHelper$1(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$1(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$1(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$1(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$1(r, a) : void 0; } }
 function _arrayLikeToArray$1(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function ownKeys$c(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$c(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$c(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$c(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$b(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$b(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$b(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$b(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$9 = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var DivaSet = /*#__PURE__*/function () {
   function DivaSet(catalog, _setId, orderSet, initSetState) {
@@ -26866,7 +26842,7 @@ var DivaSet = /*#__PURE__*/function () {
                         _context.next = 10;
                         break;
                       }
-                      validValues = repairVariantValuesAndPlanner ? article.getValidValues(_objectSpread$c({}, variantValues), article.CatalogData.mergeOptionsToSameOption) : {};
+                      validValues = repairVariantValuesAndPlanner ? article.getValidValues(_objectSpread$b({}, variantValues), article.CatalogData.mergeOptionsToSameOption) : {};
                       _context.t0 = partlistArticlesToLoad;
                       _context.next = 8;
                       return articleHandlerInstance.updateCfgValues(article, repairVariantValuesAndPlanner ? validValues : variantValues, {}, undefined, loadPlas);
@@ -26981,7 +26957,7 @@ var DivaSet = /*#__PURE__*/function () {
       }
       return false;
     });
-    _defineProperty__default["default"](this, "getPlannerConfigData", function (elementId, excludeInvalidCacheOptions, alternateRenderInfo) {
+    _defineProperty__default["default"](this, "getPlannerConfigData", function (elementId, alternateRenderInfo) {
       var article = _this.getArticleByElementId(elementId);
       var articleAccs = [];
       for (var key in article === null || article === void 0 ? void 0 : article.accessoires) {
@@ -26989,7 +26965,6 @@ var DivaSet = /*#__PURE__*/function () {
       }
       var plannerConfigData = {
         config: {},
-        containsTextureNotDigitalized: false,
         accs: articleAccs
       };
       if (article) {
@@ -27003,9 +26978,8 @@ var DivaSet = /*#__PURE__*/function () {
             }
           }
         }
-        var result = article.getPlannerConfigData(accessoireArticles, excludeInvalidCacheOptions, alternateRenderInfo);
+        var result = article.getPlannerConfigData(accessoireArticles, alternateRenderInfo);
         plannerConfigData.config = result.config;
-        plannerConfigData.containsTextureNotDigitalized = result.containsTextureNotDigitalized;
       }
       return plannerConfigData;
     });
@@ -27013,7 +26987,6 @@ var DivaSet = /*#__PURE__*/function () {
       var article = _this.getArticleByBasketId(basketId);
       var plannerConfigData = {
         config: {},
-        containsTextureNotDigitalized: false,
         accs: []
       };
       if (article) {
@@ -27021,9 +26994,8 @@ var DivaSet = /*#__PURE__*/function () {
         for (var key in article === null || article === void 0 ? void 0 : article.accessoires) {
           if (article.accessoires[key].elementId) articleAccs.push(article.accessoires[key].elementId);
         }
-        var result = article.getPlannerConfigData(article.accessoires, false);
+        var result = article.getPlannerConfigData(article.accessoires);
         plannerConfigData.config = result.config;
-        plannerConfigData.containsTextureNotDigitalized = result.containsTextureNotDigitalized;
         plannerConfigData.accs = articleAccs;
       }
       return plannerConfigData;
@@ -27119,7 +27091,6 @@ var DivaSet = /*#__PURE__*/function () {
       if (this.catalogData.useBoxPlanner) {
         plannerMode = 'BoxPlanner';
       } else if (this.catalogData.has3dModels) {
-        var _this$WebConfig;
         for (var key in this.divaArticles) {
           if (this.divaArticles[key].model3DName) {
             plannerMode = '3DImage';
@@ -27131,9 +27102,6 @@ var DivaSet = /*#__PURE__*/function () {
         if (Object.entries(this.divaArticles).length == 0) {
           plannerMode = '3DImage';
         }
-        if ((_this$WebConfig = this.WebConfig) !== null && _this$WebConfig !== void 0 && _this$WebConfig.diva3dUseSirvViewer) {
-          plannerMode = 'SirvViewer_only';
-        }
         if (this.catalogData.divaArReady && this.catalogData.useShelfPlannerRTV) {
           //TODO Matthias sauber initialisieren ob in RTV oder IMAGE3D gestartet wird.
           plannerMode = 'RTViewer';
@@ -27152,7 +27120,7 @@ var DivaSet = /*#__PURE__*/function () {
         plannerMode = 'No';
       }
       this.plannerMode = plannerMode;
-      this.setType = plannerMode == 'No' || plannerMode == 'SirvViewer_only' ? 'ARTICLE' : 'PLANNING';
+      this.setType = plannerMode == 'No' ? 'ARTICLE' : 'PLANNING';
       return plannerMode;
     }
   }, {
@@ -27447,8 +27415,8 @@ var DivaSet = /*#__PURE__*/function () {
       var articles = {};
       for (var basketId in this.divaArticles) {
         articles[basketId] = this.divaArticles[basketId];
-        if (allPartlistArticlesAlso) articles = _objectSpread$c(_objectSpread$c({}, articles), articles[basketId].getRecursivePartlistArticles());
-        if (visiblePartlistArticlesAlso) articles = _objectSpread$c(_objectSpread$c({}, articles), articles[basketId].getRecursivePartlistArticles(true));
+        if (allPartlistArticlesAlso) articles = _objectSpread$b(_objectSpread$b({}, articles), articles[basketId].getRecursivePartlistArticles());
+        if (visiblePartlistArticlesAlso) articles = _objectSpread$b(_objectSpread$b({}, articles), articles[basketId].getRecursivePartlistArticles(true));
       }
       return articles;
     }
@@ -27943,8 +27911,8 @@ var DivaSet = /*#__PURE__*/function () {
   }, {
     key: "remindPriceForHash",
     value: function remindPriceForHash(product) {
-      var _product$discountedPr, _product$discountedPr2;
-      if (!product.available) return;
+      var _product$availableFor, _product$discountedPr, _product$discountedPr2;
+      if (!((_product$availableFor = product.availableForOrganizations) !== null && _product$availableFor !== void 0 && _product$availableFor.includes(this.getSetState.organizationId))) return;
       var claculatedPrice = this.getSetPrice(true);
       if (!product.discountedPrice && product.addedPrice === product.calculatedPrice && claculatedPrice == product.calculatedPrice) {
         return;
@@ -27970,7 +27938,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context4.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-5164c50d.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-704880a1.js'); });
             case 3:
               _yield$import = _context4.sent;
               DoorPlanner = _yield$import["default"];
@@ -28075,8 +28043,8 @@ var DivaSet = /*#__PURE__*/function () {
   }, {
     key: "hasStaticRoomList",
     get: function get() {
-      var _this$WebConfig2;
-      if (this.CatalogData.roomList3DStaticBGImage.size > 0 && (_this$WebConfig2 = this.WebConfig) !== null && _this$WebConfig2 !== void 0 && _this$WebConfig2.diva3dStaticBGImage) {
+      var _this$WebConfig;
+      if (this.CatalogData.roomList3DStaticBGImage.size > 0 && (_this$WebConfig = this.WebConfig) !== null && _this$WebConfig !== void 0 && _this$WebConfig.diva3dStaticBGImage) {
         return true;
       }
       return false;
@@ -28117,8 +28085,8 @@ var DivaSet = /*#__PURE__*/function () {
   }, {
     key: "ViewConfig",
     get: function get() {
-      var _this$WebConfig3;
-      return (_this$WebConfig3 = this.WebConfig) === null || _this$WebConfig3 === void 0 ? void 0 : _this$WebConfig3.viewConfig;
+      var _this$WebConfig2;
+      return (_this$WebConfig2 = this.WebConfig) === null || _this$WebConfig2 === void 0 ? void 0 : _this$WebConfig2.viewConfig;
     }
   }, {
     key: "i18n",
@@ -29395,7 +29363,7 @@ var SummaryHandler = /*#__PURE__*/function () {
       if (article.getArticleOptionState('OPT' + optionCodexes[0])) {
         for (var i = 0; i < optionCodexes.length; i++) {
           var optionState = article.getArticleOptionState('OPT' + optionCodexes[i]);
-          if (!optionState.isInvisible && optionState.isDoShow && optionState.visibleCount > 0 && optionState.valCodex != 'OPVNR') {
+          if (optionState && !optionState.isInvisible && optionState.isDoShow && optionState.visibleCount > 0 && optionState.valCodex != 'OPVNR') {
             opss.push(optionState);
           }
         }
@@ -29605,8 +29573,8 @@ var SummaryHandler = /*#__PURE__*/function () {
 }();
 var summaryHandlerInstance = new SummaryHandler();
 
-function ownKeys$b(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$b(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$b(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$b(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$a(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$a(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$a(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$a(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var DivaFavoritesHandler = /*#__PURE__*/function () {
   function DivaFavoritesHandler() {
@@ -29687,10 +29655,10 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
               setHashes = {};
               variantId = this.getVariantIdToStart(set);
               origConfig = articles[Object.keys(articles)[0]].VariantValues;
-              i = variants.length - 1;
+              i = 0;
             case 6:
-              if (!(i >= 0)) {
-                _context3.next = 50;
+              if (!(i < variants.length)) {
+                _context3.next = 53;
                 break;
               }
               variantForTargetArticles = variants[i];
@@ -29793,9 +29761,14 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
               variantForTargetArticles.configVariantValues = configVariantValues;
               variantForTargetArticles.price = set === null || set === void 0 ? void 0 : set.getSetPrice();
               variantForTargetArticles.title = set === null || set === void 0 ? void 0 : set.CatalogData.catalogName;
-              if (!variantIsValid) {
-                variants.splice(i, 1);
+              if (variantIsValid) {
+                _context3.next = 48;
+                break;
               }
+              variants.splice(i, 1);
+              i--;
+              return _context3.abrupt("continue", 50);
+            case 48:
               reservedId = this.tryGetOldVariantIdForVariant(set, variants[i]);
               if (reservedId !== undefined) {
                 variants[i].id = reservedId;
@@ -29803,21 +29776,21 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
                 variants[i].id = variantId;
                 variantId++;
               }
-            case 47:
-              i--;
+            case 50:
+              i++;
               _context3.next = 6;
               break;
-            case 50:
+            case 53:
               if (!set.favoritesChanged) this.evalOldConfigVariants(set, variants);
-              _context3.next = 53;
+              _context3.next = 56;
               return setHandlerInstance.updateArticlesOptionStatesOfActSet(set, origConfig, Object.keys(articles), true);
-            case 53:
+            case 56:
               set.allVariantsCache = variants;
               variants.sort(function (a, b) {
                 return a.id - b.id;
               });
               return _context3.abrupt("return", variants);
-            case 56:
+            case 59:
             case "end":
               return _context3.stop();
           }
@@ -30104,7 +30077,7 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
               allvariants = _context4.t0;
               validVariants = [];
               for (i = 0; i < allvariants.length; i++) {
-                if (!set.disabledVariants.includes(i)) {
+                if (!set.disabledVariants.includes(allvariants[i].id)) {
                   validVariants.push(allvariants[i]);
                 }
               }
@@ -30279,7 +30252,7 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
                   if (targetArticle[opt] && !variantValues[opt]) variantValues[opt] = targetArticle[opt];
                 }
               }
-              configVariant = new basketModel.ConfigVariantData(variant.id, set.setName, set.setName_locales, setImage, (_hQRenderScript = hQRenderScript) === null || _hQRenderScript === void 0 ? void 0 : _hQRenderScript._id, DivaUtils__default["default"].encodeBase64(set.plannerHandler.getProject3D(set.getSetId())), set.getVariantsDescription(), set.SetArticleNr, set.getSetPrice(), set.setHash, 1, set.getVariantBasketData(), articleHandlerInstance.getCompactOrderLine(_objectSpread$b(_objectSpread$b({}, set.getDivaArticles()), set.getPartlistArticlesOfSet())), variantValues, summaryHandlerInstance.convertSummaryItemsToSummaryInfo(set), plannerData != undefined ? DivaUtils__default["default"].encodeBase64(JSON.stringify(plannerData)) : '', urlToPlanning2D, setHandlerInstance.getBBoxObject(set), set.getBruttoSetPrice(), undefined, undefined, set.MetaData, set.MetaData_locales, DivaUtils__default["default"].stripTagsFromDict(set.getVariantsDescription_locales()), (_basket$OrderSets$set = basket.OrderSets[setindex].ConfigVariants) === null || _basket$OrderSets$set === void 0 || (_basket$OrderSets$set = _basket$OrderSets$set[set.basketConfigVariants.length]) === null || _basket$OrderSets$set === void 0 ? void 0 : _basket$OrderSets$set.SetOrderText, (_basket$OrderSets$set2 = basket.OrderSets[setindex].ConfigVariants) === null || _basket$OrderSets$set2 === void 0 || (_basket$OrderSets$set2 = _basket$OrderSets$set2[set.basketConfigVariants.length]) === null || _basket$OrderSets$set2 === void 0 ? void 0 : _basket$OrderSets$set2.SetOrderText_locales);
+              configVariant = new basketModel.ConfigVariantData(variant.id, set.setName, set.setName_locales, setImage, (_hQRenderScript = hQRenderScript) === null || _hQRenderScript === void 0 ? void 0 : _hQRenderScript._id, DivaUtils__default["default"].encodeBase64(set.plannerHandler.getProject3D(set.getSetId())), set.getVariantsDescription(), set.SetArticleNr, set.getSetPrice(), set.setHash, 1, set.getVariantBasketData(), articleHandlerInstance.getCompactOrderLine(_objectSpread$a(_objectSpread$a({}, set.getDivaArticles()), set.getPartlistArticlesOfSet())), variantValues, summaryHandlerInstance.convertSummaryItemsToSummaryInfo(set), plannerData != undefined ? DivaUtils__default["default"].encodeBase64(JSON.stringify(plannerData)) : '', urlToPlanning2D, setHandlerInstance.getBBoxObject(set), set.getBruttoSetPrice(), undefined, undefined, set.MetaData, set.MetaData_locales, DivaUtils__default["default"].stripTagsFromDict(set.getVariantsDescription_locales()), (_basket$OrderSets$set = basket.OrderSets[setindex].ConfigVariants) === null || _basket$OrderSets$set === void 0 || (_basket$OrderSets$set = _basket$OrderSets$set[set.basketConfigVariants.length]) === null || _basket$OrderSets$set === void 0 ? void 0 : _basket$OrderSets$set.SetOrderText, (_basket$OrderSets$set2 = basket.OrderSets[setindex].ConfigVariants) === null || _basket$OrderSets$set2 === void 0 || (_basket$OrderSets$set2 = _basket$OrderSets$set2[set.basketConfigVariants.length]) === null || _basket$OrderSets$set2 === void 0 ? void 0 : _basket$OrderSets$set2.SetOrderText_locales);
               set.basketConfigVariants.push(configVariant);
             case 28:
             case "end":
@@ -30299,8 +30272,8 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
       if (!((_set$oldConfigVariant3 = set.oldConfigVariants) !== null && _set$oldConfigVariant3 !== void 0 && _set$oldConfigVariant3.length)) return;
       //set all invalid
       set.disabledVariants = [];
-      variants.map(function (v, index) {
-        return set.disabledVariants.push(index);
+      variants.map(function (v) {
+        return set.disabledVariants.push(v.id);
       });
       var oldConfigVariants = _toConsumableArray__default["default"](set.oldConfigVariants);
       for (var i = 0; i < variants.length; i++) {
@@ -30323,7 +30296,7 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
             if (tryNext) break;
           }
           if (!tryNext) {
-            var index = set.disabledVariants.indexOf(i);
+            var index = set.disabledVariants.indexOf(variant.id);
             if (index != -1) set.disabledVariants.splice(index, 1);
             oldConfigVariants.splice(j, 1);
           }
@@ -30334,11 +30307,11 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
   }, {
     key: "isFavorite",
     value: function isFavorite(set, targetArticles, item, optionCodex) {
-      var _item$ocd, _set$WebConfig, _set$api$ReturnToFrom, _favorites$VariantVal, _Object$keys;
+      var _item$ocd, _set$api$ReturnToFrom, _favorites$VariantVal, _Object$keys;
       var favorites = set.favorites;
       var opvCodex = (_item$ocd = item.ocd) !== null && _item$ocd !== void 0 ? _item$ocd : item.codex;
       var opt = optionCodex ? optionCodex : item.parent.codex;
-      var doShowFav = ((_set$WebConfig = set.WebConfig) === null || _set$WebConfig === void 0 ? void 0 : _set$WebConfig.diva3dUseImageCache) && !set.WebConfig.diva3dSuppressCacheCreation || !!((_set$api$ReturnToFrom = set.api.ReturnToFromParams) !== null && _set$api$ReturnToFrom !== void 0 && _set$api$ReturnToFrom.startsWith('FAVORITS'));
+      var doShowFav = !!((_set$api$ReturnToFrom = set.api.ReturnToFromParams) !== null && _set$api$ReturnToFrom !== void 0 && _set$api$ReturnToFrom.startsWith('FAVORITS'));
       if (!doShowFav) return undefined;
       if ((_favorites$VariantVal = favorites.VariantValues) !== null && _favorites$VariantVal !== void 0 && _favorites$VariantVal[opt] && (_Object$keys = Object.keys(favorites.VariantValues[opt])) !== null && _Object$keys !== void 0 && _Object$keys.includes(opvCodex)) {
         for (var i = 0; i < targetArticles.length; i++) {
@@ -30359,8 +30332,8 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
 }();
 var favoritesHandlerInstance = new DivaFavoritesHandler();
 
-function ownKeys$a(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$a(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$a(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$a(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$9(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$9(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$9(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$9(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 
 //Diese Klasse beinhaltet die Logik wie eine aktuelle Konfiguration mit allen möglicheen Ausprägungen mit Preisen in einem Set aussieht.
 //Der in einem Set gemergte Optionsbaum
@@ -30917,7 +30890,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
             //get schnittmenge of all the articles
             if (i === 0) {
               constructionRules = myOptionState.constructionRules;
-              configItems = _objectSpread$a({}, myOptionState.visibleOptionValues);
+              configItems = _objectSpread$9({}, myOptionState.visibleOptionValues);
             } else {
               for (var _key2 in configItems) {
                 if (!myOptionState.visibleOptionValues[_key2]) {
@@ -31148,8 +31121,8 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
 }();
 var configTreeHandler = new DivaConfigTreeHandler();
 
-function ownKeys$9(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$9(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$9(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$9(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$8(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$8(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$8(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$8(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$8 = DivaUtils__default["default"].initLog('Planner', 'DIVA-SET-HANDLER');
 
 /*
@@ -31639,7 +31612,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               }
               variantValues = (_initSetState$initVar = initSetState.initVariantValues) !== null && _initSetState$initVar !== void 0 ? _initSetState$initVar : catalogData === null || catalogData === void 0 || (_catalogData$promoted = catalogData.promotedOpvs) === null || _catalogData$promoted === void 0 || (_catalogData$promoted = _catalogData$promoted.articles) === null || _catalogData$promoted === void 0 || (_catalogData$promoted = _catalogData$promoted[articlesToInitialize[j]]) === null || _catalogData$promoted === void 0 || (_catalogData$promoted = _catalogData$promoted[0]) === null || _catalogData$promoted === void 0 ? void 0 : _catalogData$promoted.variantValues;
               _context6.next = 18;
-              return this.addPlannerElement(set, articlesToInitialize[j], _objectSpread$9(_objectSpread$9({}, params), variantValues ? {
+              return this.addPlannerElement(set, articlesToInitialize[j], _objectSpread$8(_objectSpread$8({}, params), variantValues ? {
                 variantValues: variantValues
               } : {}));
             case 18:
@@ -32272,7 +32245,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 _context17.next = 24;
                 break;
               }
-              return _context17.abrupt("return", _objectSpread$9(_objectSpread$9({}, doesFit), {}, {
+              return _context17.abrupt("return", _objectSpread$8(_objectSpread$8({}, doesFit), {}, {
                 accessoire: accessoire
               }));
             case 24:
@@ -32704,7 +32677,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
         var articlecodex = plannerElement.articleCodex;
         if (type == 'PLANNERSWITCH' && Object.keys(set.getDivaArticles())[0]) {
           if (plannerViewInfo.catalogPlannerArticles[i].filterType == 'Accessoire') continue;
-          cleanedCaltaogPlannerArticles.push(_objectSpread$9({}, plannerElement));
+          cleanedCaltaogPlannerArticles.push(_objectSpread$8({}, plannerElement));
           var index = cleanedCaltaogPlannerArticles.length - 1;
           cleanedCaltaogPlannerArticles[index].groupName = '';
           if (set.getArticlesByArticleCodex(articlecodex).length > 0) {
@@ -32722,10 +32695,10 @@ var DivaSetHandler = /*#__PURE__*/function () {
               plannerViewInfo.plannerConfiguration.updatePaletteAfterPlanningChanged = true;
             }
           }
-          if (!dontPushElement) cleanedCaltaogPlannerArticles.push(_objectSpread$9({}, plannerElement));
+          if (!dontPushElement) cleanedCaltaogPlannerArticles.push(_objectSpread$8({}, plannerElement));
         }
       }
-      return _objectSpread$9(_objectSpread$9({}, plannerViewInfo), {}, {
+      return _objectSpread$8(_objectSpread$8({}, plannerViewInfo), {}, {
         catalogPlannerArticles: cleanedCaltaogPlannerArticles
       });
     }
@@ -32924,7 +32897,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               filterType = set.configTree.getCurFilterType(configStepKey, optionStatesOfArticle, configItems.configItems);
               stepInfo = set.configTree.getStepInfo(configStepKey, optionStatesOfArticle);
               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({
+              return _context24.abrupt("return", _objectSpread$8(_objectSpread$8(_objectSpread$8({
                 isRenderedNotInSettingPalette: set.configTree.isRenderedNotInSettingPalette(configStepKey),
                 isRenderedInAccessorieStep: set.configTree.isRenderedInAccessorieStep(configStepKey),
                 visible: set.configTree.getVisibility(configStepKey, visible, set.CatalogData)
@@ -33347,7 +33320,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 break;
               }
               _context28.next = 17;
-              return this.addArticleToActSet(set, edoArticlesToLoad[_i5].ArticleCodex, _objectSpread$9(_objectSpread$9({}, edoArticlesToLoad[_i5]), {}, {
+              return this.addArticleToActSet(set, edoArticlesToLoad[_i5].ArticleCodex, _objectSpread$8(_objectSpread$8({}, edoArticlesToLoad[_i5]), {}, {
                 basketId: oldBasketIds[_i5]
               }), true);
             case 17:
@@ -33744,7 +33717,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           origOrderSet.BBox = actOrderSet.BBox;
           origOrderSet.VariantDescription = actOrderSet.VariantDescription;
           if (actOrderSet.ConfigVariants && origOrderSet.ConfigVariants) origOrderSet.ConfigVariants = actOrderSet.ConfigVariants.map(function (variant, index) {
-            return _objectSpread$9(_objectSpread$9({}, variant), {}, {
+            return _objectSpread$8(_objectSpread$8({}, variant), {}, {
               SetImage: origOrderSet.ConfigVariants[index].SetImage,
               HQRenderScript: origOrderSet.ConfigVariants[index].HQRenderScript,
               Set2DImage: origOrderSet.ConfigVariants[index].Set2DImage,
@@ -33782,25 +33755,12 @@ var DivaSetHandler = /*#__PURE__*/function () {
               DivaUtils__default["default"].startSpanOfApm('GetSet3D und 2D Image');
               GroupType = 'PLANNING';
               plannerData = set.plannerHandler.savePlanner(set.getSetId());
-              if (!(set.getPlannerMode() == 'SirvViewer_only')) {
-                _context31.next = 10;
-                break;
-              }
-              _context31.next = 7;
-              return set.plannerHandler.getSetImageAsUrl(set.getSetId());
-            case 7:
-              _context31.t0 = _context31.sent;
-              _context31.next = 11;
-              break;
-            case 10:
-              _context31.t0 = undefined;
-            case 11:
-              setImage = _context31.t0;
+              setImage = undefined;
               urlToPlanning2D = undefined;
               alternateSetImages = undefined;
               hqRenderScript = undefined;
               if (dontGenerateImages) {
-                _context31.next = 32;
+                _context31.next = 25;
                 break;
               }
               promise3D = this.getSetImage(set, typeof window === 'undefined');
@@ -33808,22 +33768,22 @@ var DivaSetHandler = /*#__PURE__*/function () {
               if (!catalogData.dontSaveAlternativeRenderings && set.CatalogData.alternateRenderingsForSummary.length) {
                 promise3DAlternate = this.getAlternateSetImages(set);
               }
-              _context31.next = 21;
+              _context31.next = 14;
               return Promise.all([promise3D, promise2D, promise3DAlternate]);
-            case 21:
+            case 14:
               _yield$Promise$all = _context31.sent;
               _yield$Promise$all2 = _slicedToArray__default["default"](_yield$Promise$all, 3);
               setImage = _yield$Promise$all2[0];
               urlToPlanning2D = _yield$Promise$all2[1];
               alternateSetImages = _yield$Promise$all2[2];
               promiseHQRenderScript = this.getHQRenderScript(set, divaNr);
-              _context31.next = 29;
+              _context31.next = 22;
               return Promise.all([promiseHQRenderScript]);
-            case 29:
+            case 22:
               _yield$Promise$all3 = _context31.sent;
               _yield$Promise$all4 = _slicedToArray__default["default"](_yield$Promise$all3, 1);
               hqRenderScript = _yield$Promise$all4[0];
-            case 32:
+            case 25:
               LOG$8.startTransaction({
                 event: 'FillBakset',
                 eventId: 'FILL_BASKET',
@@ -33889,7 +33849,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 MetaData_locales: !((_set$basketConfigVari3 = set.basketConfigVariants) !== null && _set$basketConfigVari3 !== void 0 && _set$basketConfigVari3.length) ? set.MetaData_locales : undefined
               });
               return _context31.abrupt("return", orderSet);
-            case 39:
+            case 32:
             case "end":
               return _context31.stop();
           }
@@ -33917,7 +33877,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               catalogData = set.CatalogData;
               is3D = ['3DImage', 'BoxPlanner', 'RTViewer'].includes(set.getPlannerMode());
               if (!is3D) {
-                _context32.next = 13;
+                _context32.next = 11;
                 break;
               }
               LOG$8.startTransaction({
@@ -33933,20 +33893,9 @@ var DivaSetHandler = /*#__PURE__*/function () {
             case 9:
               setImage = _context32.sent;
               LOG$8.successTransaction('RENDER_3D_IMAGE');
-              _context32.next = 17;
-              break;
-            case 13:
-              if (!(set.getPlannerMode() == 'SirvViewer_only')) {
-                _context32.next = 17;
-                break;
-              }
-              _context32.next = 16;
-              return set.plannerHandler.getSetImageAsUrl(set.getSetId());
-            case 16:
-              setImage = _context32.sent;
-            case 17:
+            case 11:
               return _context32.abrupt("return", setImage);
-            case 18:
+            case 12:
             case "end":
               return _context32.stop();
           }
@@ -34098,77 +34047,22 @@ var DivaSetHandler = /*#__PURE__*/function () {
         Info: bbox.width + 'cm x ' + bbox.depth + 'cm'
       };
     }
-
-    /****************************Cache building***************************/
-
-    /**
-     * This function creates the cache for all images.
-     * @returns returns true if the whole set was created correctly
-     */
   }, {
-    key: "createRenderCache",
-    value: (function () {
-      var _createRenderCache = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee34(set) {
-        var _set$getAlternateRend3;
-        var timeout;
+    key: "loadProductsOfSets",
+    value: function () {
+      var _loadProductsOfSets = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee34(orderSets, involvedSetIds) {
         return _regeneratorRuntime__default["default"].wrap(function _callee34$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
             case 0:
-              set.plannerHandler.request3D(true, false, (set === null || set === void 0 || (_set$getAlternateRend3 = set.getAlternateRenderInfo()) === null || _set$getAlternateRend3 === void 0 ? void 0 : _set$getAlternateRend3.length) > 0, undefined, true, {
-                width: 100,
-                height: 100,
-                isFullscreenRendering: false,
-                planner3DGridEnabled: false,
-                mediaServiceSaveMode: 'PERMANENT',
-                doShow3DDimensionLines: false
-              });
-              timeout = 50;
-            case 2:
-              if (!set.plannerHandler.checkIsWaitingForRendering()) {
-                _context36.next = 10;
-                break;
-              }
-              timeout--;
-              if (!(timeout == 0)) {
-                _context36.next = 6;
-                break;
-              }
-              return _context36.abrupt("return", false);
-            case 6:
-              _context36.next = 8;
-              return DivaUtils__default["default"].Sleep(300);
-            case 8:
               _context36.next = 2;
-              break;
-            case 10:
-              return _context36.abrupt("return", true);
-            case 11:
-            case "end":
-              return _context36.stop();
-          }
-        }, _callee34);
-      }));
-      function createRenderCache(_x113) {
-        return _createRenderCache.apply(this, arguments);
-      }
-      return createRenderCache;
-    }())
-  }, {
-    key: "loadProductsOfSets",
-    value: function () {
-      var _loadProductsOfSets = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee35(orderSets, involvedSetIds) {
-        return _regeneratorRuntime__default["default"].wrap(function _callee35$(_context37) {
-          while (1) switch (_context37.prev = _context37.next) {
-            case 0:
-              _context37.next = 2;
               return productHandlerInstance.loadProductsOfSets(orderSets, involvedSetIds);
             case 2:
             case "end":
-              return _context37.stop();
+              return _context36.stop();
           }
-        }, _callee35);
+        }, _callee34);
       }));
-      function loadProductsOfSets(_x114, _x115) {
+      function loadProductsOfSets(_x113, _x114) {
         return _loadProductsOfSets.apply(this, arguments);
       }
       return loadProductsOfSets;
@@ -34205,28 +34099,28 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "addOrderSetArticlesToExistingSet",
     value: function () {
-      var _addOrderSetArticlesToExistingSet = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee36(set, orderSet, lastSetToInitialize) {
-        return _regeneratorRuntime__default["default"].wrap(function _callee36$(_context38) {
-          while (1) switch (_context38.prev = _context38.next) {
+      var _addOrderSetArticlesToExistingSet = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee35(set, orderSet, lastSetToInitialize) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee35$(_context37) {
+          while (1) switch (_context37.prev = _context37.next) {
             case 0:
               //TODO: GLOBAL STUFF
               //this.updateActSet(set);
               orderSet.changeBasketIds();
-              _context38.next = 3;
+              _context37.next = 3;
               return this.initOrderLineArticles(set, orderSet);
             case 3:
-              _context38.next = 5;
+              _context37.next = 5;
               return set.plannerHandler.extendSet(set, orderSet.SetPlanData, lastSetToInitialize);
             case 5:
-              _context38.next = 7;
+              _context37.next = 7;
               return productHandlerInstance.updateProducts(set, 'onAdd');
             case 7:
             case "end":
-              return _context38.stop();
+              return _context37.stop();
           }
-        }, _callee36, this);
+        }, _callee35, this);
       }));
-      function addOrderSetArticlesToExistingSet(_x116, _x117, _x118) {
+      function addOrderSetArticlesToExistingSet(_x115, _x116, _x117) {
         return _addOrderSetArticlesToExistingSet.apply(this, arguments);
       }
       return addOrderSetArticlesToExistingSet;
@@ -34243,486 +34137,9 @@ var DivaSetHandler = /*#__PURE__*/function () {
 }();
 var setHandlerInstance = new DivaSetHandler();
 
-//This class saves all informations needed for a rendering
+function ownKeys$7(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$7(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$7(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$7(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$7 = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
-var Rendering = /*#__PURE__*/function () {
-  function Rendering(planningHash, renderHash, viewPointName, width, height, isFullscreenRendering, hasDimensionLines, plannerMeasureDigits, hasLayerMask, hasStaticBG, mediaServiceSaveMode, alternateRenderingsExist, alternateRendererInfo) {
-    _classCallCheck__default["default"](this, Rendering);
-    _defineProperty__default["default"](this, "planningHash", void 0);
-    _defineProperty__default["default"](this, "renderHash", void 0);
-    _defineProperty__default["default"](this, "creationTime", void 0);
-    _defineProperty__default["default"](this, "renderWidth", void 0);
-    _defineProperty__default["default"](this, "renderHeight", void 0);
-    _defineProperty__default["default"](this, "uiInfo", void 0);
-    _defineProperty__default["default"](this, "urlToSavedRendering", void 0);
-    // viewPoint: string;
-    //   private posInfo: any;
-    //private doStream: boolean;        Streaming over 3D Host is deprected
-    //private byteChunkArr: any;
-    //private byteChunkLayerMaskArr: any;
-    _defineProperty__default["default"](this, "hasLayerMask", void 0);
-    //private imgBytes: any;
-    _defineProperty__default["default"](this, "imgForSrc", void 0);
-    _defineProperty__default["default"](this, "HQRenderingUrl", void 0);
-    _defineProperty__default["default"](this, "SpinUrl", void 0);
-    _defineProperty__default["default"](this, "ArUrl", void 0);
-    _defineProperty__default["default"](this, "layerMaskAsBase64", void 0);
-    _defineProperty__default["default"](this, "layerMaskThreeTexture", void 0);
-    _defineProperty__default["default"](this, "isFullscreenRendering", void 0);
-    _defineProperty__default["default"](this, "hasStaticBackground", void 0);
-    _defineProperty__default["default"](this, "hasDimensionLines", void 0);
-    _defineProperty__default["default"](this, "plannerMeasureDigits", void 0);
-    _defineProperty__default["default"](this, "alternateRendererInfo", void 0);
-    _defineProperty__default["default"](this, "isAlternateRendering", void 0);
-    _defineProperty__default["default"](this, "alternateRenderingsExist", void 0);
-    _defineProperty__default["default"](this, "mediaServiceSaveMode", void 0);
-    _defineProperty__default["default"](this, "isLoadedFromCache", void 0);
-    _defineProperty__default["default"](this, "catalogData", void 0);
-    //this.doStream = false;
-    this.planningHash = planningHash;
-    this.renderHash = renderHash;
-    this.renderWidth = width;
-    this.renderHeight = height;
-    this.uiInfo = '';
-    this.imgForSrc = '';
-    this.layerMaskAsBase64 = '';
-    this.isFullscreenRendering = isFullscreenRendering;
-    this.hasDimensionLines = hasDimensionLines;
-    this.plannerMeasureDigits = plannerMeasureDigits;
-    this.hasLayerMask = hasLayerMask;
-    this.creationTime = new Date();
-    this.layerMaskThreeTexture = undefined;
-    this.hasStaticBackground = hasStaticBG;
-    this.mediaServiceSaveMode = mediaServiceSaveMode;
-    this.urlToSavedRendering = '';
-    this.catalogData = {
-      catalogCodex: '',
-      catalogGUID: ''
-    };
-    this.isLoadedFromCache = false;
-    this.HQRenderingUrl = '';
-    this.SpinUrl = '';
-    this.ArUrl = '';
-    if (alternateRendererInfo != undefined) this.isAlternateRendering = true;else this.isAlternateRendering = false;
-    this.alternateRendererInfo = alternateRendererInfo;
-    this.alternateRenderingsExist = !!alternateRenderingsExist;
-  }
-  return _createClass__default["default"](Rendering, [{
-    key: "clone",
-    value: function clone(rendering) {
-      this.planningHash = rendering.planningHash;
-      this.renderHash = rendering.renderHash;
-      this.creationTime = rendering.creationTime;
-      this.renderWidth = rendering.renderWidth;
-      this.renderHeight = rendering.renderHeight;
-      this.uiInfo = rendering.uiInfo;
-      this.urlToSavedRendering = rendering.urlToSavedRendering;
-      this.hasLayerMask = rendering.hasLayerMask;
-      this.imgForSrc = rendering.imgForSrc;
-      this.HQRenderingUrl = rendering.HQRenderingUrl;
-      this.layerMaskAsBase64 = rendering.layerMaskAsBase64;
-      this.layerMaskThreeTexture = rendering.layerMaskThreeTexture;
-      this.isFullscreenRendering = rendering.isFullscreenRendering;
-      this.hasStaticBackground = rendering.hasStaticBackground;
-      this.hasDimensionLines = rendering.hasDimensionLines;
-      this.plannerMeasureDigits = rendering.plannerMeasureDigits;
-      this.alternateRendererInfo = rendering.alternateRendererInfo;
-      this.isAlternateRendering = rendering.isAlternateRendering;
-      this.alternateRenderingsExist = rendering.alternateRenderingsExist;
-      this.mediaServiceSaveMode = rendering.mediaServiceSaveMode;
-      this.isLoadedFromCache = rendering.isLoadedFromCache;
-      this.catalogData = rendering.catalogData;
-    }
-  }, {
-    key: "getAllDockingPoints",
-    value: function getAllDockingPoints(setId, elementId) {
-      if (this.uiInfo[setId] == undefined && this.uiInfo['S1'] != undefined) {
-        return this.uiInfo['S1']['E' + elementId]['DP'];
-      }
-      return this.uiInfo[setId]['E' + elementId]['DP'];
-    }
-  }, {
-    key: "getHasStaticBackground",
-    value: function getHasStaticBackground() {
-      return this.hasStaticBackground;
-    }
-  }, {
-    key: "getIsFullscreenRendering",
-    value: function getIsFullscreenRendering() {
-      return this.isFullscreenRendering;
-    }
-  }, {
-    key: "setIsFullscreenRendering",
-    value: function setIsFullscreenRendering(isFullscreen) {
-      this.isFullscreenRendering = isFullscreen;
-    }
-  }, {
-    key: "getHasDimensionLines",
-    value: function getHasDimensionLines() {
-      return this.hasDimensionLines;
-    }
-  }, {
-    key: "getPlannerMeasureDigits",
-    value: function getPlannerMeasureDigits() {
-      return this.plannerMeasureDigits;
-    }
-  }, {
-    key: "getIsAlternateRendering",
-    value: function getIsAlternateRendering() {
-      return this.isAlternateRendering;
-    }
-  }, {
-    key: "getAlternateRenderInfo",
-    value: function getAlternateRenderInfo() {
-      return this.alternateRendererInfo;
-    }
-  }, {
-    key: "getAlternateRenderingsExist",
-    value: function getAlternateRenderingsExist() {
-      return this.alternateRenderingsExist;
-    }
-  }, {
-    key: "hasUIInfosOfElement",
-    value: function hasUIInfosOfElement(setId, elementid) {
-      if (this.uiInfo[setId] == undefined && this.uiInfo['S1'] != undefined) {
-        return this.uiInfo['S1']['E' + elementid] != undefined;
-      } else {
-        return this.uiInfo[setId] != undefined && this.uiInfo[setId]['E' + elementid] != undefined;
-      }
-    }
-  }, {
-    key: "getOutlinePolygonForSVG",
-    value: function getOutlinePolygonForSVG(setId, elementId, viewPortSize) {
-      var poly = [];
-      var avgCamDist = 0;
-      if (this.uiInfo[setId] == undefined && this.uiInfo['S1'] != undefined) {
-        poly = this.uiInfo['S1']['E' + elementId]['POLYOUTLINE'];
-        avgCamDist = this.uiInfo['S1']['E' + elementId]['AVGCAMDIST'];
-      } else if (this.uiInfo[setId]) {
-        poly = this.uiInfo[setId]['E' + elementId]['POLYOUTLINE'];
-        avgCamDist = this.uiInfo[setId]['E' + elementId]['AVGCAMDIST'];
-      } else {
-        poly = this.uiInfo['E' + elementId]['POLYOUTLINE'];
-        avgCamDist = this.uiInfo['E' + elementId]['AVGCAMDIST'];
-      }
-      if (!poly) return undefined;
-      var points = '';
-      for (var i = 0; i < poly.length; i++) {
-        points += Math.round(poly[i].x * 0.01 * viewPortSize.imgWidth) + ',' + Math.round((100 - poly[i].y) * 0.01 * viewPortSize.imgHeight) + ' ';
-      }
-      return {
-        points: points,
-        avgCamDist: avgCamDist
-      };
-    }
-
-    //Left/Right_Bottom/Top_Back/Front
-  }, {
-    key: "getRightTopBackUIPos",
-    value: function getRightTopBackUIPos(setId, elemId) {
-      var bbox = null;
-      if (this.uiInfo[setId] == undefined && this.uiInfo['S1'] != undefined) {
-        bbox = this.uiInfo['S1']['E' + elemId]['BBOX3D'];
-      } else if (this.uiInfo[setId]) bbox = this.uiInfo[setId]['E' + elemId]['BBOX3D'];else bbox = this.uiInfo['E' + elemId]['BBOX3D'];
-      if (!bbox) return;
-      for (var i = 0; i < bbox.length; i++) {
-        if (bbox[i].C == 'RTB') {
-          return bbox[i];
-        }
-      }
-    }
-    //Left/Right_Bottom/Top_Back/Front
-  }, {
-    key: "getLeftTopBackUIPos",
-    value: function getLeftTopBackUIPos(setId, elemId) {
-      var bbox = null;
-      if (this.uiInfo[setId] == undefined && this.uiInfo['S1'] != undefined) {
-        bbox = this.uiInfo['S1']['E' + elemId]['BBOX3D'];
-      } else if (this.uiInfo[setId]) bbox = this.uiInfo[setId]['E' + elemId]['BBOX3D'];else bbox = this.uiInfo['E' + elemId]['BBOX3D'];
-      if (!bbox) return;
-      for (var i = 0; i < bbox.length; i++) {
-        if (bbox[i].C == 'LTB') {
-          return bbox[i];
-        }
-      }
-    }
-    //Left/Right_Bottom/Top_Back/Front
-    //elementId has to be a string because when working with accs in shelf planner an element id is the combination of parentElementId.rasterHeight.gridId
-  }, {
-    key: "getLeftBottomFrontUIPos",
-    value: function getLeftBottomFrontUIPos(setId, elemId) {
-      var bbox = null;
-      if (this.uiInfo == '') return null;
-      if (this.uiInfo[setId] == undefined && this.uiInfo['S1'] != undefined) {
-        if (!this.uiInfo['S1']['E' + elemId]) return;
-        bbox = this.uiInfo['S1']['E' + elemId]['BBOX3D'];
-      } else if (this.uiInfo[setId]) {
-        if (!this.uiInfo[setId]['E' + elemId]) return;
-        bbox = this.uiInfo[setId]['E' + elemId]['BBOX3D'];
-      } else {
-        var _this$uiInfo;
-        bbox = (_this$uiInfo = this.uiInfo['E' + elemId]) === null || _this$uiInfo === void 0 ? void 0 : _this$uiInfo['BBOX3D'];
-      }
-      if (!bbox) return;
-      for (var i = 0; i < bbox.length; i++) {
-        if (bbox[i].C == 'LBF') {
-          return bbox[i];
-        }
-      }
-    }
-  }, {
-    key: "getBoxPlannerCornerUIPos",
-    value: function getBoxPlannerCornerUIPos(setId, elemId, corner) {
-      var boxPlan = [];
-      if (this.uiInfo[setId] == undefined && this.uiInfo['S1'] != undefined) {
-        boxPlan = this.uiInfo['S1']['E' + elemId]['BoxPlan'];
-      } else if (this.uiInfo[setId]) boxPlan = this.uiInfo[setId]['E' + elemId]['BoxPlan'];else boxPlan = this.uiInfo['E' + elemId]['BoxPlan'];
-      for (var i = 0; i < boxPlan.length; i++) {
-        if (!boxPlan[i].N || !boxPlan[i].x || !boxPlan[i].y) continue;
-        switch (corner) {
-          case 'TOPCENTER':
-            if (boxPlan[i].N == 'TC') {
-              return new Vector2(Number(boxPlan[i].x), Number(boxPlan[i].y));
-            }
-            break;
-          case 'LEFTCENTER':
-            if (boxPlan[i].N == 'LC') {
-              return new Vector2(Number(boxPlan[i].x), Number(boxPlan[i].y));
-            }
-            break;
-          case 'RIGHTCENTER':
-            if (boxPlan[i].N == 'RC') {
-              return new Vector2(Number(boxPlan[i].x), Number(boxPlan[i].y));
-            }
-            break;
-          case 'RIGHTTOPFRONT':
-            if (boxPlan[i].N == 'RTF') {
-              return new Vector2(Number(boxPlan[i].x), Number(boxPlan[i].y));
-            }
-            break;
-        }
-      }
-      return undefined;
-    }
-  }, {
-    key: "getUnityCamPos",
-    value: function getUnityCamPos() {
-      return new Vector3(parseFloat(this.uiInfo['CAM']['X']), parseFloat(this.uiInfo['CAM']['Y']), parseFloat(this.uiInfo['CAM']['Z']));
-    }
-  }, {
-    key: "getUnityCamRot",
-    value: function getUnityCamRot() {
-      //  return new Vector3(parseFloat(this.uiInfo["CAM"]["RX"]), parseFloat(this.uiInfo["CAM"]["RY"]), parseFloat(this.uiInfo["CAM"]["RZ"]));
-      var quatVec = new Vector4(parseFloat(this.uiInfo['CAM']['QX']), parseFloat(this.uiInfo['CAM']['QY']), parseFloat(this.uiInfo['CAM']['QZ']), parseFloat(this.uiInfo['CAM']['QW']));
-      return quatVec;
-    }
-  }, {
-    key: "getUnityFOV",
-    value: function getUnityFOV() {
-      return parseFloat(this.uiInfo['CAM']['FOV']);
-    }
-
-    //elementId has to be a string because when working with accs in shelf planner an element id is the combination of parentElementId.rasterHeight.gridId
-    //It returns the distance of an element to the ground in cm
-  }, {
-    key: "getDistanceToGround",
-    value: function getDistanceToGround(setId, elementId) {
-      setId = this.uiInfo[setId] == undefined && this.uiInfo['S1'] != undefined ? 'S1' : setId;
-      if (this.uiInfo[setId] && this.uiInfo[setId]['E' + elementId] && this.uiInfo[setId]['E' + elementId]['DIM'] && this.uiInfo[setId]['E' + elementId]['DIM']['dfg']) {
-        return this.uiInfo[setId]['E' + elementId]['DIM']['dfg'] * 100;
-      }
-      return -1;
-    }
-  }, {
-    key: "addUIInfo",
-    value: function addUIInfo(uiInfo) {
-      try {
-        this.uiInfo = JSON.parse(uiInfo);
-        //this.calcOutlinePolygon();
-      } catch (error) {
-        LOG$7.error(new DivaUtils.DivaError('Error when parsing UI Info in rendering. Corrupt UIInfo: ' + uiInfo, {
-          code: 'WC_0013',
-          cause: error
-        }));
-      }
-    }
-
-    /**
-     * This function adds a blobImage to the rendering .
-     * It is parsed to a base64 image.
-     * @param blob  The blob contains the image
-     * @param isLayerMask   True if the Image is the layer mask image
-     */
-  }, {
-    key: "addImgAsBlob",
-    value: function addImgAsBlob(buffer, isLayerMask) {
-      if (isLayerMask) this.layerMaskAsBase64 = buffer.toString('base64');else this.imgForSrc = 'data:image/jpeg;base64,' + buffer.toString('base64');
-    }
-
-    //Write $("img.einBild").src
-  }, {
-    key: "getHQRenderingURL",
-    value: function getHQRenderingURL() {
-      return this.HQRenderingUrl;
-    }
-  }, {
-    key: "getArURl",
-    value: function getArURl() {
-      return this.ArUrl;
-    }
-  }, {
-    key: "getSpinURL",
-    value: function getSpinURL() {
-      return this.SpinUrl;
-    }
-  }, {
-    key: "getImageForSrc",
-    value: function getImageForSrc() {
-      return this.imgForSrc;
-    }
-  }, {
-    key: "containsSirvUrl",
-    value: function containsSirvUrl() {
-      return this.HQRenderingUrl != '';
-    }
-  }, {
-    key: "setArUrl",
-    value: function setArUrl(url) {
-      this.ArUrl = url;
-    }
-  }, {
-    key: "setSpinUrl",
-    value: function setSpinUrl(url) {
-      this.SpinUrl = url;
-    }
-  }, {
-    key: "setHQRenderingUrl",
-    value: function setHQRenderingUrl(url, useSirvViewer) {
-      if (useSirvViewer) {
-        this.HQRenderingUrl = url;
-      } else {
-        this.imgForSrc = url;
-      }
-    }
-
-    //*****************************************GETTER und SETTER********************************************** */
-  }, {
-    key: "CatalogCodex",
-    get: function get() {
-      return this.catalogData.catalogCodex;
-    },
-    set: function set(val) {
-      this.catalogData.catalogCodex = val;
-    }
-  }, {
-    key: "CatalogGUID",
-    get: function get() {
-      return this.catalogData.catalogGUID;
-    },
-    set: function set(val) {
-      this.catalogData.catalogGUID = val;
-    }
-  }, {
-    key: "IsLoadedFromCache",
-    get: function get() {
-      return this.isLoadedFromCache;
-    },
-    set: function set(val) {
-      this.isLoadedFromCache = val;
-    }
-  }, {
-    key: "PlanningHash",
-    get: function get() {
-      return this.planningHash;
-    }
-  }, {
-    key: "RenderHash",
-    get: function get() {
-      return this.renderHash;
-    }
-  }, {
-    key: "UrlToSavedRendering",
-    get: function get() {
-      return this.urlToSavedRendering;
-    },
-    set: function set(url) {
-      this.urlToSavedRendering = url;
-    }
-  }, {
-    key: "HasLayerMask",
-    get: function get() {
-      return this.hasLayerMask;
-    },
-    set: function set(hasLayerMask) {
-      this.hasLayerMask = hasLayerMask;
-    }
-  }, {
-    key: "RenderWidth",
-    get: function get() {
-      return this.renderWidth;
-    }
-  }, {
-    key: "RenderHeight",
-    get: function get() {
-      return this.renderHeight;
-    }
-  }, {
-    key: "getHasLayerMask",
-    value: function getHasLayerMask() {
-      return this.hasLayerMask;
-    }
-  }, {
-    key: "getLayerMaskForSrc",
-    value: function getLayerMaskForSrc() {
-      return this.layerMaskAsBase64;
-    }
-  }, {
-    key: "HasLayerMaskThreeTexture",
-    get: function get() {
-      return this.layerMaskThreeTexture != undefined;
-    }
-  }, {
-    key: "LayerMaskThreeTexture",
-    get: function get() {
-      return this.layerMaskThreeTexture;
-    },
-    set: function set(tex) {
-      this.layerMaskThreeTexture = tex;
-    }
-    /*
-          get DoStream() {
-              return this.doStream;
-          }
-      */
-  }, {
-    key: "AllImgLoaded",
-    get: function get() {
-      return (this.imgForSrc != '' || this.HQRenderingUrl != '') && (!this.hasLayerMask || this.layerMaskAsBase64 != '');
-    }
-  }, {
-    key: "UiInfoLoaded",
-    get: function get() {
-      return this.uiInfo != '';
-    }
-  }, {
-    key: "CreationTime",
-    get: function get() {
-      return this.creationTime.getTime();
-    }
-  }, {
-    key: "MediaServiceSaveMode",
-    get: function get() {
-      return this.mediaServiceSaveMode;
-    },
-    set: function set(mode) {
-      this.mediaServiceSaveMode = mode;
-    }
-  }]);
-}();
-
-function ownKeys$8(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$8(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$8(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$8(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var LOG$6 = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var DivaBasketHandler = /*#__PURE__*/function () {
   function DivaBasketHandler(plannerConfig) {
     var _this = this,
@@ -34756,7 +34173,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     this.assignNewDivaNr = !!this.plannerConfig.assignNewDivaNr;
     this._handler = plannerConfig.handler;
     if (this.plannerConfig.divaNr == undefined && this.plannerConfig.basketData == undefined && this.plannerConfig.catalogCodex == undefined && this.plannerConfig.productId == undefined && this.plannerConfig.customProductId == undefined && this.plannerConfig.returnTo != 'TEST_CONFIGURATORLOGIC' && !((_this$plannerConfig$s = this.plannerConfig.settings) !== null && _this$plannerConfig$s !== void 0 && (_this$plannerConfig$s = _this$plannerConfig$s.ViewConfig) !== null && _this$plannerConfig$s !== void 0 && (_this$plannerConfig$s = _this$plannerConfig$s.plannerType) !== null && _this$plannerConfig$s !== void 0 && _this$plannerConfig$s.includes('PRODUCTS') || (_this$plannerConfig$s2 = this.plannerConfig.settings) !== null && _this$plannerConfig$s2 !== void 0 && (_this$plannerConfig$s2 = _this$plannerConfig$s2.ViewConfig) !== null && _this$plannerConfig$s2 !== void 0 && (_this$plannerConfig$s2 = _this$plannerConfig$s2.plannerType) !== null && _this$plannerConfig$s2 !== void 0 && _this$plannerConfig$s2.includes('PROMOTED'))) {
-      LOG$6.error(new DivaUtils.DivaError('Keine Öffnungsparameter', {
+      LOG$7.error(new DivaUtils.DivaError('Keine Öffnungsparameter', {
         code: 'WC_0003'
       }));
     }
@@ -34766,7 +34183,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     }
     if ((_this$plannerConfig$a = this.plannerConfig.apiConfig) !== null && _this$plannerConfig$a !== void 0 && _this$plannerConfig$a.basketService) {
       var _this$plannerConfig$a2, _this$plannerConfig$a3;
-      this._basketHandler = new BasketHandler__default["default"](LOG$6, (_this$plannerConfig$a2 = this.plannerConfig.apiConfig) === null || _this$plannerConfig$a2 === void 0 ? void 0 : _this$plannerConfig$a2.basketService, (_this$plannerConfig$a3 = this.plannerConfig.apiConfig) === null || _this$plannerConfig$a3 === void 0 ? void 0 : _this$plannerConfig$a3.api2["default"]);
+      this._basketHandler = new BasketHandler__default["default"](LOG$7, (_this$plannerConfig$a2 = this.plannerConfig.apiConfig) === null || _this$plannerConfig$a2 === void 0 ? void 0 : _this$plannerConfig$a2.basketService, (_this$plannerConfig$a3 = this.plannerConfig.apiConfig) === null || _this$plannerConfig$a3 === void 0 ? void 0 : _this$plannerConfig$a3.api2["default"]);
     }
   }
   return _createClass__default["default"](DivaBasketHandler, [{
@@ -34819,13 +34236,13 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     value: function () {
       var _initializeBasket = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(api) {
         var _this$plannerConfig$s3, _this$plannerConfig$s5, _api$getPlannerType, _this$plannerConfig$r;
-        var returnSuccessfully, divaNr, i, os, _params$customFieldsT, params, _this$plannerConfig$h, _this$plannerConfig$c, _this$plannerConfig$c2, _result$data$, result, _result$data$2, _this$plannerConfig$s4, _this$plannerConfig$a4, _api$getI18n, _api$getI18n2, successfully;
+        var returnSuccessfully, divaNr, i, os, _params$customFieldsT, params, _this$plannerConfig$h, _this$plannerConfig$c, _this$plannerConfig$c2, _this$plannerConfig$c3, _result$data$, result, _result$data$2, _this$plannerConfig$s4, _this$plannerConfig$a4, _api$getI18n, _api$getI18n2, successfully;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               this.basketWasSavedWithCurrentDocVersion = false;
               this.startProductId = undefined;
-              LOG$6.debug("Basket initialising. initObject is: '", this.plannerConfig, "' divaNr to load is: '" + this.loadDivaNr + "'");
+              LOG$7.debug("Basket initialising. initObject is: '", this.plannerConfig, "' divaNr to load is: '" + this.loadDivaNr + "'");
               if (this.ignoreInitObjectWhenInitializing) {
                 _context.next = 34;
                 break;
@@ -34952,9 +34369,9 @@ var DivaBasketHandler = /*#__PURE__*/function () {
                 op: 'eq',
                 value: (_this$plannerConfig$c2 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c2 === void 0 ? void 0 : _this$plannerConfig$c2._id
               }, {
-                id: 'available',
+                id: 'availableForOrganizations',
                 op: 'eq',
-                value: true
+                value: (_this$plannerConfig$c3 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c3 === void 0 ? void 0 : _this$plannerConfig$c3._id
               }]);
             case 60:
               result = _context.sent;
@@ -34991,7 +34408,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
                 title: (_api$getI18n = api.getI18n()) === null || _api$getI18n === void 0 ? void 0 : _api$getI18n.t('configurator.no_startproduct_defined_title'),
                 text: (_api$getI18n2 = api.getI18n()) === null || _api$getI18n2 === void 0 ? void 0 : _api$getI18n2.t('configurator.no_startproduct_defined_text')
               });
-              LOG$6.error(new DivaUtils.DivaError('it is configured to initialize the startProductForOrganizations if there are no other parameters. But no available product was found with organizationId: "' + this.plannerConfig.currentOrganization._id + '" in the field: "startProductForOrganizations"!'));
+              LOG$7.error(new DivaUtils.DivaError('it is configured to initialize the startProductForOrganizations if there are no other parameters. But no available product was found with organizationId: "' + this.plannerConfig.currentOrganization._id + '" in the field: "startProductForOrganizations"!'));
             case 77:
               _context.next = 83;
               break;
@@ -35139,12 +34556,12 @@ var DivaBasketHandler = /*#__PURE__*/function () {
             case 0:
               basketFromAPI = (_dataFromApi$basket = dataFromApi.basket) !== null && _dataFromApi$basket !== void 0 ? _dataFromApi$basket : dataFromApi.Basket; //evaluateRopoEffect(basketFromAPI,);
               if (origProductId) basketFromAPI.OrigProductId = origProductId;
-              basket = _objectSpread$8({}, basketFromAPI);
+              basket = _objectSpread$7({}, basketFromAPI);
               if (!basketFromAPI) {
-                _context5.next = 50;
+                _context5.next = 48;
                 break;
               }
-              LOG$6.debug('divaNr: ' + divaNr + ' was loaded successfully from server!');
+              LOG$7.debug('divaNr: ' + divaNr + ' was loaded successfully from server!');
               if (basketFromAPI.OrigDivaNr) {
                 this.origConfiguration.originDivaNr = basketFromAPI.OrigDivaNr;
               } else if (basketFromAPI.OrigCatalogCodex) {
@@ -35238,20 +34655,14 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               this.baskets[newDivaNr] = new basketModel.BasketData(basket);
               this.baskets[newDivaNr].clearRenderData();
               if (!keepOldDivaNr) this.divaNr = newDivaNr;
-              _context5.next = 46;
-              return DivaUtils__default["default"].initCache({
-                accountGuid: this.baskets[newDivaNr].OrderSets[0].AccountGUID,
-                catalogCodex: this.baskets[newDivaNr].OrderSets[0].CatalogCodex
-              });
-            case 46:
               if (this.assignNewDivaNr) {
                 this.baskets[newDivaNr].clearBasketClientData();
                 this.baskets[newDivaNr].ProductSetName = '';
               }
               return _context5.abrupt("return", true);
-            case 50:
+            case 48:
               return _context5.abrupt("return", false);
-            case 51:
+            case 49:
             case "end":
               return _context5.stop();
           }
@@ -35285,7 +34696,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     key: "loadBasketByCatalogCodex",
     value: function () {
       var _loadBasketByCatalogCodex = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee6(api) {
-        var _this$plannerConfig$s8, _this$actBasket$Order, _this$actBasket$Order2;
+        var _this$plannerConfig$s8;
         var newBasket, _this$baskets$this$di;
         return _regeneratorRuntime__default["default"].wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
@@ -35296,37 +34707,23 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               if (this.plannerConfig.articleCodexes) {
                 this.origConfiguration.originArticleCodexes = this.plannerConfig.articleCodexes;
               }
-              if (!(DivaUtils__default["default"].CacheIsEnabled && DivaUtils__default["default"].CacheAccountGuid)) {
+              if (!((_this$plannerConfig$s8 = this.plannerConfig.startDivaNr) !== null && _this$plannerConfig$s8 !== void 0)) {
                 _context6.next = 6;
                 break;
               }
-              this.plannerConfig.accountGuid = DivaUtils__default["default"].CacheAccountGuid;
-              _context6.next = 8;
+              _context6.t0 = _this$plannerConfig$s8;
+              _context6.next = 9;
               break;
             case 6:
               _context6.next = 8;
-              return DivaUtils__default["default"].initCache({
-                accountGuid: this.plannerConfig.accountGuid,
-                catalogCodex: this.plannerConfig.catalogCodex
-              });
-            case 8:
-              if (!((_this$plannerConfig$s8 = this.plannerConfig.startDivaNr) !== null && _this$plannerConfig$s8 !== void 0)) {
-                _context6.next = 12;
-                break;
-              }
-              _context6.t0 = _this$plannerConfig$s8;
-              _context6.next = 15;
-              break;
-            case 12:
-              _context6.next = 14;
               return this.createNewDivaNr(api);
-            case 14:
+            case 8:
               _context6.t0 = _context6.sent;
-            case 15:
+            case 9:
               this.divaNr = _context6.t0;
-              _context6.next = 18;
+              _context6.next = 12;
               return this.createNewBasket(api, this.plannerConfig, this.divaNr, api.getLanguage());
-            case 18:
+            case 12:
               newBasket = _context6.sent;
               if (!this.plannerConfig.basketData) {
                 this.baskets[this.divaNr] = newBasket;
@@ -35343,14 +34740,8 @@ var DivaBasketHandler = /*#__PURE__*/function () {
                 if (this.baskets[this.divaNr].SetPlannerInfos) ;
               }
               this.specificSetIdToLoad = this.plannerConfig.setId;
-              _context6.next = 23;
-              return DivaUtils__default["default"].initCache({
-                accountGuid: (_this$actBasket$Order = this.actBasket.OrderSets[0]) === null || _this$actBasket$Order === void 0 ? void 0 : _this$actBasket$Order.AccountGUID,
-                catalogCodex: (_this$actBasket$Order2 = this.actBasket.OrderSets[0]) === null || _this$actBasket$Order2 === void 0 ? void 0 : _this$actBasket$Order2.CatalogCodex
-              });
-            case 23:
               return _context6.abrupt("return", true);
-            case 24:
+            case 16:
             case "end":
               return _context6.stop();
           }
@@ -35381,7 +34772,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
             case 9:
               _context7.prev = 9;
               _context7.t0 = _context7["catch"](0);
-              LOG$6.error(new DivaUtils.DivaError('DivaNr konnte in der Datenbank nicht gefunden werden', {
+              LOG$7.error(new DivaUtils.DivaError('DivaNr konnte in der Datenbank nicht gefunden werden', {
                 code: 'WC_0004',
                 custom: {
                   divaNr: divaNr
@@ -35417,7 +34808,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
                 _context8.next = 8;
                 break;
               }
-              LOG$6.error(new DivaUtils.DivaError('ProductId konnte in der Datenbank nicht gefunden werden', {
+              LOG$7.error(new DivaUtils.DivaError('ProductId konnte in der Datenbank nicht gefunden werden', {
                 code: 'WC_0005',
                 custom: {
                   productId: productId
@@ -35501,7 +34892,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
                 _context10.next = 6;
                 break;
               }
-              LOG$6.error(new DivaUtils.DivaError('ProductId konnte in der Datenbank nicht gefunden werden', {
+              LOG$7.error(new DivaUtils.DivaError('ProductId konnte in der Datenbank nicht gefunden werden', {
                 code: 'WC_0005',
                 custom: {
                   productId: productId
@@ -35538,8 +34929,8 @@ var DivaBasketHandler = /*#__PURE__*/function () {
                 CatalogGUID: initObject.catalogGuid,
                 AccountGUID: initObject.accountGuid,
                 Favorites: new basketModel.Favorites()
-              }); //dont get session if cache is active (SuS)
-              if (!(initObject.accountGuid && !orderSet.AccountSessionGUID && !DivaUtils__default["default"].cacheIsReady)) {
+              });
+              if (!(initObject.accountGuid && !orderSet.AccountSessionGUID)) {
                 _context11.next = 5;
                 break;
               }
@@ -35588,12 +34979,12 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     key: "saveToBasket",
     value: function () {
       var _saveToBasket = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee12(api, actBasket, returnTo) {
-        var _this$plannerConfig$c3, _this$_basketHandler, _api$getJwt;
+        var _this$plannerConfig$c4, _this$_basketHandler, _api$getJwt;
         var response;
         return _regeneratorRuntime__default["default"].wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              LOG$6.startTransaction({
+              LOG$7.startTransaction({
                 event: 'SaveBasketOnAPI',
                 eventId: 'SAVE_BASKET_ON_API',
                 message: 'Save Basket on API'
@@ -35607,7 +34998,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return DivaUtils__default["default"].updateBasketOrgInfo(actBasket, this.plannerConfig.currentOrganization, this.plannerConfig.currentUser, this.plannerConfig.settings.keepSalesPersonDataInBasket);
             case 8:
               actBasket.UserLanguage = api.getLanguage();
-              actBasket.PrintRetailLogo = (_this$plannerConfig$c3 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c3 === void 0 ? void 0 : _this$plannerConfig$c3.logoUrl;
+              actBasket.PrintRetailLogo = (_this$plannerConfig$c4 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c4 === void 0 ? void 0 : _this$plannerConfig$c4.logoUrl;
               _context12.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,
@@ -35632,7 +35023,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               }
               return _context12.abrupt("return", response);
             case 19:
-              LOG$6.successTransaction('saveBasketOnAPI');
+              LOG$7.successTransaction('saveBasketOnAPI');
               return _context12.abrupt("return", response === null || response === void 0 ? void 0 : response._id);
             case 21:
             case "end":
@@ -35738,7 +35129,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
         if (_loop2()) continue;
       }
       var variantValues = article.VariantValuesParentOption;
-      var data = _objectSpread$8(_objectSpread$8({}, this.actBasket), {}, {
+      var data = _objectSpread$7(_objectSpread$7({}, this.actBasket), {}, {
         changedValues: changedValues,
         variantValues: variantValues,
         isInit: isInit,
@@ -35763,7 +35154,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context13.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-0447de84.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-73a6a1bb.js'); });
             case 5:
               _yield$import = _context13.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -35771,7 +35162,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context13.abrupt("break", 33);
             case 9:
               _context13.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-32bb295f.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-495734b8.js'); });
             case 11:
               _yield$import2 = _context13.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -35779,7 +35170,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context13.abrupt("break", 33);
             case 15:
               _context13.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-e7f5bfb9.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-4254c183.js'); });
             case 17:
               _yield$import3 = _context13.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -35787,7 +35178,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context13.abrupt("break", 33);
             case 21:
               _context13.next = 23;
-              return Promise.resolve().then(function () { return require('./ProductBasketHandler-144386d9.js'); });
+              return Promise.resolve().then(function () { return require('./ProductBasketHandler-fca32045.js'); });
             case 23:
               _yield$import4 = _context13.sent;
               ProductWWSHandler = _yield$import4["default"];
@@ -35795,7 +35186,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context13.abrupt("break", 33);
             case 27:
               _context13.next = 29;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-96b3ab81.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-785777e5.js'); });
             case 29:
               _yield$import5 = _context13.sent;
               StandardWWSHandler = _yield$import5["default"];
@@ -35826,43 +35217,43 @@ var DivaBasketHandler = /*#__PURE__*/function () {
         //if no shopType is set in parent organization, no ropo effekt
         if (!organization.shopType) return;
         if (organization.shopType == 'store' && sourceOrganizationId.shopType == 'store') {
-          var _this$plannerConfig$c4;
-          LOG$6.businessEvent('ropoEffectStoreToStore', 'Seller', 'Evaluating the ROPO Effect Store To Store', {
-            sourceDivaNr: sourceBasket.DivaNr,
-            sourceOrgId: sourceOrganizationId.id,
-            targetOrgId: (_this$plannerConfig$c4 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c4 === void 0 ? void 0 : _this$plannerConfig$c4._id
-          });
-        } else if (organization.shopType == 'webshop' && sourceOrganizationId.shopType == 'webshop') {
           var _this$plannerConfig$c5;
-          LOG$6.businessEvent('ropoEffectWebToWeb', 'Seller', 'Evaluating the ROPO Effect Web To Web', {
+          LOG$7.businessEvent('ropoEffectStoreToStore', 'Seller', 'Evaluating the ROPO Effect Store To Store', {
             sourceDivaNr: sourceBasket.DivaNr,
             sourceOrgId: sourceOrganizationId.id,
             targetOrgId: (_this$plannerConfig$c5 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c5 === void 0 ? void 0 : _this$plannerConfig$c5._id
           });
-        } else if (organization.shopType == 'store' && sourceOrganizationId.shopType == 'webshop') {
+        } else if (organization.shopType == 'webshop' && sourceOrganizationId.shopType == 'webshop') {
           var _this$plannerConfig$c6;
-          LOG$6.businessEvent('ropoEffectStoreToWeb', 'Seller', 'Evaluating the ROPO Effect Web To Store', {
+          LOG$7.businessEvent('ropoEffectWebToWeb', 'Seller', 'Evaluating the ROPO Effect Web To Web', {
             sourceDivaNr: sourceBasket.DivaNr,
             sourceOrgId: sourceOrganizationId.id,
             targetOrgId: (_this$plannerConfig$c6 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c6 === void 0 ? void 0 : _this$plannerConfig$c6._id
           });
-        } else if (organization.shopType == 'webshop' && sourceOrganizationId.shopType == 'store') {
+        } else if (organization.shopType == 'store' && sourceOrganizationId.shopType == 'webshop') {
           var _this$plannerConfig$c7;
-          LOG$6.businessEvent('ropoEffectWebToStore', 'Seller', 'Evaluating the ROPO Effect Store To Web', {
+          LOG$7.businessEvent('ropoEffectStoreToWeb', 'Seller', 'Evaluating the ROPO Effect Web To Store', {
             sourceDivaNr: sourceBasket.DivaNr,
             sourceOrgId: sourceOrganizationId.id,
             targetOrgId: (_this$plannerConfig$c7 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c7 === void 0 ? void 0 : _this$plannerConfig$c7._id
           });
+        } else if (organization.shopType == 'webshop' && sourceOrganizationId.shopType == 'store') {
+          var _this$plannerConfig$c8;
+          LOG$7.businessEvent('ropoEffectWebToStore', 'Seller', 'Evaluating the ROPO Effect Store To Web', {
+            sourceDivaNr: sourceBasket.DivaNr,
+            sourceOrgId: sourceOrganizationId.id,
+            targetOrgId: (_this$plannerConfig$c8 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c8 === void 0 ? void 0 : _this$plannerConfig$c8._id
+          });
         }
       } catch (e) {
-        var _this$plannerConfig$c8;
-        LOG$6.error(new DivaUtils.DivaError('Error on Evaluating ROPO Effect', {
+        var _this$plannerConfig$c9;
+        LOG$7.error(new DivaUtils.DivaError('Error on Evaluating ROPO Effect', {
           code: 'SELLER_0006',
           cause: e,
           custom: {
             sourceDivaNr: sourceBasket.DivaNr,
             sourceOrgId: sourceOrganizationId,
-            targetOrgId: (_this$plannerConfig$c8 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c8 === void 0 ? void 0 : _this$plannerConfig$c8._id
+            targetOrgId: (_this$plannerConfig$c9 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c9 === void 0 ? void 0 : _this$plannerConfig$c9._id
           }
         }));
       }
@@ -35870,7 +35261,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
   }]);
 }();
 
-var LOG$5 = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
+var LOG$6 = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var ViewPointHandler = /*#__PURE__*/function () {
   function ViewPointHandler() {
     _classCallCheck__default["default"](this, ViewPointHandler);
@@ -36093,22 +35484,22 @@ var ViewPointHandler = /*#__PURE__*/function () {
       var roomListObj = JSON.parse(roomlist);
       var roomIsSel = true;
       for (var roomCodex in roomListObj) {
-        LOG$5.debug('Successfully Init roomList with Codex ' + roomCodex, 'ViewPointHandler - initRoomList');
+        LOG$6.debug('Successfully Init roomList with Codex ' + roomCodex, 'ViewPointHandler - initRoomList');
         var curRoom = roomListObj[roomCodex];
         var mainCategory = '#WG#';
         if (!this.staticRoomMainCategories.has(roomCodex)) {
-          LOG$5.error(new DivaUtils.DivaError('Error when parsing preview URL for a viewPoint. Please add a retailerMainCategory for this catalog in the CE!', {
+          LOG$6.error(new DivaUtils.DivaError('Error when parsing preview URL for a viewPoint. Please add a retailerMainCategory for this catalog in the CE!', {
             code: 'WC_0013'
           }));
         } else {
           var categories = this.staticRoomMainCategories.get(roomCodex);
           if (categories.length == 0) {
-            LOG$5.error(new DivaUtils.DivaError('Error when parsing preview URL for a viewPoint. Please add a retailerMainCategory for this catalog in the CE!', {
+            LOG$6.error(new DivaUtils.DivaError('Error when parsing preview URL for a viewPoint. Please add a retailerMainCategory for this catalog in the CE!', {
               code: 'WC_0013'
             }));
           } else {
             if (categories.length > 1) {
-              LOG$5.error(new DivaUtils.DivaError('Error when parsing preview URL for a viewPoint. There is more than one Catalog loaded. Decide a strategy which mainCategory should be taken!', {
+              LOG$6.error(new DivaUtils.DivaError('Error when parsing preview URL for a viewPoint. There is more than one Catalog loaded. Decide a strategy which mainCategory should be taken!', {
                 code: 'WC_0013'
               }));
             }
@@ -36122,7 +35513,7 @@ var ViewPointHandler = /*#__PURE__*/function () {
             previewUrl = previewUrl.replace('#WG#', mainCategory);
           }
           if (curRoom.VP[i].R && curRoom.VP[i].R.indexOf(':') == -1) {
-            LOG$5.error(new DivaUtils.DivaError('The background has a custom width and custom height. However it is not formatted correctly. the width and height must be separated with ":" : ' + curRoom.VP[i].R, {
+            LOG$6.error(new DivaUtils.DivaError('The background has a custom width and custom height. However it is not formatted correctly. the width and height must be separated with ":" : ' + curRoom.VP[i].R, {
               code: 'WC_0013'
             }));
           }
@@ -36220,7 +35611,7 @@ var ViewPointHandler = /*#__PURE__*/function () {
             this.navInfo3D.rotVert = 0;
             this.navInfo3D.rotHori = 0;
           } else {
-            LOG$5.debug('There is no static frontend viewpoint room: ' + roomCodex);
+            LOG$6.debug('There is no static frontend viewpoint room: ' + roomCodex);
           }
         } else if (this.curRoomCodex == roominfo.codex) {
           roominfo.sel = false;
@@ -36365,207 +35756,415 @@ var ViewPointHandler = /*#__PURE__*/function () {
   }]);
 }();
 
-function ownKeys$7(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$7(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$7(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$7(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var LOG$4 = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
-var DivaMediaServiceHandler = /*#__PURE__*/function () {
-  //-------------------------------------------------- INITIALIZATION--------------------------------------------------------------//
-
-  function DivaMediaServiceHandler() {
-    _classCallCheck__default["default"](this, DivaMediaServiceHandler);
-    _defineProperty__default["default"](this, "organizationId", void 0);
-    _defineProperty__default["default"](this, "mediaServiceUrl", void 0);
-    _defineProperty__default["default"](this, "mediaServiceApiKey", void 0);
-    _defineProperty__default["default"](this, "jwt", void 0);
-    _defineProperty__default["default"](this, "POST_saveTmp2PermanentPostfix", '/saveTmp2Permanent');
-    _defineProperty__default["default"](this, "GET_MediaItemrefs", '/v1/mediaitems/refs?limit=20&skip=0&filter=');
-    _defineProperty__default["default"](this, "POST_mediaItem", '/v1/mediaitems?ref=true');
-    this.organizationId = '';
-    this.mediaServiceUrl = '';
-    this.mediaServiceApiKey = '';
+//This class saves all informations needed for a rendering
+var LOG$5 = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
+var Rendering = /*#__PURE__*/function () {
+  function Rendering(planningHash, renderHash, viewPointName, width, height, isFullscreenRendering, hasDimensionLines, plannerMeasureDigits, hasLayerMask, hasStaticBG, mediaServiceSaveMode, alternateRenderingsExist, alternateRendererInfo) {
+    _classCallCheck__default["default"](this, Rendering);
+    _defineProperty__default["default"](this, "planningHash", void 0);
+    _defineProperty__default["default"](this, "renderHash", void 0);
+    _defineProperty__default["default"](this, "creationTime", void 0);
+    _defineProperty__default["default"](this, "renderWidth", void 0);
+    _defineProperty__default["default"](this, "renderHeight", void 0);
+    _defineProperty__default["default"](this, "uiInfo", void 0);
+    _defineProperty__default["default"](this, "urlToSavedRendering", void 0);
+    // viewPoint: string;
+    //   private posInfo: any;
+    //private doStream: boolean;        Streaming over 3D Host is deprected
+    //private byteChunkArr: any;
+    //private byteChunkLayerMaskArr: any;
+    _defineProperty__default["default"](this, "hasLayerMask", void 0);
+    //private imgBytes: any;
+    _defineProperty__default["default"](this, "imgForSrc", void 0);
+    _defineProperty__default["default"](this, "layerMaskAsBase64", void 0);
+    _defineProperty__default["default"](this, "layerMaskThreeTexture", void 0);
+    _defineProperty__default["default"](this, "isFullscreenRendering", void 0);
+    _defineProperty__default["default"](this, "hasStaticBackground", void 0);
+    _defineProperty__default["default"](this, "hasDimensionLines", void 0);
+    _defineProperty__default["default"](this, "plannerMeasureDigits", void 0);
+    _defineProperty__default["default"](this, "alternateRendererInfo", void 0);
+    _defineProperty__default["default"](this, "isAlternateRendering", void 0);
+    _defineProperty__default["default"](this, "alternateRenderingsExist", void 0);
+    _defineProperty__default["default"](this, "mediaServiceSaveMode", void 0);
+    _defineProperty__default["default"](this, "catalogData", void 0);
+    this.planningHash = planningHash;
+    this.renderHash = renderHash;
+    this.renderWidth = width;
+    this.renderHeight = height;
+    this.uiInfo = '';
+    this.imgForSrc = '';
+    this.layerMaskAsBase64 = '';
+    this.isFullscreenRendering = isFullscreenRendering;
+    this.hasDimensionLines = hasDimensionLines;
+    this.plannerMeasureDigits = plannerMeasureDigits;
+    this.hasLayerMask = hasLayerMask;
+    this.creationTime = new Date();
+    this.layerMaskThreeTexture = undefined;
+    this.hasStaticBackground = hasStaticBG;
+    this.mediaServiceSaveMode = mediaServiceSaveMode;
+    this.urlToSavedRendering = '';
+    this.catalogData = {
+      catalogCodex: '',
+      catalogGUID: ''
+    };
+    if (alternateRendererInfo != undefined) this.isAlternateRendering = true;else this.isAlternateRendering = false;
+    this.alternateRendererInfo = alternateRendererInfo;
+    this.alternateRenderingsExist = !!alternateRenderingsExist;
   }
-  return _createClass__default["default"](DivaMediaServiceHandler, [{
-    key: "setOrganizationId",
-    value: function setOrganizationId(organizationId) {
-      this.organizationId = organizationId;
+  return _createClass__default["default"](Rendering, [{
+    key: "clone",
+    value: function clone(rendering) {
+      this.planningHash = rendering.planningHash;
+      this.renderHash = rendering.renderHash;
+      this.creationTime = rendering.creationTime;
+      this.renderWidth = rendering.renderWidth;
+      this.renderHeight = rendering.renderHeight;
+      this.uiInfo = rendering.uiInfo;
+      this.urlToSavedRendering = rendering.urlToSavedRendering;
+      this.hasLayerMask = rendering.hasLayerMask;
+      this.imgForSrc = rendering.imgForSrc;
+      this.layerMaskAsBase64 = rendering.layerMaskAsBase64;
+      this.layerMaskThreeTexture = rendering.layerMaskThreeTexture;
+      this.isFullscreenRendering = rendering.isFullscreenRendering;
+      this.hasStaticBackground = rendering.hasStaticBackground;
+      this.hasDimensionLines = rendering.hasDimensionLines;
+      this.plannerMeasureDigits = rendering.plannerMeasureDigits;
+      this.alternateRendererInfo = rendering.alternateRendererInfo;
+      this.isAlternateRendering = rendering.isAlternateRendering;
+      this.alternateRenderingsExist = rendering.alternateRenderingsExist;
+      this.mediaServiceSaveMode = rendering.mediaServiceSaveMode;
+      this.catalogData = rendering.catalogData;
     }
   }, {
-    key: "setMediaServiceUrl",
-    value: function setMediaServiceUrl(mediaServiceUrl) {
-      this.mediaServiceUrl = mediaServiceUrl;
+    key: "getAllDockingPoints",
+    value: function getAllDockingPoints(setId, elementId) {
+      if (this.uiInfo[setId] == undefined && this.uiInfo['S1'] != undefined) {
+        return this.uiInfo['S1']['E' + elementId]['DP'];
+      }
+      return this.uiInfo[setId]['E' + elementId]['DP'];
     }
   }, {
-    key: "setMediaServiceApiKey",
-    value: function setMediaServiceApiKey(mediaServiceApiKey) {
-      this.mediaServiceApiKey = mediaServiceApiKey;
+    key: "getHasStaticBackground",
+    value: function getHasStaticBackground() {
+      return this.hasStaticBackground;
     }
   }, {
-    key: "setJwt",
-    value: function setJwt(jwt) {
-      this.jwt = jwt;
+    key: "getIsFullscreenRendering",
+    value: function getIsFullscreenRendering() {
+      return this.isFullscreenRendering;
     }
   }, {
-    key: "loadRenderingFromCache",
-    value: function () {
-      var _loadRenderingFromCache = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(hash) {
-        var logOnError,
-          url,
-          response,
-          error,
-          result,
-          _args = arguments;
-        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              logOnError = _args.length > 1 && _args[1] !== undefined ? _args[1] : true;
-              LOG$4.startTransaction({
-                event: 'onRequestRendering',
-                message: 'Requesting Rendering',
-                eventId: 'ON_REQUEST_RENDERING',
-                warningTime: 2000,
-                errorTime: 4000,
-                labels: {}
-              });
-              url = this.mediaServiceUrl + this.GET_MediaItemrefs + '%5B%7Bhash%2Ceq%2C' + hash + '%7D%2C%7BorganizationId%2Ceq%2C' + this.organizationId + '%7D%5D';
-              LOG$4.debug('Try load Rendering from Cache. hash: ' + hash);
-              _context.next = 6;
-              return fetch(url, {
-                method: 'GET',
-                mode: 'cors',
-                headers: _objectSpread$7({}, this.jwt ? {
-                  authorization: "Bearer ".concat(this.jwt)
-                } : {
-                  'X-API-KEY': this.mediaServiceApiKey
-                })
-              });
-            case 6:
-              response = _context.sent;
-              error = false;
-              if (!response.ok) {
-                _context.next = 20;
-                break;
-              }
-              _context.next = 11;
-              return response.json();
-            case 11:
-              result = _context.sent;
-              if (!(result.data.length > 0)) {
-                _context.next = 17;
-                break;
-              }
-              LOG$4.successTransaction('ON_REQUEST_RENDERING', {});
-              return _context.abrupt("return", result.data[0].url);
-            case 17:
-              error = true;
-            case 18:
-              _context.next = 21;
-              break;
-            case 20:
-              error = true;
-            case 21:
-              if (error && logOnError) {
-                LOG$4.errorTransaction('ON_REQUEST_RENDERING', 'WC_0015', 'loadRenderingFromCache not found (functionType C3D). Load rendering from Cache not successfull. Hash: ' + hash + 'response: ' + response);
-              }
-              LOG$4.successTransaction('ON_REQUEST_RENDERING', {});
-              return _context.abrupt("return", '');
-            case 24:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function loadRenderingFromCache(_x) {
-        return _loadRenderingFromCache.apply(this, arguments);
+    key: "setIsFullscreenRendering",
+    value: function setIsFullscreenRendering(isFullscreen) {
+      this.isFullscreenRendering = isFullscreen;
+    }
+  }, {
+    key: "getHasDimensionLines",
+    value: function getHasDimensionLines() {
+      return this.hasDimensionLines;
+    }
+  }, {
+    key: "getPlannerMeasureDigits",
+    value: function getPlannerMeasureDigits() {
+      return this.plannerMeasureDigits;
+    }
+  }, {
+    key: "getIsAlternateRendering",
+    value: function getIsAlternateRendering() {
+      return this.isAlternateRendering;
+    }
+  }, {
+    key: "getAlternateRenderInfo",
+    value: function getAlternateRenderInfo() {
+      return this.alternateRendererInfo;
+    }
+  }, {
+    key: "getAlternateRenderingsExist",
+    value: function getAlternateRenderingsExist() {
+      return this.alternateRenderingsExist;
+    }
+  }, {
+    key: "hasUIInfosOfElement",
+    value: function hasUIInfosOfElement(setId, elementid) {
+      if (this.uiInfo[setId] == undefined && this.uiInfo['S1'] != undefined) {
+        return this.uiInfo['S1']['E' + elementid] != undefined;
+      } else {
+        return this.uiInfo[setId] != undefined && this.uiInfo[setId]['E' + elementid] != undefined;
       }
-      return loadRenderingFromCache;
-    }()
+    }
   }, {
-    key: "base64ToBlob",
-    value: function base64ToBlob(base64String, hash) {
-      DivaUtils__default["default"].startSpanOfApm('MediaServiceHandler base64ToBlob');
-      if (base64String.startsWith('data:image/jpeg;base64,')) {
-        base64String = base64String.replace('data:image/jpeg;base64,', '');
+    key: "getOutlinePolygonForSVG",
+    value: function getOutlinePolygonForSVG(setId, elementId, viewPortSize) {
+      var poly = [];
+      var avgCamDist = 0;
+      if (this.uiInfo[setId] == undefined && this.uiInfo['S1'] != undefined) {
+        poly = this.uiInfo['S1']['E' + elementId]['POLYOUTLINE'];
+        avgCamDist = this.uiInfo['S1']['E' + elementId]['AVGCAMDIST'];
+      } else if (this.uiInfo[setId]) {
+        poly = this.uiInfo[setId]['E' + elementId]['POLYOUTLINE'];
+        avgCamDist = this.uiInfo[setId]['E' + elementId]['AVGCAMDIST'];
+      } else {
+        poly = this.uiInfo['E' + elementId]['POLYOUTLINE'];
+        avgCamDist = this.uiInfo['E' + elementId]['AVGCAMDIST'];
       }
-      var binary_string = window.atob(base64String);
-      var len = binary_string.length;
-      var bytes = new Uint8Array(len);
-      for (var i = 0; i < len; i++) {
-        bytes[i] = binary_string.charCodeAt(i);
+      if (!poly) return undefined;
+      var points = '';
+      for (var i = 0; i < poly.length; i++) {
+        points += Math.round(poly[i].x * 0.01 * viewPortSize.imgWidth) + ',' + Math.round((100 - poly[i].y) * 0.01 * viewPortSize.imgHeight) + ' ';
       }
-      var blob = new File([bytes.buffer], hash + '.jpg', {
-        type: 'image/jpeg'
-      });
-      DivaUtils__default["default"].endSpanOfApm('MediaServiceHandler base64ToBlob');
-      return blob;
+      return {
+        points: points,
+        avgCamDist: avgCamDist
+      };
     }
+
+    //Left/Right_Bottom/Top_Back/Front
   }, {
-    key: "savePlanning2DPermanent",
-    value: function () {
-      var _savePlanning2DPermanent = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(hash, catalogCodex, catalogGUID, planning2DAsJPG) {
-        var imageBlob, url, data, mediaItem, mediaItemRef, response, res;
-        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              DivaUtils__default["default"].startSpanOfApm('MediaServiceHandler savePlanning2DPermanent');
-              imageBlob = this.base64ToBlob(planning2DAsJPG, hash);
-              url = this.mediaServiceUrl + this.POST_mediaItem; //push media item return url
-              //create media item ref and set same paramters
-              data = new FormData();
-              data.append('file', imageBlob);
-              mediaItem = {
-                organizationId: this.organizationId,
-                mediaType: 'PCT',
-                fileName: hash + '.jpg'
-              };
-              data.append('mediaItem', JSON.stringify(mediaItem));
-              mediaItemRef = {
-                functionType: 'P2D',
-                planningHash: hash,
-                catalogCodex: catalogCodex,
-                catalogGuid: catalogGUID
-              };
-              data.append('mediaItemRef', JSON.stringify(mediaItemRef));
-              _context2.next = 11;
-              return fetch(url, {
-                method: 'POST',
-                body: data,
-                headers: {
-                  'X-API-KEY': this.mediaServiceApiKey
-                }
-              });
-            case 11:
-              response = _context2.sent;
-              if (!response.ok) {
-                _context2.next = 20;
-                break;
-              }
-              _context2.next = 15;
-              return response.json();
-            case 15:
-              res = _context2.sent;
-              LOG$4.debug('Successfully saved 2D Planning in media Service. URL: ' + res.url);
-              return _context2.abrupt("return", res.url);
-            case 20:
-              LOG$4.error(new DivaUtils.DivaError('Error when saving the Planning2D image on mediaService. Hash: ' + hash + 'response: ' + response, {
-                code: 'WC_0016'
-              }));
-            case 21:
-              DivaUtils__default["default"].endSpanOfApm('MediaServiceHandler savePlanning2DPermanent');
-              return _context2.abrupt("return", '');
-            case 23:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function savePlanning2DPermanent(_x2, _x3, _x4, _x5) {
-        return _savePlanning2DPermanent.apply(this, arguments);
+    key: "getRightTopBackUIPos",
+    value: function getRightTopBackUIPos(setId, elemId) {
+      var bbox = null;
+      if (this.uiInfo[setId] == undefined && this.uiInfo['S1'] != undefined) {
+        bbox = this.uiInfo['S1']['E' + elemId]['BBOX3D'];
+      } else if (this.uiInfo[setId]) bbox = this.uiInfo[setId]['E' + elemId]['BBOX3D'];else bbox = this.uiInfo['E' + elemId]['BBOX3D'];
+      if (!bbox) return;
+      for (var i = 0; i < bbox.length; i++) {
+        if (bbox[i].C == 'RTB') {
+          return bbox[i];
+        }
       }
-      return savePlanning2DPermanent;
-    }()
+    }
+    //Left/Right_Bottom/Top_Back/Front
+  }, {
+    key: "getLeftTopBackUIPos",
+    value: function getLeftTopBackUIPos(setId, elemId) {
+      var bbox = null;
+      if (this.uiInfo[setId] == undefined && this.uiInfo['S1'] != undefined) {
+        bbox = this.uiInfo['S1']['E' + elemId]['BBOX3D'];
+      } else if (this.uiInfo[setId]) bbox = this.uiInfo[setId]['E' + elemId]['BBOX3D'];else bbox = this.uiInfo['E' + elemId]['BBOX3D'];
+      if (!bbox) return;
+      for (var i = 0; i < bbox.length; i++) {
+        if (bbox[i].C == 'LTB') {
+          return bbox[i];
+        }
+      }
+    }
+    //Left/Right_Bottom/Top_Back/Front
+    //elementId has to be a string because when working with accs in shelf planner an element id is the combination of parentElementId.rasterHeight.gridId
+  }, {
+    key: "getLeftBottomFrontUIPos",
+    value: function getLeftBottomFrontUIPos(setId, elemId) {
+      var bbox = null;
+      if (this.uiInfo == '') return null;
+      if (this.uiInfo[setId] == undefined && this.uiInfo['S1'] != undefined) {
+        if (!this.uiInfo['S1']['E' + elemId]) return;
+        bbox = this.uiInfo['S1']['E' + elemId]['BBOX3D'];
+      } else if (this.uiInfo[setId]) {
+        if (!this.uiInfo[setId]['E' + elemId]) return;
+        bbox = this.uiInfo[setId]['E' + elemId]['BBOX3D'];
+      } else {
+        var _this$uiInfo;
+        bbox = (_this$uiInfo = this.uiInfo['E' + elemId]) === null || _this$uiInfo === void 0 ? void 0 : _this$uiInfo['BBOX3D'];
+      }
+      if (!bbox) return;
+      for (var i = 0; i < bbox.length; i++) {
+        if (bbox[i].C == 'LBF') {
+          return bbox[i];
+        }
+      }
+    }
+  }, {
+    key: "getBoxPlannerCornerUIPos",
+    value: function getBoxPlannerCornerUIPos(setId, elemId, corner) {
+      var boxPlan = [];
+      if (this.uiInfo[setId] == undefined && this.uiInfo['S1'] != undefined) {
+        boxPlan = this.uiInfo['S1']['E' + elemId]['BoxPlan'];
+      } else if (this.uiInfo[setId]) boxPlan = this.uiInfo[setId]['E' + elemId]['BoxPlan'];else boxPlan = this.uiInfo['E' + elemId]['BoxPlan'];
+      for (var i = 0; i < boxPlan.length; i++) {
+        if (!boxPlan[i].N || !boxPlan[i].x || !boxPlan[i].y) continue;
+        switch (corner) {
+          case 'TOPCENTER':
+            if (boxPlan[i].N == 'TC') {
+              return new Vector2(Number(boxPlan[i].x), Number(boxPlan[i].y));
+            }
+            break;
+          case 'LEFTCENTER':
+            if (boxPlan[i].N == 'LC') {
+              return new Vector2(Number(boxPlan[i].x), Number(boxPlan[i].y));
+            }
+            break;
+          case 'RIGHTCENTER':
+            if (boxPlan[i].N == 'RC') {
+              return new Vector2(Number(boxPlan[i].x), Number(boxPlan[i].y));
+            }
+            break;
+          case 'RIGHTTOPFRONT':
+            if (boxPlan[i].N == 'RTF') {
+              return new Vector2(Number(boxPlan[i].x), Number(boxPlan[i].y));
+            }
+            break;
+        }
+      }
+      return undefined;
+    }
+  }, {
+    key: "getUnityCamPos",
+    value: function getUnityCamPos() {
+      return new Vector3(parseFloat(this.uiInfo['CAM']['X']), parseFloat(this.uiInfo['CAM']['Y']), parseFloat(this.uiInfo['CAM']['Z']));
+    }
+  }, {
+    key: "getUnityCamRot",
+    value: function getUnityCamRot() {
+      var quatVec = new Vector4(parseFloat(this.uiInfo['CAM']['QX']), parseFloat(this.uiInfo['CAM']['QY']), parseFloat(this.uiInfo['CAM']['QZ']), parseFloat(this.uiInfo['CAM']['QW']));
+      return quatVec;
+    }
+  }, {
+    key: "getUnityFOV",
+    value: function getUnityFOV() {
+      return parseFloat(this.uiInfo['CAM']['FOV']);
+    }
+
+    //elementId has to be a string because when working with accs in shelf planner an element id is the combination of parentElementId.rasterHeight.gridId
+    //It returns the distance of an element to the ground in cm
+  }, {
+    key: "getDistanceToGround",
+    value: function getDistanceToGround(setId, elementId) {
+      setId = this.uiInfo[setId] == undefined && this.uiInfo['S1'] != undefined ? 'S1' : setId;
+      if (this.uiInfo[setId] && this.uiInfo[setId]['E' + elementId] && this.uiInfo[setId]['E' + elementId]['DIM'] && this.uiInfo[setId]['E' + elementId]['DIM']['dfg']) {
+        return this.uiInfo[setId]['E' + elementId]['DIM']['dfg'] * 100;
+      }
+      return -1;
+    }
+  }, {
+    key: "addUIInfo",
+    value: function addUIInfo(uiInfo) {
+      try {
+        this.uiInfo = JSON.parse(uiInfo);
+      } catch (error) {
+        LOG$5.error(new DivaUtils.DivaError('Error when parsing UI Info in rendering. Corrupt UIInfo: ' + uiInfo, {
+          code: 'WC_0013',
+          cause: error
+        }));
+      }
+    }
+
+    /**
+     * This function adds a blobImage to the rendering .
+     * It is parsed to a base64 image.
+     * @param blob  The blob contains the image
+     * @param isLayerMask   True if the Image is the layer mask image
+     */
+  }, {
+    key: "addImgAsBlob",
+    value: function addImgAsBlob(buffer, isLayerMask) {
+      if (isLayerMask) this.layerMaskAsBase64 = buffer.toString('base64');else this.imgForSrc = 'data:image/jpeg;base64,' + buffer.toString('base64');
+    }
+  }, {
+    key: "getImageForSrc",
+    value: function getImageForSrc() {
+      return this.imgForSrc;
+    }
+
+    //*****************************************GETTER und SETTER********************************************** */
+  }, {
+    key: "CatalogCodex",
+    get: function get() {
+      return this.catalogData.catalogCodex;
+    },
+    set: function set(val) {
+      this.catalogData.catalogCodex = val;
+    }
+  }, {
+    key: "CatalogGUID",
+    get: function get() {
+      return this.catalogData.catalogGUID;
+    },
+    set: function set(val) {
+      this.catalogData.catalogGUID = val;
+    }
+  }, {
+    key: "PlanningHash",
+    get: function get() {
+      return this.planningHash;
+    }
+  }, {
+    key: "RenderHash",
+    get: function get() {
+      return this.renderHash;
+    }
+  }, {
+    key: "UrlToSavedRendering",
+    get: function get() {
+      return this.urlToSavedRendering;
+    },
+    set: function set(url) {
+      this.urlToSavedRendering = url;
+    }
+  }, {
+    key: "HasLayerMask",
+    get: function get() {
+      return this.hasLayerMask;
+    },
+    set: function set(hasLayerMask) {
+      this.hasLayerMask = hasLayerMask;
+    }
+  }, {
+    key: "RenderWidth",
+    get: function get() {
+      return this.renderWidth;
+    }
+  }, {
+    key: "RenderHeight",
+    get: function get() {
+      return this.renderHeight;
+    }
+  }, {
+    key: "getHasLayerMask",
+    value: function getHasLayerMask() {
+      return this.hasLayerMask;
+    }
+  }, {
+    key: "getLayerMaskForSrc",
+    value: function getLayerMaskForSrc() {
+      return this.layerMaskAsBase64;
+    }
+  }, {
+    key: "HasLayerMaskThreeTexture",
+    get: function get() {
+      return this.layerMaskThreeTexture != undefined;
+    }
+  }, {
+    key: "LayerMaskThreeTexture",
+    get: function get() {
+      return this.layerMaskThreeTexture;
+    },
+    set: function set(tex) {
+      this.layerMaskThreeTexture = tex;
+    }
+  }, {
+    key: "AllImgLoaded",
+    get: function get() {
+      return this.imgForSrc != '' && (!this.hasLayerMask || this.layerMaskAsBase64 != '');
+    }
+  }, {
+    key: "UiInfoLoaded",
+    get: function get() {
+      return this.uiInfo != '';
+    }
+  }, {
+    key: "CreationTime",
+    get: function get() {
+      return this.creationTime.getTime();
+    }
+  }, {
+    key: "MediaServiceSaveMode",
+    get: function get() {
+      return this.mediaServiceSaveMode;
+    },
+    set: function set(mode) {
+      this.mediaServiceSaveMode = mode;
+    }
   }]);
 }();
-var mediaServiceHandler = new DivaMediaServiceHandler();
 
 var RenderSettings = /*#__PURE__*/function () {
   function RenderSettings() {
@@ -36586,9 +36185,6 @@ var RenderSettings = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "applicationName", void 0);
     _defineProperty__default["default"](this, "divaMediaServiceUrl", void 0);
     _defineProperty__default["default"](this, "renderGroup", void 0);
-    _defineProperty__default["default"](this, "useSirvViewer", void 0);
-    _defineProperty__default["default"](this, "useMediaServiceImageCache", void 0);
-    _defineProperty__default["default"](this, "suppressCacheCreation", void 0);
     this.organizationId = '';
     this.diva3DServerURL = '';
     this.userID = '';
@@ -36597,9 +36193,6 @@ var RenderSettings = /*#__PURE__*/function () {
     this.applicationName = '';
     this.divaMediaServiceUrl = '';
     this.renderGroup = '';
-    this.useSirvViewer = false;
-    this.useMediaServiceImageCache = false;
-    this.suppressCacheCreation = false;
   }
   return _createClass__default["default"](RenderSettings, [{
     key: "OrganizationId",
@@ -36665,30 +36258,6 @@ var RenderSettings = /*#__PURE__*/function () {
     set: function set(group) {
       this.renderGroup = group;
     }
-  }, {
-    key: "UseSirvViewer",
-    get: function get() {
-      return this.useSirvViewer;
-    },
-    set: function set(viewer) {
-      this.useSirvViewer = viewer;
-    }
-  }, {
-    key: "UseMediaServiceImageCache",
-    get: function get() {
-      return this.useMediaServiceImageCache;
-    },
-    set: function set(cache) {
-      this.useMediaServiceImageCache = cache;
-    }
-  }, {
-    key: "SuppressCacheCreation",
-    get: function get() {
-      return this.suppressCacheCreation;
-    },
-    set: function set(cache) {
-      this.suppressCacheCreation = cache;
-    }
   }]);
 }();
 /*
@@ -36737,7 +36306,7 @@ function _objectSpread$6(e) { for (var r = 1; r < arguments.length; r++) { var t
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-var LOG$3 = DivaUtils__default["default"].initLog('Planner', 'PLANNER-HANDLER-3D');
+var LOG$4 = DivaUtils__default["default"].initLog('Planner', 'PLANNER-HANDLER-3D');
 var PlannerHandler3D = /*#__PURE__*/function () {
   //-------------------------------------------------Initialization---------------------------------------------------------------
 
@@ -36855,12 +36424,6 @@ var PlannerHandler3D = /*#__PURE__*/function () {
     };
   }
   return _createClass__default["default"](PlannerHandler3D, [{
-    key: "doUseRealtimeRendering",
-    value: function doUseRealtimeRendering() {
-      if (this.renderSettings.SuppressCacheCreation && this.renderSettings.UseMediaServiceImageCache) return false;
-      return true;
-    }
-  }, {
     key: "setJwt",
     value: function setJwt(jwt) {
       this.jwt = jwt;
@@ -36980,9 +36543,6 @@ var PlannerHandler3D = /*#__PURE__*/function () {
       }
       this.renderSettings.DivaMediaServiceUrl = params.divaMediaServiceUrl;
       this.renderSettings.OrganizationId = params.organizationId;
-      this.renderSettings.UseSirvViewer = params.useSirvViewer;
-      this.renderSettings.UseMediaServiceImageCache = params.useMediaServiceImageCache;
-      this.renderSettings.SuppressCacheCreation = params.suppressCacheCreation;
       this.liveArViewerUrl = params.arViewerUrl;
       return result;
     }
@@ -36995,21 +36555,16 @@ var PlannerHandler3D = /*#__PURE__*/function () {
         return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              if (!this.doUseRealtimeRendering()) {
-                _context3.next = 7;
-                break;
-              }
-              _context3.next = 3;
-              return Promise.resolve().then(function () { return require('./Host3DSignalR-f13134cb.js'); });
-            case 3:
+              _context3.next = 2;
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-59436bad.js'); });
+            case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
               this.connectionHandler = new Host3DSignalR(this.renderSettings, this);
-              LOG$3.debug('initializeConnection to Host3DSignalR');
-            case 7:
-              _context3.next = 9;
+              LOG$4.debug('initializeConnection to Host3DSignalR');
+              _context3.next = 8;
               return (_this$connectionHandl2 = this.connectionHandler) === null || _this$connectionHandl2 === void 0 ? void 0 : _this$connectionHandl2.initializeConnection();
-            case 9:
+            case 8:
             case "end":
               return _context3.stop();
           }
@@ -37072,7 +36627,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
     value: function onConnectedToDivaNr(status) {
       //Check if request3D has to be called againe
       if (status != 'SUCCESSFULL' || !this.todoAfterLogin.request3D.doRequest3D) return;
-      LOG$3.debug('Return Login - joind successfully but during loggin, a render or hqRenderScript Request was made. Remake it now');
+      LOG$4.debug('Return Login - joind successfully but during loggin, a render or hqRenderScript Request was made. Remake it now');
       this.todoAfterLogin.request3D.doRequest3D = false;
       this.request3D(this.todoAfterLogin.request3D.params);
       this.todoAfterLogin.request3D.params = undefined;
@@ -37126,36 +36681,36 @@ var PlannerHandler3D = /*#__PURE__*/function () {
      * @param buffer
      */
     function handleReceiveRendering(params) {
-      LOG$3.debug('handleReceiveRendering ' + params.hash + '; SameMode: ' + params.saveMode);
+      LOG$4.debug('handleReceiveRendering ' + params.hash + '; SameMode: ' + params.saveMode);
       var isLayerMask = params.hash.endsWith('_m') ? true : false;
       params.hash = isLayerMask ? params.hash.substring(0, params.hash.length - 2) : params.hash;
       var cachedRendering = this.getRenderingFromCache(params.hash);
       var waitedRendering = this.getWaitForRendering(params.hash);
       if (!cachedRendering && !waitedRendering) {
-        LOG$3.error(new DivaUtils.DivaError('Error when handling receive Rendering. Not waiting for new Rendering but also not in cache ' + params.hash + '; saveMode: ' + params.saveMode));
+        LOG$4.error(new DivaUtils.DivaError('Error when handling receive Rendering. Not waiting for new Rendering but also not in cache ' + params.hash + '; saveMode: ' + params.saveMode));
         return;
       }
       if (waitedRendering) {
-        LOG$3.debug('handleReceiveRendering ' + params.hash + '; Found in waitForRenderings');
+        LOG$4.debug('handleReceiveRendering ' + params.hash + '; Found in waitForRenderings');
         //If the last requested rendering was in another saving mode than the received rendering - do nothing and wait for the correct rendering
         if ((waitedRendering === null || waitedRendering === void 0 ? void 0 : waitedRendering.MediaServiceSaveMode) == 'PERMANENT' && params.saveMode != '1' || (waitedRendering === null || waitedRendering === void 0 ? void 0 : waitedRendering.MediaServiceSaveMode) == 'STREAM' && params.saveMode != '0') {
-          LOG$3.debug('Rendering with wrong savemode arrived. Wait for correct rendering');
+          LOG$4.debug('Rendering with wrong savemode arrived. Wait for correct rendering');
           return;
         }
         if (params.url && waitedRendering.MediaServiceSaveMode == 'PERMANENT') {
           waitedRendering.UrlToSavedRendering = params.url;
-          LOG$3.debug('handleReceiveRendering Set lastSavedRendering URL ' + params.url);
+          LOG$4.debug('handleReceiveRendering Set lastSavedRendering URL ' + params.url);
         }
-        if (this.renderSettings.UseSirvViewer && params.url) waitedRendering.setHQRenderingUrl(params.url, true);else waitedRendering.addImgAsBlob(Buffer.from(params.buffer), isLayerMask);
+        waitedRendering.addImgAsBlob(Buffer.from(params.buffer), isLayerMask);
 
         //Do not display the rendering if it was saved in real Time mode withough cache - it was only saved when entering the Zusammenfassung for saving it later in the Basket
 
-        if ((!this.doUseRealtimeRendering() || this.renderSettings.UseMediaServiceImageCache || waitedRendering.MediaServiceSaveMode == 'STREAM') && this.checkRenderingReady(params.hash, waitedRendering)) this.updatePlannerRendering(waitedRendering);
+        if (waitedRendering.MediaServiceSaveMode == 'STREAM' && this.checkRenderingReady(params.hash, waitedRendering)) this.updatePlannerRendering(waitedRendering);
         return;
       }
       if (params.url) {
         //If several renderings of the same hash are requested contemoranely (first Stream then TEMP). Then save the tempURL in  the rendering
-        LOG$3.debug('handleReceiveRendering load from cache');
+        LOG$4.debug('handleReceiveRendering load from cache');
         cachedRendering.UrlToSavedRendering = params.url;
       }
     }
@@ -37186,10 +36741,10 @@ var PlannerHandler3D = /*#__PURE__*/function () {
   }, {
     key: "checkRenderingReady",
     value: function checkRenderingReady(hash, rendering) {
-      if (!rendering.AllImgLoaded || !rendering.UiInfoLoaded && !rendering.IsLoadedFromCache) return false;
+      if (!rendering.AllImgLoaded || !rendering.UiInfoLoaded) return false;
       this.waitForRenderings["delete"](hash);
       this.renderCache.set(hash, rendering);
-      LOG$3.debug('Send to view. CurrentHash: ' + hash + '; lastRequestedHash: ' + this.lastRequestedRenderHash);
+      LOG$4.debug('Send to view. CurrentHash: ' + hash + '; lastRequestedHash: ' + this.lastRequestedRenderHash);
       return true;
     }
     /**
@@ -37204,7 +36759,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
         this.waitForRenderings["delete"](hash);
         return false;
       }
-      LOG$3.debug('Wait for rendering - The same rendering was asked not 4 seconds ago. !', 'PlannerHandler3D checkWaitForImage');
+      LOG$4.debug('Wait for rendering - The same rendering was asked not 4 seconds ago. !', 'PlannerHandler3D checkWaitForImage');
       return true;
     }
   }, {
@@ -37216,7 +36771,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
         this.waitForHQRenderScript["delete"](hash);
         return false;
       }
-      LOG$3.debug('Wait for rendering - The same rendering was asked not 4 seconds ago. !', 'PlannerHandler3D checkWaitForImage');
+      LOG$4.debug('Wait for rendering - The same rendering was asked not 4 seconds ago. !', 'PlannerHandler3D checkWaitForImage');
       return true;
     }
 
@@ -37238,10 +36793,6 @@ var PlannerHandler3D = /*#__PURE__*/function () {
         result.renderHeight = curRoomListVP.backgroundImg_Height;
         result.renderHeight = result.renderHeight * 1.3;
         result.renderWidth = result.renderWidth * 1.3;
-      } else if (this.renderSettings.UseMediaServiceImageCache) {
-        //Force the size of the rendering to be a standard size
-        result.renderWidth = this.renderSettings.CACHE_16_9_RENDER_WIDTH;
-        result.renderHeight = this.renderSettings.CACHE_16_9_RENDER_HEIGHT;
       } else if (mediaServiceSaveMode == 'PERMANENT') {
         //SAVE with correct Resolution
         result.renderWidth = this.renderSettings.SAVE_16_9_RENDER_WIDTH;
@@ -37285,7 +36836,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
         return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              LOG$3.debug('getLastSavedRendering ' + ((_this$lastSavedRender = this.lastSavedRendering) === null || _this$lastSavedRender === void 0 ? void 0 : _this$lastSavedRender.UrlToSavedRendering));
+              LOG$4.debug('getLastSavedRendering ' + ((_this$lastSavedRender = this.lastSavedRendering) === null || _this$lastSavedRender === void 0 ? void 0 : _this$lastSavedRender.UrlToSavedRendering));
               if (!(this.lastSavedRendering == undefined)) {
                 _context5.next = 3;
                 break;
@@ -37300,7 +36851,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
                 _context5.next = 12;
                 break;
               }
-              LOG$3.debug('getLAstSavedRendering - wait here');
+              LOG$4.debug('getLAstSavedRendering - wait here');
               _context5.next = 8;
               return this.delay(100);
             case 8:
@@ -37454,20 +37005,20 @@ var PlannerHandler3D = /*#__PURE__*/function () {
     value: (function () {
       var _request3D = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7(params) {
         var _params$renderRequest, _params$renderRequest2, _params$renderRequest3, _params$renderRequest4, _params$renderRequest5, _params$renderRequest6, _this$viewPointHandle;
-        var room, newRenderSize, doReloadWholePlanning, planningHash, requestRenderingFrom3DHost, requestHqRenderScriptFrom3DHost, rendering, renderHash, viewPointName, functionType, _params$camera, sizeInfo, _plannerMeasureDigits, productHash, renderingFoundInCache, _rendering, fullscreenRendering, renderingInCacheFound, _plannerMeasureDigits2, _productHash, _this$connectionHandl6, _plannerMeasureDigits3, _params$camera2, _params$camera3, returnRequest;
+        var room, newRenderSize, doReloadWholePlanning, planningHash, requestRenderingFrom3DHost, requestHqRenderScriptFrom3DHost, rendering, renderHash, viewPointName, functionType, _params$camera, sizeInfo, _rendering, fullscreenRendering, renderingInCacheFound, _this$connectionHandl6, _plannerMeasureDigits, _params$camera2, _params$camera3, returnRequest;
         return _regeneratorRuntime__default["default"].wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              if (!(this.doUseRealtimeRendering() && this.connectionHandler && (!this.connectionHandler.getConnectionReady() || !this.connectionHandler.getSuccessfullyJoinedToDivaNr()))) {
+              if (!(this.connectionHandler && (!this.connectionHandler.getConnectionReady() || !this.connectionHandler.getSuccessfullyJoinedToDivaNr()))) {
                 _context7.next = 5;
                 break;
               }
-              LOG$3.debug('RequestRendering - but connection Not Ready');
+              LOG$4.debug('RequestRendering - but connection Not Ready');
               this.todoAfterLogin.request3D.params = params;
               this.todoAfterLogin.request3D.doRequest3D = true;
               return _context7.abrupt("return");
             case 5:
-              LOG$3.debug('Request New 3D rendering: ' + (params === null || params === void 0 ? void 0 : params.doRequestRendering) + ', hqRenderScript: ' + (params === null || params === void 0 ? void 0 : params.doRequestHqRenderScript), 'PlannerHandler3D');
+              LOG$4.debug('Request New 3D rendering: ' + (params === null || params === void 0 ? void 0 : params.doRequestRendering) + ', hqRenderScript: ' + (params === null || params === void 0 ? void 0 : params.doRequestHqRenderScript), 'PlannerHandler3D');
               room = this.viewPointHandler.getCurRoomCodex();
               newRenderSize = this.setRoomInfoInPlanningData(params.planningData, (_params$renderRequest = (_params$renderRequest2 = params.renderRequestInfos) === null || _params$renderRequest2 === void 0 ? void 0 : _params$renderRequest2.width) !== null && _params$renderRequest !== void 0 ? _params$renderRequest : 500, (_params$renderRequest3 = (_params$renderRequest4 = params.renderRequestInfos) === null || _params$renderRequest4 === void 0 ? void 0 : _params$renderRequest4.height) !== null && _params$renderRequest3 !== void 0 ? _params$renderRequest3 : 500, (_params$renderRequest5 = (_params$renderRequest6 = params.renderRequestInfos) === null || _params$renderRequest6 === void 0 ? void 0 : _params$renderRequest6.mediaServiceSaveMode) !== null && _params$renderRequest5 !== void 0 ? _params$renderRequest5 : undefined);
               doReloadWholePlanning = true;
@@ -37486,103 +37037,63 @@ var PlannerHandler3D = /*#__PURE__*/function () {
               this.lastFramePlanningHash = planningHash;
               requestRenderingFrom3DHost = false;
               requestHqRenderScriptFrom3DHost = false;
-              if (!params.doRequestHqRenderScript) {
-                _context7.next = 23;
-                break;
-              }
-              if (this.doUseRealtimeRendering()) {
-                _context7.next = 21;
-                break;
-              }
-              LOG$3.error(new DivaUtils.DivaError('Requesting hqRenderScript is only supported when using real time rendering'));
-              return _context7.abrupt("return");
-            case 21:
-              rendering = this.hqRenderScriptCache.get(planningHash);
-              if (rendering) {
-                LOG$3.debug('Get HQRenderScript from cache');
-                this.lastSavedHQRenderScript = JSON.parse(rendering.HQRenderScript);
-                this.updatePlannerHqRenderScriptInView(rendering);
-                this.sendARRenderScript(rendering);
-                params.doRequestHqRenderScript = false;
-              } else {
-                if (!this.checkWaitForHQRenderScript(planningHash)) {
-                  requestHqRenderScriptFrom3DHost = true;
-                  this.waitForHQRenderScript.set(planningHash, new HQRenderScript('PLACEHOLDER'));
-                  //If a new HQRenderscript has to be loaded - always reload planning
-                  doReloadWholePlanning = true;
+              if (params.doRequestHqRenderScript) {
+                rendering = this.hqRenderScriptCache.get(planningHash);
+                if (rendering) {
+                  LOG$4.debug('Get HQRenderScript from cache');
+                  this.lastSavedHQRenderScript = JSON.parse(rendering.HQRenderScript);
+                  this.updatePlannerHqRenderScriptInView(rendering);
+                  this.sendARRenderScript(rendering);
+                  params.doRequestHqRenderScript = false;
+                } else {
+                  if (!this.checkWaitForHQRenderScript(planningHash)) {
+                    requestHqRenderScriptFrom3DHost = true;
+                    this.waitForHQRenderScript.set(planningHash, new HQRenderScript('PLACEHOLDER'));
+                    //If a new HQRenderscript has to be loaded - always reload planning
+                    doReloadWholePlanning = true;
+                  }
                 }
               }
-            case 23:
               renderHash = '';
               viewPointName = '';
               functionType = 'P3D';
-              if (!params.doRequestRendering) {
-                _context7.next = 54;
-                break;
-              }
-              viewPointName = this.viewPointHandler.getCurViewPointToRender();
-              sizeInfo = params.renderRequestInfos.width + ':' + params.renderRequestInfos.height;
-              renderHash = DivaUtils.md5(JSON.stringify(params.planningData) + '#' + room + '#' + viewPointName + '#' + sizeInfo + '#' + JSON.stringify((_params$camera = params.camera) !== null && _params$camera !== void 0 ? _params$camera : this.latestCamera));
-              this.lastRequestedRenderHash = renderHash;
-              LOG$3.debug('Request New Rendering with hash ' + renderHash + '; and planningHash: ' + planningHash, 'PlannerHandler3D');
-              if (this.doUseRealtimeRendering()) {
-                _context7.next = 40;
-                break;
-              }
-              productHash = this.getProductHash(params.planningData); // If you only have to load the rendering from the cache and do not have to create the cache - you not have to use the SignalR Connection
-              _context7.next = 36;
-              return this.requestRenderingCache(planningHash, renderHash, productHash, viewPointName, params.renderRequestInfos.width, params.renderRequestInfos.height, params.renderRequestInfos.isFullscreenRendering, params.renderRequestInfos.doShow3DDimensionLines, (_plannerMeasureDigits = params.renderRequestInfos.plannerMeasureDigits) !== null && _plannerMeasureDigits !== void 0 ? _plannerMeasureDigits : 0, params.catalogData);
-            case 36:
-              renderingFoundInCache = _context7.sent;
-              if (!renderingFoundInCache) LOG$3.debug('Cached rendering not found ' + renderHash);
-              _context7.next = 54;
-              break;
-            case 40:
-              if (!this.checkIsRenderingCached(renderHash, params.renderRequestInfos.planner3DGridEnabled, params.renderRequestInfos.mediaServiceSaveMode)) {
-                _context7.next = 47;
-                break;
-              }
-              //If planning is laoded from cache - reset lastFramePlanningHash. It can happen that something changed in the planning (Delete element) and the Rendering with 1 element is loaded from cahche - the exe has still 2 elements.
-              //When the client then rotates - nothing changes in the hash - but the exe loads 2 elements.
-              LOG$3.debug('Load Rendering from Cache with hash ' + renderHash, 'PlannerHandler3D');
-              this.lastFramePlanningHash = '';
-              _rendering = this.getRenderingFromCache(renderHash); //check if current rendering is fullscreenrendering
-              if ((!params.renderRequestInfos.planner3DGridEnabled || _rendering !== null && _rendering !== void 0 && _rendering.getHasLayerMask()) && !this.onlyRunLogic) {
-                if (params.renderRequestInfos.isFullscreenRendering != (_rendering === null || _rendering === void 0 ? void 0 : _rendering.getIsFullscreenRendering())) {
-                  fullscreenRendering = new Rendering('', '', '', -1, -1, false, false, 0, false, false, 'PERMANENT', undefined);
-                  fullscreenRendering.clone(_rendering);
-                  fullscreenRendering.setIsFullscreenRendering(params.renderRequestInfos.isFullscreenRendering);
-                  this.updatePlannerRendering(fullscreenRendering); //load the rendering as fullscreen image
-                  params.doRequestRendering = false;
+              if (params.doRequestRendering) {
+                viewPointName = this.viewPointHandler.getCurViewPointToRender();
+                sizeInfo = params.renderRequestInfos.width + ':' + params.renderRequestInfos.height;
+                renderHash = DivaUtils.md5(JSON.stringify(params.planningData) + '#' + room + '#' + viewPointName + '#' + sizeInfo + '#' + JSON.stringify((_params$camera = params.camera) !== null && _params$camera !== void 0 ? _params$camera : this.latestCamera));
+                this.lastRequestedRenderHash = renderHash;
+                LOG$4.debug('Request New Rendering with hash ' + renderHash + '; and planningHash: ' + planningHash, 'PlannerHandler3D');
+                if (this.checkIsRenderingCached(renderHash, params.renderRequestInfos.planner3DGridEnabled, params.renderRequestInfos.mediaServiceSaveMode)) {
+                  //If planning is laoded from cache - reset lastFramePlanningHash. It can happen that something changed in the planning (Delete element) and the Rendering with 1 element is loaded from cahche - the exe has still 2 elements.
+                  //When the client then rotates - nothing changes in the hash - but the exe loads 2 elements.
+                  LOG$4.debug('Load Rendering from Cache with hash ' + renderHash, 'PlannerHandler3D');
+                  this.lastFramePlanningHash = '';
+                  _rendering = this.getRenderingFromCache(renderHash); //check if current rendering is fullscreenrendering
+                  if ((!params.renderRequestInfos.planner3DGridEnabled || _rendering !== null && _rendering !== void 0 && _rendering.getHasLayerMask()) && !this.onlyRunLogic) {
+                    if (params.renderRequestInfos.isFullscreenRendering != (_rendering === null || _rendering === void 0 ? void 0 : _rendering.getIsFullscreenRendering())) {
+                      fullscreenRendering = new Rendering('', '', '', -1, -1, false, false, 0, false, false, 'PERMANENT', undefined);
+                      fullscreenRendering.clone(_rendering);
+                      fullscreenRendering.setIsFullscreenRendering(params.renderRequestInfos.isFullscreenRendering);
+                      this.updatePlannerRendering(fullscreenRendering); //load the rendering as fullscreen image
+                      params.doRequestRendering = false;
+                    } else {
+                      this.updatePlannerRendering(_rendering); //lade einfach
+                      params.doRequestRendering = false;
+                      LOG$4.debug('Do load rendering from cache with renderHash: ' + renderHash);
+                    }
+                  }
                 } else {
-                  this.updatePlannerRendering(_rendering); //lade einfach
-                  params.doRequestRendering = false;
-                  LOG$3.debug('Do load rendering from cache with renderHash: ' + renderHash);
-                }
-              }
-              _context7.next = 54;
-              break;
-            case 47:
-              renderingInCacheFound = false;
-              if (!(this.renderSettings.UseMediaServiceImageCache && this.viewPointHandler.getCurVPIsStart())) {
-                _context7.next = 53;
-                break;
-              }
-              _productHash = this.getProductHash(params.planningData);
-              _context7.next = 52;
-              return this.requestRenderingCache(planningHash, renderHash, _productHash, viewPointName, params.renderRequestInfos.width, params.renderRequestInfos.height, params.renderRequestInfos.isFullscreenRendering, params.renderRequestInfos.doShow3DDimensionLines, (_plannerMeasureDigits2 = params.renderRequestInfos.plannerMeasureDigits) !== null && _plannerMeasureDigits2 !== void 0 ? _plannerMeasureDigits2 : 0, params.catalogData);
-            case 52:
-              renderingInCacheFound = _context7.sent;
-            case 53:
-              if (!this.renderSettings.UseMediaServiceImageCache || !renderingInCacheFound) {
-                if (!this.checkWaitForImage(renderHash)) {
-                  requestRenderingFrom3DHost = true;
-                  this.waitForRenderings.set(renderHash, new Rendering('PLACEHOLDER', 'PLACEHOLDER', '', 0, 0, false, false, 0, false, false, 'STREAM'));
+                  renderingInCacheFound = false;
+                  if (!renderingInCacheFound) {
+                    if (!this.checkWaitForImage(renderHash)) {
+                      requestRenderingFrom3DHost = true;
+                      this.waitForRenderings.set(renderHash, new Rendering('PLACEHOLDER', 'PLACEHOLDER', '', 0, 0, false, false, 0, false, false, 'STREAM'));
+                    }
+                  }
                 }
               }
-            case 54:
               if (!(requestHqRenderScriptFrom3DHost || requestRenderingFrom3DHost)) {
-                _context7.next = 63;
+                _context7.next = 31;
                 break;
               }
               if (params.catalogData.lang) params.planningData.SCE.Lang = params.catalogData.lang;
@@ -37600,7 +37111,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
                   height: params.renderRequestInfos.height,
                   isFullscreenRendering: params.renderRequestInfos.isFullscreenRendering,
                   hasDimensionLines: params.renderRequestInfos.doShow3DDimensionLines,
-                  plannerMeasureDigits: (_plannerMeasureDigits3 = params.renderRequestInfos.plannerMeasureDigits) !== null && _plannerMeasureDigits3 !== void 0 ? _plannerMeasureDigits3 : 0,
+                  plannerMeasureDigits: (_plannerMeasureDigits = params.renderRequestInfos.plannerMeasureDigits) !== null && _plannerMeasureDigits !== void 0 ? _plannerMeasureDigits : 0,
                   planner3DGridEnabled: params.renderRequestInfos.planner3DGridEnabled,
                   mediaServiceSaveMode: params.renderRequestInfos.mediaServiceSaveMode,
                   functionType: functionType,
@@ -37615,14 +37126,14 @@ var PlannerHandler3D = /*#__PURE__*/function () {
               });
               if (params.camera) this.latestCamera = params.camera;
               if (!(returnRequest === undefined || requestHqRenderScriptFrom3DHost && returnRequest.hqRenderScript == undefined || requestRenderingFrom3DHost && returnRequest.rendering == undefined)) {
-                _context7.next = 61;
+                _context7.next = 29;
                 break;
               }
-              LOG$3.error(new DivaUtils.DivaError('Error requesting the 3D from host. RequestHqRenderScript: ' + requestHqRenderScriptFrom3DHost + '; RequestRendering: ' + requestRenderingFrom3DHost, {
+              LOG$4.error(new DivaUtils.DivaError('Error requesting the 3D from host. RequestHqRenderScript: ' + requestHqRenderScriptFrom3DHost + '; RequestRendering: ' + requestRenderingFrom3DHost, {
                 code: 'WC_0013'
               }));
               return _context7.abrupt("return");
-            case 61:
+            case 29:
               if (requestHqRenderScriptFrom3DHost) {
                 if (this.waitForHQRenderScript.has(planningHash)) this.waitForHQRenderScript["delete"](planningHash);
                 this.waitForHQRenderScript.set(planningHash, returnRequest.hqRenderScript);
@@ -37634,7 +37145,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
                   if (returnRequest.rendering.getIsAlternateRendering()) this.addAlternateRenderingToSavedAlternateRenderings(returnRequest.rendering);else this.lastSavedRendering = returnRequest.rendering;
                 }
               }
-            case 63:
+            case 31:
             case "end":
               return _context7.stop();
           }
@@ -37687,70 +37198,6 @@ var PlannerHandler3D = /*#__PURE__*/function () {
       });
       if (index === -1) this.lastSavedAlternateRenderings.push(rendering);else this.lastSavedAlternateRenderings[index] = rendering;
     }
-
-    /**
-     * This function handles to load a rendering from the cache
-     * @param hash
-     * @param viewPointName
-     * @param width
-     * @param height
-     * @param isFullscreenRendering
-     *
-     * @returns true, if the rendering was found in the cache
-     */
-  }, {
-    key: "requestRenderingCache",
-    value: (function () {
-      var _requestRenderingCache = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee8(planningHash, renderHash, productHash, viewPointName, width, height, isFullscreenRendering, hasDimensionLines, plannerMeasureDigits, catalogData, alternateRenderingsExist, alternateRendererInfo) {
-        var renderingInCacheFound, rendering, promises, _yield$Promise$all, _yield$Promise$all2, urlRenderingCache, urlARCache, doUpdateRendering;
-        return _regeneratorRuntime__default["default"].wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
-            case 0:
-              renderingInCacheFound = false;
-              if (this.waitForRenderings.has(renderHash)) {
-                _context8.next = 12;
-                break;
-              }
-              rendering = new Rendering(planningHash, renderHash, viewPointName, width, height, isFullscreenRendering, hasDimensionLines, plannerMeasureDigits, false, false, 'PERMANENT', alternateRenderingsExist, alternateRendererInfo);
-              this.waitForRenderings.set(renderHash, rendering);
-              //Try load image from cache
-              promises = [mediaServiceHandler.loadRenderingFromCache(renderHash), mediaServiceHandler.loadRenderingFromCache(productHash, false)];
-              _context8.next = 7;
-              return Promise.all(promises);
-            case 7:
-              _yield$Promise$all = _context8.sent;
-              _yield$Promise$all2 = _slicedToArray__default["default"](_yield$Promise$all, 2);
-              urlRenderingCache = _yield$Promise$all2[0];
-              urlARCache = _yield$Promise$all2[1];
-              if (urlRenderingCache || urlARCache) {
-                renderingInCacheFound = true;
-                if (urlRenderingCache) {
-                  rendering.setHQRenderingUrl(urlRenderingCache, this.renderSettings.UseSirvViewer);
-                  rendering.UrlToSavedRendering = rendering.getHQRenderingURL();
-                }
-                if (urlARCache) rendering.setArUrl(urlARCache);
-                rendering.IsLoadedFromCache = true;
-                rendering.CatalogCodex = catalogData.catalogCodex;
-                rendering.CatalogGUID = catalogData.catalogGUID;
-                LOG$3.debug('The rendering is loaded from the MediaServiceCache: ' + urlRenderingCache);
-                doUpdateRendering = this.checkRenderingReady(renderHash, rendering);
-                if (doUpdateRendering) this.updatePlannerRendering(rendering);
-              } else {
-                this.waitForRenderings["delete"](renderHash);
-              }
-            case 12:
-              return _context8.abrupt("return", renderingInCacheFound);
-            case 13:
-            case "end":
-              return _context8.stop();
-          }
-        }, _callee8, this);
-      }));
-      function requestRenderingCache(_x6, _x7, _x8, _x9, _x10, _x11, _x12, _x13, _x14, _x15, _x16, _x17) {
-        return _requestRenderingCache.apply(this, arguments);
-      }
-      return requestRenderingCache;
-    }())
   }, {
     key: "handleStaticVP",
     value: function handleStaticVP(vpCodex) {
@@ -37854,20 +37301,6 @@ var PlannerHandler3D = /*#__PURE__*/function () {
     value: function getStaticRoomListItems() {
       return this.viewPointHandler.getStaticRoomList();
     }
-
-    /**
-     * Clears the whole renderCache and sets the current rendering and the lastSavedRendering to undefined
-     */
-  }, {
-    key: "clearRenderCache",
-    value: function clearRenderCache() {
-      LOG$3.debug('PlannerHandler3D clearRenderCache');
-      this.renderCache.clear();
-      this.currRendering = undefined;
-      this.lastSavedRendering = undefined;
-      this.lastSavedAlternateRenderings = undefined;
-      this.hqRenderScriptCache.clear();
-    }
   }, {
     key: "clearCurrentRendering",
     value: function clearCurrentRendering() {
@@ -37896,11 +37329,6 @@ var PlannerHandler3D = /*#__PURE__*/function () {
     value: function checkIsWaitingForHQRenderScript() {
       return this.waitForHQRenderScript.size > 0;
     }
-  }, {
-    key: "getUseMediaServiceImageCache",
-    value: function getUseMediaServiceImageCache() {
-      return this.renderSettings.UseMediaServiceImageCache;
-    }
   }, {
     key: "setOrigConfigurationCallback",
     value: function setOrigConfigurationCallback(callback) {
@@ -37914,19 +37342,19 @@ var PlannerHandler3D = /*#__PURE__*/function () {
   }, {
     key: "openARObserverConnection",
     value: function () {
-      var _openARObserverConnection = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee10(handleNoHqrs) {
+      var _openARObserverConnection = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee9(handleNoHqrs) {
         var _this2 = this;
-        return _regeneratorRuntime__default["default"].wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              return _context10.abrupt("return", new Promise( /*#__PURE__*/function () {
-                var _ref = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee9(resolve, reject) {
+              return _context9.abrupt("return", new Promise( /*#__PURE__*/function () {
+                var _ref = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee8(resolve, reject) {
                   var socketUrl;
-                  return _regeneratorRuntime__default["default"].wrap(function _callee9$(_context9) {
-                    while (1) switch (_context9.prev = _context9.next) {
+                  return _regeneratorRuntime__default["default"].wrap(function _callee8$(_context8) {
+                    while (1) switch (_context8.prev = _context8.next) {
                       case 0:
                         if (_this2.liveArViewerUrl) {
-                          _context9.next = 2;
+                          _context8.next = 2;
                           break;
                         }
                         throw new Error('No Live AR Viewer URL set');
@@ -37942,26 +37370,26 @@ var PlannerHandler3D = /*#__PURE__*/function () {
                             }
                           });
                           _this2.liveArSocket.on('disconnect', function () {
-                            LOG$3.error(new DivaUtils.DivaError('AR Socket disconnected'));
+                            LOG$4.error(new DivaUtils.DivaError('AR Socket disconnected'));
                           });
                           _this2.liveArSocket.on('observer-joined', function () {
                             var _this2$liveArSocket;
-                            LOG$3.debug('AR Observer joined');
+                            LOG$4.debug('AR Observer joined');
                             _this2.liveArClientsConnected = true;
                             var hqRenderScript = _this2.lastSavedHQRenderScript;
                             if (hqRenderScript) (_this2$liveArSocket = _this2.liveArSocket) === null || _this2$liveArSocket === void 0 || _this2$liveArSocket.emit('update', {
                               hqRenderScript: JSON.stringify(hqRenderScript)
                             });else {
-                              LOG$3.debug('No HQRenderScript found for observer-joined');
+                              LOG$4.debug('No HQRenderScript found for observer-joined');
                               handleNoHqrs();
                             }
                           });
                           _this2.liveArSocket.on('observer-left', function () {
-                            LOG$3.debug('AR Observer left');
+                            LOG$4.debug('AR Observer left');
                             _this2.liveArClientsConnected = false;
                           });
                           _this2.liveArSocket.on('connected', function (data) {
-                            LOG$3.debug('AR Socket connected ' + data.connectionId);
+                            LOG$4.debug('AR Socket connected ' + data.connectionId);
                             _this2.liveArSocket.auth = _objectSpread$6(_objectSpread$6({}, _this2.liveArSocket.auth), {}, {
                               connectionId: data.connectionId
                             });
@@ -37975,21 +37403,21 @@ var PlannerHandler3D = /*#__PURE__*/function () {
                         }
                       case 3:
                       case "end":
-                        return _context9.stop();
+                        return _context8.stop();
                     }
-                  }, _callee9);
+                  }, _callee8);
                 }));
-                return function (_x19, _x20) {
+                return function (_x7, _x8) {
                   return _ref.apply(this, arguments);
                 };
               }()));
             case 1:
             case "end":
-              return _context10.stop();
+              return _context9.stop();
           }
-        }, _callee10);
+        }, _callee9);
       }));
-      function openARObserverConnection(_x18) {
+      function openARObserverConnection(_x6) {
         return _openARObserverConnection.apply(this, arguments);
       }
       return openARObserverConnection;
@@ -37999,10 +37427,10 @@ var PlannerHandler3D = /*#__PURE__*/function () {
     value: function sendARRenderScript(hqRenderScript) {
       var _this$liveArSocket;
       if (!this.liveArClientsConnected) {
-        LOG$3.debug('No AR Clients connected, dont send render script');
+        LOG$4.debug('No AR Clients connected, dont send render script');
         return;
       }
-      LOG$3.debug('Sending AR Render Script to clients');
+      LOG$4.debug('Sending AR Render Script to clients');
       (_this$liveArSocket = this.liveArSocket) === null || _this$liveArSocket === void 0 || _this$liveArSocket.emit('update', {
         hqRenderScript: hqRenderScript.HQRenderScript
       });
@@ -38010,6 +37438,131 @@ var PlannerHandler3D = /*#__PURE__*/function () {
   }]);
 }();
 
+var LOG$3 = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
+var DivaMediaServiceHandler = /*#__PURE__*/function () {
+  //-------------------------------------------------- INITIALIZATION--------------------------------------------------------------//
+
+  function DivaMediaServiceHandler() {
+    _classCallCheck__default["default"](this, DivaMediaServiceHandler);
+    _defineProperty__default["default"](this, "organizationId", void 0);
+    _defineProperty__default["default"](this, "mediaServiceUrl", void 0);
+    _defineProperty__default["default"](this, "mediaServiceApiKey", void 0);
+    _defineProperty__default["default"](this, "jwt", void 0);
+    _defineProperty__default["default"](this, "POST_saveTmp2PermanentPostfix", '/saveTmp2Permanent');
+    _defineProperty__default["default"](this, "GET_MediaItemrefs", '/v1/mediaitems/refs?limit=20&skip=0&filter=');
+    _defineProperty__default["default"](this, "POST_mediaItem", '/v1/mediaitems?ref=true');
+    this.organizationId = '';
+    this.mediaServiceUrl = '';
+    this.mediaServiceApiKey = '';
+  }
+  return _createClass__default["default"](DivaMediaServiceHandler, [{
+    key: "setOrganizationId",
+    value: function setOrganizationId(organizationId) {
+      this.organizationId = organizationId;
+    }
+  }, {
+    key: "setMediaServiceUrl",
+    value: function setMediaServiceUrl(mediaServiceUrl) {
+      this.mediaServiceUrl = mediaServiceUrl;
+    }
+  }, {
+    key: "setMediaServiceApiKey",
+    value: function setMediaServiceApiKey(mediaServiceApiKey) {
+      this.mediaServiceApiKey = mediaServiceApiKey;
+    }
+  }, {
+    key: "setJwt",
+    value: function setJwt(jwt) {
+      this.jwt = jwt;
+    }
+  }, {
+    key: "base64ToBlob",
+    value: function base64ToBlob(base64String, hash) {
+      DivaUtils__default["default"].startSpanOfApm('MediaServiceHandler base64ToBlob');
+      if (base64String.startsWith('data:image/jpeg;base64,')) {
+        base64String = base64String.replace('data:image/jpeg;base64,', '');
+      }
+      var binary_string = window.atob(base64String);
+      var len = binary_string.length;
+      var bytes = new Uint8Array(len);
+      for (var i = 0; i < len; i++) {
+        bytes[i] = binary_string.charCodeAt(i);
+      }
+      var blob = new File([bytes.buffer], hash + '.jpg', {
+        type: 'image/jpeg'
+      });
+      DivaUtils__default["default"].endSpanOfApm('MediaServiceHandler base64ToBlob');
+      return blob;
+    }
+  }, {
+    key: "savePlanning2DPermanent",
+    value: function () {
+      var _savePlanning2DPermanent = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(hash, catalogCodex, catalogGUID, planning2DAsJPG) {
+        var imageBlob, url, data, mediaItem, mediaItemRef, response, res;
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              DivaUtils__default["default"].startSpanOfApm('MediaServiceHandler savePlanning2DPermanent');
+              imageBlob = this.base64ToBlob(planning2DAsJPG, hash);
+              url = this.mediaServiceUrl + this.POST_mediaItem; //push media item return url
+              //create media item ref and set same paramters
+              data = new FormData();
+              data.append('file', imageBlob);
+              mediaItem = {
+                organizationId: this.organizationId,
+                mediaType: 'PCT',
+                fileName: hash + '.jpg'
+              };
+              data.append('mediaItem', JSON.stringify(mediaItem));
+              mediaItemRef = {
+                functionType: 'P2D',
+                planningHash: hash,
+                catalogCodex: catalogCodex,
+                catalogGuid: catalogGUID
+              };
+              data.append('mediaItemRef', JSON.stringify(mediaItemRef));
+              _context.next = 11;
+              return fetch(url, {
+                method: 'POST',
+                body: data,
+                headers: {
+                  'X-API-KEY': this.mediaServiceApiKey
+                }
+              });
+            case 11:
+              response = _context.sent;
+              if (!response.ok) {
+                _context.next = 20;
+                break;
+              }
+              _context.next = 15;
+              return response.json();
+            case 15:
+              res = _context.sent;
+              LOG$3.debug('Successfully saved 2D Planning in media Service. URL: ' + res.url);
+              return _context.abrupt("return", res.url);
+            case 20:
+              LOG$3.error(new DivaUtils.DivaError('Error when saving the Planning2D image on mediaService. Hash: ' + hash + 'response: ' + response, {
+                code: 'WC_0016'
+              }));
+            case 21:
+              DivaUtils__default["default"].endSpanOfApm('MediaServiceHandler savePlanning2DPermanent');
+              return _context.abrupt("return", '');
+            case 23:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function savePlanning2DPermanent(_x, _x2, _x3, _x4) {
+        return _savePlanning2DPermanent.apply(this, arguments);
+      }
+      return savePlanning2DPermanent;
+    }()
+  }]);
+}();
+var mediaServiceHandler = new DivaMediaServiceHandler();
+
 /**
  * This class saves a Bounding box. This bounding box can be of one Planner (one Set) or for several planner elements (multiple Sets)
  */
@@ -38344,7 +37897,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
     key: "initPlanner",
     value: (function () {
       var _initPlanner = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(initSetState, plannerHandlerFunctions) {
-        var renderGroup, diva3dServerUrl, divaMediaServiceUrl, mediaServiceApiKey, useSirvViewer, _initSetState$api$web, result;
+        var renderGroup, diva3dServerUrl, divaMediaServiceUrl, mediaServiceApiKey, _initSetState$api$web, result;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -38353,8 +37906,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               this.plannerHandlerFunctions = plannerHandlerFunctions;
               diva3dServerUrl = initSetState.api.get3DServerUrl();
               divaMediaServiceUrl = initSetState.api.getDivaMediaServiceUrl();
-              mediaServiceApiKey = initSetState.api.getDivaMediaServiceApiKey();
-              useSirvViewer = initSetState.api.getDiva3dUseSirvViewer(); //renderGroup = 'LeaTest';
+              mediaServiceApiKey = initSetState.api.getDivaMediaServiceApiKey(); //renderGroup = 'LeaTest';
               //diva3dServerUrl = "https://test-einkauf-onboarding.pfister.ch/diva3d/diva3dhost2/";
               // diva3dServerUrl = "https://diva3dhost.diva-portal.com/diva3d/diva3dhost2/";
               //diva3dServerUrl = 'https://localhost:44315/';
@@ -38364,7 +37916,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               //divaMediaServiceUrl = 'https://api-test.diva-portal.com/media/';
               //divaMediaServiceUrl = 'http://localhost:3000';
               if (!(!initSetState.onlyRunLogic && !initSetState.no3DConnection)) {
-                _context.next = 15;
+                _context.next = 14;
                 break;
               }
               this.handler3D.initializeCallbackFunctions({
@@ -38376,34 +37928,31 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               this.handler3D.setJwt(initSetState.api.getJwt());
               //Only use if only 1 Planner/Set is used. Not possible in setPlanner
               result = this.handler3D.initializeAPISettings({
-                useMediaServiceImageCache: initSetState.api.getDiva3dUseImageCache(),
-                suppressCacheCreation: initSetState.api.getDiva3DSuppressCacheCreation(),
                 renderGroup: renderGroup,
                 diva3dServerUrl: diva3dServerUrl,
                 divaMediaServiceUrl: divaMediaServiceUrl,
                 organizationId: initSetState.organizationId,
-                useSirvViewer: useSirvViewer,
                 arViewerUrl: (_initSetState$api$web = initSetState.api.webConfig) === null || _initSetState$api$web === void 0 ? void 0 : _initSetState$api$web.arViewerUrl
               });
               if (!(!this.handler3D.checkConnectionInitialized() || result.renderGroupChanged || result.diva3dServerUrlChanged)) {
-                _context.next = 14;
+                _context.next = 13;
                 break;
               }
-              _context.next = 14;
+              _context.next = 13;
               return this.handler3D.initializeConnection();
-            case 14:
+            case 13:
               if (this.divaNr != initSetState.divaNr) {
                 this.divaNr = initSetState.divaNr;
                 this.handler3D.joinDivaNr(this.divaNr);
               }
-            case 15:
+            case 14:
               mediaServiceHandler.setMediaServiceUrl(divaMediaServiceUrl);
               mediaServiceHandler.setMediaServiceApiKey(mediaServiceApiKey);
               mediaServiceHandler.setOrganizationId(initSetState.organizationId);
               mediaServiceHandler.setJwt(initSetState.api.getJwt());
               this.handler3D.setOrigConfigurationCallback(this.plannerHandlerFunctions.getOrigConfiguration);
               DivaUtils__default["default"].endSpanOfApm('DivaPlannerHandler initPlanner');
-            case 21:
+            case 20:
             case "end":
               return _context.stop();
           }
@@ -38520,10 +38069,8 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
           roomlistCodex,
           roomLists,
           _yield$import,
-          DivaSingleProductPlanner,
-          _yield$import2,
           DivaStandardPlanner,
-          _yield$import3,
+          _yield$import2,
           DivaBoxPlanner,
           _args4 = arguments;
         return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context4) {
@@ -38552,58 +38099,44 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               }
               this.handler3D.initializeViewPoint(catalogData.standardWhiteroom);
               _context4.t0 = set.getPlannerEdition();
-              _context4.next = _context4.t0 === 'STANDARD' ? 8 : _context4.t0 === 'BOX' ? 23 : 29;
+              _context4.next = _context4.t0 === 'STANDARD' ? 8 : _context4.t0 === 'BOX' ? 15 : 21;
               break;
             case 8:
-              if (!this.handler3D.getUseMediaServiceImageCache()) {
-                _context4.next = 16;
-                break;
-              }
-              _context4.next = 11;
-              return Promise.resolve().then(function () { return require('./DivaSingleProductPlanner-fcf3e4be.js'); });
-            case 11:
+              _context4.next = 10;
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-25919135.js'); });
+            case 10:
               _yield$import = _context4.sent;
-              DivaSingleProductPlanner = _yield$import["default"];
-              planner = new DivaSingleProductPlanner(set, this.plannerIDCount, this.setPlannerHandler.getGlobalBoundingBox(), set.api.getHidePlanner());
-              _context4.next = 22;
-              break;
-            case 16:
-              _context4.next = 18;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-a18f752d.js'); });
-            case 18:
-              _yield$import2 = _context4.sent;
-              DivaStandardPlanner = _yield$import2["default"];
+              DivaStandardPlanner = _yield$import["default"];
               planner = new DivaStandardPlanner(set, this.plannerHandlerFunctions.updatePlannerMsgContainer, this.plannerIDCount, this.setPlannerHandler.getGlobalBoundingBox(), set.api.getHidePlanner(), !!set.api.getDoShowAR(), set.api.getDoDisablePlanner2D(), hasStaticBackground);
               if (catalogData.isIDM3DCat) {
                 planner.initIDM3DMeta(catalogData.IDM3DCatCodex);
               }
-            case 22:
-              return _context4.abrupt("break", 29);
-            case 23:
-              _context4.next = 25;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-6a883291.js'); });
-            case 25:
-              _yield$import3 = _context4.sent;
-              DivaBoxPlanner = _yield$import3["default"];
+              return _context4.abrupt("break", 21);
+            case 15:
+              _context4.next = 17;
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-26e0cace.js'); });
+            case 17:
+              _yield$import2 = _context4.sent;
+              DivaBoxPlanner = _yield$import2["default"];
               planner = new DivaBoxPlanner(set, this.plannerIDCount);
-              return _context4.abrupt("break", 29);
-            case 29:
+              return _context4.abrupt("break", 21);
+            case 21:
               this.plannerList.set(set.getSetId(), planner);
               this.plannerIDCount++;
               if (!(setPlanData != null && setPlanData != '')) {
-                _context4.next = 34;
+                _context4.next = 26;
                 break;
               }
-              _context4.next = 34;
+              _context4.next = 26;
               return planner.initPlanner(setPlanData);
-            case 34:
+            case 26:
               if (lastSetToInitialize) {
                 this.updateAllPlannerBBs();
                 this.setPlannerHandler.calcGlobalBoundingBox(this.plannerList);
               }
               this.setPlannerHandler.updateSetPosNr(this.plannerList);
               DivaUtils__default["default"].endSpanOfApm('DivaPlannerHandler initSet');
-            case 37:
+            case 29:
             case "end":
               return _context4.stop();
           }
@@ -39073,7 +38606,6 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
   }, {
     key: "clearHandler3D",
     value: function clearHandler3D() {
-      this.handler3D.clearRenderCache();
       this.handler3D.closeConnection();
     }
   }, {
@@ -39322,7 +38854,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
         if (!renderRequestInfos) {
           LOG$2.error(new DivaUtils.DivaError('Error requesting 3D rendering. No renderRequestInfo is set'));
           return;
-        } else if ((renderRequestInfos.width <= 0 || isNaN(renderRequestInfos.width) || renderRequestInfos.height <= 0 || isNaN(renderRequestInfos.height)) && !this.handler3D.getUseMediaServiceImageCache()) {
+        } else if (renderRequestInfos.width <= 0 || isNaN(renderRequestInfos.width) || renderRequestInfos.height <= 0 || isNaN(renderRequestInfos.height)) {
           LOG$2.error(new DivaUtils.DivaError('Error requesting rendering. Not valid width or height request width: ' + renderRequestInfos.width + ' height: ' + renderRequestInfos.height));
           return;
         }
@@ -39331,14 +38863,11 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
       var loadedCatData = [];
       var plannerExists = false;
       var savedSetId = undefined;
-      var containsNotDigitalizedTextures = false;
-      var useMediaServiceImageCache = doRequestRendering && this.handler3D.getUseMediaServiceImageCache() ? true : false;
       this.plannerList.forEach(function (planner, setId) {
         var _renderRequestInfos$d;
         savedSetId = setId;
-        var config = planner.getSetData(true, _this3.plannerHandlerFunctions.doAllowSetPlanner(), (_renderRequestInfos$d = renderRequestInfos === null || renderRequestInfos === void 0 ? void 0 : renderRequestInfos.doShow3DDimensionLines) !== null && _renderRequestInfos$d !== void 0 ? _renderRequestInfos$d : false, useMediaServiceImageCache, alternateRenderInfo);
+        var config = planner.getSetData(true, _this3.plannerHandlerFunctions.doAllowSetPlanner(), (_renderRequestInfos$d = renderRequestInfos === null || renderRequestInfos === void 0 ? void 0 : renderRequestInfos.doShow3DDimensionLines) !== null && _renderRequestInfos$d !== void 0 ? _renderRequestInfos$d : false, alternateRenderInfo);
         var setData = config.constructionSet;
-        if (config.containsNotDigitalizedTextures) containsNotDigitalizedTextures = true;
 
         //Add technical Info to setData
         var bboxInfo2D = _this3.get2DViewPlannerBoundingBox();
@@ -39358,15 +38887,6 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
         });
       });
       if (plannerExists) {
-        if (containsNotDigitalizedTextures) {
-          var _this$plannerHandlerF3, _this$plannerHandlerF4;
-          (_this$plannerHandlerF3 = (_this$plannerHandlerF4 = this.plannerHandlerFunctions).updatePlannerMsgContainer) === null || _this$plannerHandlerF3 === void 0 || _this$plannerHandlerF3.call(_this$plannerHandlerF4, 'TEXTURE_NOT_DIGITALIZED_WARNING', true, 'INFO', 'TEXTURE_NOT_DIGITALIZED_WARNING', false, undefined);
-        } else {
-          var _this$plannerHandlerF5, _this$plannerHandlerF6;
-          //Hide message warning if shown
-          (_this$plannerHandlerF5 = (_this$plannerHandlerF6 = this.plannerHandlerFunctions).updatePlannerMsgContainer) === null || _this$plannerHandlerF5 === void 0 || _this$plannerHandlerF5.call(_this$plannerHandlerF6, 'TEXTURE_NOT_DIGITALIZED_WARNING', false, 'INFO', 'TEXTURE_NOT_DIGITALIZED_WARNING', false, undefined);
-        }
-
         // if not in set planner mode overwrite s1 with correct setId
         if (!this.plannerHandlerFunctions.doAllowSetPlanner()) {
           plannerData.SCE.ROO[0].SET[0].ID = savedSetId;
@@ -39409,12 +38929,12 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
 
       if (!setId) {
         this.plannerList.forEach(function (planner, setId) {
-          var config = planner.getSetData(true, _this4.plannerHandlerFunctions.doAllowSetPlanner(), false, _this4.handler3D.getUseMediaServiceImageCache());
+          var config = planner.getSetData(true, _this4.plannerHandlerFunctions.doAllowSetPlanner(), false);
           var setData = config.constructionSet;
           plannerData.SCE.ROO[0].SET.push(setData);
         });
       } else {
-        var config = this.plannerList.get(setId).getSetData(true, this.plannerHandlerFunctions.doAllowSetPlanner(), false, this.handler3D.getUseMediaServiceImageCache());
+        var config = this.plannerList.get(setId).getSetData(true, this.plannerHandlerFunctions.doAllowSetPlanner(), false);
         plannerData.SCE.ROO[0].SET.push(config.constructionSet);
       }
       return JSON.stringify(plannerData);
@@ -39441,7 +38961,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
       //      let posInformation: any = {};
 
       this.plannerList.forEach(function (planner, setId) {
-        var config = planner.getSetData(false, _this5.plannerHandlerFunctions.doAllowSetPlanner(), false, _this5.handler3D.getUseMediaServiceImageCache());
+        var config = planner.getSetData(false, _this5.plannerHandlerFunctions.doAllowSetPlanner(), false);
         plannerData.SCE.ROO[0].SET.push(config.constructionSet);
       });
       return DivaUtils.md5(JSON.stringify(plannerData));
@@ -39496,7 +39016,6 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "updatePlanner3DImage", void 0);
     _defineProperty__default["default"](this, "setRotationOrbitCube", void 0);
     _defineProperty__default["default"](this, "getCanvas2DAsJPG", void 0);
-    _defineProperty__default["default"](this, "updateSirvViewer", void 0);
     _defineProperty__default["default"](this, "updateFullscreenRendering", void 0);
     _defineProperty__default["default"](this, "plannerHandler", void 0);
     _defineProperty__default["default"](this, "updateSetImage", void 0);
@@ -39586,18 +39105,12 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       if (rendering.getIsFullscreenRendering()) {
         _this.updateFullscreenRendering(rendering);
       } else {
-        if (_this.getCurPlannerViewMode() == 'SirvViewer_only') {
-          var _this$actSet, _this$updateSirvViewe, _this$actSet2;
-          (_this$actSet = _this.actSet()) === null || _this$actSet === void 0 || _this$actSet.getVariantBasketData();
-          (_this$updateSirvViewe = _this.updateSirvViewer) === null || _this$updateSirvViewe === void 0 || _this$updateSirvViewe.call(_this, rendering, (_this$actSet2 = _this.actSet()) === null || _this$actSet2 === void 0 ? void 0 : _this$actSet2.getArticleVariantValues());
-        } else {
-          var _this$actSet3;
-          _this.updatePlanner3DImage(rendering, ((_this$actSet3 = _this.actSet()) === null || _this$actSet3 === void 0 ? void 0 : _this$actSet3.getAlternateRenderInfo().length) > 0);
-        }
+        var _this$actSet;
+        _this.updatePlanner3DImage(rendering, ((_this$actSet = _this.actSet()) === null || _this$actSet === void 0 ? void 0 : _this$actSet.getAlternateRenderInfo().length) > 0);
       }
       if (_this.actions && (_this$state = _this.state) !== null && _this$state !== void 0 && _this$state.enableSupport) {
-        var _this$actSet4, _this$state$user, _this$state$user2, _this$state$user3;
-        _this.api.postPlanningInfo((_this$actSet4 = _this.actSet()) === null || _this$actSet4 === void 0 ? void 0 : _this$actSet4.getVariantBasketData(), _this.divaNr, rendering.getImageForSrc(), _this.getCurSetPrice() + setHandlerInstance.getActSetPriceFormat(_this.actSet()), _this.getCurCatalogName(), (_this$state$user = _this.state.user) === null || _this$state$user === void 0 ? void 0 : _this$state$user._id, (_this$state$user2 = _this.state.user) === null || _this$state$user2 === void 0 ? void 0 : _this$state$user2.name, (_this$state$user3 = _this.state.user) === null || _this$state$user3 === void 0 ? void 0 : _this$state$user3.familyName, _this.state.organization._id);
+        var _this$actSet2, _this$state$user, _this$state$user2, _this$state$user3;
+        _this.api.postPlanningInfo((_this$actSet2 = _this.actSet()) === null || _this$actSet2 === void 0 ? void 0 : _this$actSet2.getVariantBasketData(), _this.divaNr, rendering.getImageForSrc(), _this.getCurSetPrice() + setHandlerInstance.getActSetPriceFormat(_this.actSet()), _this.getCurCatalogName(), (_this$state$user = _this.state.user) === null || _this$state$user === void 0 ? void 0 : _this$state$user._id, (_this$state$user2 = _this.state.user) === null || _this$state$user2 === void 0 ? void 0 : _this$state$user2.name, (_this$state$user3 = _this.state.user) === null || _this$state$user3 === void 0 ? void 0 : _this$state$user3.familyName, _this.state.organization._id);
       }
     });
     /**
@@ -40439,19 +39952,19 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getDivaArticles",
     value: function getDivaArticles() {
-      var _this$actSet5;
-      return (_this$actSet5 = this.actSet()) === null || _this$actSet5 === void 0 ? void 0 : _this$actSet5.getDivaArticles();
+      var _this$actSet3;
+      return (_this$actSet3 = this.actSet()) === null || _this$actSet3 === void 0 ? void 0 : _this$actSet3.getDivaArticles();
     }
   }, {
     key: "getDimension",
     value: function () {
       var _getDimension = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee14() {
-        var _this$actSet6;
+        var _this$actSet4;
         return _regeneratorRuntime__default["default"].wrap(function _callee14$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
             case 0:
               _context14.next = 2;
-              return (_this$actSet6 = this.actSet()) === null || _this$actSet6 === void 0 ? void 0 : _this$actSet6.getDimensionPerVariant();
+              return (_this$actSet4 = this.actSet()) === null || _this$actSet4 === void 0 ? void 0 : _this$actSet4.getDimensionPerVariant();
             case 2:
               return _context14.abrupt("return", _context14.sent);
             case 3:
@@ -40510,7 +40023,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               this.updateWebConfiguratorTitle();
               //initialize planner view
               (_this$updateViewPlann9 = this.updateViewPlannerElements) === null || _this$updateViewPlann9 === void 0 || _this$updateViewPlann9.call(this, setHandlerInstance.getAllViewPlannerElements(set), setHandlerInstance.getAllVisualiedNotPlannedElements(set), set.getSetId(), set.firstElementId);
-              this.initCache();
+              this.updatePlannerView('INIT_VIEW');
               this.onBasketInitialized();
               this.checkVariantData();
             case 17:
@@ -40530,8 +40043,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "updateWebConfiguratorTitle",
     value: function updateWebConfiguratorTitle() {
-      var _this$setWebConifgura, _this$actSet7;
-      (_this$setWebConifgura = this.setWebConifguratorTitle) === null || _this$setWebConifgura === void 0 || _this$setWebConifgura.call(this, (_this$actSet7 = this.actSet()) === null || _this$actSet7 === void 0 ? void 0 : _this$actSet7.getSetTitle());
+      var _this$setWebConifgura, _this$actSet5;
+      (_this$setWebConifgura = this.setWebConifguratorTitle) === null || _this$setWebConifgura === void 0 || _this$setWebConifgura.call(this, (_this$actSet5 = this.actSet()) === null || _this$actSet5 === void 0 ? void 0 : _this$actSet5.getSetTitle());
     }
   }, {
     key: "updateConfigStructure",
@@ -40543,7 +40056,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     value: function () {
       var _runInitMode = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee16(plannerMode) {
         var _this$navigateToTabGr2;
-        var doDefault, configStepKey, _this$actSet8, _this$navigateToTabGr3, _this$navigateToTabGr4, _this$navigateToTabGr5;
+        var doDefault, configStepKey, _this$actSet6, _this$navigateToTabGr3, _this$navigateToTabGr4, _this$navigateToTabGr5;
         return _regeneratorRuntime__default["default"].wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
@@ -40578,7 +40091,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               if (doDefault) {
                 if (plannerMode == 'ProductList') {
                   (_this$navigateToTabGr3 = this.navigateToTabGroup) === null || _this$navigateToTabGr3 === void 0 || _this$navigateToTabGr3.call(this, 'PRODUCTS');
-                } else if ((_this$actSet8 = this.actSet()) !== null && _this$actSet8 !== void 0 && _this$actSet8.hasStaticRoomList) {
+                } else if ((_this$actSet6 = this.actSet()) !== null && _this$actSet6 !== void 0 && _this$actSet6.hasStaticRoomList) {
                   (_this$navigateToTabGr4 = this.navigateToTabGroup) === null || _this$navigateToTabGr4 === void 0 || _this$navigateToTabGr4.call(this, 'ROOMLIST', true);
                 } else {
                   (_this$navigateToTabGr5 = this.navigateToTabGroup) === null || _this$navigateToTabGr5 === void 0 || _this$navigateToTabGr5.call(this, this.getCurPlannerType(true), true);
@@ -40595,24 +40108,6 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       }
       return runInitMode;
     }()
-  }, {
-    key: "initCache",
-    value: function initCache() {
-      //get cached image
-      var initFirstRenderingByCache = false;
-      if (DivaUtils__default["default"].CacheIsEnabled) {
-        var firstImageUrl = DivaUtils__default["default"].getCacheData('FIRSTIMAGE', '');
-        if (firstImageUrl) {
-          initFirstRenderingByCache = true;
-          var rendering = new Rendering('', '', '', -1, -1, false, false, 0, false, false, 'STREAM');
-          rendering.setHQRenderingUrl(firstImageUrl, this.api.getDiva3dUseSirvViewer());
-          this.updatePlannerRendering(rendering);
-        }
-      }
-      if (!initFirstRenderingByCache) {
-        this.updatePlannerView('INIT_VIEW');
-      }
-    }
   }, {
     key: "addSetToActPlanningByDivaNr",
     value: function () {
@@ -40826,7 +40321,6 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           setHandlerInstance.update3DPlannerView(true, true, set, this.getPlannerRenderingSize(), this.getPlanner3DGridEnabled(), 'STREAM', (_this$getDoShow3DDime2 = this.getDoShow3DDimensionLines) === null || _this$getDoShow3DDime2 === void 0 ? void 0 : _this$getDoShow3DDime2.call(this), alternateRenderInfo, viewpoint);
           break;
         case '3DImage':
-        case 'SirvViewer_only':
           //Request new Rendering
           setHandlerInstance.update3DPlannerView(true, !!this.doLoadHQR, set, this.getPlannerRenderingSize(), this.getPlanner3DGridEnabled(), 'STREAM', (_this$getDoShow3DDime3 = this.getDoShow3DDimensionLines) === null || _this$getDoShow3DDime3 === void 0 ? void 0 : _this$getDoShow3DDime3.call(this), alternateRenderInfo);
           break;
@@ -40873,8 +40367,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getAlternateRenderingsForSummary",
     value: function getAlternateRenderingsForSummary() {
-      var _this$actSet9;
-      return (_this$actSet9 = this.actSet()) === null || _this$actSet9 === void 0 || (_this$actSet9 = _this$actSet9.CatalogData) === null || _this$actSet9 === void 0 ? void 0 : _this$actSet9.alternateRenderingsForSummary;
+      var _this$actSet7;
+      return (_this$actSet7 = this.actSet()) === null || _this$actSet7 === void 0 || (_this$actSet7 = _this$actSet7.CatalogData) === null || _this$actSet7 === void 0 ? void 0 : _this$actSet7.alternateRenderingsForSummary;
     }
   }, {
     key: "destroyWebPlanner",
@@ -41170,8 +40664,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "setDifferentOptions",
     value: function setDifferentOptions(options) {
-      var _this$actSet10;
-      (_this$actSet10 = this.actSet()) === null || _this$actSet10 === void 0 || _this$actSet10.setDifferentOptions(options);
+      var _this$actSet8;
+      (_this$actSet8 = this.actSet()) === null || _this$actSet8 === void 0 || _this$actSet8.setDifferentOptions(options);
     }
 
     /**
@@ -41548,7 +41042,6 @@ var DivaWebPlanner = /*#__PURE__*/function () {
      * This function returns true if the Planner Mode should be visible and the planner Step should be shown.
      * The planner step is not shown if:
      * - There is no viewer Option set for the Planner
-     * - The configurator config disables the planner Step (SuS + Cache System)
      * - The box Planner is loaded
      */
   }, {
@@ -41569,8 +41062,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
 
       //if planner is hidden by config but nothing is planned initially
       if (plannerType === 'NONE') {
-        var _this$plannerConfig$a7, _this$actSet11;
-        if (!this.plannerConfig.divaNr && this.plannerConfig.catalogCodex && !((_this$plannerConfig$a7 = this.plannerConfig.articleCodexes) !== null && _this$plannerConfig$a7 !== void 0 && _this$plannerConfig$a7.length) && !this.plannerConfig.productId && !this.plannerConfig.customProductId && !this.plannerConfig.basketData && !((_this$actSet11 = this.actSet()) !== null && _this$actSet11 !== void 0 && (_this$actSet11 = _this$actSet11.CatalogData.startPlannerArticle) !== null && _this$actSet11 !== void 0 && _this$actSet11.length)) {
+        var _this$plannerConfig$a7, _this$actSet9;
+        if (!this.plannerConfig.divaNr && this.plannerConfig.catalogCodex && !((_this$plannerConfig$a7 = this.plannerConfig.articleCodexes) !== null && _this$plannerConfig$a7 !== void 0 && _this$plannerConfig$a7.length) && !this.plannerConfig.productId && !this.plannerConfig.customProductId && !this.plannerConfig.basketData && !((_this$actSet9 = this.actSet()) !== null && _this$actSet9 !== void 0 && (_this$actSet9 = _this$actSet9.CatalogData.startPlannerArticle) !== null && _this$actSet9 !== void 0 && _this$actSet9.length)) {
           plannerType = 'PLANNER';
         }
       }
@@ -41610,38 +41103,38 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getCurCatalogCodex",
     value: function getCurCatalogCodex() {
-      var _this$actSet12;
-      return (_this$actSet12 = this.actSet()) === null || _this$actSet12 === void 0 ? void 0 : _this$actSet12.getCatalogCodex();
+      var _this$actSet10;
+      return (_this$actSet10 = this.actSet()) === null || _this$actSet10 === void 0 ? void 0 : _this$actSet10.getCatalogCodex();
     }
   }, {
     key: "getCurCatalogName",
     value: function getCurCatalogName() {
-      var _this$actSet13;
-      return (_this$actSet13 = this.actSet()) === null || _this$actSet13 === void 0 ? void 0 : _this$actSet13.getCatalogName();
+      var _this$actSet11;
+      return (_this$actSet11 = this.actSet()) === null || _this$actSet11 === void 0 ? void 0 : _this$actSet11.getCatalogName();
     }
   }, {
     key: "getCurAccountName",
     value: function getCurAccountName() {
-      var _this$actSet14;
-      return (_this$actSet14 = this.actSet()) === null || _this$actSet14 === void 0 ? void 0 : _this$actSet14.getAccountName();
+      var _this$actSet12;
+      return (_this$actSet12 = this.actSet()) === null || _this$actSet12 === void 0 ? void 0 : _this$actSet12.getAccountName();
     }
   }, {
     key: "getCurSupplierGuid",
     value: function getCurSupplierGuid() {
-      var _this$actSet15;
-      return (_this$actSet15 = this.actSet()) === null || _this$actSet15 === void 0 ? void 0 : _this$actSet15.getSupplierGuid();
+      var _this$actSet13;
+      return (_this$actSet13 = this.actSet()) === null || _this$actSet13 === void 0 ? void 0 : _this$actSet13.getSupplierGuid();
     }
   }, {
     key: "getCurSetPrice",
     value: function getCurSetPrice() {
-      var _this$actSet$getSetPr, _this$actSet16;
-      return (_this$actSet$getSetPr = (_this$actSet16 = this.actSet()) === null || _this$actSet16 === void 0 ? void 0 : _this$actSet16.getSetPrice()) !== null && _this$actSet$getSetPr !== void 0 ? _this$actSet$getSetPr : 0;
+      var _this$actSet$getSetPr, _this$actSet14;
+      return (_this$actSet$getSetPr = (_this$actSet14 = this.actSet()) === null || _this$actSet14 === void 0 ? void 0 : _this$actSet14.getSetPrice()) !== null && _this$actSet$getSetPr !== void 0 ? _this$actSet$getSetPr : 0;
     }
   }, {
     key: "getCurImageMode",
     value: function getCurImageMode() {
-      var _this$actSet17;
-      return (_this$actSet17 = this.actSet()) !== null && _this$actSet17 !== void 0 && (_this$actSet17 = _this$actSet17.CatalogData) !== null && _this$actSet17 !== void 0 && _this$actSet17.has3dModels ? '3D' : '2D';
+      var _this$actSet15;
+      return (_this$actSet15 = this.actSet()) !== null && _this$actSet15 !== void 0 && (_this$actSet15 = _this$actSet15.CatalogData) !== null && _this$actSet15 !== void 0 && _this$actSet15.has3dModels ? '3D' : '2D';
     }
   }, {
     key: "getViewConfig",
@@ -41672,73 +41165,63 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "doShow3DDimensionLines",
     value: function doShow3DDimensionLines() {
-      var _this$actSet18;
-      return (_this$actSet18 = this.actSet()) === null || _this$actSet18 === void 0 || (_this$actSet18 = _this$actSet18.CatalogData) === null || _this$actSet18 === void 0 ? void 0 : _this$actSet18.doShow3DDimensionLines;
+      var _this$actSet16;
+      return (_this$actSet16 = this.actSet()) === null || _this$actSet16 === void 0 || (_this$actSet16 = _this$actSet16.CatalogData) === null || _this$actSet16 === void 0 ? void 0 : _this$actSet16.doShow3DDimensionLines;
     }
   }, {
     key: "hidePlannerUiIcons",
     value: function hidePlannerUiIcons() {
-      var _this$actSet19;
-      return (_this$actSet19 = this.actSet()) === null || _this$actSet19 === void 0 || (_this$actSet19 = _this$actSet19.CatalogData) === null || _this$actSet19 === void 0 ? void 0 : _this$actSet19.hidePlannerUiIcons;
+      var _this$actSet17;
+      return (_this$actSet17 = this.actSet()) === null || _this$actSet17 === void 0 || (_this$actSet17 = _this$actSet17.CatalogData) === null || _this$actSet17 === void 0 ? void 0 : _this$actSet17.hidePlannerUiIcons;
     }
   }, {
     key: "doShowPlannerReplaceMode",
     value: function doShowPlannerReplaceMode() {
-      var _this$actSet20, _this$api$getViewConf2, _catalogData$PlannerP, _catalogData$PlannerP2;
-      var catalogData = (_this$actSet20 = this.actSet()) === null || _this$actSet20 === void 0 ? void 0 : _this$actSet20.CatalogData;
+      var _this$actSet18, _this$api$getViewConf2, _catalogData$PlannerP, _catalogData$PlannerP2;
+      var catalogData = (_this$actSet18 = this.actSet()) === null || _this$actSet18 === void 0 ? void 0 : _this$actSet18.CatalogData;
       return (catalogData === null || catalogData === void 0 ? void 0 : catalogData.replaceModeActive) && ((_this$api$getViewConf2 = this.api.getViewConfig()) === null || _this$api$getViewConf2 === void 0 ? void 0 : _this$api$getViewConf2.showReplaceFunctionInPlanner) && Object.entries(catalogData.allCatalogPlannerArticles).length > 1 && Object.entries((_catalogData$PlannerP = (_catalogData$PlannerP2 = catalogData.PlannerPaletteViewInfo) === null || _catalogData$PlannerP2 === void 0 ? void 0 : _catalogData$PlannerP2.catalogPlannerArticles) !== null && _catalogData$PlannerP !== void 0 ? _catalogData$PlannerP : {}).length > 1;
     }
   }, {
     key: "doPlannerReplaceAutoSwitch",
     value: function doPlannerReplaceAutoSwitch() {
-      var _this$actSet21, _this$api$getViewConf3;
-      var catalogData = (_this$actSet21 = this.actSet()) === null || _this$actSet21 === void 0 ? void 0 : _this$actSet21.CatalogData;
+      var _this$actSet19, _this$api$getViewConf3;
+      var catalogData = (_this$actSet19 = this.actSet()) === null || _this$actSet19 === void 0 ? void 0 : _this$actSet19.CatalogData;
       return (catalogData === null || catalogData === void 0 ? void 0 : catalogData.catalogPlannsCompletely) && this.doShowPlannerReplaceMode() && ((_this$api$getViewConf3 = this.api.getViewConfig()) === null || _this$api$getViewConf3 === void 0 ? void 0 : _this$api$getViewConf3.allowAutoSwitchInReplaceFunctionInPlanner);
     }
   }, {
     key: "getHidePlanner",
     value: function getHidePlanner() {
-      var _this$actSet22;
-      return this.api.getHidePlanner() || !!((_this$actSet22 = this.actSet()) !== null && _this$actSet22 !== void 0 && _this$actSet22.CatalogData.useBoxPlanner);
+      var _this$actSet20;
+      return this.api.getHidePlanner() || !!((_this$actSet20 = this.actSet()) !== null && _this$actSet20 !== void 0 && _this$actSet20.CatalogData.useBoxPlanner);
     }
   }, {
     key: "getAllowRTV",
     value: function getAllowRTV() {
-      var _this$actSet23, _this$actSet24;
-      if ((_this$actSet23 = this.actSet()) !== null && _this$actSet23 !== void 0 && _this$actSet23.CatalogData.divaForceRTV) return true;
-      if (this.api.getDoShowRTV() && (_this$actSet24 = this.actSet()) !== null && _this$actSet24 !== void 0 && _this$actSet24.CatalogData.divaArReady) return true;
+      var _this$actSet21, _this$actSet22;
+      if ((_this$actSet21 = this.actSet()) !== null && _this$actSet21 !== void 0 && _this$actSet21.CatalogData.divaForceRTV) return true;
+      if (this.api.getDoShowRTV() && (_this$actSet22 = this.actSet()) !== null && _this$actSet22 !== void 0 && _this$actSet22.CatalogData.divaArReady) return true;
       return false;
     }
   }, {
     key: "geAllowQRCodeAR",
     value: function geAllowQRCodeAR() {
-      var _this$actSet25;
-      if (this.api.getDoShowAR() && (_this$actSet25 = this.actSet()) !== null && _this$actSet25 !== void 0 && _this$actSet25.CatalogData.divaArReady) return true;
+      var _this$actSet23;
+      if (this.api.getDoShowAR() && (_this$actSet23 = this.actSet()) !== null && _this$actSet23 !== void 0 && _this$actSet23.CatalogData.divaArReady) return true;
       return false;
     }
   }, {
     key: "getEnableUnityRtvKombi",
     value: function getEnableUnityRtvKombi() {
-      var _this$actSet26;
+      var _this$actSet24;
       // if force rtv disable unity kombi - biohort
-      if ((_this$actSet26 = this.actSet()) !== null && _this$actSet26 !== void 0 && _this$actSet26.CatalogData.divaForceRTV) return false;
+      if ((_this$actSet24 = this.actSet()) !== null && _this$actSet24 !== void 0 && _this$actSet24.CatalogData.divaForceRTV) return false;
       return this.api.getEnableRTVUnityKombi();
     }
   }, {
     key: "getShelfPlannerRTV",
     value: function getShelfPlannerRTV() {
-      var _this$actSet27;
-      return (_this$actSet27 = this.actSet()) === null || _this$actSet27 === void 0 ? void 0 : _this$actSet27.CatalogData.useShelfPlannerRTV;
-    }
-  }, {
-    key: "getDiva3DSuppressCacheCreation",
-    value: function getDiva3DSuppressCacheCreation() {
-      return this.api.getDiva3DSuppressCacheCreation();
-    }
-  }, {
-    key: "getDiva3dUseImageCache",
-    value: function getDiva3dUseImageCache() {
-      return this.api.getDiva3dUseImageCache();
+      var _this$actSet25;
+      return (_this$actSet25 = this.actSet()) === null || _this$actSet25 === void 0 ? void 0 : _this$actSet25.CatalogData.useShelfPlannerRTV;
     }
   }, {
     key: "getBasketData",
@@ -41779,8 +41262,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getCatalogData",
     value: function getCatalogData() {
-      var _this$actSet28;
-      return (_this$actSet28 = this.actSet()) === null || _this$actSet28 === void 0 ? void 0 : _this$actSet28.CatalogData;
+      var _this$actSet26;
+      return (_this$actSet26 = this.actSet()) === null || _this$actSet26 === void 0 ? void 0 : _this$actSet26.CatalogData;
     }
   }, {
     key: "ReturnTo",
@@ -42061,11 +41544,6 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     value: function registerGetCanvas2DAsJPG(getCanvas2DAsJPG) {
       this.getCanvas2DAsJPG = getCanvas2DAsJPG;
     }
-  }, {
-    key: "registerUpdateSirvViewer",
-    value: function registerUpdateSirvViewer(updateSirvViewer) {
-      this.updateSirvViewer = updateSirvViewer;
-    }
   }, {
     key: "registerUpdatePlanner2DGrid",
     value: function registerUpdatePlanner2DGrid(updatePlanner2DGrid) {
@@ -42533,7 +42011,6 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       this.updatePlanner3DImage = undefined;
       this.setRotationOrbitCube = undefined;
       this.getCanvas2DAsJPG = undefined;
-      this.updateSirvViewer = undefined;
       this.updatePlannerMsgContainer = undefined;
       this.updateFullscreenRendering = undefined;
       this.updateSetImage = undefined;
@@ -42974,6 +42451,8 @@ var Grid = /*#__PURE__*/function () {
     // E.g: "Grid Left" or "Grid Middle" or "Grid Right"
     _defineProperty__default["default"](this, "gridName", void 0);
     _defineProperty__default["default"](this, "maxAccessoireInGridCounter", void 0);
+    //only one array of accessoires is plannable together in one grid. the accessoires of the mid array exclude each other. The outer array is for te usage of this rule in different usecases.
+    _defineProperty__default["default"](this, "excludeAccessoiresByAccessoiresInGrid", void 0);
     _defineProperty__default["default"](this, "influencedByNeighborGrids", void 0);
     _defineProperty__default["default"](this, "influencedByOverlappingGrids", void 0);
     var grid = data.ShelfPlanner[index];
@@ -42989,6 +42468,7 @@ var Grid = /*#__PURE__*/function () {
     this.requiredWarning = grid.RequiredWarning;
     this.gridName = grid.GridName;
     this.maxAccessoireInGridCounter = grid.MaxAccessoireInGridCounter;
+    this.excludeAccessoiresByAccessoiresInGrid = grid.ExcludeAccessoiresByAccessoiresInGrid;
     this.influencedByNeighborGrids = grid.InfluencedByNeighborGrids;
     this.influencedByOverlappingGrids = grid.InfluencedByOverlappingGrids;
     this._group = grid.Group;
@@ -43001,8 +42481,9 @@ var Grid = /*#__PURE__*/function () {
       for (var i = 0; i < this.heightGridCellCountOnRule.length; i++) {
         var gridOnRule = this.heightGridCellCountOnRule[i];
         if (this.article.evalRule(DivaUtils__default["default"].getRuleByFormula(gridOnRule.Rule))) {
-          cellCount = gridOnRule.HeightGridCellCount;
-          this.articleRelations = gridOnRule.ArticleRelations;
+          var _gridOnRule$HeightGri, _gridOnRule$ArticleRe;
+          cellCount = (_gridOnRule$HeightGri = gridOnRule.HeightGridCellCount) !== null && _gridOnRule$HeightGri !== void 0 ? _gridOnRule$HeightGri : grid.HeightGridCellCount;
+          this.articleRelations = (_gridOnRule$ArticleRe = gridOnRule.ArticleRelations) !== null && _gridOnRule$ArticleRe !== void 0 ? _gridOnRule$ArticleRe : grid.ArticleRelations;
           if (gridOnRule.initAccArr) this.initAccArr = gridOnRule.initAccArr;
           this.currentLoadedRuleIndex = i;
         }
@@ -43674,7 +43155,7 @@ var Grid = /*#__PURE__*/function () {
     key: "getFreeSpacesOfAccessoire",
     value: function getFreeSpacesOfAccessoire(accessoire) {
       var size = accessoire.shelfHeight;
-      if (!size || this.disabledByRule || this.maxAccessoireCountReached(accessoire)) return [];
+      if (!size || this.disabledByRule || this.checkAccessoireInGridRules(accessoire)) return [];
       var freeCells = [];
       for (var i = 0; i < this.Cells.length; i++) {
         var _cell$Article4;
@@ -43709,22 +43190,51 @@ var Grid = /*#__PURE__*/function () {
       return _toConsumableArray__default["default"](new Set(freeCells));
     }
   }, {
-    key: "maxAccessoireCountReached",
-    value: function maxAccessoireCountReached(accessoire) {
-      var _this$maxAccessoireIn;
-      if (!((_this$maxAccessoireIn = this.maxAccessoireInGridCounter) !== null && _this$maxAccessoireIn !== void 0 && _this$maxAccessoireIn.length)) return false;
-      for (var i = 0; i < this.maxAccessoireInGridCounter.length; i++) {
-        var rule = this.maxAccessoireInGridCounter[i];
-        var counter = 0;
-        if (rule.accessoires.includes(accessoire.articleCodex)) {
-          var currentAccessoires = Object.values(this.Accessoires);
-          for (var j = 0; j < currentAccessoires.length; j++) {
-            var curAcc = currentAccessoires[j];
-            if (rule.accessoires.includes(curAcc.articleCodex)) {
-              counter = counter + curAcc.quantity;
+    key: "checkAccessoireInGridRules",
+    value: function checkAccessoireInGridRules(accessoire) {
+      var _this$maxAccessoireIn, _this$excludeAccessoi;
+      //max count in grid logic
+      if ((_this$maxAccessoireIn = this.maxAccessoireInGridCounter) !== null && _this$maxAccessoireIn !== void 0 && _this$maxAccessoireIn.length) {
+        for (var i = 0; i < this.maxAccessoireInGridCounter.length; i++) {
+          var rule = this.maxAccessoireInGridCounter[i];
+          var counter = 0;
+          if (rule.accessoires.includes(accessoire.articleCodex)) {
+            var currentAccessoires = Object.values(this.Accessoires);
+            for (var j = 0; j < currentAccessoires.length; j++) {
+              var curAcc = currentAccessoires[j];
+              if (rule.accessoires.includes(curAcc.articleCodex)) {
+                counter = counter + curAcc.quantity;
+              }
+            }
+            if (counter >= rule.maxCount) return true;
+          }
+        }
+      }
+
+      //accessories excluded eachother
+      if ((_this$excludeAccessoi = this.excludeAccessoiresByAccessoiresInGrid) !== null && _this$excludeAccessoi !== void 0 && _this$excludeAccessoi.length) {
+        var excludeAccessoiresGroup = this.excludeAccessoiresByAccessoiresInGrid;
+        for (var _j2 = 0; _j2 < excludeAccessoiresGroup.length; _j2++) {
+          var plannedAccessoireIndex = -1;
+          var excludeAccessoires = excludeAccessoiresGroup[_j2];
+          for (var _i16 = 0; _i16 < excludeAccessoires.length; _i16++) {
+            var accessoireArray = excludeAccessoires[_i16];
+            for (var basketId in this.Accessoires) {
+              var palnnedAccessoire = this.Accessoires[basketId];
+              if (accessoireArray.includes(palnnedAccessoire.articleCodex)) {
+                plannedAccessoireIndex = _i16;
+                break;
+              }
+            }
+            if (plannedAccessoireIndex >= 0) break;
+          }
+          if (plannedAccessoireIndex >= 0) {
+            for (var _i17 = 0; _i17 < excludeAccessoires.length; _i17++) {
+              var _accessoireArray = excludeAccessoires[_i17];
+              if (plannedAccessoireIndex == _i17) continue;
+              if (_accessoireArray.includes(accessoire.articleCodex)) return true;
             }
           }
-          if (counter >= rule.maxCount) return true;
         }
       }
       return false;
@@ -43769,16 +43279,16 @@ var Grid = /*#__PURE__*/function () {
         }
       }
       if ((_this$influencedByNei = this.influencedByNeighborGrids) !== null && _this$influencedByNei !== void 0 && _this$influencedByNei.length) {
-        for (var _i16 = 0; _i16 < this.influencedByNeighborGrids.length; _i16++) {
+        for (var _i18 = 0; _i18 < this.influencedByNeighborGrids.length; _i18++) {
           var _this$article$shelfPl2;
-          var _influenced = this.influencedByNeighborGrids[_i16];
+          var _influenced = this.influencedByNeighborGrids[_i18];
           var neighborGrid = (_this$article$shelfPl2 = this.article.shelfPlanner) === null || _this$article$shelfPl2 === void 0 ? void 0 : _this$article$shelfPl2.getGridByGridName(_influenced.GridName);
           var _ret = false;
           if (!neighborGrid) continue;
           if (neighborGrid.Direction === this.Direction) {
-            for (var _j2 = 0; _j2 < size; _j2++) {
+            for (var _j3 = 0; _j3 < size; _j3++) {
               var _cell$Article5;
-              var cell = neighborGrid.cells[_j2 + index];
+              var cell = neighborGrid.cells[_j3 + index];
               if ((cell === null || cell === void 0 ? void 0 : cell.InUse) !== -1 && ((_cell$Article5 = cell.Article) === null || _cell$Article5 === void 0 ? void 0 : _cell$Article5.basketId) !== accessoire.basketId) {
                 _ret = true;
               }
@@ -43881,19 +43391,20 @@ var Grid = /*#__PURE__*/function () {
       });
       if (alternative) return alternative.ArticleRelations;
       if (this.heightGridCellCountOnRule && this.currentLoadedRuleIndex !== false) {
-        return this.heightGridCellCountOnRule[this.currentLoadedRuleIndex].ArticleRelations;
+        var curGrid = this.heightGridCellCountOnRule[this.currentLoadedRuleIndex];
+        if (curGrid.ArticleRelations) return curGrid.ArticleRelations;
       }
       return this.articleRelations;
     }
   }, {
     key: "getGridIdByArticleCodex",
     value: function getGridIdByArticleCodex(articleCodex) {
-      var _this$ArticleRelation3;
+      var _this$ArticleRelation3, _this$heightGridCellC;
       var alternative = (_this$ArticleRelation3 = this.ArticleRelationsForOtherGroups) === null || _this$ArticleRelation3 === void 0 ? void 0 : _this$ArticleRelation3.find(function (g) {
         return g.ArticleRelations.includes(articleCodex);
       });
       if (alternative) return alternative.Group;
-      if (this.heightGridCellCountOnRule && this.currentLoadedRuleIndex !== false && this.heightGridCellCountOnRule[this.currentLoadedRuleIndex].ArticleRelations.includes(articleCodex)) {
+      if (this.heightGridCellCountOnRule && this.currentLoadedRuleIndex !== false && (_this$heightGridCellC = this.heightGridCellCountOnRule[this.currentLoadedRuleIndex].ArticleRelations) !== null && _this$heightGridCellC !== void 0 && _this$heightGridCellC.includes(articleCodex)) {
         return this.gridGroup;
       }
       if (this.articleRelations.includes(articleCodex)) {
@@ -59884,7 +59395,7 @@ var ProductHandler = /*#__PURE__*/function () {
      */
     _defineProperty__default["default"](this, "loadProducts", /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(_ref3) {
-        var _productData$length, _basket$OrderSets, _baseProduct, _baseProduct2, _baseProduct3, _baseProduct4, _baseProduct5, _baseProduct6, _baseProduct7, _baseProduct8, _baseProduct9, _baseProduct10, _baseProduct11, _baseProduct$width, _baseProduct12, _basket$SetPlannerInf, _basket$OrderSets$0$B, _baseProduct$height, _baseProduct13, _basket$SetPlannerInf2, _basket$OrderSets$0$B2, _baseProduct$depth, _baseProduct14, _basket$SetPlannerInf3, _basket$OrderSets$0$B3, _basket$SetPlannerInf4, _basket$SetPlannerInf5, _baseProduct15, _baseProduct16, _baseProduct17, _baseProduct18;
+        var _productData$length, _basket$OrderSets, _baseProduct, _baseProduct2, _baseProduct3, _baseProduct4, _baseProduct5, _baseProduct6, _baseProduct7, _baseProduct8, _baseProduct9, _baseProduct10, _baseProduct11, _baseProduct$width, _baseProduct12, _basket$SetPlannerInf, _basket$OrderSets$0$B, _baseProduct$height, _baseProduct13, _basket$SetPlannerInf2, _basket$OrderSets$0$B2, _baseProduct$depth, _baseProduct14, _basket$SetPlannerInf3, _basket$OrderSets$0$B3, _basket$SetPlannerInf4, _basket$SetPlannerInf5, _baseProduct15, _baseProduct16, _baseProduct17;
         var basket, catalogData, productData, classificationFields, products, baseProduct, variantProducts, isSet, dockingPoints, orderDescription, catalogDataName, catalogDataDescription, setName, _ProductHandler$calcu, shortDescription, shortDescriptionModified, _ProductHandler$calcu2, addedPrice, addedPriceModified, articles, baseData, classificationData, variantData, variantDataModified, addedProducts, removedProducts, optFields, initialSelectedFields, _basket$OrderSets$0$C2, usedConfigVariants, differingOPTs, _basket$OrderSets$0$C3, opts, i;
         return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -59996,10 +59507,9 @@ var ProductHandler = /*#__PURE__*/function () {
                 mainCategory: _this.mainCategory,
                 subCategory: _this.subCategory,
                 retailerArticleNr: (_baseProduct15 = baseProduct) === null || _baseProduct15 === void 0 ? void 0 : _baseProduct15.retailerArticleNr,
-                available: ((_baseProduct16 = baseProduct) === null || _baseProduct16 === void 0 ? void 0 : _baseProduct16.available) != undefined ? baseProduct.available : false,
                 dockingPoints: dockingPoints,
-                media: (_baseProduct17 = baseProduct) === null || _baseProduct17 === void 0 ? void 0 : _baseProduct17.media,
-                affiliate: (_baseProduct18 = baseProduct) === null || _baseProduct18 === void 0 ? void 0 : _baseProduct18.affiliate
+                media: (_baseProduct16 = baseProduct) === null || _baseProduct16 === void 0 ? void 0 : _baseProduct16.media,
+                affiliate: (_baseProduct17 = baseProduct) === null || _baseProduct17 === void 0 ? void 0 : _baseProduct17.affiliate
               }; //get classification data and remove field prefix
               classificationData = _this.parseClassificationFields(baseProduct, true); // init Variants
               variantData = [];
@@ -60481,11 +59991,6 @@ _defineProperty__default["default"](ProductHandler, "baseDataFields", [{
   type: 'text',
   title: 'productcreator.fields.technicalDescription',
   fieldType: 'BASE'
-}, {
-  field: 'available',
-  type: 'boolean',
-  title: 'productcreator.fields.available',
-  fieldType: 'BASE'
 }, {
   field: 'calculatedPrice',
   type: 'price',