@crystaldesign/web-planner-logic 24.15.0-beta.4 → 24.15.0-beta.41

package/build/cjs/{index-79241c54.js → index-d354bd29.js}

@@ -43,8 +43,8 @@ var _typeof__default = /*#__PURE__*/_interopDefaultLegacy(_typeof);
 })();
 
 var _excluded = ["type"];
-function ownKeys$g(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$g(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$g(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$g(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$h(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$h(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$h(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$h(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$h = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var JsonDataCache = /*#__PURE__*/function () {
   function JsonDataCache() {
@@ -249,8 +249,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$g;
-              _context2.t1 = _objectSpread$g({}, init.config.headers);
+              _context2.t0 = _objectSpread$h;
+              _context2.t1 = _objectSpread$h({}, init.config.headers);
               _context2.t2 = {};
               _context2.next = 20;
               return this.getSessionGuid('V', undefined, this.OrganizationId, api2Url);
@@ -280,11 +280,12 @@ var DivaApiHandler = /*#__PURE__*/function () {
     key: "getDataCache",
     value: function () {
       var _getDataCache = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(queryString, cacheMD5, accountSessionGuid, useWebServiceApi, method, data) {
-        var myQS, url, init, addSession, _this$apiConfig3, _this$apiConfig4, api2Url, result;
+        var _this$divaWebConfigDa, _this$divaWebConfigDa2, _this$divaWebConfigDa3;
+        var myQS, url, init, addSession, cacheHit, _this$apiConfig3, _this$apiConfig4, api2Url, result;
         return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              myQS = DivaUtils.md5(queryString.toLowerCase()).toUpperCase();
+              myQS = DivaUtils.md5(queryString.toLowerCase() + ((_this$divaWebConfigDa = this.divaWebConfigData) !== null && _this$divaWebConfigDa !== void 0 && _this$divaWebConfigDa.addOrganizationIdToCacheKey ? this.OrganizationId : '')).toUpperCase();
               url = this.apiUrl(queryString, useWebServiceApi);
               init = {
                 method: method,
@@ -292,80 +293,82 @@ var DivaApiHandler = /*#__PURE__*/function () {
                 data: data !== null && data !== void 0 ? data : {}
               };
               addSession = true;
-              if (!(this.jsonDataCache.get(myQS) || cacheMD5 && this.jsonDataCache.get(cacheMD5))) {
-                _context3.next = 9;
+              cacheHit = this.jsonDataCache.get(myQS);
+              if (!cacheHit) {
+                _context3.next = 8;
                 break;
               }
               LOG$h.debug('getDataFromInternalCache: ' + queryString);
-              if (!this.jsonDataCache.get(myQS)) {
-                _context3.next = 8;
+              return _context3.abrupt("return", cacheHit);
+            case 8:
+              if (!(cacheMD5 && this.jsonDataCache.get(cacheMD5) && !((_this$divaWebConfigDa2 = this.divaWebConfigData) !== null && _this$divaWebConfigDa2 !== void 0 && _this$divaWebConfigDa2.addOrganizationIdToCacheKey))) {
+                _context3.next = 11;
                 break;
               }
-              return _context3.abrupt("return", this.jsonDataCache.get(myQS));
-            case 8:
+              LOG$h.debug('getDataFromInternalCache: ' + queryString);
               return _context3.abrupt("return", this.jsonDataCache.get(cacheMD5));
-            case 9:
+            case 11:
               if (!addSession) {
-                _context3.next = 31;
+                _context3.next = 33;
                 break;
               }
               if (!useWebServiceApi) {
-                _context3.next = 22;
+                _context3.next = 24;
                 break;
               }
               if (!this.jwt) {
-                _context3.next = 15;
+                _context3.next = 17;
                 break;
               }
               init.config.headers = {
                 Authorization: 'Bearer ' + this.jwt
               };
-              _context3.next = 20;
+              _context3.next = 22;
               break;
-            case 15:
+            case 17:
               if (!this.apiKey) {
-                _context3.next = 19;
+                _context3.next = 21;
                 break;
               }
               init.config.headers = {
                 'X-API-KEY': this.apiKey
               };
-              _context3.next = 20;
+              _context3.next = 22;
               break;
-            case 19:
+            case 21:
               throw new Error('not jwt or API Key Found');
-            case 20:
-              _context3.next = 31;
-              break;
             case 22:
+              _context3.next = 33;
+              break;
+            case 24:
               api2Url = (_this$apiConfig3 = this.apiConfig) === null || _this$apiConfig3 === void 0 ? void 0 : _this$apiConfig3.api2["default"];
               if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig4 = this.apiConfig) !== null && _this$apiConfig4 !== void 0 && _this$apiConfig4.api2.web) {
                 api2Url = this.apiConfig.api2.web;
               }
               _context3.t0 = accountSessionGuid;
               if (_context3.t0) {
-                _context3.next = 29;
+                _context3.next = 31;
                 break;
               }
-              _context3.next = 28;
+              _context3.next = 30;
               return this.getSessionGuid('V', undefined, this.OrganizationId, api2Url);
-            case 28:
+            case 30:
               _context3.t0 = _context3.sent;
-            case 29:
+            case 31:
               _context3.t1 = _context3.t0;
               init.config.headers = {
                 sessionGuid: _context3.t1
               };
-            case 31:
-              _context3.next = 33;
-              return this.fetchData(url, init);
             case 33:
+              _context3.next = 35;
+              return this.fetchData(url, init);
+            case 35:
               result = _context3.sent;
               if (method !== 'POST') this.jsonDataCache.set(myQS, result);
-              if (cacheMD5) this.jsonDataCache.set(cacheMD5, result);
+              if (cacheMD5 && !((_this$divaWebConfigDa3 = this.divaWebConfigData) !== null && _this$divaWebConfigDa3 !== void 0 && _this$divaWebConfigDa3.addOrganizationIdToCacheKey)) this.jsonDataCache.set(cacheMD5, result);
               LOG$h.debug('getDataFromApi: ' + queryString);
               return _context3.abrupt("return", result);
-            case 38:
+            case 40:
             case "end":
               return _context3.stop();
           }
@@ -449,7 +452,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
         dontLoadAdditionalModelInfos: data.dontLoadAdditionalModelInfos,
         arViewerUrl: data.arViewerUrl,
         useMask: data.useMask,
-        loadProductBasketParams: data.loadProductBasketParams
+        loadProductBasketParams: data.loadProductBasketParams,
+        addOrganizationIdToCacheKey: data.addOrganizationIdToCacheKey
       };
     }
   }, {
@@ -485,8 +489,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getLoadProductBasketParams",
     value: function getLoadProductBasketParams() {
-      var _this$divaWebConfigDa;
-      return (_this$divaWebConfigDa = this.divaWebConfigData) === null || _this$divaWebConfigDa === void 0 ? void 0 : _this$divaWebConfigDa.loadProductBasketParams;
+      var _this$divaWebConfigDa4;
+      return (_this$divaWebConfigDa4 = this.divaWebConfigData) === null || _this$divaWebConfigDa4 === void 0 ? void 0 : _this$divaWebConfigDa4.loadProductBasketParams;
     }
   }, {
     key: "get3DServerUrl",
@@ -497,26 +501,26 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "doCheckForProductsPrice",
     value: function doCheckForProductsPrice() {
-      var _this$divaWebConfigDa2;
-      return (_this$divaWebConfigDa2 = this.divaWebConfigData) === null || _this$divaWebConfigDa2 === void 0 ? void 0 : _this$divaWebConfigDa2.checkForProductsPrice;
+      var _this$divaWebConfigDa5;
+      return (_this$divaWebConfigDa5 = this.divaWebConfigData) === null || _this$divaWebConfigDa5 === void 0 ? void 0 : _this$divaWebConfigDa5.checkForProductsPrice;
     }
   }, {
     key: "doCheckForProductsMatch",
     value: function doCheckForProductsMatch() {
-      var _this$divaWebConfigDa3;
-      return (_this$divaWebConfigDa3 = this.divaWebConfigData) === null || _this$divaWebConfigDa3 === void 0 ? void 0 : _this$divaWebConfigDa3.checkForProductsMatch;
+      var _this$divaWebConfigDa6;
+      return (_this$divaWebConfigDa6 = this.divaWebConfigData) === null || _this$divaWebConfigDa6 === void 0 ? void 0 : _this$divaWebConfigDa6.checkForProductsMatch;
     }
   }, {
     key: "getReportConfigIdentifier",
     value: function getReportConfigIdentifier() {
-      var _this$divaWebConfigDa4;
-      return (_this$divaWebConfigDa4 = this.divaWebConfigData) === null || _this$divaWebConfigDa4 === void 0 ? void 0 : _this$divaWebConfigDa4.reportConfigIdentifier;
+      var _this$divaWebConfigDa7;
+      return (_this$divaWebConfigDa7 = this.divaWebConfigData) === null || _this$divaWebConfigDa7 === void 0 ? void 0 : _this$divaWebConfigDa7.reportConfigIdentifier;
     }
   }, {
     key: "getPrintOptions",
     value: function getPrintOptions() {
-      var _this$divaWebConfigDa5;
-      var reportConfig = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : (_this$divaWebConfigDa5 = this.divaWebConfigData) === null || _this$divaWebConfigDa5 === void 0 ? void 0 : _this$divaWebConfigDa5.reportConfig;
+      var _this$divaWebConfigDa8;
+      var reportConfig = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : (_this$divaWebConfigDa8 = this.divaWebConfigData) === null || _this$divaWebConfigDa8 === void 0 ? void 0 : _this$divaWebConfigDa8.reportConfig;
       return {
         Gdpr: !!(reportConfig !== null && reportConfig !== void 0 && reportConfig.printWithGDPR),
         PlanningSketch: !!(reportConfig !== null && reportConfig !== void 0 && reportConfig.printWithPlanningSketch),
@@ -536,8 +540,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "get3DRenderGroup",
     value: function get3DRenderGroup() {
-      var _this$divaWebConfigDa6, _this$divaWebConfigDa7;
-      return (_this$divaWebConfigDa6 = (_this$divaWebConfigDa7 = this.divaWebConfigData) === null || _this$divaWebConfigDa7 === void 0 ? void 0 : _this$divaWebConfigDa7.diva3dRenderGroup) !== null && _this$divaWebConfigDa6 !== void 0 ? _this$divaWebConfigDa6 : '';
+      var _this$divaWebConfigDa9, _this$divaWebConfigDa10;
+      return (_this$divaWebConfigDa9 = (_this$divaWebConfigDa10 = this.divaWebConfigData) === null || _this$divaWebConfigDa10 === void 0 ? void 0 : _this$divaWebConfigDa10.diva3dRenderGroup) !== null && _this$divaWebConfigDa9 !== void 0 ? _this$divaWebConfigDa9 : '';
     }
   }, {
     key: "getServerId",
@@ -574,73 +578,74 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getDiva3dStaticBGImage",
     value: function getDiva3dStaticBGImage() {
-      var _this$divaWebConfigDa8;
-      return (_this$divaWebConfigDa8 = this.divaWebConfigData) === null || _this$divaWebConfigDa8 === void 0 ? void 0 : _this$divaWebConfigDa8.diva3dStaticBGImage;
+      var _this$divaWebConfigDa11;
+      return (_this$divaWebConfigDa11 = this.divaWebConfigData) === null || _this$divaWebConfigDa11 === void 0 ? void 0 : _this$divaWebConfigDa11.diva3dStaticBGImage;
     }
   }, {
     key: "getDiva3dStaticBGImage_DefaultRoomList",
     value: function getDiva3dStaticBGImage_DefaultRoomList() {
-      var _this$divaWebConfigDa9, _this$divaWebConfigDa10;
-      return ((_this$divaWebConfigDa9 = this.divaWebConfigData) === null || _this$divaWebConfigDa9 === void 0 ? void 0 : _this$divaWebConfigDa9.diva3dStaticBGImage_DefaultRoomList) == '' ? '3D_STATBG_ROOMLIST' : (_this$divaWebConfigDa10 = this.divaWebConfigData) === null || _this$divaWebConfigDa10 === void 0 ? void 0 : _this$divaWebConfigDa10.diva3dStaticBGImage_DefaultRoomList;
+      var _this$divaWebConfigDa12, _this$divaWebConfigDa13;
+      return ((_this$divaWebConfigDa12 = this.divaWebConfigData) === null || _this$divaWebConfigDa12 === void 0 ? void 0 : _this$divaWebConfigDa12.diva3dStaticBGImage_DefaultRoomList) == '' ? '3D_STATBG_ROOMLIST' : (_this$divaWebConfigDa13 = this.divaWebConfigData) === null || _this$divaWebConfigDa13 === void 0 ? void 0 : _this$divaWebConfigDa13.diva3dStaticBGImage_DefaultRoomList;
     }
   }, {
     key: "getDiva3DAllowDefaultCatRoomList",
     value: function getDiva3DAllowDefaultCatRoomList() {
-      var _this$divaWebConfigDa11;
-      return (_this$divaWebConfigDa11 = this.divaWebConfigData) === null || _this$divaWebConfigDa11 === void 0 ? void 0 : _this$divaWebConfigDa11.diva3DAllowDefaultCatRoomList;
+      var _this$divaWebConfigDa14;
+      return (_this$divaWebConfigDa14 = this.divaWebConfigData) === null || _this$divaWebConfigDa14 === void 0 ? void 0 : _this$divaWebConfigDa14.diva3DAllowDefaultCatRoomList;
     }
   }, {
     key: "doAllowSetPlanner",
     value: function doAllowSetPlanner() {
-      var _this$divaWebConfigDa12;
-      return (_this$divaWebConfigDa12 = this.divaWebConfigData) === null || _this$divaWebConfigDa12 === void 0 ? void 0 : _this$divaWebConfigDa12.doAllowSetPlanner;
+      var _this$divaWebConfigDa15;
+      return (_this$divaWebConfigDa15 = this.divaWebConfigData) === null || _this$divaWebConfigDa15 === void 0 ? void 0 : _this$divaWebConfigDa15.doAllowSetPlanner;
     }
   }, {
     key: "getHidePlanner",
     value: function getHidePlanner() {
-      var _this$divaWebConfigDa13;
-      return !!((_this$divaWebConfigDa13 = this.divaWebConfigData) !== null && _this$divaWebConfigDa13 !== void 0 && (_this$divaWebConfigDa13 = _this$divaWebConfigDa13.viewConfig) !== null && _this$divaWebConfigDa13 !== void 0 && _this$divaWebConfigDa13.hidePlanner);
+      var _this$divaWebConfigDa16;
+      return !!((_this$divaWebConfigDa16 = this.divaWebConfigData) !== null && _this$divaWebConfigDa16 !== void 0 && (_this$divaWebConfigDa16 = _this$divaWebConfigDa16.viewConfig) !== null && _this$divaWebConfigDa16 !== void 0 && _this$divaWebConfigDa16.hidePlanner);
     }
   }, {
     key: "getEnableRTVUnityKombi",
     value: function getEnableRTVUnityKombi() {
-      return !!this.organization.settings.enableRTV;
+      var _this$organization$se;
+      return !!((_this$organization$se = this.organization.settings) !== null && _this$organization$se !== void 0 && _this$organization$se.enableRTV);
     }
   }, {
     key: "getDoDisablePlanner2D",
     value: function getDoDisablePlanner2D() {
-      var _this$divaWebConfigDa14;
-      return !!((_this$divaWebConfigDa14 = this.divaWebConfigData) !== null && _this$divaWebConfigDa14 !== void 0 && _this$divaWebConfigDa14.doDisablePlanner2D);
+      var _this$divaWebConfigDa17;
+      return !!((_this$divaWebConfigDa17 = this.divaWebConfigData) !== null && _this$divaWebConfigDa17 !== void 0 && _this$divaWebConfigDa17.doDisablePlanner2D);
     }
   }, {
     key: "getRoomListInProduct",
     value: function getRoomListInProduct() {
-      var _this$divaWebConfigDa15;
-      return !!((_this$divaWebConfigDa15 = this.divaWebConfigData) !== null && _this$divaWebConfigDa15 !== void 0 && (_this$divaWebConfigDa15 = _this$divaWebConfigDa15.viewConfig) !== null && _this$divaWebConfigDa15 !== void 0 && _this$divaWebConfigDa15.roomListInProduct);
+      var _this$divaWebConfigDa18;
+      return !!((_this$divaWebConfigDa18 = this.divaWebConfigData) !== null && _this$divaWebConfigDa18 !== void 0 && (_this$divaWebConfigDa18 = _this$divaWebConfigDa18.viewConfig) !== null && _this$divaWebConfigDa18 !== void 0 && _this$divaWebConfigDa18.roomListInProduct);
     }
   }, {
     key: "getPlannerType",
     value: function getPlannerType() {
-      var _this$divaWebConfigDa16;
-      return (_this$divaWebConfigDa16 = this.divaWebConfigData) === null || _this$divaWebConfigDa16 === void 0 || (_this$divaWebConfigDa16 = _this$divaWebConfigDa16.viewConfig) === null || _this$divaWebConfigDa16 === void 0 ? void 0 : _this$divaWebConfigDa16.plannerType;
+      var _this$divaWebConfigDa19;
+      return (_this$divaWebConfigDa19 = this.divaWebConfigData) === null || _this$divaWebConfigDa19 === void 0 || (_this$divaWebConfigDa19 = _this$divaWebConfigDa19.viewConfig) === null || _this$divaWebConfigDa19 === void 0 ? void 0 : _this$divaWebConfigDa19.plannerType;
     }
   }, {
     key: "getLoadSupplierColors",
     value: function getLoadSupplierColors() {
-      var _this$divaWebConfigDa17;
-      return !!((_this$divaWebConfigDa17 = this.divaWebConfigData) !== null && _this$divaWebConfigDa17 !== void 0 && _this$divaWebConfigDa17.loadSupplierColors);
+      var _this$divaWebConfigDa20;
+      return !!((_this$divaWebConfigDa20 = this.divaWebConfigData) !== null && _this$divaWebConfigDa20 !== void 0 && _this$divaWebConfigDa20.loadSupplierColors);
     }
   }, {
     key: "showSelectionModeZero",
     value: function showSelectionModeZero() {
-      var _this$divaWebConfigDa18;
-      return !!((_this$divaWebConfigDa18 = this.divaWebConfigData) !== null && _this$divaWebConfigDa18 !== void 0 && _this$divaWebConfigDa18.showSelectionModeZero);
+      var _this$divaWebConfigDa21;
+      return !!((_this$divaWebConfigDa21 = this.divaWebConfigData) !== null && _this$divaWebConfigDa21 !== void 0 && _this$divaWebConfigDa21.showSelectionModeZero);
     }
   }, {
     key: "ruleDescSeperator",
     value: function ruleDescSeperator() {
-      var _this$organization$se, _this$organization2;
-      var seperator = (_this$organization$se = (_this$organization2 = this.organization) === null || _this$organization2 === void 0 || (_this$organization2 = _this$organization2.settings) === null || _this$organization2 === void 0 ? void 0 : _this$organization2.ruleDescSeperator) !== null && _this$organization$se !== void 0 ? _this$organization$se : ', ';
+      var _this$organization$se2, _this$organization2;
+      var seperator = (_this$organization$se2 = (_this$organization2 = this.organization) === null || _this$organization2 === void 0 || (_this$organization2 = _this$organization2.settings) === null || _this$organization2 === void 0 ? void 0 : _this$organization2.ruleDescSeperator) !== null && _this$organization$se2 !== void 0 ? _this$organization$se2 : ', ';
       // \n is escaped in url and therefore needs to be set via keyword
       if (seperator == 'newLine') return '\n';
       return seperator;
@@ -742,50 +747,50 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getViewConfig",
     value: function getViewConfig() {
-      var _this$divaWebConfigDa19;
-      return (_this$divaWebConfigDa19 = this.divaWebConfigData) === null || _this$divaWebConfigDa19 === void 0 ? void 0 : _this$divaWebConfigDa19.viewConfig;
+      var _this$divaWebConfigDa22;
+      return (_this$divaWebConfigDa22 = this.divaWebConfigData) === null || _this$divaWebConfigDa22 === void 0 ? void 0 : _this$divaWebConfigDa22.viewConfig;
     }
   }, {
     key: "getEmailConfig",
     value: function getEmailConfig() {
-      var _this$divaWebConfigDa20;
-      return (_this$divaWebConfigDa20 = this.divaWebConfigData) === null || _this$divaWebConfigDa20 === void 0 ? void 0 : _this$divaWebConfigDa20.emailConfig;
+      var _this$divaWebConfigDa23;
+      return (_this$divaWebConfigDa23 = this.divaWebConfigData) === null || _this$divaWebConfigDa23 === void 0 ? void 0 : _this$divaWebConfigDa23.emailConfig;
     }
   }, {
     key: "getABTestCases",
     value: function getABTestCases() {
-      var _this$divaWebConfigDa21, _this$divaWebConfigDa22;
-      return (_this$divaWebConfigDa21 = (_this$divaWebConfigDa22 = this.divaWebConfigData) === null || _this$divaWebConfigDa22 === void 0 ? void 0 : _this$divaWebConfigDa22.abTestCases) !== null && _this$divaWebConfigDa21 !== void 0 ? _this$divaWebConfigDa21 : [];
+      var _this$divaWebConfigDa24, _this$divaWebConfigDa25;
+      return (_this$divaWebConfigDa24 = (_this$divaWebConfigDa25 = this.divaWebConfigData) === null || _this$divaWebConfigDa25 === void 0 ? void 0 : _this$divaWebConfigDa25.abTestCases) !== null && _this$divaWebConfigDa24 !== void 0 ? _this$divaWebConfigDa24 : [];
     }
   }, {
     key: "getBarrierConfig",
     value: function getBarrierConfig() {
-      var _this$divaWebConfigDa23;
-      return (_this$divaWebConfigDa23 = this.divaWebConfigData) === null || _this$divaWebConfigDa23 === void 0 ? void 0 : _this$divaWebConfigDa23.barrierConfig;
+      var _this$divaWebConfigDa26;
+      return (_this$divaWebConfigDa26 = this.divaWebConfigData) === null || _this$divaWebConfigDa26 === void 0 ? void 0 : _this$divaWebConfigDa26.barrierConfig;
     }
   }, {
     key: "getTemplateConfig",
     value: function getTemplateConfig() {
-      var _this$divaWebConfigDa24;
-      return (_this$divaWebConfigDa24 = this.divaWebConfigData) === null || _this$divaWebConfigDa24 === void 0 ? void 0 : _this$divaWebConfigDa24.templateConfig;
+      var _this$divaWebConfigDa27;
+      return (_this$divaWebConfigDa27 = this.divaWebConfigData) === null || _this$divaWebConfigDa27 === void 0 ? void 0 : _this$divaWebConfigDa27.templateConfig;
     }
   }, {
     key: "showDivaNr",
     value: function showDivaNr() {
-      var _this$divaWebConfigDa25;
-      return (_this$divaWebConfigDa25 = this.divaWebConfigData) === null || _this$divaWebConfigDa25 === void 0 ? void 0 : _this$divaWebConfigDa25.showDivaNr;
+      var _this$divaWebConfigDa28;
+      return (_this$divaWebConfigDa28 = this.divaWebConfigData) === null || _this$divaWebConfigDa28 === void 0 ? void 0 : _this$divaWebConfigDa28.showDivaNr;
     }
   }, {
     key: "onErrorHandling",
     value: function onErrorHandling() {
-      var _this$divaWebConfigDa26;
-      return (_this$divaWebConfigDa26 = this.divaWebConfigData) === null || _this$divaWebConfigDa26 === void 0 ? void 0 : _this$divaWebConfigDa26.onErrorHandling;
+      var _this$divaWebConfigDa29;
+      return (_this$divaWebConfigDa29 = this.divaWebConfigData) === null || _this$divaWebConfigDa29 === void 0 ? void 0 : _this$divaWebConfigDa29.onErrorHandling;
     }
   }, {
     key: "diva3DRenderingDefault",
     value: function diva3DRenderingDefault() {
-      var _this$divaWebConfigDa27;
-      return (_this$divaWebConfigDa27 = this.divaWebConfigData) === null || _this$divaWebConfigDa27 === void 0 ? void 0 : _this$divaWebConfigDa27.diva3DRenderingDefault;
+      var _this$divaWebConfigDa30;
+      return (_this$divaWebConfigDa30 = this.divaWebConfigData) === null || _this$divaWebConfigDa30 === void 0 ? void 0 : _this$divaWebConfigDa30.diva3DRenderingDefault;
     }
   }, {
     key: "getJwt",
@@ -800,8 +805,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getUseMask",
     value: function getUseMask() {
-      var _this$divaWebConfigDa28;
-      return (_this$divaWebConfigDa28 = this.divaWebConfigData) === null || _this$divaWebConfigDa28 === void 0 ? void 0 : _this$divaWebConfigDa28.useMask;
+      var _this$divaWebConfigDa31;
+      return (_this$divaWebConfigDa31 = this.divaWebConfigData) === null || _this$divaWebConfigDa31 === void 0 ? void 0 : _this$divaWebConfigDa31.useMask;
     }
   }, {
     key: "apiUrl",
@@ -1316,14 +1321,14 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "dontLoadAdditionalModelInfos",
     get: function get() {
-      var _this$divaWebConfigDa29;
-      return (_this$divaWebConfigDa29 = this.divaWebConfigData) === null || _this$divaWebConfigDa29 === void 0 ? void 0 : _this$divaWebConfigDa29.dontLoadAdditionalModelInfos;
+      var _this$divaWebConfigDa32;
+      return (_this$divaWebConfigDa32 = this.divaWebConfigData) === null || _this$divaWebConfigDa32 === void 0 ? void 0 : _this$divaWebConfigDa32.dontLoadAdditionalModelInfos;
     }
   }, {
     key: "dontLoadCatalogEditorLiteMask",
     get: function get() {
-      var _this$divaWebConfigDa30;
-      return (_this$divaWebConfigDa30 = this.divaWebConfigData) === null || _this$divaWebConfigDa30 === void 0 ? void 0 : _this$divaWebConfigDa30.dontLoadCatalogEditorLiteMask;
+      var _this$divaWebConfigDa33;
+      return (_this$divaWebConfigDa33 = this.divaWebConfigData) === null || _this$divaWebConfigDa33 === void 0 ? void 0 : _this$divaWebConfigDa33.dontLoadCatalogEditorLiteMask;
     }
   }, {
     key: "OrganizationId",
@@ -1758,7 +1763,8 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
   }, {
     key: "isNotRelevant",
     get: function get() {
-      return this.opv.catalogOPV.isNotRelevant;
+      var _this$opv$catalogOPV$, _this$ocd;
+      return (_this$opv$catalogOPV$ = this.opv.catalogOPV.isNotRelevant) !== null && _this$opv$catalogOPV$ !== void 0 ? _this$opv$catalogOPV$ : ['OPVNR', 'OPVNRR', 'OPVNR_0'].includes((_this$ocd = this.ocd) !== null && _this$ocd !== void 0 ? _this$ocd : this.codex);
     }
   }, {
     key: "vCodex",
@@ -2009,11 +2015,11 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
   }, {
     key: "metaDataView",
     get: function get() {
-      var _this$ocd;
+      var _this$ocd2;
       return [].concat(_toConsumableArray__default["default"](this.opv.catalogOPV.metaDataView), [{
         codex: 'codex',
         name: '',
-        values: [((_this$ocd = this.ocd) !== null && _this$ocd !== void 0 ? _this$ocd : this.codex).replace('OPVOPV_', 'OPV_')],
+        values: [((_this$ocd2 = this.ocd) !== null && _this$ocd2 !== void 0 ? _this$ocd2 : this.codex).replace('OPVOPV_', 'OPV_')],
         values_locales: []
       }]);
     }
@@ -15900,13 +15906,13 @@ var ralClassics = [{
 }];
 
 var OptionValueCatalogData = /*#__PURE__*/function () {
-  function OptionValueCatalogData(_codex, jsonOPV, catalog) {
+  function OptionValueCatalogData(_codex, jsonOPV, catalogData) {
     var _this = this,
-      _catalog$catalogMask$,
-      _catalog$catalogMask,
-      _catalog$catalogMask2,
+      _catalogData$catalogM,
+      _catalogData$catalogM2,
+      _catalogData$catalogM3,
       _optionvalues$_codex,
-      _mask$name$catalog$ap,
+      _mask$name$catalogDat,
       _mask$name,
       _mask$name2,
       _mask$groupname$catal,
@@ -15969,12 +15975,12 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
       }
       return undefined;
     });
-    var optionvalues = (_catalog$catalogMask$ = (_catalog$catalogMask = catalog.catalogMask) === null || _catalog$catalogMask === void 0 ? void 0 : _catalog$catalogMask.optionvalues) !== null && _catalog$catalogMask$ !== void 0 ? _catalog$catalogMask$ : (_catalog$catalogMask2 = catalog.catalogMask) === null || _catalog$catalogMask2 === void 0 ? void 0 : _catalog$catalogMask2.optionValues;
+    var optionvalues = (_catalogData$catalogM = (_catalogData$catalogM2 = catalogData.catalogMask) === null || _catalogData$catalogM2 === void 0 ? void 0 : _catalogData$catalogM2.optionvalues) !== null && _catalogData$catalogM !== void 0 ? _catalogData$catalogM : (_catalogData$catalogM3 = catalogData.catalogMask) === null || _catalogData$catalogM3 === void 0 ? void 0 : _catalogData$catalogM3.optionValues;
     var mask = (_optionvalues$_codex = optionvalues === null || optionvalues === void 0 ? void 0 : optionvalues[_codex]) !== null && _optionvalues$_codex !== void 0 ? _optionvalues$_codex : _codex.startsWith('OPV') ? optionvalues === null || optionvalues === void 0 ? void 0 : optionvalues[_codex.substring(3)] : undefined;
     this.opv = {
       codex: _codex,
       vCodex: jsonOPV.VCodex,
-      name: (_mask$name$catalog$ap = mask === null || mask === void 0 || (_mask$name = mask.name) === null || _mask$name === void 0 ? void 0 : _mask$name[catalog.api.getLanguage()]) !== null && _mask$name$catalog$ap !== void 0 ? _mask$name$catalog$ap : jsonOPV.Name,
+      name: (_mask$name$catalogDat = mask === null || mask === void 0 || (_mask$name = mask.name) === null || _mask$name === void 0 ? void 0 : _mask$name[catalogData.api.getLanguage()]) !== null && _mask$name$catalogDat !== void 0 ? _mask$name$catalogDat : jsonOPV.Name,
       origName: jsonOPV.Name,
       name_locales: (_mask$name2 = mask === null || mask === void 0 ? void 0 : mask.name) !== null && _mask$name2 !== void 0 ? _mask$name2 : jsonOPV.Name_locales,
       image: jsonOPV.Image && jsonOPV.Image != '' ? jsonOPV.Image : undefined,
@@ -15982,7 +15988,7 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
       isTexture: jsonOPV.IsTexture && jsonOPV.IsTexture == 'True' ? true : false,
       description: jsonOPV.Description,
       description_locales: jsonOPV.Description_locales,
-      groupName: (_mask$groupname$catal = mask === null || mask === void 0 || (_mask$groupname = mask.groupname) === null || _mask$groupname === void 0 ? void 0 : _mask$groupname[catalog.api.getLanguage()]) !== null && _mask$groupname$catal !== void 0 ? _mask$groupname$catal : jsonOPV.GroupName && jsonOPV.GroupName != '' ? jsonOPV.GroupName : undefined,
+      groupName: (_mask$groupname$catal = mask === null || mask === void 0 || (_mask$groupname = mask.groupname) === null || _mask$groupname === void 0 ? void 0 : _mask$groupname[catalogData.api.getLanguage()]) !== null && _mask$groupname$catal !== void 0 ? _mask$groupname$catal : jsonOPV.GroupName && jsonOPV.GroupName != '' ? jsonOPV.GroupName : undefined,
       groupName_locales: (_mask$groupname2 = mask === null || mask === void 0 ? void 0 : mask.groupname) !== null && _mask$groupname2 !== void 0 ? _mask$groupname2 : jsonOPV.GroupName_locales,
       hiddenByMask: mask === null || mask === void 0 ? void 0 : mask.hidden,
       textureName: jsonOPV.TextureName && jsonOPV.TextureName != '' ? jsonOPV.TextureName : jsonOPV.PFTFile && jsonOPV.PFTFile != '' ? jsonOPV.PFTFile : undefined,
@@ -16020,7 +16026,7 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
         this.opv.images.push({
           fileName: image.FileName,
           functiontype: image.Functiontype,
-          jsFormula: image.JsFormula ? DivaUtils__default["default"].getRuleByFormula(image.JsFormula, catalog.catalogCodex, catalog.multiselectOptions) : '',
+          jsFormula: image.JsFormula ? DivaUtils__default["default"].getRuleByFormula(image.JsFormula, catalogData.catalogCodex, catalogData.multiselectOptions) : '',
           name: image.Name,
           replaceMainImage: image.ReplaceMainImage
         });
@@ -16030,56 +16036,76 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
     for (var _i = 0; _i < ((_this$opv$property$le = (_this$opv$property = this.opv.property) === null || _this$opv$property === void 0 ? void 0 : _this$opv$property.length) !== null && _this$opv$property$le !== void 0 ? _this$opv$property$le : 0); _i++) {
       var _this$opv$property$le, _this$opv$property, _this$opv$property2;
       var prop = (_this$opv$property2 = this.opv.property) === null || _this$opv$property2 === void 0 ? void 0 : _this$opv$property2[_i];
-      if (prop.Codex === 'INFO_URL') {
-        this.opv.url = prop.Value;
-      } else if (prop.Codex === 'INFO_PDF') {
-        this.opv.pdfUrl = prop.Value;
-      } else if (prop.Codex === 'SAME_OPV') {
-        this.opv.sameopv = prop.Value;
-      } else if (prop.Codex === 'ONLY_VISIBLE_IF_NOT_UNDOCK') {
-        this.opv.onlyVisibleIfNotDocked = prop.Value;
-      } else if (prop.Codex === 'DEFAULT_VALUE') {
-        this.opv.defaultValue = prop.Value;
-      } else if (prop.Codex === 'SUMMARY_CODEX') {
-        this.opv.summaryCodex = prop.Value;
-      } else if (prop.Codex === 'VIEWPOINTNAME') {
-        this.opv.viewPointName = prop.Value;
-      } else if (prop.Codex === 'HIDE_IN_SUMMARY') {
-        this.opv.hideInSummary = !!prop.Value;
-      } else if (prop.Codex === 'SETNAME') {
-        this.opv.setName = prop.Value;
-      } else if (prop.Codex === 'SET_CONFIG') {
-        this.opv.setConfig = prop.Value;
-      } else if (prop.Codex === 'ON_RULE') {
-        this.opv.onRule = prop.Value;
-      } else if (prop.Codex === 'CONTENT_ITEM') {
-        this.opv.contentItemId = prop.Value;
-      } else if (prop.Codex === 'IS_NOT_RELEVANT') {
-        this.opv.isNotRelevant = prop.Value;
-      } else if (prop.Codex === 'GROUP_CONTENT_ITEM') {
-        this.opv.groupContentItemId = prop.Value;
-      } else if (prop.Codex === 'SET_BY_RULE') {
-        this.opv.setByRule = prop.Value;
-      } else {
-        var values_locales = [];
-        if (prop.Value_locales) {
-          var _prop$Value_locales;
-          var langs = Object.keys((_prop$Value_locales = prop.Value_locales) !== null && _prop$Value_locales !== void 0 ? _prop$Value_locales : {});
-          for (var j = 0; j < langs.length; j++) {
-            var lang = langs[j];
-            var values = prop.Value_locales[lang].split(';');
-            for (var m = 0; m < values.length; m++) {
-              if (!values_locales[m]) values_locales[m] = {};
-              values_locales[m][lang] = values[m];
+      var key = prop.Codex;
+      if (key.startsWith(catalogData.catalogCodex + '__')) key = key.replace(catalogData.catalogCodex + '__', '');
+      switch (key) {
+        case 'INFO_URL':
+          this.opv.url = prop.Value;
+          break;
+        case 'INFO_PDF':
+          this.opv.pdfUrl = prop.Value;
+          break;
+        case 'SAME_OPV':
+          this.opv.sameopv = prop.Value;
+          break;
+        case 'ONLY_VISIBLE_IF_NOT_UNDOCK':
+          this.opv.onlyVisibleIfNotDocked = prop.Value;
+          break;
+        case 'DEFAULT_VALUE':
+          this.opv.defaultValue = prop.Value;
+          break;
+        case 'SUMMARY_CODEX':
+          this.opv.summaryCodex = prop.Value;
+          break;
+        case 'VIEWPOINTNAME':
+          this.opv.viewPointName = prop.Value;
+          break;
+        case 'HIDE_IN_SUMMARY':
+          this.opv.hideInSummary = !!prop.Value;
+          break;
+        case 'SETNAME':
+          this.opv.setName = prop.Value;
+          break;
+        case 'SET_CONFIG':
+          this.opv.setConfig = prop.Value;
+          break;
+        case 'ON_RULE':
+          this.opv.onRule = prop.Value;
+          break;
+        case 'CONTENT_ITEM':
+          this.opv.contentItemId = prop.Value;
+          break;
+        case 'IS_NOT_RELEVANT':
+          this.opv.isNotRelevant = prop.Value;
+          break;
+        case 'GROUP_CONTENT_ITEM':
+          this.opv.groupContentItemId = prop.Value;
+          break;
+        case 'SET_BY_RULE':
+          this.opv.setByRule = prop.Value;
+          break;
+        default:
+          if (key.includes('__')) break;
+          var values_locales = [];
+          if (prop.Value_locales) {
+            var _prop$Value_locales;
+            var langs = Object.keys((_prop$Value_locales = prop.Value_locales) !== null && _prop$Value_locales !== void 0 ? _prop$Value_locales : {});
+            for (var j = 0; j < langs.length; j++) {
+              var lang = langs[j];
+              var values = prop.Value_locales[lang].split(';');
+              for (var m = 0; m < values.length; m++) {
+                if (!values_locales[m]) values_locales[m] = {};
+                values_locales[m][lang] = values[m];
+              }
             }
           }
-        }
-        metaDatas.push({
-          codex: prop.Codex,
-          name: prop.Name,
-          values: prop.Value.split(';'),
-          values_locales: values_locales
-        });
+          metaDatas.push({
+            codex: prop.Codex,
+            name: prop.Name,
+            values: prop.Value.split(';'),
+            values_locales: values_locales
+          });
+          break;
       }
     }
     this.opv.metaData = metaDatas;
@@ -16437,70 +16463,95 @@ var CatalogArticleData = /*#__PURE__*/function () {
     for (var i = 0; i < this.catalogArticle.properties.length; i++) {
       var prop = this.catalogArticle.properties[i];
       var _key = prop.Codex;
-      if (_key == 'BUNDLE_RULES') {
-        this.catalogArticle.bundleRules = JSON.parse(prop.Value);
-      } else if (_key == 'HEIGHTGRIDUSED') {
-        this.catalogArticle.heightGridUsed = Number(prop.Value);
-      } else if (_key == 'HEIGHTGRIDBELOW') {
-        this.catalogArticle.heightGridBelow = Number(prop.Value);
-      } else if (_key == 'HEIGHTGRIDABOVE') {
-        this.catalogArticle.heightGridAbove = Number(prop.Value);
-      } else if (_key == 'OVERWRITE_PARENT_WIDTH') {
-        this.catalogArticle.overwriteParentWidth = prop.Value;
-      } else if (_key == 'OVERWRITE_PARENT_HEIGHT') {
-        this.catalogArticle.overwriteParentHeight = prop.Value;
-      } else if (_key == 'OVERWRITE_PARENT_DEPTH') {
-        this.catalogArticle.overwriteParentDepth = prop.Value;
-      } else if (_key == 'DO_NOT_DEL_ACC_IF_NOT_DOCKED') {
-        this.catalogArticle.doNotDelAccIfNotDocked = prop.Value;
-      } else if (_key == 'HEIGHT_HAS_PRICE') {
-        this.catalogArticle.heightHasPrice = prop.Value;
-      } else if (_key == 'DEPTH_HAS_PRICE') {
-        this.catalogArticle.depthHasPrice = prop.Value;
-      } else if (_key == 'WIDTH_HAS_PRICE') {
-        this.catalogArticle.widthHasPrice = prop.Value;
-      } else if (_key == 'BASIC_UNIT_PRICE') {
-        this.catalogArticle.basicUnitPrice = Number(prop.Value);
-      } else if (_key == 'INVALID_ACCESSORIES') {
-        this.catalogArticle.invalidAccessoires = prop.Value.split(',');
-      } else if (_key == 'ON_CONFIG_OPTION') {
-        this.catalogArticle.onConfigOption = prop.Value;
-      } else if (_key == 'ON_SET_CONFIG_OPTION') {
-        this.catalogArticle.onSetConfigOtpion = prop.Value;
-      } else if (_key == 'ORDER_POSNR') {
-        this.catalogArticle.orderPosNr = prop.Value;
-      } else if (_key == 'HIDE_IN_PLANNERSTEP') {
-        this.catalogArticle.hideInPlannerStep = !!prop.Value;
-      } else if (_key == 'MAX_PLANNING_COUNT') {
-        this.catalogArticle.maxPlanningCount = Number(prop.Value);
-      } else if (_key == 'CONTENT_ITEM') {
-        this.catalogArticle.contentItemId = prop.Value;
-      } else if (_key == 'GROUP_CONTENT_ITEM') {
-        this.catalogArticle.groupContentItemId = prop.Value;
-      } else if (_key == 'HAS3D') {
-        this.catalogArticle.isVisualized = prop.Value;
-      } else {
-        var values = prop.Value.split(';');
-        var values_locales = [];
-        if (prop.Value_locales) {
-          var _prop$Value_locales;
-          var langs = Object.keys((_prop$Value_locales = prop.Value_locales) !== null && _prop$Value_locales !== void 0 ? _prop$Value_locales : {});
-          for (var j = 0; j < langs.length; j++) {
-            var lang = langs[j];
-            if (!prop.Value_locales[lang]) continue;
-            var _values = prop.Value_locales[lang].split(';');
-            for (var m = 0; m < _values.length; m++) {
-              if (!values_locales[m]) values_locales[m] = {};
-              values_locales[m][lang] = _values[m];
+      if (_key.startsWith(this.catalogCodex + '__')) _key = _key.replace(this.catalogCodex + '__', '');
+      switch (_key) {
+        case 'BUNDLE_RULES':
+          this.catalogArticle.bundleRules = JSON.parse(prop.Value);
+          break;
+        case 'HEIGHTGRIDUSED':
+          this.catalogArticle.heightGridUsed = Number(prop.Value);
+          break;
+        case 'HEIGHTGRIDBELOW':
+          this.catalogArticle.heightGridBelow = Number(prop.Value);
+          break;
+        case 'HEIGHTGRIDABOVE':
+          this.catalogArticle.heightGridAbove = Number(prop.Value);
+          break;
+        case 'OVERWRITE_PARENT_WIDTH':
+          this.catalogArticle.overwriteParentWidth = prop.Value;
+          break;
+        case 'OVERWRITE_PARENT_HEIGHT':
+          this.catalogArticle.overwriteParentHeight = prop.Value;
+          break;
+        case 'OVERWRITE_PARENT_DEPTH':
+          this.catalogArticle.overwriteParentDepth = prop.Value;
+          break;
+        case 'DO_NOT_DEL_ACC_IF_NOT_DOCKED':
+          this.catalogArticle.doNotDelAccIfNotDocked = prop.Value;
+          break;
+        case 'HEIGHT_HAS_PRICE':
+          this.catalogArticle.heightHasPrice = prop.Value;
+          break;
+        case 'DEPTH_HAS_PRICE':
+          this.catalogArticle.depthHasPrice = prop.Value;
+          break;
+        case 'WIDTH_HAS_PRICE':
+          this.catalogArticle.widthHasPrice = prop.Value;
+          break;
+        case 'BASIC_UNIT_PRICE':
+          this.catalogArticle.basicUnitPrice = Number(prop.Value);
+          break;
+        case 'INVALID_ACCESSORIES':
+          this.catalogArticle.invalidAccessoires = prop.Value.split(',');
+          break;
+        case 'ON_CONFIG_OPTION':
+          this.catalogArticle.onConfigOption = prop.Value;
+          break;
+        case 'ON_SET_CONFIG_OPTION':
+          this.catalogArticle.onSetConfigOtpion = prop.Value;
+          break;
+        case 'ORDER_POSNR':
+          this.catalogArticle.orderPosNr = prop.Value;
+          break;
+        case 'HIDE_IN_PLANNERSTEP':
+          this.catalogArticle.hideInPlannerStep = !!prop.Value;
+          break;
+        case 'MAX_PLANNING_COUNT':
+          this.catalogArticle.maxPlanningCount = Number(prop.Value);
+          break;
+        case 'CONTENT_ITEM':
+          this.catalogArticle.contentItemId = prop.Value;
+          break;
+        case 'GROUP_CONTENT_ITEM':
+          this.catalogArticle.groupContentItemId = prop.Value;
+          break;
+        case 'HAS3D':
+          this.catalogArticle.isVisualized = prop.Value;
+          break;
+        default:
+          if (_key.includes('__')) break;
+          var values = prop.Value.split(';');
+          var values_locales = [];
+          if (prop.Value_locales) {
+            var _prop$Value_locales;
+            var langs = Object.keys((_prop$Value_locales = prop.Value_locales) !== null && _prop$Value_locales !== void 0 ? _prop$Value_locales : {});
+            for (var j = 0; j < langs.length; j++) {
+              var lang = langs[j];
+              if (!prop.Value_locales[lang]) continue;
+              var _values = prop.Value_locales[lang].split(';');
+              for (var m = 0; m < _values.length; m++) {
+                if (!values_locales[m]) values_locales[m] = {};
+                values_locales[m][lang] = _values[m];
+              }
             }
           }
-        }
-        metaDatas.push({
-          codex: _key,
-          values: values,
-          name: this.catalogArticle.properties[i].Name,
-          values_locales: values_locales
-        });
+          metaDatas.push({
+            codex: _key,
+            values: values,
+            name: this.catalogArticle.properties[i].Name,
+            values_locales: values_locales
+          });
+          break;
       }
     }
     this.catalogArticle.metaData = metaDatas;
@@ -17876,7 +17927,9 @@ var OptionCatalogData = /*#__PURE__*/function () {
     for (var i = 0; i < ((_this$opt$property = this.opt.property) === null || _this$opt$property === void 0 ? void 0 : _this$opt$property.length); i++) {
       var _this$opt$property;
       var prop = this.opt.property[i];
-      switch (prop.Codex) {
+      var key = prop.Codex;
+      if (key.startsWith(catalogData.catalogCodex + '__')) key = key.replace(catalogData.catalogCodex + '__', '');
+      switch (key) {
         case 'INFO_URL':
           this.opt.url = prop.Value;
           break;
@@ -18149,8 +18202,8 @@ var OptionCatalogData = /*#__PURE__*/function () {
   }]);
 }();
 
-function ownKeys$f(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$f(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$f(Object(t), !0).forEach(function (r) { _defineProperty__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$g(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$g(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$g(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$g(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$f = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 
 /*
@@ -18168,7 +18221,7 @@ var DivaCatalogData = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "catalogPlannerArticles", {});
     //Dictionary
     _defineProperty__default["default"](this, "origProperties", []);
-    // private catalogPlannerArticlesView: CatalogPlannerArticleViewDataType[]; //array von CatalogPlannerArticleViewDataType
+    _defineProperty__default["default"](this, "variantsPriceHashObj", {});
     _defineProperty__default["default"](this, "plannerPaletteViewInfo", void 0);
     _defineProperty__default["default"](this, "_api", void 0);
     this._api = api;
@@ -18323,6 +18376,8 @@ var DivaCatalogData = /*#__PURE__*/function () {
       usePosCountValue: false,
       // old tag
       useDecisionPosCountValue: false,
+      ignoreIsDefinedCheck: false,
+      //                                 if true, on summary click does not check and show the dialob that some articles have options that were not visited
       useShelfPlannerRTV: false,
       notificationsRules: [{
         rules: [{
@@ -18432,40 +18487,43 @@ var DivaCatalogData = /*#__PURE__*/function () {
       var diva3DRenderingIsSet = false;
       properties.forEach(function (item, index) {
         //3D Allgemein
-        if (item.Codex == 'DIVA3D_ROOM') {
+
+        var key = item.Codex;
+        if (key.startsWith(_this.catalogCodex + '__')) key = key.replace(_this.catalogCodex + '__', '');
+        if (key == 'DIVA3D_ROOM') {
           _this.catalogData.diva3dRoom = item.Value;
           if (_this.catalogData.diva3dRoom == 'raumatlantis') _this.catalogData.diva3dRoom = 'weissraumatlantis';
-        } else if (item.Codex == 'DIVA3D_RENDERING') {
+        } else if (key == 'DIVA3D_RENDERING') {
           //Ist Unity Rendering von Catalogeinstellungen abhängig?
           diva3DRenderingIsSet = item.Value == '1' || item.Value.toLowerCase() == 'true';
           if (_this.catalogData.diva3dShowRenderingByCatalogData) {
             _this.catalogData.has3dModels = _this.catalogData.has3dModels && diva3DRenderingIsSet;
           }
-        } else if (item.Codex == 'DIVA3D_AR_READY') {
+        } else if (key == 'DIVA3D_AR_READY') {
           _this.catalogData.divaArReady = !!item.Value;
-        } else if (item.Codex == 'DIVA3D_AR_FORCERTV') {
+        } else if (key == 'DIVA3D_AR_FORCERTV') {
           _this.catalogData.divaForceRTV = !!item.Value;
-        } else if (item.Codex == 'HEADER_DIMENSION_IDS') {
+        } else if (key == 'HEADER_DIMENSION_IDS') {
           _this.catalogData.headerDimensionIds = item.Value.split(';');
-        } else if (item.Codex == 'DONTCALCBASEPRICE') {
+        } else if (key == 'DONTCALCBASEPRICE') {
           _this.catalogData.dontShowBasePrice = item.Value == '1';
-        } else if (item.Codex == 'DIVA3D_STATIC_BG_IMAGE_ROOMLIST') {
+        } else if (key == 'DIVA3D_STATIC_BG_IMAGE_ROOMLIST') {
           _this.catalogData.roomList3DStaticBGImage.set('3D_STATBG_ROOMLIST', item.Value.split(';'));
-        } else if (item.Codex.startsWith('3D_STATBG_ROOMLIST')) {
+        } else if (key.startsWith('3D_STATBG_ROOMLIST')) {
           //  item.Value =
           //   "weissraum_LUECK;backgroundimgroom_lueck_modern;backgroundimgroom_lueck_romantic;backgroundimgroom_lueck_loft;backgroundimgroom_lueck_night";
           _this.catalogData.roomList3DStaticBGImage.set(item.Codex, item.Value.split(';'));
-        } else if (item.Codex.startsWith('3D_STANDARD_WHITEROOM')) {
+        } else if (key.startsWith('3D_STANDARD_WHITEROOM')) {
           _this.catalogData.diva3dStandardWhiteroom = item.Value;
-        } else if (item.Codex == '3D_COMPATIBLE_WITH_IMAGE_CACHE') {
+        } else if (key == '3D_COMPATIBLE_WITH_IMAGE_CACHE') {
           _this.catalogData.diva3dCompatibleWithImageCache = item.Value == '1';
-        } else if (item.Codex == 'ENABLE_DO_SHOW_3DDIMENSIONS') {
+        } else if (key == 'ENABLE_DO_SHOW_3DDIMENSIONS') {
           _this.catalogData.doShow3DDimensionLines = item.Value == '1' || item.Value.toLowerCase() == 'true';
-        } else if (item.Codex == 'IS_IDM3D_CAT') {
+        } else if (key == 'IS_IDM3D_CAT') {
           _this.catalogData.isIDM3DCat = item.Value == '1' || item.Value.toLowerCase() == 'true';
-        } else if (item.Codex == 'IDM3D_CAT_CODEX') {
+        } else if (key == 'IDM3D_CAT_CODEX') {
           _this.catalogData.IDM3DCatCodex = item.Value;
-        } else if (item.Codex.startsWith('DIVA3D_IMAGE')) {
+        } else if (key.startsWith('DIVA3D_IMAGE')) {
           //this.Value = "ON.ZUBEHOER_KORPUS1;ON.ZUBEHOER_KORPUS2;ON.ZUBEHOER_KORPUS3:HIDEOPTIONS.FAF;PANEEL;ACP:VIEWPOINTNAME.START_RECHTS";
           //Diese Regel gilt für Optionen ZUBEHOER_KORPUS1, ZUBEHOER_KORPUS2 und ZUBEHOER_KORPUS3
 
@@ -18531,145 +18589,147 @@ var DivaCatalogData = /*#__PURE__*/function () {
           //hier findest du die richtigen option Codexe this.options
         }
         //Planner Themen
-        else if (item.Codex == 'DIVA3D_PLANER_DIGITS') {
+        else if (key == 'DIVA3D_PLANER_DIGITS') {
           _this.catalogData.divaPlanerDigits = Number(item.Value);
-        } else if (item.Codex == 'DIVA3D_PLANER_SHOW_ARTICLE_SVG') {
+        } else if (key == 'DIVA3D_PLANER_SHOW_ARTICLE_SVG') {
           _this.catalogData.diva3dPlanerShowArticleAsSvg = item.Value == '1';
-        } else if (item.Codex == 'SHOWTYPENRINPLANNER') {
+        } else if (key == 'SHOWTYPENRINPLANNER') {
           _this.catalogData.showTypeNrInPlanner = item.Value == '1';
-        } else if (item.Codex == 'STARTFILTERPARAMS') {
+        } else if (key == 'STARTFILTERPARAMS') {
           _this.catalogData.startFilterParams = String(item.Value);
-        } else if (item.Codex == 'STARTHIDEARTICLES') {
+        } else if (key == 'STARTHIDEARTICLES') {
           _this.catalogData.startHideArticles = item.Value.split(';');
-        } else if (item.Codex == 'USEGLOBALSVGSCALE') {
+        } else if (key == 'USEGLOBALSVGSCALE') {
           _this.catalogData.useGlobalSVGScale = item.Value == '1';
-        } else if (item.Codex == 'USEBOXPLANNER') {
+        } else if (key == 'USEBOXPLANNER') {
           _this.catalogData.useBoxPlanner = item.Value == '1';
-        } else if (item.Codex == 'START_PLANNER_ARTICLE') {
+        } else if (key == 'START_PLANNER_ARTICLE') {
           _this.catalogData.startPlannerArticle = item.Value;
-        } else if (item.Codex == 'ACCESSOIRE_STEP_AS_PLANNER') {
+        } else if (key == 'ACCESSOIRE_STEP_AS_PLANNER') {
           _this.catalogData.accessorieStepAsPlanner = item.Value == '1';
-        } else if (item.Codex == 'DONT_SAVE_ALTERNATIVERENDERINGS') {
+        } else if (key == 'DONT_SAVE_ALTERNATIVERENDERINGS') {
           _this.catalogData.dontSaveAlternativeRenderings = item.Value == '1';
-        } else if (item.Codex == 'SHOW_ALL_ITEMS_IN_PLANNER') {
+        } else if (key == 'SHOW_ALL_ITEMS_IN_PLANNER') {
           _this.catalogData.showAllItemsInPlanner = item.Value == '1';
-        } else if (item.Codex == 'HIDE_AV_BUTTONS') {
+        } else if (key == 'HIDE_AV_BUTTONS') {
           _this.catalogData.hideAVButtons = item.Value;
-        } else if (item.Codex == 'PLANNER_REPLACE_MODE') {
+        } else if (key == 'PLANNER_REPLACE_MODE') {
           _this.catalogData.replaceModeActive = item.Value == '1';
-        } else if (item.Codex == 'HIDE_PLANNER_UI_ICONS') {
+        } else if (key == 'HIDE_PLANNER_UI_ICONS') {
           _this.catalogData.hidePlannerUiIcons = item.Value == '1';
         }
 
         //Warnings
-        else if (item.Codex == 'HIDECONSTRUCTIONWARNING') {
+        else if (key == 'HIDECONSTRUCTIONWARNING') {
           _this.catalogData.doCheckConstructionWarnings = item.Value == '0';
-        } else if (item.Codex == 'FORCECONSTRUCTIONWARNINGARTICLES') {
+        } else if (key == 'FORCECONSTRUCTIONWARNINGARTICLES') {
           _this.catalogData.forceConstructionWarningForArticles = item.Value.split(';');
-        } else if (item.Codex == 'HIDECOMPLETENESSWARNING') {
+        } else if (key == 'HIDECOMPLETENESSWARNING') {
           _this.catalogData.hideCompletenessWarning = item.Value == '1';
         }
 
         //DP Logik
-        else if (item.Codex == 'IGNORELAYERAVC') {
+        else if (key == 'IGNORELAYERAVC') {
           _this.catalogData.ignoreLayerAVC = item.Value == '1';
-        } else if (item.Codex == 'IGNORELAYERAVOAVU') {
+        } else if (key == 'IGNORELAYERAVOAVU') {
           _this.catalogData.ignoreLayerAVOAVU = item.Value == '1';
-        } else if (item.Codex == 'IGNORELAYERAVNAVS') {
+        } else if (key == 'IGNORELAYERAVNAVS') {
           _this.catalogData.ignoreLayerAVNAVS = item.Value == '1';
-        } else if (item.Codex == 'DOCKACCONAVOONLY') {
+        } else if (key == 'DOCKACCONAVOONLY') {
           //Accessoires können nur aufwärts verplant werden. (Für Küssnacht)
           _this.catalogData.dockAccOnAvoOnly = item.Value == '1';
-        } else if (item.Codex == 'SHOWACCONDPONLY') {
+        } else if (key == 'SHOWACCONDPONLY') {
           //Accessoires werden nur angezeigt falls das Plus (DockingPoint) selcetiert ist. (Für Küssnacht)
           _this.catalogData.showAccOnDpOnly = item.Value == '1';
-        } else if (item.Codex == 'RECONFIG_AFTER_ARTICLE_DOCKED') {
+        } else if (key == 'RECONFIG_AFTER_ARTICLE_DOCKED') {
           _this.catalogData.reconfigAfterArticleDocked = item.Value == '1';
         }
         //Konfiguration
-        else if (item.Codex == 'USEPRGASOPVARTICLENR') {
+        else if (key == 'USEPRGASOPVARTICLENR') {
           _this.catalogData.UsePrgAsOpvArticleNr = item.Value == '1';
-        } else if (item.Codex == 'ARTICLECONFIGSINGLE') {
+        } else if (key == 'ARTICLECONFIGSINGLE') {
           _this.catalogData.articleConfigSingle = item.Value == '1';
-        } else if (item.Codex == 'DEFAULT_GROUPS_CLOSED') {
+        } else if (key == 'DEFAULT_GROUPS_CLOSED') {
           if (item.Value != '1' && item.Value != '0') {
             _this.catalogData.defaultGroupsClosed = item.Value.split(';');
           } else {
             _this.catalogData.defaultGroupsClosed = item.Value == '1';
           }
-        } else if (item.Codex == 'ARTICLECONFIGALL') {
+        } else if (key == 'ARTICLECONFIGALL') {
           _this.catalogData.articleConfigAll = item.Value == '1';
-        } else if (item.Codex == 'HIDE_PRICE_GROUPS_OF_OPGS') {
+        } else if (key == 'HIDE_PRICE_GROUPS_OF_OPGS') {
           _this.catalogData.hidePriceGroupsOfOPGs = item.Value == '1';
-        } else if (item.Codex == 'DONTHIDEOPTION') {
+        } else if (key == 'DONTHIDEOPTION') {
           _this.catalogData.dontHideOption = String(item.Value).split(',');
-        } else if (item.Codex == 'SHOWACCESSOIREONLASTTAB') {
+        } else if (key == 'SHOWACCESSOIREONLASTTAB') {
           _this.catalogData.showAccessioreOnLastTab = item.Value == '1';
-        } else if (item.Codex == 'FORCE_CONFIG_ALL_ACCESSOIRES') {
+        } else if (key == 'FORCE_CONFIG_ALL_ACCESSOIRES') {
           _this.catalogData.forceConfigAllAccessoires = item.Value == '1';
-        } else if (item.Codex == 'CONFIG_ACCESSOIRES') {
+        } else if (key == 'CONFIG_ACCESSOIRES') {
           _this.catalogData.configAccessoires = item.Value == '1';
-        } else if (item.Codex == 'CONFIG_ONLY_ACCESSOIRES') {
+        } else if (key == 'CONFIG_ONLY_ACCESSOIRES') {
           _this.catalogData.configOnlyAccessoires = item.Value == '1';
-        } else if (item.Codex == 'IGNORE_ARTICLERELATIONS') {
+        } else if (key == 'IGNORE_ARTICLERELATIONS') {
           _this.catalogData.ignoreArticleRelations = item.Value == '1';
-        } else if (item.Codex == 'REPAIR_VARIANT_VALUES') {
+        } else if (key == 'REPAIR_VARIANT_VALUES') {
           var entries = item.Value.split(';;');
           _this.catalogData.repairVariantValues = {};
           for (var _i = 0; _i < entries.length; _i++) {
             var keyValuePair = entries[_i].split(';');
             _this.catalogData.repairVariantValues['OPT' + keyValuePair[0].replace(':', ':OPV')] = 'OPT' + keyValuePair[1].replace(':', ':OPV');
           }
-        } else if (item.Codex == 'DO_USE_RULEDESC_FOR_PARTLIST') {
+        } else if (key == 'DO_USE_RULEDESC_FOR_PARTLIST') {
           _this.catalogData.doUseRuleDescForPartListArticles = item.Value == '1';
-        } else if (item.Codex == 'USEPOSCOUNTVALUE') {
+        } else if (key == 'USEPOSCOUNTVALUE') {
           _this.catalogData.usePosCountValue = item.Value == '1';
-        } else if (item.Codex == 'USE_DECISION_POS_COUNT_VALUE') {
+        } else if (key == 'USE_DECISION_POS_COUNT_VALUE') {
           _this.catalogData.useDecisionPosCountValue = item.Value == '1';
-        } else if (item.Codex == 'USE_SHELFPLANNER_RTV') {
+        } else if (key == 'USE_SHELFPLANNER_RTV') {
           _this.catalogData.useShelfPlannerRTV = item.Value == '1';
-        } else if (item.Codex == 'DONT_SHOW_ACC_STEP') {
+        } else if (key == 'DONT_SHOW_ACC_STEP') {
           _this.catalogData.dontShowAccStep = item.Value == '1';
-        } else if (item.Codex == 'MERGE_OPTIONS_TO_SAME_OPTION') {
+        } else if (key == 'MERGE_OPTIONS_TO_SAME_OPTION') {
           _this.catalogData.mergeOptionsToSameOption = [];
           var options = item.Value.split(';');
           for (var _i2 = 0; _i2 < options.length; _i2++) {
             _this.catalogData.mergeOptionsToSameOption.push(options[_i2].split(','));
           }
-        } else if (item.Codex == 'FORCE_CONFIG_SINGLE') {
+        } else if (key == 'FORCE_CONFIG_SINGLE') {
           _this.catalogData.forceConfigSingle = item.Value == '1';
-        } else if (item.Codex == 'SHOW_PRICEPREVIEW_ON_OPTIONS') {
+        } else if (key == 'SHOW_PRICEPREVIEW_ON_OPTIONS') {
           _this.catalogData.showPricePreviewOnlyOnOptions = item.Value.split(';').map(function (option) {
             return 'OPT' + option;
           });
-        } else if (item.Codex == 'DOUBLE_CLICK_ON_CONFIG') {
+        } else if (key == 'DOUBLE_CLICK_ON_CONFIG') {
           _this.catalogData.doubleClickOnConfig = item.Value == '1';
-        } else if (item.Codex == 'INIT_OPTIONTREE_TWICE') {
+        } else if (key == 'INIT_OPTIONTREE_TWICE') {
           _this.catalogData.initOptionTreeTwice = item.Value == '1';
-        } else if (item.Codex == 'USE_TYPENR_AS_ARTICLENR_EKTEXT') {
+        } else if (key == 'USE_TYPENR_AS_ARTICLENR_EKTEXT') {
           _this.catalogData.useTypeNrAsArticleNrEKText = item.Value == '1';
-        } else if (item.Codex == 'ADD_NEW_LINE_BEFOR_RULEDESC') {
+        } else if (key == 'ADD_NEW_LINE_BEFOR_RULEDESC') {
           _this.catalogData.addNewLineBeforRuleDesc = item.Value == '1';
-        } else if (item.Codex == 'ONCONFIG_SINGLE_DONT_GENERALIZE') {
+        } else if (key == 'ONCONFIG_SINGLE_DONT_GENERALIZE') {
           _this.catalogData.onConfigSingleDontGeneralize = item.Value == '1';
-        } else if (item.Codex == 'SUMMARY_TABGROUP_POSITION') {
+        } else if (key == 'SUMMARY_TABGROUP_POSITION') {
           _this.catalogData.summaryTabGroupPosition = item.Value.split(';');
-        } else if (item.Codex == 'BUNDLE_RULES') {
+        } else if (key == 'BUNDLE_RULES') {
           _this.catalogData.bundleRules = JSON.parse(item.Value);
-        } else if (item.Codex == 'NOTIFICATIONS') {
+        } else if (key == 'NOTIFICATIONS') {
           _this.catalogData.notificationsRules = JSON.parse(item.Value);
-        } else if (item.Codex == 'WARNINGS') {
+        } else if (key == 'WARNINGS') {
           _this.catalogData.warningRules = JSON.parse(item.Value);
-        } else if (item.Codex == 'BANNER') {
+        } else if (key == 'BANNER') {
           _this.catalogData.bannerRules = JSON.parse(item.Value);
-        } else if (item.Codex == 'IGNORE_MAX_PRICE_AS_BASEPRICE') {
+        } else if (key == 'IGNORE_MAX_PRICE_AS_BASEPRICE') {
           _this.catalogData.ignoreMaxPriceAsBP = item.Value == '1';
-        } else if (item.Codex == 'DONT_USE_VCODEX_FOR_BASKET') {
+        } else if (key == 'DONT_USE_VCODEX_FOR_BASKET') {
           _this.catalogData.dontUseVCodexInBasket = item.Value == '1';
+        } else if (key == 'IGNORE_ISDEFINED_CHECK') {
+          _this.catalogData.ignoreIsDefinedCheck = item.Value == '1';
         }
 
         //HOTFIX wied später ausgebaut Philipp mus Properties in der Artikelliste ausgeben
-        else if (item.Codex == 'ADD_PA_ON_EDO') {
+        else if (key == 'ADD_PA_ON_EDO') {
           var _properties$find;
           var thisCodex = (_properties$find = properties.find(function (item) {
             return item.Codex == 'ADD_PA_ON_EDO_ARTICLECODEX';
@@ -19428,6 +19488,11 @@ var DivaCatalogData = /*#__PURE__*/function () {
     get: function get() {
       return this.catalogData.useBoxPlanner;
     }
+  }, {
+    key: "ignoreIsDefinedCheck",
+    get: function get() {
+      return this.catalogData.ignoreIsDefinedCheck;
+    }
   }, {
     key: "startPlannerArticle",
     get: function get() {
@@ -19705,12 +19770,24 @@ var DivaCatalogData = /*#__PURE__*/function () {
       }
       return updateMask;
     }()
+  }, {
+    key: "getVariantsPriceByHash",
+    value: function getVariantsPriceByHash(hash) {
+      return this.variantsPriceHashObj[hash];
+    }
+  }, {
+    key: "setVariantsPriceByHash",
+    value: function setVariantsPriceByHash(hash, data) {
+      this.variantsPriceHashObj[hash] = _objectSpread$g(_objectSpread$g({}, data), {}, {
+        calcTime: -1
+      });
+    }
   }]);
 }();
 var mapMask = function mapMask(mask) {
   var _mappedMask$catalog;
   if (!mask) return undefined;
-  var mappedMask = _objectSpread$f({}, mask);
+  var mappedMask = _objectSpread$g({}, mask);
   var mapProperties = function mapProperties(props) {
     if (Array.isArray(props)) return props;
     var mappedProps = [];
@@ -19873,6 +19950,8 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
 }();
 var catalogHandlerInstance = new DivaCatalogHandler();
 
+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; }
 var ArticleOptionStateData = /*#__PURE__*/function () {
   function ArticleOptionStateData(option, defaultOPV, useIsOptionDefinedWarning) {
     _classCallCheck__default["default"](this, ArticleOptionStateData);
@@ -20008,9 +20087,9 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
     key: "multiselectValCodex",
     get: function get() {
       var _this$multiSelects$ma, _this$multiSelects2;
-      return (_this$multiSelects$ma = (_this$multiSelects2 = this.multiSelects) === null || _this$multiSelects2 === void 0 ? void 0 : _this$multiSelects2.map(function (v) {
+      return [this.valCodex].concat(_toConsumableArray__default["default"]((_this$multiSelects$ma = (_this$multiSelects2 = this.multiSelects) === null || _this$multiSelects2 === void 0 ? void 0 : _this$multiSelects2.map(function (v) {
         return v.codex;
-      })) !== null && _this$multiSelects$ma !== void 0 ? _this$multiSelects$ma : [];
+      })) !== null && _this$multiSelects$ma !== void 0 ? _this$multiSelects$ma : []));
     }
   }, {
     key: "measureValue",
@@ -20505,6 +20584,18 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
     set: function set(val) {
       this.articleOptionState.isDifferentOption = val;
     }
+  }, {
+    key: "cloneOptionState",
+    value: function cloneOptionState() {
+      var clonedOps = new ArticleOptionStateData(this.option);
+      clonedOps.articleOptionState = _objectSpread$f(_objectSpread$f({}, this.articleOptionState), {}, {
+        imageOPVs: _objectSpread$f({}, this.articleOptionState.imageOPVs),
+        visibleOPVs: _objectSpread$f({}, this.articleOptionState.visibleOPVs),
+        visibleOPVsImages: _objectSpread$f({}, this.articleOptionState.visibleOPVsImages),
+        favoriteOPVs: _objectSpread$f({}, this.articleOptionState.favoriteOPVs)
+      });
+      return clonedOps;
+    }
   }]);
 }();
 
@@ -20545,7 +20636,7 @@ var DivaArticle = /*#__PURE__*/function () {
       quantity: initParams.quantity ? initParams.quantity : initParams.Quantity ? initParams.Quantity : 1,
       actDescription: initParams.actDescription,
       actDescription_locales: initParams.actDescription_locales,
-      price: initParams.price ? initParams.price : articleData.articlePrice ? articleData.articlePrice : 0,
+      price: initParams.price !== undefined ? initParams.price : articleData.articlePrice ? articleData.articlePrice : 0,
       relatedToBasketId: initParams.relatedToBasketId ? initParams.relatedToBasketId : initParams.relatedToBasketID,
       isPartlistArticle: initParams.isPartlistArticle ? initParams.isPartlistArticle : false,
       relatedToSubItem: initParams.relatedToSubItem,
@@ -21220,6 +21311,15 @@ var DivaArticle = /*#__PURE__*/function () {
       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 : {});
     }
+  }, {
+    key: "getAllArticleOptionsStates",
+    value: function getAllArticleOptionsStates() {
+      var opss = _objectSpread$e({}, this.articleOptionStates);
+      for (var key in this.partlistArticles) {
+        opss = _objectSpread$e(_objectSpread$e({}, opss), this.partlistArticles[key].getAllArticleOptionsStates());
+      }
+      return opss;
+    }
   }, {
     key: "clearArticleOptionStates",
     value: function clearArticleOptionStates() {
@@ -21855,6 +21955,22 @@ var DivaArticle = /*#__PURE__*/function () {
       }
       return ret;
     }
+  }, {
+    key: "VisibleVariantValues",
+    get: function get() {
+      var ret = {};
+      var opss = this.getAllArticleOptionsStates();
+      for (var key in opss) {
+        var myOPS = opss[key];
+        if (myOPS.isDoShow && myOPS.valCodex && !myOPS.isInvisible && !['I', 'U'].includes(myOPS.headerPosVariationType)) {
+          ret[myOPS.optionCodex] = myOPS.valCodex;
+          if (myOPS.freeText) {
+            ret[myOPS.optionCodex + '_val'] = myOPS.freeText;
+          }
+        }
+      }
+      return ret;
+    }
   }, {
     key: "VariantValuesWithoutFreetext",
     get: function get() {
@@ -21982,6 +22098,7 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "areAllOptionsDefined",
     get: function get() {
+      if (this.CatalogData.ignoreIsDefinedCheck) return true;
       for (var key in this.articleOptionStates) {
         if (!this.articleOptionStates[key].isDefined) {
           return false;
@@ -22711,7 +22828,12 @@ var DivaArticle = /*#__PURE__*/function () {
       //Das hier wird Doppelt initialisiert und am ende stehen bei den AVL /AVR Filter die Filter Doppelt drinnen
       if (myArtOPS && myArtOPS.isDoShow) {
         if (myItem) {
-          if (myItem.subRetailArticleNr) this.subRetailArticleNr = myItem.subRetailArticleNr;
+          if (myItem.subRetailArticleNr) {
+            if (this.isPartListArticle) {
+              LOG$d.error(new DivaUtils.DivaError('SubRetailArticleNr is not allowed for PartListArticles'));
+            }
+            this.subRetailArticleNr = myItem.subRetailArticleNr;
+          }
           if (myItem.subRetailTypeNr) this.subRetailTypeNr = myItem.subRetailTypeNr;
         }
         this.updateIDMSpecificFeature(myArtOPS);
@@ -23708,7 +23830,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-dd941184.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-5c3bb271.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -24101,7 +24223,7 @@ var DivaArticle = /*#__PURE__*/function () {
         }
       }
       for (var _key3 in myValues) {
-        var ops = this.articleOptionStates[_key3];
+        var ops = this.getArticleOptionState(_key3);
         var opv = ops === null || ops === void 0 ? void 0 : ops.visibleOptionValues[myValues[_key3]];
         if (opv) {
           var value = opv.setConfig;
@@ -24133,7 +24255,7 @@ var DivaArticle = /*#__PURE__*/function () {
         var _ops7 = this.getArticleOptionState(_key4);
         if (_ops7) {
           validValues[_key4] = myValues[_key4];
-        } else if (_key4.endsWith('_val') && this.articleOptionStates[_key4.replace(/_val/g, '')]) {
+        } else if (_key4.endsWith('_val') && this.getArticleOptionState(_key4.replace(/_val/g, ''))) {
           validValues[_key4] = myValues[_key4];
         } else {
           for (var _opt in this.articleOptionStates) {
@@ -24625,6 +24747,19 @@ var DivaArticle = /*#__PURE__*/function () {
     get: function get() {
       return this.article.catalogArticle.shelfHeightAbove;
     }
+  }, {
+    key: "cloneArticle",
+    value: function cloneArticle(set) {
+      var clonedArticle = new DivaArticle(set, this.basketId, _objectSpread$e({}, this.article), this.article.catalogArticle, set.CatalogData);
+      for (var key in this.articleOptionStates) {
+        clonedArticle.articleOptionStates[key] = this.articleOptionStates[key].cloneOptionState();
+      }
+      clonedArticle.article.partlistArticles = {};
+      for (var _key6 in this.partlistArticles) {
+        clonedArticle.article.partlistArticles[_key6] = this.partlistArticles[_key6].cloneArticle(set);
+      }
+      return clonedArticle;
+    }
   }]);
 }();
 
@@ -24957,33 +25092,37 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               _context6.next = 42;
               break;
             case 53:
+              if (!(from !== 'calcVariant')) {
+                _context6.next = 65;
+                break;
+              }
               _i = 0;
-            case 54:
+            case 55:
               if (!(_i < targetArticlesToUpdate.length)) {
-                _context6.next = 64;
+                _context6.next = 65;
                 break;
               }
               _actArticle2 = articles[targetArticlesToUpdate[_i]];
               if (!(_actArticle2.CatalogData.doubleClickOnConfig || _actArticle2.hasType1Dependencies)) {
-                _context6.next = 61;
+                _context6.next = 62;
                 break;
               }
-              _context6.next = 59;
-              return this.updateCfgValues(_actArticle2, valuesArray[_i], {}, undefined, undefined, from == 'calcVariant');
-            case 59:
-              _context6.next = 61;
-              return this.updateCfgValues(_actArticle2, valuesArray[_i], {}, undefined, undefined, from == 'calcVariant');
-            case 61:
+              _context6.next = 60;
+              return this.updateCfgValues(_actArticle2, valuesArray[_i], {});
+            case 60:
+              _context6.next = 62;
+              return this.updateCfgValues(_actArticle2, valuesArray[_i], {});
+            case 62:
               _i++;
-              _context6.next = 54;
+              _context6.next = 55;
               break;
-            case 64:
+            case 65:
               return _context6.abrupt("return", {
                 newEDOExtraArticles: newEDOExtraArticles,
                 targetArticlesToUpdate: targetArticlesToUpdate,
                 partlistArticlesToLoad: partlistArticlesToLoad
               });
-            case 65:
+            case 66:
             case "end":
               return _context6.stop();
           }
@@ -25305,12 +25444,14 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               //danach Preise berechnen
               if (!dontCalcPrice) {
                 article.calcConfigPrice(maxPriceOfGroupCodex, 2);
-                //evtl articlebild berechnen
-                article.updateArticleImage();
-                //evtl SVG tausch berechnen
-                article.updateArticleSVG();
-                //evtl opv images mit rules updaten
-                article.updateOPVImages();
+                if (!calcVariantPrice) {
+                  //evtl articlebild berechnen
+                  article.updateArticleImage();
+                  //evtl SVG tausch berechnen
+                  article.updateArticleSVG();
+                  //evtl opv images mit rules updaten
+                  article.updateOPVImages();
+                }
               }
               return _context10.abrupt("return", partlistArticlesToLoad);
             case 18:
@@ -26686,14 +26827,16 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
     }
   }, {
     key: "getCurPaletteType",
-    value: function getCurPaletteType(set, configStepKey, articles) {
+    value: function getCurPaletteType(set, configStepKey) {
+      var _set$api$ReturnToFrom;
       var step = this.getAllByKey(configStepKey);
       var configStep = step === null || step === void 0 ? void 0 : step.configStep;
       var optionStep = step === null || step === void 0 ? void 0 : step.optionStep;
       var paletteType = 'SMALL';
       if (configStep && optionStep) {
-        var optionState = articles[configStep.targetArticles[0]][configStep.option];
-        if (configStep.option == 'OPTVINYL' || configStep.option == 'OPTVINYL_1' || configStep.option == 'OPTFABRIC' || configStep.option == 'OPTBE' || configStep.option == 'OPTBE_AUSSEN' || configStep.option == 'OPTBE_INNEN' || configStep.option == 'OPTBE_PANEELE' || configStep.option == 'OPTMATRATZE_BE' || configStep.option == 'OPTBE_UG' || configStep.option == 'OPTBEZUG' || configStep.option == 'OPTKO' || configStep.option == 'OPTFR' || configStep.option == 'OPTNI' || configStep.option == 'OPTUF_FA' || configStep.option == 'OPTBE_NETZ' || configStep.option == 'OPTBE_AL' || configStep.option == 'OPTKISSEN_BE' || configStep.option == 'OPTKP_BE' || configStep.option == 'OPTARM_BE' || configStep.option == 'OPTBE_KT' || configStep.option == 'OPT3' || configStep.option == 'OPT5' || configStep.option == 'OPTBE_KNOEPFE' || configStep.option == 'OPTSK_FARBE' || configStep.option == 'OPTBANDFARBE' || configStep.option == 'OPTBE_BOX' || configStep.option == 'OPTMA_AF_BE' || configStep.option == 'OPTTOPPER_BE' || optionState.option.hasOPG && optionState.hasImages || optionStep.mergesToOPG) {
+        var _set$getDivaArticles$;
+        var optionState = (_set$getDivaArticles$ = set.getDivaArticles()[configStep.targetArticles[0]]) === null || _set$getDivaArticles$ === void 0 ? void 0 : _set$getDivaArticles$.getArticleOptionState(configStep.option);
+        if (configStep.option == 'OPTVINYL' || configStep.option == 'OPTVINYL_1' || configStep.option == 'OPTFABRIC' || configStep.option == 'OPTBE' || configStep.option == 'OPTBE_AUSSEN' || configStep.option == 'OPTBE_INNEN' || configStep.option == 'OPTBE_PANEELE' || configStep.option == 'OPTMATRATZE_BE' || configStep.option == 'OPTBE_UG' || configStep.option == 'OPTBEZUG' || configStep.option == 'OPTKO' || configStep.option == 'OPTFR' || configStep.option == 'OPTNI' || configStep.option == 'OPTUF_FA' || configStep.option == 'OPTBE_NETZ' || configStep.option == 'OPTBE_AL' || configStep.option == 'OPTKISSEN_BE' || configStep.option == 'OPTKP_BE' || configStep.option == 'OPTARM_BE' || configStep.option == 'OPTBE_KT' || configStep.option == 'OPT3' || configStep.option == 'OPT5' || configStep.option == 'OPTBE_KNOEPFE' || configStep.option == 'OPTSK_FARBE' || configStep.option == 'OPTBANDFARBE' || configStep.option == 'OPTBE_BOX' || configStep.option == 'OPTMA_AF_BE' || configStep.option == 'OPTTOPPER_BE' || optionState !== null && optionState !== void 0 && optionState.option.hasOPG && optionState.hasImages || optionStep.mergesToOPG) {
           paletteType = 'GAL';
         }
         if (configStep.option == 'OPTBA' && !optionState.option.layout) {
@@ -26720,11 +26863,14 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
           paletteType = 'GAL';
         }
       }
+      if ((_set$api$ReturnToFrom = set.api.ReturnToFromParams) !== null && _set$api$ReturnToFrom !== void 0 && _set$api$ReturnToFrom.includes('FAVORITS')) if (paletteType == 'DROPDOWN_IMAGE' || paletteType == 'DROPDOWN_TEXT' || paletteType == 'TOGGLE_NAME' || paletteType == 'TOGGLE') {
+        paletteType = 'SMALL';
+      }
       return paletteType;
     }
   }, {
     key: "getStepInfo",
-    value: function getStepInfo(configStepKey, optionStatesOfArticle) {
+    value: function getStepInfo(configStepKey) {
       var allSteps = this.getAllByKey(configStepKey);
       if (allSteps !== null && allSteps !== void 0 && allSteps.optionStep) ;
       if (allSteps !== null && allSteps !== void 0 && allSteps.configStep.warning) return allSteps.configStep.warning;
@@ -26756,7 +26902,7 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
     }
   }, {
     key: "getCurFilterType",
-    value: function getCurFilterType(configStepKey, articles, confgiItems) {
+    value: function getCurFilterType(configStepKey, confgiItems) {
       var configStep = this.getConfigStepByKey(configStepKey);
       var filterType = '';
       if (configStep) {
@@ -27047,7 +27193,6 @@ var DivaSet = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "setId", void 0);
     _defineProperty__default["default"](this, "_isActSet", false);
     _defineProperty__default["default"](this, "setData", void 0);
-    _defineProperty__default["default"](this, "_onlyCalcVariants", void 0);
     _defineProperty__default["default"](this, "divaArticles", void 0);
     //Schlüssel ist basketId
     _defineProperty__default["default"](this, "configSingleData", void 0);
@@ -27063,7 +27208,6 @@ var DivaSet = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "doorPlannerHandler", void 0);
     _defineProperty__default["default"](this, "matchingProduct", void 0);
     _defineProperty__default["default"](this, "matchingOrigProduct", void 0);
-    _defineProperty__default["default"](this, "_dontCalcPricePreviewDueToPerformanceIssues", false);
     _defineProperty__default["default"](this, "_supplierColors", void 0);
     /**Favorits state */
     _defineProperty__default["default"](this, "_handlelingCurrentFavorites", false);
@@ -27838,16 +27982,6 @@ var DivaSet = /*#__PURE__*/function () {
     value: function addArticle(newArticle) {
       this.divaArticles[newArticle.basketId] = newArticle;
     }
-  }, {
-    key: "getOptionStatesOfArticles",
-    value: function getOptionStatesOfArticles() {
-      var articles = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.divaArticles;
-      var ret = {};
-      for (var key in articles) {
-        ret[key] = articles[key].articleOptionStates;
-      }
-      return ret;
-    }
   }, {
     key: "sortDivaArticlesByArticlePosNr",
     value: function sortDivaArticlesByArticlePosNr() {
@@ -28231,7 +28365,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context4.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-faebb0a3.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-f55d0a9a.js'); });
             case 3:
               _yield$import = _context4.sent;
               DoorPlanner = _yield$import["default"];
@@ -28296,14 +28430,6 @@ var DivaSet = /*#__PURE__*/function () {
     get: function get() {
       return this.setState;
     }
-  }, {
-    key: "onlyCalcVariants",
-    get: function get() {
-      return this._onlyCalcVariants;
-    },
-    set: function set(val) {
-      this._onlyCalcVariants = val;
-    }
 
     /**
      *
@@ -28354,14 +28480,6 @@ var DivaSet = /*#__PURE__*/function () {
       }
       return false;
     }
-  }, {
-    key: "dontCalcPricePreviewDueToPerformanceIssues",
-    get: function get() {
-      return this._dontCalcPricePreviewDueToPerformanceIssues;
-    },
-    set: function set(val) {
-      this._dontCalcPricePreviewDueToPerformanceIssues = val;
-    }
   }, {
     key: "plannerHandler",
     get: function get() {
@@ -28417,6 +28535,20 @@ var DivaSet = /*#__PURE__*/function () {
       var _this$ViewConfig2;
       return !!(this.catalogData.configAccessoires || this.catalogData.configOnlyAccessoires || (_this$ViewConfig2 = this.ViewConfig) !== null && _this$ViewConfig2 !== void 0 && _this$ViewConfig2.selectAccessoiresWithToggle);
     }
+  }, {
+    key: "cloneSet",
+    value: function cloneSet() {
+      var clonedSet = new DivaSet(this.CatalogData, this.setId, {}, _objectSpread$c({}, this.setState));
+      clonedSet.setData = this.setData;
+      clonedSet.configSingle = this.configSingle;
+      var articles = this.getDivaArticles();
+      //if boxplanner needs to be working, the planner needs to be cloned too
+      //this.setState.plannerHandler = this.setState.plannerHandler.clonePlannerHandler(clonedSet, this);
+      for (var key in articles) {
+        clonedSet.addArticle(articles[key].cloneArticle(clonedSet));
+      }
+      return clonedSet;
+    }
   }]);
 }();
 
@@ -29755,7 +29887,7 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
     key: "getValidVariants",
     value: function () {
       var _getValidVariants = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(set, useCache) {
-        var allvariants, validVariants, i, _set$onlyCalcVariants;
+        var allvariants, validVariants, i;
         return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -29775,11 +29907,7 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
               allvariants = _context4.t0;
               validVariants = [];
               for (i = 0; i < allvariants.length; i++) {
-                if (!set.disabledVariants.includes(allvariants[i].id)) {
-                  if (!((_set$onlyCalcVariants = set.onlyCalcVariants) !== null && _set$onlyCalcVariants !== void 0 && _set$onlyCalcVariants.length) || set.onlyCalcVariants.includes(allvariants[i].id)) {
-                    validVariants.push(allvariants[i]);
-                  }
-                }
+                if (!set.disabledVariants.includes(allvariants[i].id)) validVariants.push(allvariants[i]);
               }
               return _context4.abrupt("return", validVariants);
             case 11:
@@ -30441,25 +30569,24 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
     key: "getConifgItemsForView",
     value: function () {
       var _getConifgItemsForView = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(set, configStepKey) {
-        var optionStatesOfArticles, articles, step, retValues, optionCodex, configItems, selectedItems, optionState, key, _configItem$parent$oc, configItem, configItemsInOPG, retVal, _retVal, configStepOPG, configStepOPV, targetArticle, opg, ops, selectedOpv, originalVariantValues, seomethingChanged, variantValues, _key, _set$favorites$Varian, _set$favorites, alreadyCalcedVisibleOPVs, i, _ops$optionOcd2, _retVal2, clonedConfigItemsForView, _i, _configItems;
+        var articles, step, retValues, optionCodex, configItems, selectedItems, optionState, key, _configItem$parent$oc, configItem, configItemsInOPG, retVal, _retVal, configStepOPG, configStepOPV, targetArticle, opg, ops, selectedOpv, originalVariantValues, seomethingChanged, variantValues, _key, _set$favorites$Varian, _set$favorites, alreadyCalcedVisibleOPVs, i, _ops$optionOcd2, _retVal2, clonedConfigItemsForView, _i, _configItems;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              optionStatesOfArticles = set.getOptionStatesOfArticles(set.getDivaArticles(true));
               articles = set.getDivaArticles(true);
               step = set.configTree.getAllByKey(configStepKey);
               retValues = this.getConfigItems(configStepKey, articles, set.configTree);
               optionCodex = undefined;
               if (!(retValues && step != null)) {
-                _context.next = 55;
+                _context.next = 54;
                 break;
               }
               configItems = [];
               selectedItems = retValues.selectedVals;
-              optionState = optionStatesOfArticles[retValues.targetArticles[0]][retValues.optionCodex];
+              optionState = articles[retValues.targetArticles[0]].getArticleOptionState(retValues.optionCodex);
               optionCodex = optionState.optionCodex;
               if (!retValues.isOPG) {
-                _context.next = 14;
+                _context.next = 13;
                 break;
               }
               for (key in retValues.configItems) {
@@ -30471,26 +30598,26 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                   configItems = configItems.concat(retVal.myConfigItemsForView);
                 }
               }
-              _context.next = 52;
+              _context.next = 51;
               break;
-            case 14:
+            case 13:
               if (!(step.optionStep.mergesToOPG == undefined)) {
-                _context.next = 19;
+                _context.next = 18;
                 break;
               }
               _retVal = this.prepareConfigItemsForView(set, optionState, retValues.configItems, retValues.constructionRules, selectedItems, step.configStep.targetArticles, undefined, undefined, undefined, undefined, retValues.freeTextValue, retValues.freeTextLang);
               configItems = _retVal.myConfigItemsForView;
-              _context.next = 52;
+              _context.next = 51;
               break;
-            case 19:
+            case 18:
               if (!(typeof step.optionStep.mergesToOPG == 'string' && step.tabGroup.options[step.optionStep.mergesToOPG])) {
-                _context.next = 52;
+                _context.next = 51;
                 break;
               }
               //IDM Bezugschritte werden zusammengefasst zu OPG und OPV
               configStepOPG = step.configStep, configStepOPV = set.configTree.getConfigStepBasketIdAndOptionCodex(configStepOPG.targetArticles[0], step.optionStep.mergesToOPG); //falls mehrere Artikel im Schritt sind werden trotzdem nur die Values des erster verwendet um die z.B. OPT2 und OPT3 zu vereinen
               if (!configStepOPV) {
-                _context.next = 52;
+                _context.next = 51;
                 break;
               }
               targetArticle = articles[configStepOPG.targetArticles[0]];
@@ -30501,9 +30628,9 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
               seomethingChanged = false;
               variantValues = {};
               _context.t0 = _regeneratorRuntime__default["default"].keys(opg.visibleOptionValues);
-            case 30:
+            case 29:
               if ((_context.t1 = _context.t0()).done) {
-                _context.next = 48;
+                _context.next = 47;
                 break;
               }
               _key = _context.t1.value;
@@ -30511,7 +30638,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
               variantValues[opg.optionCodex] = opg.visibleOptionValues[_key].codex;
               alreadyCalcedVisibleOPVs = targetArticle.getMergesToOPG(opg.optionCodex + '_' + opg.visibleOptionValues[_key].codex, JSON.stringify(targetArticle.getVariantValuesTillOPT(opg.optionCodex)));
               if (!(alreadyCalcedVisibleOPVs != undefined && Object.keys((_set$favorites$Varian = (_set$favorites = set.favorites) === null || _set$favorites === void 0 ? void 0 : _set$favorites.VariantValues) !== null && _set$favorites$Varian !== void 0 ? _set$favorites$Varian : {}).length == 0)) {
-                _context.next = 39;
+                _context.next = 38;
                 break;
               }
               //die merged OPG wurde bereist ausgerechnet und kann wiederverwendet werden. nur die Selected value muss repariert werden
@@ -30523,35 +30650,35 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                 }
               }
               configItems = configItems.concat(alreadyCalcedVisibleOPVs);
-              _context.next = 46;
+              _context.next = 45;
               break;
-            case 39:
+            case 38:
               seomethingChanged = true;
-              _context.next = 42;
+              _context.next = 41;
               return articleHandlerInstance.updateCfgValues(targetArticle, variantValues, {}, true, true, true);
-            case 42:
+            case 41:
               _retVal2 = this.prepareConfigItemsForView(set, optionState, targetArticle.getArticleOptionState(ops.optionCodex).visibleOptionValues, retValues.constructionRules, [], step.configStep.targetArticles, (_ops$optionOcd2 = ops.optionOcd) !== null && _ops$optionOcd2 !== void 0 ? _ops$optionOcd2 : ops.optionCodex, opg.visibleOptionValues[_key].name, opg.visibleOptionValues[_key].codex, opg.optionCodex);
               configItems = configItems.concat(_retVal2.myConfigItemsForView);
               clonedConfigItemsForView = JSON.parse(JSON.stringify(_retVal2.myConfigItemsForView));
               targetArticle.addMergesToOPG(opg.optionCodex + '_' + opg.visibleOptionValues[_key].codex, JSON.stringify(targetArticle.getVariantValuesTillOPT(opg.optionCodex)), clonedConfigItemsForView);
-            case 46:
-              _context.next = 30;
+            case 45:
+              _context.next = 29;
               break;
-            case 48:
+            case 47:
               if (!seomethingChanged) {
-                _context.next = 51;
+                _context.next = 50;
                 break;
               }
-              _context.next = 51;
+              _context.next = 50;
               return setHandlerInstance.updateArticlesOptionStatesOfActSet(set, originalVariantValues, [targetArticle.basketId], true, 'calcVariant');
-            case 51:
+            case 50:
               for (_i = 0; _i < configItems.length; _i++) {
                 if (configItems[_i].codex == (selectedOpv === null || selectedOpv === void 0 ? void 0 : selectedOpv.codex)) {
                   selectedItems = [selectedOpv.codex];
                   configItems[_i].sel = true;
                 }
               }
-            case 52:
+            case 51:
               return _context.abrupt("return", {
                 configItems: configItems,
                 option: optionCodex ? set.CatalogData.getOption(optionCodex) : undefined,
@@ -30562,13 +30689,13 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                 }),
                 notTotallyMatichingOPVs: !set.CatalogData.articleConfigAll ? retValues.notTotallyMatichingOPVs : undefined
               });
-            case 55:
+            case 54:
               _configItems = [];
               return _context.abrupt("return", {
                 configItems: _configItems,
                 selectedItems: []
               });
-            case 57:
+            case 56:
             case "end":
               return _context.stop();
           }
@@ -30595,10 +30722,10 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
           notTotallyMatichingOPVs = false,
           myOptionState = undefined;
         for (var i = 0; i < configStep.targetArticles.length; i++) {
+          var _myOptionState;
           var article = articles[configStep.targetArticles[i]];
-          var myOptions = article.articleOptionStates;
-          myOptionState = myOptions[configStep.option];
-          if (myOptionState.option.hasOPG) isOPG = true;
+          myOptionState = article.getArticleOptionState(configStep.option);
+          if ((_myOptionState = myOptionState) !== null && _myOptionState !== void 0 && (_myOptionState = _myOptionState.option) !== null && _myOptionState !== void 0 && _myOptionState.hasOPG) isOPG = true;
           selectedVals = selectedVals.concat(myOptionState.getSelectedVals);
           if (myOptionState.isFreeText && myOptionState.freeText) {
             freeTextValue = myOptionState.freeText;
@@ -30711,12 +30838,13 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
      */
   }, {
     key: "checkIfLoadedArticlesAreConfigSingle",
-    value: function checkIfLoadedArticlesAreConfigSingle(optionStatesOfArticles) {
+    value: function checkIfLoadedArticlesAreConfigSingle(set) {
       var optionValues = {},
         ret = false;
-      for (var ikey in optionStatesOfArticles) {
-        for (var jKey in optionStatesOfArticles[ikey]) {
-          var optionState = optionStatesOfArticles[ikey][jKey];
+      var articles = set.getDivaArticles();
+      for (var basketId in articles) {
+        for (var jKey in articles[basketId].articleOptionStates) {
+          var optionState = articles[basketId].articleOptionStates[jKey];
           if (optionState.headerPosVariationType == 'K') {
             if (optionValues[optionState.optionCodex] == undefined) {
               optionValues[optionState.optionCodex] = optionState.valCodex ? optionState.valCodex : null;
@@ -30740,7 +30868,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       var myConfigItemsForView = [],
         objectKeys = Object.keys(myConfigItems);
       var _loop8 = function _loop8() {
-        var _ops$optionOcd3, _item$colorGroups, _item$pdfUrl, _item$url;
+        var _ops$optionOcd3, _item$images, _item$colorGroups, _item$pdfUrl, _item$url;
         var item = myConfigItems[objectKeys[i]];
         var key = objectKeys[i];
         var groupName = item.groupName ? item.groupName : idmOpgGroupName;
@@ -30769,7 +30897,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
           codex: item.codex,
           ocd: item.ocd,
           vCodex: item.vCodex,
-          layout: item.isTexture ? 'TEXTURE' : item.image ? 'IMAGE' : 'TEXT',
+          layout: item.isTexture ? 'TEXTURE' : item.image || (_item$images = item.images) !== null && _item$images !== void 0 && _item$images.length ? 'IMAGE' : 'TEXT',
           image: image,
           zoomImage: zoomImage,
           hexColor: item.hexColor,
@@ -30788,6 +30916,8 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
           //if a opv has isFreeText = true and its selected a Textbox sould appear in the OptionValue
           //if the text is empty the opv is really selected
           contentItemId: item.contentItemId,
+          isOPVG: item.isOPVG,
+          isParentOPVG: item.parent.codex.startsWith('OPV'),
           groupContentItemId: item.groupContentItemId,
           idmOpgOptionCodex: idmOpgOptionCodex,
           idmOpgValCodex: idmOpgValCodex,
@@ -31161,7 +31291,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               _context4.next = 72;
               break;
             case 85:
-              set.configSingle = configTreeHandler.checkIfLoadedArticlesAreConfigSingle(set.getOptionStatesOfArticles());
+              set.configSingle = configTreeHandler.checkIfLoadedArticlesAreConfigSingle(set);
               _context4.next = 88;
               return this.updateArticlesOptionStatesOfActSet(set, {}, [], undefined, 'initializing');
             case 88:
@@ -32398,18 +32528,18 @@ var DivaSetHandler = /*#__PURE__*/function () {
      */
   }, {
     key: "update3DPlannerView",
-    value: function update3DPlannerView(doRequestRendering, doRequestHqRenderScript, set, renderSize, planner3DGridEnabled, mediaServiceSaveMode, doShow3DDimensionLines, alternateRenderInfo, hybrid3DInfo) {
+    value: function update3DPlannerView(doRequestRendering, doRequestHqRenderScript, set, renderSize, planner3DGridEnabled, mediaServiceSaveMode, doShow3DDimensionLines, alternateRenderInfo, hybrid3DInfo, useLatestHybridInfo) {
       var _set$plannerHandler, _set$getAlternateRend2;
       var width = renderSize.imgWidth;
       var height = renderSize.imgHeight;
-      (_set$plannerHandler = set.plannerHandler) === null || _set$plannerHandler === void 0 || _set$plannerHandler.request3D(doRequestRendering, doRequestHqRenderScript, true, (set === null || set === void 0 || (_set$getAlternateRend2 = set.getAlternateRenderInfo()) === null || _set$getAlternateRend2 === void 0 ? void 0 : _set$getAlternateRend2.length) > 0, alternateRenderInfo, undefined, {
+      (_set$plannerHandler = set.plannerHandler) === null || _set$plannerHandler === void 0 || _set$plannerHandler.request3D(doRequestRendering, doRequestHqRenderScript, (set === null || set === void 0 || (_set$getAlternateRend2 = set.getAlternateRenderInfo()) === null || _set$getAlternateRend2 === void 0 ? void 0 : _set$getAlternateRend2.length) > 0, alternateRenderInfo, undefined, {
         width: width,
         height: height,
         isFullscreenRendering: false,
         planner3DGridEnabled: planner3DGridEnabled,
         mediaServiceSaveMode: mediaServiceSaveMode,
         doShow3DDimensionLines: !!doShow3DDimensionLines
-      }, hybrid3DInfo);
+      }, hybrid3DInfo, useLatestHybridInfo);
     }
   }, {
     key: "getPlannerPaletteViewInfo",
@@ -32637,23 +32767,22 @@ var DivaSetHandler = /*#__PURE__*/function () {
     value: function () {
       var _loadConfigItemsOfActSetByConfigStepKey = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee22(set, configStepKey, visible) {
         var _configItems$option;
-        var optionStatesOfArticle, configItems, paletteType, filterType, stepInfo, contentItemId;
+        var configItems, paletteType, filterType, stepInfo, contentItemId;
         return _regeneratorRuntime__default["default"].wrap(function _callee22$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
             case 0:
-              optionStatesOfArticle = set.getOptionStatesOfArticles(set.getDivaArticles(true));
-              _context24.next = 3;
+              _context24.next = 2;
               return configTreeHandler.getConifgItemsForView(set, configStepKey);
-            case 3:
+            case 2:
               configItems = _context24.sent;
-              paletteType = set.configTree.getCurPaletteType(set, configStepKey, optionStatesOfArticle);
+              paletteType = set.configTree.getCurPaletteType(set, configStepKey);
               configItems.configItems = this.removeDockingInfluencableconfigItems(set, configItems.configItems, configStepKey);
-              _context24.next = 8;
+              _context24.next = 7;
               return this.variantsEvaluator(set, configItems.configItems, configStepKey, paletteType);
-            case 8:
+            case 7:
               configItems.configItems = _context24.sent;
-              filterType = set.configTree.getCurFilterType(configStepKey, optionStatesOfArticle, configItems.configItems);
-              stepInfo = set.configTree.getStepInfo(configStepKey, optionStatesOfArticle);
+              filterType = set.configTree.getCurFilterType(configStepKey, configItems.configItems);
+              stepInfo = set.configTree.getStepInfo(configStepKey);
               contentItemId = (_configItems$option = configItems.option) === null || _configItems$option === void 0 ? void 0 : _configItems$option.contentItemId;
               return _context24.abrupt("return", _objectSpread$9(_objectSpread$9(_objectSpread$9({
                 isRenderedNotInSettingPalette: set.configTree.isRenderedNotInSettingPalette(configStepKey),
@@ -32666,7 +32795,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               }, set.configTree.getOptionStuff(configStepKey, set)), {}, {
                 contentItemId: contentItemId
               }));
-            case 13:
+            case 12:
             case "end":
               return _context24.stop();
           }
@@ -32715,45 +32844,31 @@ var DivaSetHandler = /*#__PURE__*/function () {
     key: "variantsEvaluator",
     value: (function () {
       var _variantsEvaluator = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee23(set, configItems, configStepKey, paletteType) {
-        var _set$ViewConfig, _configItems$;
-        var opt, calcVariantsForPricePreview, previewType, _set$api$ReturnToFrom, _set$CatalogData$show, targetArticles, startTime, variants, endTime;
+        var _set$ViewConfig, _set$api$ReturnToFrom, _set$CatalogData$show;
+        var opt, previewType, targetArticles, variants;
         return _regeneratorRuntime__default["default"].wrap(function _callee23$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
               opt = set.CatalogData.getOption(configItems[0].op);
-              if (opt) {
-                _context25.next = 3;
-                break;
-              }
-              return _context25.abrupt("return", configItems);
-            case 3:
-              calcVariantsForPricePreview = false;
               previewType = (_set$ViewConfig = set.ViewConfig) === null || _set$ViewConfig === void 0 ? void 0 : _set$ViewConfig.pricePreview;
-              if (previewType) {
-                calcVariantsForPricePreview = !set.dontCalcPricePreviewDueToPerformanceIssues && !((_set$api$ReturnToFrom = set.api.ReturnToFromParams) !== null && _set$api$ReturnToFrom !== void 0 && _set$api$ReturnToFrom.includes('PRODUCTCREATOR')) && !opt.showOnSeparatTabgroup && (!((_set$CatalogData$show = set.CatalogData.showPricePreviewOnlyOnOptions) !== null && _set$CatalogData$show !== void 0 && _set$CatalogData$show.length) || set.CatalogData.showPricePreviewOnlyOnOptions.includes(opt.codex));
-              }
-              if (set.PlannerMode === 'BoxPlanner') calcVariantsForPricePreview = false;
-              if (paletteType == 'GAL' && ((_configItems$ = configItems[0]) === null || _configItems$ === void 0 ? void 0 : _configItems$.groupName) === undefined || paletteType == 'TEXTBOX' || paletteType == 'NUMBERBOX' || paletteType == 'RANGE') {
-                calcVariantsForPricePreview = false;
-              }
-              if (!calcVariantsForPricePreview) {
-                _context25.next = 17;
+              if (!(!opt || !previewType || opt.mergeIDMToOPG || opt.isDescribingState || configItems[0].isOPVG || configItems.length == 1 || opt.showOnSeparatTabgroup || set.PlannerMode === 'BoxPlanner' || ['TEXTBOX', 'NUMBERBOX', 'RANGE'].includes(paletteType) || (_set$api$ReturnToFrom = set.api.ReturnToFromParams) !== null && _set$api$ReturnToFrom !== void 0 && _set$api$ReturnToFrom.includes('PRODUCTCREATOR') || (_set$CatalogData$show = set.CatalogData.showPricePreviewOnlyOnOptions) !== null && _set$CatalogData$show !== void 0 && _set$CatalogData$show.length && !set.CatalogData.showPricePreviewOnlyOnOptions.includes(opt.codex))) {
+                _context25.next = 4;
                 break;
               }
+              return _context25.abrupt("return", configItems);
+            case 4:
               targetArticles = set.configTree.getTargetArticles(configStepKey);
-              startTime = new Date();
-              _context25.next = 13;
-              return this.calcVariants(set, configItems, targetArticles);
-            case 13:
+              _context25.next = 7;
+              return this.calcVariants(set, configItems, targetArticles, opt.codex);
+            case 7:
               variants = _context25.sent;
-              endTime = new Date();
-              if (endTime.getTime() - startTime.getTime() > 1000) set.dontCalcPricePreviewDueToPerformanceIssues = true;
               if (previewType) {
-                this.calcPricePreview(set, configItems, variants);
+                configItems.map(function (c, index) {
+                  return c.pricePreviewPromise = variants[index];
+                });
               }
-            case 17:
               return _context25.abrupt("return", configItems);
-            case 18:
+            case 10:
             case "end":
               return _context25.stop();
           }
@@ -32767,109 +32882,167 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "calcVariants",
     value: function () {
-      var _calcVariants = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee24(set, configItems, targetArticles) {
-        var variantInfo, articles, origConfigs, i, item, variantValues, doUseConfigs, targetIndex, origConfig, key, _targetIndex;
+      var _calcVariants = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee24(realSet, configItems, targetArticles, optionCodex) {
+        var variantInfo, set, articles, origPrice, articleConfigs, i, basketId, totalConfig, key, parentNames, _i5, configItem;
         return _regeneratorRuntime__default["default"].wrap(function _callee24$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
               variantInfo = [];
+              set = realSet.cloneSet();
               articles = set.getDivaArticles();
-              origConfigs = targetArticles.map(function (basketId) {
-                return articles[basketId].VariantValues;
-              });
-              i = 0;
-            case 4:
-              if (!(i < configItems.length)) {
+              origPrice = set.getSetPrice();
+              articleConfigs = {};
+              for (i = 0; i < targetArticles.length; i++) {
+                basketId = targetArticles[i];
+                articleConfigs[basketId] = {
+                  config: articles[basketId].VisibleVariantValues,
+                  articleCodex: articles[basketId].articleCodex
+                };
+              }
+              totalConfig = {};
+              for (key in articles) {
+                totalConfig[key] = {
+                  config: articles[key].VisibleVariantValues,
+                  articleCodex: articles[key].articleCodex
+                };
+              }
+              parentNames = [];
+              _i5 = 0;
+            case 10:
+              if (!(_i5 < configItems.length)) {
                 _context26.next = 23;
                 break;
               }
-              item = configItems[i];
-              variantValues = {};
-              doUseConfigs = false;
-              targetIndex = 0;
-            case 9:
-              if (!(targetIndex < origConfigs.length)) {
+              configItem = configItems[_i5];
+              if (!(configItem.parentName && configItem.isParentOPVG)) {
                 _context26.next = 19;
                 break;
               }
-              origConfig = origConfigs[targetIndex];
-              for (key in origConfig) {
-                if (key == item.op || key == item.idmOpgOptionCodex) {
-                  doUseConfigs = true;
-                } else if (doUseConfigs) variantValues[key] = origConfig[key];
+              if (!parentNames.includes(configItem.parentName)) {
+                _context26.next = 18;
+                break;
               }
-              variantValues[item.op] = item.codex;
-              if (item.idmOpgOptionCodex) variantValues[item.idmOpgOptionCodex] = item.idmOpgValCodex;
-              _context26.next = 16;
-              return this.updateArticlesOptionStatesOfActSet(set, variantValues, [targetArticles[targetIndex]], true, 'calcVariant');
-            case 16:
-              targetIndex++;
-              _context26.next = 9;
-              break;
+              variantInfo.push(variantInfo[_i5 - 1]);
+              return _context26.abrupt("continue", 20);
+            case 18:
+              parentNames.push(configItem.parentName);
             case 19:
-              variantInfo.push({
-                price: set.getSetPrice(),
-                variants: set.getGeneralVariantValues(targetArticles),
-                opt: item.op
-              });
+              variantInfo.push(this.getVariant(set, configItem, articleConfigs, totalConfig, targetArticles, optionCodex, origPrice, _i5, variantInfo[_i5 - 1]));
             case 20:
-              i++;
-              _context26.next = 4;
+              _i5++;
+              _context26.next = 10;
               break;
             case 23:
-              _targetIndex = 0;
-            case 24:
-              if (!(_targetIndex < origConfigs.length)) {
-                _context26.next = 30;
-                break;
-              }
-              _context26.next = 27;
-              return this.updateArticlesOptionStatesOfActSet(set, origConfigs[_targetIndex], [targetArticles[_targetIndex]], true);
-            case 27:
-              _targetIndex++;
-              _context26.next = 24;
-              break;
-            case 30:
               return _context26.abrupt("return", variantInfo);
-            case 31:
+            case 24:
             case "end":
               return _context26.stop();
           }
         }, _callee24, this);
       }));
-      function calcVariants(_x85, _x86, _x87) {
+      function calcVariants(_x85, _x86, _x87, _x88) {
         return _calcVariants.apply(this, arguments);
       }
       return calcVariants;
     }()
   }, {
-    key: "calcPricePreview",
-    value: function calcPricePreview(set, configItems, variantsInfo) {
-      var _set$ViewConfig2;
-      var previewType = (_set$ViewConfig2 = set.ViewConfig) === null || _set$ViewConfig2 === void 0 ? void 0 : _set$ViewConfig2.pricePreview;
-      var origPrice = set.getSetPrice();
-      var firstPrice;
-      if (configItems.length < 20) {
-        for (var i = 0; i < configItems.length; i++) {
-          var item = configItems[i];
-          var variant = variantsInfo[i];
-          switch (previewType) {
-            case 'fromCurrentPrice':
-              item.deltaPrice = variant.price - origPrice;
+    key: "getVariant",
+    value: function () {
+      var _getVariant = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee25(set, item, origConfigs, totalConfig, targetArticles, optionCodex, origPrice, index, previousPromise) {
+        var firstPrice, startTime, doUseConfigs, hashVariantValues, variantValues, i, basketId, origConfig, key, hash, dataHash, _i6, endTime, calcTime, priceObj;
+        return _regeneratorRuntime__default["default"].wrap(function _callee25$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
+            case 0:
+              firstPrice = undefined;
+              if (!previousPromise) {
+                _context27.next = 7;
+                break;
+              }
+              _context27.next = 4;
+              return previousPromise;
+            case 4:
+              firstPrice = _context27.sent.firstPrice;
+              _context27.next = 8;
               break;
-            case 'fromBasePrice':
-              if (firstPrice === undefined) {
-                firstPrice = variant.price;
-                item.deltaPrice = 0;
-              } else {
-                item.deltaPrice = variant.price - firstPrice;
+            case 7:
+              firstPrice = set.getSetPrice();
+            case 8:
+              startTime = new Date();
+              doUseConfigs = false;
+              hashVariantValues = [];
+              variantValues = [];
+              i = 0;
+              for (basketId in origConfigs) {
+                hashVariantValues[i] = {
+                  articleCodex: origConfigs[basketId].articleCodex
+                };
+                variantValues[i] = {};
+                origConfig = origConfigs[basketId].config;
+                for (key in origConfig) {
+                  if (key == item.op || key == item.idmOpgOptionCodex) {
+                    doUseConfigs = true;
+                  } else if (doUseConfigs) {
+                    variantValues[i][key] = origConfig[key];
+                  }
+                  hashVariantValues[i][key] = origConfig[key];
+                }
+                variantValues[i][item.op] = item.codex;
+                hashVariantValues[i][item.op] = item.codex;
+                totalConfig[basketId].config[item.op] = item.codex;
+                if (item.idmOpgOptionCodex) variantValues[i][item.idmOpgOptionCodex] = item.idmOpgValCodex;
+                i++;
+              }
+              hash = DivaUtils.md5(JSON.stringify([].concat(hashVariantValues, _toConsumableArray__default["default"](Object.values(totalConfig)))));
+              dataHash = set.CatalogData.getVariantsPriceByHash(hash);
+              if (!dataHash) {
+                _context27.next = 19;
+                break;
+              }
+              LOG$9.debug('calcingVariant from Option:' + optionCodex + ' and index: ' + index + ' hash hit!', dataHash, [].concat(hashVariantValues, _toConsumableArray__default["default"](Object.values(totalConfig))), targetArticles);
+              return _context27.abrupt("return", _objectSpread$9(_objectSpread$9({}, dataHash), {}, {
+                origPrice: origPrice,
+                firstPrice: firstPrice
+              }));
+            case 19:
+              _i6 = 0;
+            case 20:
+              if (!(_i6 < variantValues.length)) {
+                _context27.next = 26;
+                break;
               }
+              _context27.next = 23;
+              return this.updateArticlesOptionStatesOfActSet(set, variantValues[_i6], [targetArticles[_i6]], true, 'calcVariant');
+            case 23:
+              _i6++;
+              _context27.next = 20;
               break;
+            case 26:
+              endTime = new Date();
+              calcTime = endTime.getTime() - startTime.getTime();
+              LOG$9.debug('calcingVariant Time from Option:' + optionCodex + ' and index: ' + index + ' time is: ' + calcTime + 'ms' + targetArticles.join(';'), [].concat(hashVariantValues, _toConsumableArray__default["default"](Object.values(totalConfig))));
+              priceObj = {
+                price: set.getSetPrice(),
+                opt: item.op,
+                opv: item.codex,
+                origPrice: origPrice,
+                calcTime: calcTime,
+                firstPrice: firstPrice,
+                variantValues: hashVariantValues,
+                hashObj: [].concat(hashVariantValues, _toConsumableArray__default["default"](Object.values(totalConfig)))
+              };
+              set.CatalogData.setVariantsPriceByHash(hash, priceObj);
+              return _context27.abrupt("return", priceObj);
+            case 32:
+            case "end":
+              return _context27.stop();
           }
-        }
+        }, _callee25, this);
+      }));
+      function getVariant(_x89, _x90, _x91, _x92, _x93, _x94, _x95, _x96, _x97) {
+        return _getVariant.apply(this, arguments);
       }
-    }
-
+      return getVariant;
+    }()
     /**
      * This function updates the option values of the articles
      * @param myValues
@@ -32879,11 +33052,11 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "updateArticlesOptionStatesOfActSet",
     value: (function () {
-      var _updateArticlesOptionStatesOfActSet = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee25(set, myValues, targetArticlesWithNewValues, ignorePlanner, from, partlistDiff) {
+      var _updateArticlesOptionStatesOfActSet = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee26(set, myValues, targetArticlesWithNewValues, ignorePlanner, from, partlistDiff) {
         var _Object$keys, _resultPlannerUpdate;
         var elementsToDeleteById, targetArticlesToUpdateOnly, retValues, diff, resultPlannerUpdate, targetElementIds, i, articleToDel, index, articleCopyRelation, newArticle;
-        return _regeneratorRuntime__default["default"].wrap(function _callee25$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee26$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
               elementsToDeleteById = [];
               targetArticlesToUpdateOnly = [];
@@ -32895,54 +33068,54 @@ var DivaSetHandler = /*#__PURE__*/function () {
               } else {
                 targetArticlesToUpdateOnly = targetArticlesWithNewValues;
               }
-              _context27.next = 5;
+              _context28.next = 5;
               return articleHandlerInstance.updateArticlesOptionStates(myValues, targetArticlesWithNewValues, targetArticlesToUpdateOnly, set.getDivaArticles(true), from);
             case 5:
-              retValues = _context27.sent;
+              retValues = _context28.sent;
               targetArticlesWithNewValues = retValues.targetArticlesToUpdate;
               if (!(retValues.partlistArticlesToLoad.length > 0)) {
-                _context27.next = 16;
+                _context28.next = 16;
                 break;
               }
               diff = targetArticlesToUpdateOnly.length - Object.keys(set.getDivaArticles()).length;
               if (!(diff == 0 || partlistDiff == diff)) {
-                _context27.next = 14;
+                _context28.next = 14;
                 break;
               }
-              _context27.next = 12;
+              _context28.next = 12;
               return articleHandlerInstance.correctPartlistArticlesByGlobalRules(set, retValues.partlistArticlesToLoad, set.CatalogData.bundleRules, {
                 doChange: false
               });
             case 12:
-              _context27.next = 16;
+              _context28.next = 16;
               break;
             case 14:
-              _context27.next = 16;
+              _context28.next = 16;
               return this.updateArticlesOptionStatesOfActSet(set, {}, targetArticlesWithNewValues, ignorePlanner, from, diff);
             case 16:
               if (!(from !== 'initializingPartlist')) {
-                _context27.next = 19;
+                _context28.next = 19;
                 break;
               }
-              _context27.next = 19;
+              _context28.next = 19;
               return this.updateEdoArticles(set, retValues.newEDOExtraArticles);
             case 19:
               if (set.CatalogData.hasAlternateRenderings) set.CatalogData.updateAlternativeRenderings(set.getDivaArticles());
 
               //Update Planner - check if planner data changed
               if (!(!ignorePlanner && from != 'calcVariant')) {
-                _context27.next = 48;
+                _context28.next = 49;
                 break;
               }
               targetElementIds = this.getElementIdsOfArticles(set, targetArticlesWithNewValues);
-              _context27.next = 24;
+              _context28.next = 24;
               return set.plannerHandler.updatePlanner(set.getSetId(), myValues, targetElementIds);
             case 24:
-              resultPlannerUpdate = _context27.sent;
+              resultPlannerUpdate = _context28.sent;
               i = 0;
             case 26:
               if (!(i < resultPlannerUpdate.elemIdsToDelete.length)) {
-                _context27.next = 35;
+                _context28.next = 35;
                 break;
               }
               articleToDel = set.getArticleByElementId(resultPlannerUpdate.elemIdsToDelete[i]);
@@ -32950,15 +33123,15 @@ var DivaSetHandler = /*#__PURE__*/function () {
               if (index > -1) {
                 targetArticlesWithNewValues.splice(index, 1);
               }
-              _context27.next = 32;
+              _context28.next = 32;
               return this.deleteElementFromSetByElemId(set, resultPlannerUpdate.elemIdsToDelete[i], false, resultPlannerUpdate.deletionType);
             case 32:
               i++;
-              _context27.next = 26;
+              _context28.next = 26;
               break;
             case 35:
               if (!(resultPlannerUpdate.elementIdToCopy && resultPlannerUpdate.elementIdToCopy.length > 0)) {
-                _context27.next = 48;
+                _context28.next = 48;
                 break;
               }
               //Todo copy these elements
@@ -32966,20 +33139,20 @@ var DivaSetHandler = /*#__PURE__*/function () {
               i = 0;
             case 38:
               if (!(i < resultPlannerUpdate.elementIdToCopy.length)) {
-                _context27.next = 46;
+                _context28.next = 46;
                 break;
               }
-              _context27.next = 41;
+              _context28.next = 41;
               return this.copyArticleByElementId(set, resultPlannerUpdate.elementIdToCopy[i], resultPlannerUpdate.ignoreOptionsToCopy);
             case 41:
-              newArticle = _context27.sent;
+              newArticle = _context28.sent;
               articleCopyRelation.set(resultPlannerUpdate.elementIdToCopy[i], newArticle.basketId);
             case 43:
               i++;
-              _context27.next = 38;
+              _context28.next = 38;
               break;
             case 46:
-              _context27.next = 48;
+              _context28.next = 48;
               return set.plannerHandler.copyPlannerElements(set.getSetId(), articleCopyRelation, {
                 dpType: resultPlannerUpdate.copyDPType ? resultPlannerUpdate.copyDPType : 'NO',
                 copyType: resultPlannerUpdate.copyType,
@@ -32988,21 +33161,22 @@ var DivaSetHandler = /*#__PURE__*/function () {
               });
             case 48:
               this.updatePosNrOfAccessoiresOfTargetArticles(set, targetArticlesWithNewValues);
+            case 49:
               if (from == 'FromViewClick' && (_Object$keys = Object.keys(myValues)) !== null && _Object$keys !== void 0 && _Object$keys.length) {
                 this.confirmOptionsInMetric(set, [Object.keys(myValues)[0]]);
               }
-              return _context27.abrupt("return", {
+              return _context28.abrupt("return", {
                 articleCountChanged: elementsToDeleteById.length > 0,
                 elementIdsToUpdateSelection: (_resultPlannerUpdate = resultPlannerUpdate) === null || _resultPlannerUpdate === void 0 ? void 0 : _resultPlannerUpdate.elementIdsToUpdateSelection,
                 setId: set.getSetId()
               });
             case 51:
             case "end":
-              return _context27.stop();
+              return _context28.stop();
           }
-        }, _callee25, this);
+        }, _callee26, this);
       }));
-      function updateArticlesOptionStatesOfActSet(_x88, _x89, _x90, _x91, _x92, _x93) {
+      function updateArticlesOptionStatesOfActSet(_x98, _x99, _x100, _x101, _x102, _x103) {
         return _updateArticlesOptionStatesOfActSet.apply(this, arguments);
       }
       return updateArticlesOptionStatesOfActSet;
@@ -33056,63 +33230,63 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "updateEdoArticles",
     value: function () {
-      var _updateEdoArticles = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee26(set, edoArticlesToLoad) {
-        var oldBasketIds, i, article, newArticles, _i5, _i6;
-        return _regeneratorRuntime__default["default"].wrap(function _callee26$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+      var _updateEdoArticles = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee27(set, edoArticlesToLoad) {
+        var oldBasketIds, i, article, newArticles, _i7, _i8;
+        return _regeneratorRuntime__default["default"].wrap(function _callee27$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
               if (!(set.edoExtraArticles.length > 0 || edoArticlesToLoad.length > 0)) {
-                _context28.next = 22;
+                _context29.next = 22;
                 break;
               }
               oldBasketIds = _toConsumableArray__default["default"](set.edoExtraArticles);
               i = 0;
             case 3:
               if (!(i < set.edoExtraArticles.length)) {
-                _context28.next = 11;
+                _context29.next = 11;
                 break;
               }
               article = set.getArticleByBasketId(set.edoExtraArticles[i]);
               if (!article) {
-                _context28.next = 8;
+                _context29.next = 8;
                 break;
               }
-              _context28.next = 8;
+              _context29.next = 8;
               return this.deleteElementFromSet(set, article);
             case 8:
               i++;
-              _context28.next = 3;
+              _context29.next = 3;
               break;
             case 11:
               set.edoExtraArticles = [];
               newArticles = [];
-              _i5 = 0;
+              _i7 = 0;
             case 14:
-              if (!(_i5 < edoArticlesToLoad.length)) {
-                _context28.next = 21;
+              if (!(_i7 < edoArticlesToLoad.length)) {
+                _context29.next = 21;
                 break;
               }
-              _context28.next = 17;
-              return this.addArticleToActSet(set, edoArticlesToLoad[_i5].ArticleCodex, _objectSpread$9(_objectSpread$9({}, edoArticlesToLoad[_i5]), {}, {
-                basketId: oldBasketIds[_i5]
+              _context29.next = 17;
+              return this.addArticleToActSet(set, edoArticlesToLoad[_i7].ArticleCodex, _objectSpread$9(_objectSpread$9({}, edoArticlesToLoad[_i7]), {}, {
+                basketId: oldBasketIds[_i7]
               }), true);
             case 17:
-              newArticles[_i5] = _context28.sent;
+              newArticles[_i7] = _context29.sent;
             case 18:
-              _i5++;
-              _context28.next = 14;
+              _i7++;
+              _context29.next = 14;
               break;
             case 21:
-              for (_i6 = 0; _i6 < newArticles.length; _i6++) {
-                set.edoExtraArticles.push(newArticles[_i6].basketId);
+              for (_i8 = 0; _i8 < newArticles.length; _i8++) {
+                set.edoExtraArticles.push(newArticles[_i8].basketId);
               }
             case 22:
             case "end":
-              return _context28.stop();
+              return _context29.stop();
           }
-        }, _callee26, this);
+        }, _callee27, this);
       }));
-      function updateEdoArticles(_x94, _x95) {
+      function updateEdoArticles(_x104, _x105) {
         return _updateEdoArticles.apply(this, arguments);
       }
       return updateEdoArticles;
@@ -33278,11 +33452,11 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "fillOrderLinesAndOrderSets",
     value: function () {
-      var _fillOrderLinesAndOrderSets = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee27(sets, divaBasketHandler, repairOnly, setPlanner, returnTo) {
+      var _fillOrderLinesAndOrderSets = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee28(sets, divaBasketHandler, repairOnly, setPlanner, returnTo) {
         var _set$getMatchingProdu2, _set$getMatchingProdu3;
         var orderSets, basketData, set, setPosNr, _set$getMatchingProdu, key, _set$basketConfigVari, _OrderLinesOfActSet$, _set, catalogData, articles, newOrderSet, OrderLinesOfActSet, ret, _key2, i, _basketData$OrderSets, _basketData$SetPlanne, oderSetsIsInActPlanning, setId, j;
-        return _regeneratorRuntime__default["default"].wrap(function _callee27$(_context29) {
-          while (1) switch (_context29.prev = _context29.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee28$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
             case 0:
               orderSets = [];
               basketData = divaBasketHandler.actBasket;
@@ -33295,29 +33469,29 @@ var DivaSetHandler = /*#__PURE__*/function () {
               }
               basketData.MatchingProductId = set === null || set === void 0 || (_set$getMatchingProdu2 = set.getMatchingProduct()) === null || _set$getMatchingProdu2 === void 0 ? void 0 : _set$getMatchingProdu2._id;
               basketData.MatchingProductRetailerArticleNr = set === null || set === void 0 || (_set$getMatchingProdu3 = set.getMatchingProduct()) === null || _set$getMatchingProdu3 === void 0 || (_set$getMatchingProdu3 = _set$getMatchingProdu3.retailerArticleNr) === null || _set$getMatchingProdu3 === void 0 ? void 0 : _set$getMatchingProdu3.toString();
-              _context29.t0 = _regeneratorRuntime__default["default"].keys(sets);
+              _context30.t0 = _regeneratorRuntime__default["default"].keys(sets);
             case 9:
-              if ((_context29.t1 = _context29.t0()).done) {
-                _context29.next = 31;
+              if ((_context30.t1 = _context30.t0()).done) {
+                _context30.next = 31;
                 break;
               }
-              key = _context29.t1.value;
+              key = _context30.t1.value;
               setPosNr++;
               _set = sets[key];
               catalogData = _set.CatalogData;
               articles = _set.getDivaArticles();
-              _context29.next = 17;
+              _context30.next = 17;
               return this.getOrderSet(_set, catalogData, setPosNr, divaBasketHandler.actDivaNr, repairOnly, returnTo);
             case 17:
-              newOrderSet = _context29.sent;
+              newOrderSet = _context30.sent;
               basketData.setIsPlanning(_set.SetType == 'PLANNING' ? '1' : '0');
               OrderLinesOfActSet = articleHandlerInstance.getOrderLinesOfArticles(articles, repairOnly, !!((_set$basketConfigVari = _set.basketConfigVariants) !== null && _set$basketConfigVari !== void 0 && _set$basketConfigVari.length));
               articleHandlerInstance.checkForRoundingError(OrderLinesOfActSet, _set);
               if (OrderLinesOfActSet.length) {
-                _context29.next = 23;
+                _context30.next = 23;
                 break;
               }
-              return _context29.abrupt("continue", 9);
+              return _context30.abrupt("continue", 9);
             case 23:
               OrderLinesOfActSet = divaBasketHandler.divaWWSHandler.repairWWSFlags(articles, OrderLinesOfActSet);
               if (newOrderSet.SetImage == '' && (_OrderLinesOfActSet$ = OrderLinesOfActSet[0]) !== null && _OrderLinesOfActSet$ !== void 0 && _OrderLinesOfActSet$.Image && _set.PlannerMode == 'No') {
@@ -33339,7 +33513,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               }
               newOrderSet.setOrderLines(OrderLinesOfActSet);
               orderSets.push(newOrderSet);
-              _context29.next = 9;
+              _context30.next = 9;
               break;
             case 31:
               //fill diva3DProject for renderings & AR Converter
@@ -33347,7 +33521,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               i = 0;
             case 33:
               if (!(i < ((_basketData$OrderSets = basketData.OrderSets) === null || _basketData$OrderSets === void 0 ? void 0 : _basketData$OrderSets.length))) {
-                _context29.next = 48;
+                _context30.next = 48;
                 break;
               }
               oderSetsIsInActPlanning = false;
@@ -33355,18 +33529,18 @@ var DivaSetHandler = /*#__PURE__*/function () {
               j = 0;
             case 37:
               if (!(j < orderSets.length)) {
-                _context29.next = 44;
+                _context30.next = 44;
                 break;
               }
               if (!(orderSets[j].SetID == setId)) {
-                _context29.next = 41;
+                _context30.next = 41;
                 break;
               }
               oderSetsIsInActPlanning = true;
-              return _context29.abrupt("break", 44);
+              return _context30.abrupt("break", 44);
             case 41:
               j++;
-              _context29.next = 37;
+              _context30.next = 37;
               break;
             case 44:
               if (!oderSetsIsInActPlanning && !((_basketData$SetPlanne = basketData.SetPlannerInfos) !== null && _basketData$SetPlanne !== void 0 && _basketData$SetPlanne.InvolvedSetIds.includes(setId))) {
@@ -33374,7 +33548,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               }
             case 45:
               i++;
-              _context29.next = 33;
+              _context30.next = 33;
               break;
             case 48:
               basketData.SetPlannerInfos = setPlanner ? this.getSetPlannerInfos(Object.keys(sets), orderSets) : undefined;
@@ -33383,14 +33557,14 @@ var DivaSetHandler = /*#__PURE__*/function () {
               } else {
                 basketData.setOrderSets(orderSets);
               }
-              return _context29.abrupt("return", basketData);
+              return _context30.abrupt("return", basketData);
             case 51:
             case "end":
-              return _context29.stop();
+              return _context30.stop();
           }
-        }, _callee27, this);
+        }, _callee28, this);
       }));
-      function fillOrderLinesAndOrderSets(_x96, _x97, _x98, _x99, _x100) {
+      function fillOrderLinesAndOrderSets(_x106, _x107, _x108, _x109, _x110) {
         return _fillOrderLinesAndOrderSets.apply(this, arguments);
       }
       return fillOrderLinesAndOrderSets;
@@ -33474,11 +33648,11 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "getOrderSet",
     value: function () {
-      var _getOrderSet = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee28(set, catalogData, posNr, divaNr, repairOnly, returnTo) {
+      var _getOrderSet = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee29(set, catalogData, posNr, divaNr, repairOnly, returnTo) {
         var _Object$values$, _set$getDivaArticles, _hqRenderScript, _set$basketConfigVari2, _set$basketConfigVari3;
         var dontGenerateImages, orderSet, GroupType, plannerData, setImage, urlToPlanning2D, alternateSetImages, hqRenderScript, dimensions, promise3D, promise2D, promise3DAlternate, _yield$Promise$all, _yield$Promise$all2, _yield$Promise$all2$, promiseHQRenderScript, _yield$Promise$all3, _yield$Promise$all4, plannerWarnings, bruttoPrice;
-        return _regeneratorRuntime__default["default"].wrap(function _callee28$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee29$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
               dontGenerateImages = repairOnly || returnTo == 'DONT_SAVE_BASKET' || returnTo == 'TEST_CONFIGURATORLOGIC';
               DivaUtils__default["default"].startSpanOfApm('GetSet3D und 2D Image');
@@ -33490,7 +33664,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               hqRenderScript = undefined;
               dimensions = {};
               if (dontGenerateImages) {
-                _context30.next = 28;
+                _context31.next = 28;
                 break;
               }
               promise3D = this.getSetImage(set, typeof window === 'undefined');
@@ -33498,10 +33672,10 @@ var DivaSetHandler = /*#__PURE__*/function () {
               if (!catalogData.dontSaveAlternativeRenderings && set.CatalogData.alternateRenderingsForSummary.length) {
                 promise3DAlternate = this.getAlternateSetImages(set);
               }
-              _context30.next = 15;
+              _context31.next = 15;
               return Promise.all([promise3D, promise2D, promise3DAlternate]);
             case 15:
-              _yield$Promise$all = _context30.sent;
+              _yield$Promise$all = _context31.sent;
               _yield$Promise$all2 = _slicedToArray__default["default"](_yield$Promise$all, 3);
               _yield$Promise$all2$ = _yield$Promise$all2[0];
               setImage = _yield$Promise$all2$.url;
@@ -33509,10 +33683,10 @@ var DivaSetHandler = /*#__PURE__*/function () {
               urlToPlanning2D = _yield$Promise$all2[1];
               alternateSetImages = _yield$Promise$all2[2];
               promiseHQRenderScript = this.getHQRenderScript(set, divaNr);
-              _context30.next = 25;
+              _context31.next = 25;
               return Promise.all([promiseHQRenderScript]);
             case 25:
-              _yield$Promise$all3 = _context30.sent;
+              _yield$Promise$all3 = _context31.sent;
               _yield$Promise$all4 = _slicedToArray__default["default"](_yield$Promise$all3, 1);
               hqRenderScript = _yield$Promise$all4[0];
             case 28:
@@ -33574,14 +33748,14 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 MetaData: !((_set$basketConfigVari2 = set.basketConfigVariants) !== null && _set$basketConfigVari2 !== void 0 && _set$basketConfigVari2.length) ? set.MetaData : undefined,
                 MetaData_locales: !((_set$basketConfigVari3 = set.basketConfigVariants) !== null && _set$basketConfigVari3 !== void 0 && _set$basketConfigVari3.length) ? set.MetaData_locales : undefined
               });
-              return _context30.abrupt("return", orderSet);
+              return _context31.abrupt("return", orderSet);
             case 34:
             case "end":
-              return _context30.stop();
+              return _context31.stop();
           }
-        }, _callee28, this);
+        }, _callee29, this);
       }));
-      function getOrderSet(_x101, _x102, _x103, _x104, _x105, _x106) {
+      function getOrderSet(_x111, _x112, _x113, _x114, _x115, _x116) {
         return _getOrderSet.apply(this, arguments);
       }
       return getOrderSet;
@@ -33594,31 +33768,31 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "getSetImage",
     value: (function () {
-      var _getSetImage = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee29(set, overwriteLastSavedRendering) {
+      var _getSetImage = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee30(set, overwriteLastSavedRendering) {
         var is3D, _yield$set$plannerHan, dimensions, url;
-        return _regeneratorRuntime__default["default"].wrap(function _callee29$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee30$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
             case 0:
               is3D = ['3DImage', '3DCOMB', 'BoxPlanner', 'RTViewer'].includes(set.getPlannerMode());
               if (!is3D) {
-                _context31.next = 10;
+                _context32.next = 10;
                 break;
               }
-              _context31.next = 4;
+              _context32.next = 4;
               return set.plannerHandler.saveSetImage(overwriteLastSavedRendering);
             case 4:
-              _context31.next = 6;
+              _context32.next = 6;
               return set.plannerHandler.getSetImageAsUrl(set.getSetId());
             case 6:
-              _yield$set$plannerHan = _context31.sent;
+              _yield$set$plannerHan = _context32.sent;
               dimensions = _yield$set$plannerHan.dimensions;
               url = _yield$set$plannerHan.url;
-              return _context31.abrupt("return", {
+              return _context32.abrupt("return", {
                 dimensions: dimensions,
                 url: url
               });
             case 10:
-              return _context31.abrupt("return", {
+              return _context32.abrupt("return", {
                 dimensions: {
                   w: undefined,
                   h: undefined,
@@ -33627,11 +33801,11 @@ var DivaSetHandler = /*#__PURE__*/function () {
               });
             case 11:
             case "end":
-              return _context31.stop();
+              return _context32.stop();
           }
-        }, _callee29);
+        }, _callee30);
       }));
-      function getSetImage(_x107, _x108) {
+      function getSetImage(_x117, _x118) {
         return _getSetImage.apply(this, arguments);
       }
       return getSetImage;
@@ -33639,45 +33813,45 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "getHQRenderScript",
     value: function () {
-      var _getHQRenderScript = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee30(set, divaNr) {
+      var _getHQRenderScript = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee31(set, divaNr) {
         var is3D, hqRenderScript, createdHQRenderScript;
-        return _regeneratorRuntime__default["default"].wrap(function _callee30$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee31$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
             case 0:
               //if not 3d
               is3D = ['3DImage', '3DCOMB', 'BoxPlanner', 'RTViewer'].includes(set.getPlannerMode());
               if (is3D) {
-                _context32.next = 3;
+                _context33.next = 3;
                 break;
               }
-              return _context32.abrupt("return");
+              return _context33.abrupt("return");
             case 3:
-              _context32.next = 5;
+              _context33.next = 5;
               return set.plannerHandler.saveSetHQRenderScript();
             case 5:
               hqRenderScript = set.plannerHandler.getSetHQRenderScript();
               if (hqRenderScript) {
-                _context32.next = 8;
+                _context33.next = 8;
                 break;
               }
-              return _context32.abrupt("return");
+              return _context33.abrupt("return");
             case 8:
-              _context32.next = 10;
+              _context33.next = 10;
               return set.api.postHQRenderScript({
                 divaNr: divaNr,
                 hqRenderscript: hqRenderScript,
                 organization: set.api.OrganizationId
               });
             case 10:
-              createdHQRenderScript = _context32.sent;
-              return _context32.abrupt("return", createdHQRenderScript);
+              createdHQRenderScript = _context33.sent;
+              return _context33.abrupt("return", createdHQRenderScript);
             case 12:
             case "end":
-              return _context32.stop();
+              return _context33.stop();
           }
-        }, _callee30);
+        }, _callee31);
       }));
-      function getHQRenderScript(_x109, _x110) {
+      function getHQRenderScript(_x119, _x120) {
         return _getHQRenderScript.apply(this, arguments);
       }
       return getHQRenderScript;
@@ -33691,34 +33865,34 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "getAlternateSetImages",
     value: (function () {
-      var _getAlternateSetImages = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee31(set) {
+      var _getAlternateSetImages = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee32(set) {
         var is2D, catalogData, setImages;
-        return _regeneratorRuntime__default["default"].wrap(function _callee31$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee32$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
               is2D = !['3DImage', '3DCOMB', 'BoxPlanner'].includes(set.getPlannerMode());
               if (!(is2D || set.onlyRunLogic)) {
-                _context33.next = 3;
+                _context34.next = 3;
                 break;
               }
-              return _context33.abrupt("return", []);
+              return _context34.abrupt("return", []);
             case 3:
               catalogData = set.CatalogData;
-              _context33.next = 6;
+              _context34.next = 6;
               return set.plannerHandler.saveAlternateSetImages(catalogData.catalogCodex, catalogData.catalogGuid);
             case 6:
-              _context33.next = 8;
+              _context34.next = 8;
               return set.plannerHandler.getAlternateSetImagesAsSetImageData(set.getSetId());
             case 8:
-              setImages = _context33.sent;
-              return _context33.abrupt("return", setImages);
+              setImages = _context34.sent;
+              return _context34.abrupt("return", setImages);
             case 10:
             case "end":
-              return _context33.stop();
+              return _context34.stop();
           }
-        }, _callee31);
+        }, _callee32);
       }));
-      function getAlternateSetImages(_x111) {
+      function getAlternateSetImages(_x121) {
         return _getAlternateSetImages.apply(this, arguments);
       }
       return getAlternateSetImages;
@@ -33726,30 +33900,30 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "get2DSetImage",
     value: function () {
-      var _get2DSetImage = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee32(set) {
+      var _get2DSetImage = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee33(set) {
         var urlToPlanning2D, catalogData, planning2DAsJPGBase64;
-        return _regeneratorRuntime__default["default"].wrap(function _callee32$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee33$(_context35) {
+          while (1) switch (_context35.prev = _context35.next) {
             case 0:
               urlToPlanning2D = undefined, catalogData = set.CatalogData;
               planning2DAsJPGBase64 = set.getPlanning2DAsJpg();
               if (!(planning2DAsJPGBase64 != undefined && planning2DAsJPGBase64 != '' && planning2DAsJPGBase64 != 'data:,')) {
-                _context34.next = 6;
+                _context35.next = 6;
                 break;
               }
-              _context34.next = 5;
+              _context35.next = 5;
               return set.plannerHandler.saveSet2DImage(set.getSetId(), catalogData.catalogCodex, catalogData.catalogGuid, planning2DAsJPGBase64);
             case 5:
-              urlToPlanning2D = _context34.sent;
+              urlToPlanning2D = _context35.sent;
             case 6:
-              return _context34.abrupt("return", urlToPlanning2D);
+              return _context35.abrupt("return", urlToPlanning2D);
             case 7:
             case "end":
-              return _context34.stop();
+              return _context35.stop();
           }
-        }, _callee32);
+        }, _callee33);
       }));
-      function get2DSetImage(_x112) {
+      function get2DSetImage(_x122) {
         return _get2DSetImage.apply(this, arguments);
       }
       return get2DSetImage;
@@ -33788,25 +33962,25 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "addOrderSetArticlesToExistingSet",
     value: function () {
-      var _addOrderSetArticlesToExistingSet = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee33(set, orderSet, lastSetToInitialize) {
-        return _regeneratorRuntime__default["default"].wrap(function _callee33$(_context35) {
-          while (1) switch (_context35.prev = _context35.next) {
+      var _addOrderSetArticlesToExistingSet = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee34(set, orderSet, lastSetToInitialize) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee34$(_context36) {
+          while (1) switch (_context36.prev = _context36.next) {
             case 0:
               //TODO: GLOBAL STUFF
               //this.updateActSet(set);
               orderSet.changeBasketIds();
-              _context35.next = 3;
+              _context36.next = 3;
               return this.initOrderLineArticles(set, orderSet);
             case 3:
-              _context35.next = 5;
+              _context36.next = 5;
               return set.plannerHandler.extendSet(set, orderSet.SetPlanData, lastSetToInitialize);
             case 5:
             case "end":
-              return _context35.stop();
+              return _context36.stop();
           }
-        }, _callee33, this);
+        }, _callee34, this);
       }));
-      function addOrderSetArticlesToExistingSet(_x113, _x114, _x115) {
+      function addOrderSetArticlesToExistingSet(_x123, _x124, _x125) {
         return _addOrderSetArticlesToExistingSet.apply(this, arguments);
       }
       return addOrderSetArticlesToExistingSet;
@@ -34857,7 +35031,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context12.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-9cd478e3.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-0bb1d800.js'); });
             case 5:
               _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -34865,7 +35039,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 9:
               _context12.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-3971939b.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-78d7443a.js'); });
             case 11:
               _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -34873,7 +35047,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 15:
               _context12.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-5fa059fb.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-b9dbaeb5.js'); });
             case 17:
               _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -34881,7 +35055,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 21:
               _context12.next = 23;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-6a401019.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-3efed4eb.js'); });
             case 23:
               _yield$import4 = _context12.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -35079,7 +35253,7 @@ var ViewPointHandler = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "curViewPointRenderName", void 0);
     //Even if the viewpoint should be Start, it can contain the value Frontal. In this case the start is set using the rotation
     _defineProperty__default["default"](this, "curRoomCodex", void 0);
-    _defineProperty__default["default"](this, "defaultWhiteroom", 'weissraum');
+    _defineProperty__default["default"](this, "whiteroom", 'weissraum');
     _defineProperty__default["default"](this, "roomListInfo", void 0);
     //this saves all ViewPoint Infos per room
     _defineProperty__default["default"](this, "staticRoomMainCategories", void 0);
@@ -35097,7 +35271,7 @@ var ViewPointHandler = /*#__PURE__*/function () {
     this.roomListInfo = [];
     this.curViewPointName = 'Start';
     this.curViewPointRenderName = 'Start';
-    this.curRoomCodex = this.defaultWhiteroom;
+    this.curRoomCodex = this.whiteroom;
     this.staticRoomMainCategories = new Map();
     this.vpInfosByRoom = new Map();
   }
@@ -35135,17 +35309,6 @@ var ViewPointHandler = /*#__PURE__*/function () {
     }
 
     //------------------------------------------------Functions needed for frontend Navigation------------------------------------------------
-  }, {
-    key: "setDefaultWhiteroom",
-    value: function setDefaultWhiteroom(defaultWhiteroom) {
-      this.defaultWhiteroom = defaultWhiteroom;
-      this.curRoomCodex = defaultWhiteroom;
-    }
-  }, {
-    key: "getDefaultWhiteRoom",
-    value: function getDefaultWhiteRoom() {
-      return this.defaultWhiteroom;
-    }
 
     /**
      * This function resets the viewpoint.
@@ -35155,29 +35318,10 @@ var ViewPointHandler = /*#__PURE__*/function () {
   }, {
     key: "resetViewPoint",
     value: function resetViewPoint() {
-      var _this$vpInfosByRoom$g;
       this.navInfo3D.zoom = 0;
       this.navInfo3D.focusOnElement = '';
       this.navInfo3D.rotVert = 0;
       this.navInfo3D.rotHori = 0;
-      if (this.vpInfosByRoom.has(this.defaultWhiteroom) && (_this$vpInfosByRoom$g = this.vpInfosByRoom.get(this.defaultWhiteroom)) !== null && _this$vpInfosByRoom$g !== void 0 && _this$vpInfosByRoom$g.has('start')) {
-        var _this$vpInfosByRoom$g2;
-        var vp = (_this$vpInfosByRoom$g2 = this.vpInfosByRoom.get(this.defaultWhiteroom)) === null || _this$vpInfosByRoom$g2 === void 0 ? void 0 : _this$vpInfosByRoom$g2.get('start');
-        if (vp && vp.M.toLowerCase() == 'orbit') {
-          this.curViewPointName = 'Start';
-          this.curViewPointRenderName = 'Frontal';
-          this.navInfo3D.rotVert = vp.CRV;
-          this.navInfo3D.rotHori = vp.CRH;
-          return {
-            updateOrbitCube: true,
-            rotVert: vp.CRV,
-            rotHori: vp.CRH
-          };
-        }
-      }
-      return {
-        updateOrbitCube: false
-      };
     }
   }, {
     key: "zoomIn",
@@ -35221,27 +35365,9 @@ var ViewPointHandler = /*#__PURE__*/function () {
   }, {
     key: "setVpName",
     value: function setVpName(vpName) {
-      var _this$vpInfosByRoom$g3;
       //if the viewpoint name is get from3D host update it correctly
-      if (this.curRoomCodex == this.defaultWhiteroom && this.vpInfosByRoom.has(this.defaultWhiteroom) && (_this$vpInfosByRoom$g3 = this.vpInfosByRoom.get(this.defaultWhiteroom)) !== null && _this$vpInfosByRoom$g3 !== void 0 && _this$vpInfosByRoom$g3.has(vpName.toLowerCase())) {
-        var _this$vpInfosByRoom$g4;
-        var vp = (_this$vpInfosByRoom$g4 = this.vpInfosByRoom.get(this.defaultWhiteroom)) === null || _this$vpInfosByRoom$g4 === void 0 ? void 0 : _this$vpInfosByRoom$g4.get(vpName.toLowerCase());
-        if (vp) {
-          this.curViewPointName = vpName;
-          this.setVpByVal(vp.CRH, vp.CRV);
-          return {
-            updateOrbitCube: true,
-            rotVert: vp.CRV,
-            rotHori: vp.CRH
-          };
-        }
-      } else {
-        this.curViewPointName = vpName;
-        this.curViewPointRenderName = vpName;
-      }
-      return {
-        updateOrbitCube: false
-      };
+      this.curViewPointName = vpName;
+      this.curViewPointRenderName = vpName;
     }
   }, {
     key: "focusOnElementId",
@@ -35379,26 +35505,6 @@ var ViewPointHandler = /*#__PURE__*/function () {
         roomIsSel = false;
       }
     }
-    /**
-     * Returns all room lists in the String - that contains a list of roomCodexes separated with a ; - that are not cached already. Only these have to be downloaded
-     * @param roomlist
-     */
-    /*
-      public getNotChachedRoomlist(roomlist: string[]): string[] {
-          var uncached: string[] = [];
-          for (var i = 0; i < roomlist.length; i++) {
-              var notCached = true;
-              for (var j = 0; j < this.roomListInfo.length; j++) {
-                  if (roomlist[i] == this.roomListInfo[j].codex) {
-                      notCached = false;
-                      break;
-                  }
-              }
-              if (notCached) uncached.push(roomlist[i]);
-          }
-          return uncached;
-      }
-      */
   }, {
     key: "getStaticRoomList",
     value: function getStaticRoomList() {
@@ -35488,10 +35594,10 @@ var ViewPointHandler = /*#__PURE__*/function () {
   }, {
     key: "getVpInfoByRoomCodex",
     value: function getVpInfoByRoomCodex(roomCodex, vpName) {
-      var _this$vpInfosByRoom$g5;
+      var _this$vpInfosByRoom$g;
       //  roomCodex = roomCodex.toLowerCase();
       vpName = vpName.toLowerCase();
-      if (this.vpInfosByRoom.has(roomCodex) && (_this$vpInfosByRoom$g5 = this.vpInfosByRoom.get(roomCodex)) !== null && _this$vpInfosByRoom$g5 !== void 0 && _this$vpInfosByRoom$g5.has(vpName)) return this.vpInfosByRoom.get(roomCodex).get(vpName);
+      if (this.vpInfosByRoom.has(roomCodex) && (_this$vpInfosByRoom$g = this.vpInfosByRoom.get(roomCodex)) !== null && _this$vpInfosByRoom$g !== void 0 && _this$vpInfosByRoom$g.has(vpName)) return this.vpInfosByRoom.get(roomCodex).get(vpName);
       return undefined;
     }
 
@@ -35514,17 +35620,6 @@ var ViewPointHandler = /*#__PURE__*/function () {
       }
       return undefined;
     }
-
-    /**
-     * This function returns if the current room/VP enables navigation (e.g. weissraum).
-     * Static background rooms disable navigation
-     */
-    /*
-    public curVPHasStaticBG(): boolean {
-      let vpInfo = this.getVPInfo(this.curRoomCodex, this.curViewPointName);
-      if (vpInfo != undefined) return vpInfo.isStatic;
-      return false;
-    }*/
   }, {
     key: "getCurRoomlistVP",
     value: function getCurRoomlistVP() {
@@ -35555,7 +35650,7 @@ var ViewPointHandler = /*#__PURE__*/function () {
   }, {
     key: "getDefaultRoom",
     value: function getDefaultRoom() {
-      return this.defaultWhiteroom;
+      return this.whiteroom;
     }
   }, {
     key: "getCurVPIsStart",
@@ -35696,6 +35791,7 @@ var Rendering = /*#__PURE__*/function () {
   }, {
     key: "hasUIInfosOfElement",
     value: function hasUIInfosOfElement(setId, elementid) {
+      if (this.hasStaticBackground) return false; //when the rendering has static background, no UI Info is loaded d
       if (this.uiInfo[setId] == undefined && this.uiInfo['S1'] != undefined) {
         return this.uiInfo['S1']['E' + elementid] != undefined;
       } else {
@@ -35825,20 +35921,29 @@ var Rendering = /*#__PURE__*/function () {
       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: "getCamInfo",
+    value: function getCamInfo() {
+      if (!this.uiInfo['CAM']) return undefined;
+      return this.uiInfo['CAM'];
     }
   }, {
-    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']);
+    key: "getCamCubeRotation",
+    value: function getCamCubeRotation() {
+      if (this.getCamInfo() == undefined) return {
+        rotHoriDeg: 0,
+        rotVertDeg: 0
+      };
+      var camInfo = this.getCamInfo();
+      var dirVec = new Vector3(camInfo.targetPos.x - camInfo.pos.x, camInfo.targetPos.y - camInfo.pos.y, camInfo.targetPos.z - camInfo.pos.z);
+      var rotHori_rad = Math.atan2(dirVec.x, dirVec.z);
+      var rotHori = rotHori_rad * 180 / Math.PI;
+      rotHori = -((rotHori - 180) % 360);
+      var rotVert_rad = Math.atan2(dirVec.y, Math.sqrt(Math.pow(dirVec.x, 2) + Math.pow(dirVec.z, 2)));
+      var rotVert = -(rotVert_rad * 180 / Math.PI);
+      return {
+        rotHoriDeg: rotHori,
+        rotVertDeg: rotVert
+      };
     }
   }, {
     key: "get3DDimInfo",
@@ -36276,27 +36381,24 @@ var PlannerHandler3D = /*#__PURE__*/function () {
     value: (function () {
       var _initializeViewPoint = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(standardWhiteRoom) {
         var _this$connectionHandl;
-        var res, info;
+        var res;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               if ((_this$connectionHandl = this.connectionHandler) !== null && _this$connectionHandl !== void 0 && _this$connectionHandl.getConnectionReady()) {
-                _context.next = 4;
+                _context.next = 3;
                 break;
               }
               this.todoAfterLogin.initViewPoint.doUpdate = true;
-              this.todoAfterLogin.initViewPoint.stdWhiteRoom = standardWhiteRoom;
               return _context.abrupt("return");
-            case 4:
+            case 3:
               this.todoAfterLogin.initViewPoint.doUpdate = false;
-              this.viewPointHandler.setDefaultWhiteroom(standardWhiteRoom);
-              _context.next = 8;
+              _context.next = 6;
               return this.connectionHandler.getViewPointInfo(this.viewPointHandler.getCurViewPointName(), standardWhiteRoom);
-            case 8:
+            case 6:
               res = _context.sent;
-              if (res) info = this.viewPointHandler.setVpInfoByRoomCodex(standardWhiteRoom, this.viewPointHandler.getCurViewPointName(), res);
-              if (info && this.setRotationOfOrbitCube) this.setRotationOfOrbitCube(this.viewPointHandler.getCurRoomCodex() == standardWhiteRoom ? true : false, info.CRH, info.CRV);
-            case 11:
+              if (res) this.viewPointHandler.setVpInfoByRoomCodex(standardWhiteRoom, this.viewPointHandler.getCurViewPointName(), res);
+            case 8:
             case "end":
               return _context.stop();
           }
@@ -36394,7 +36496,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _context3.next = 2;
-              return Promise.resolve().then(function () { return require('./Host3DSignalR-8f6e6051.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-a8ce75a9.js'); });
             case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -36567,6 +36669,14 @@ var PlannerHandler3D = /*#__PURE__*/function () {
     value: function updatePlannerRendering(rendering) {
       if (this.lastRequestedRenderHash != rendering.RenderHash) return;
       this.currRendering = rendering;
+
+      //Update cube rotation
+      if (rendering.getCamInfo() != undefined && this.setRotationOfOrbitCube) {
+        //now update the rotation of the orbit cube
+        //Update orbit cube
+        var cubeRotInfo = rendering.getCamCubeRotation();
+        this.setRotationOfOrbitCube(false, cubeRotInfo.rotHoriDeg, cubeRotInfo.rotVertDeg);
+      }
       if (rendering.MediaServiceSaveMode == 'PERMANENT') {
         if (rendering.getIsAlternateRendering()) this.addAlternateRenderingToSavedAlternateRenderings(rendering);else this.lastSavedRendering = rendering;
       }
@@ -36892,7 +37002,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
               requestHqRenderScriptFrom3DHost = false;
               if (params.doRequestHqRenderScript) {
                 rendering = this.hqRenderScriptCache.get(planningHash);
-                if (rendering && !params.useLatestCamera) {
+                if (rendering && !params.useLatestHybridInfo) {
                   LOG$4.debug('Get HQRenderScript from cache');
                   this.lastSavedHQRenderScript = JSON.parse(rendering.HQRenderScript);
                   this.updatePlannerHqRenderScriptInView(rendering);
@@ -37080,7 +37190,6 @@ var PlannerHandler3D = /*#__PURE__*/function () {
     key: "handle3DVisualizationChanged",
     value: function handle3DVisualizationChanged(mode, params) {
       var _params$nav3DZoom, _params$nav3DZoom2, _params$nav3DZoom3, _params$nav3DSwipe, _params$nav3DSwipe2, _params$nav3DSwipe3, _params$nav3DSwipe4;
-      var info;
       switch (mode) {
         case 'Nav3DFullScreen':
           break;
@@ -37108,20 +37217,12 @@ var PlannerHandler3D = /*#__PURE__*/function () {
           this.viewPointHandler.focusOnElementId(params.nav3DFocus.setId, params.nav3DFocus.focusElementId);
           break;
         case 'Nav3DPlannerMode':
-          // this.viewPointHandler.resetViewPoint();
-          info = this.viewPointHandler.setVpName('Start');
-          if (info && this.setRotationOfOrbitCube) {
-            this.setRotationOfOrbitCube(true, info.rotHori, info.rotVert);
-          }
+          this.viewPointHandler.resetViewPoint();
+          this.viewPointHandler.setVpName('Start');
           break;
         case 'Nav3DSetVPByName':
-          if (params.nav3DSetVPByName.clearNav) {
-            this.viewPointHandler.resetViewPoint();
-          }
-          info = this.viewPointHandler.setVpName(params.nav3DSetVPByName.vpName);
-          if (info && info.updateOrbitCube && this.setRotationOfOrbitCube) {
-            this.setRotationOfOrbitCube(true, info.rotHori, info.rotVert);
-          }
+          this.viewPointHandler.resetViewPoint();
+          this.viewPointHandler.setVpName(params.nav3DSetVPByName.vpName);
           break;
         case 'Nav3DSetVPByVal':
           this.viewPointHandler.setVpByVal(params.nav3DSetVPByVal.rotX, params.nav3DSetVPByVal.rotY);
@@ -37133,7 +37234,8 @@ var PlannerHandler3D = /*#__PURE__*/function () {
           this.handleStaticVP(params.staticVP.codex);
           break;
         case 'Nav3DResetNavParams':
-          this.handleStaticVP('Start');
+          this.viewPointHandler.resetViewPoint();
+          this.viewPointHandler.setVpName('Start');
           break;
       }
     }
@@ -37144,11 +37246,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
   }, {
     key: "resetNav3D",
     value: function resetNav3D() {
-      var resetInfo = this.viewPointHandler.resetViewPoint();
-      if (resetInfo.updateOrbitCube) {
-        var _this$setRotationOfOr;
-        (_this$setRotationOfOr = this.setRotationOfOrbitCube) === null || _this$setRotationOfOr === void 0 || _this$setRotationOfOr.call(this, true, resetInfo.rotHori, resetInfo.rotVert);
-      }
+      this.viewPointHandler.resetViewPoint();
     }
 
     /**
@@ -37725,7 +37823,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
      */
     _defineProperty__default["default"](this, "noRenderClientFound", function (doMakeRendering, doMakeHQRenderScript, width, height, isFullscreenRendering, planner3DGridEnabled, doShow3DDimensionLines, plannerMeasureDigits, alternateRendererInfo, alternateRenderingsExist) {
       LOG$2.debug('noRenderClientFound - Request rendering again by sending all planningData');
-      _this.request3D(doMakeRendering, doMakeHQRenderScript, true, !!alternateRenderingsExist, alternateRendererInfo, true, {
+      _this.request3D(doMakeRendering, doMakeHQRenderScript, !!alternateRenderingsExist, alternateRendererInfo, true, {
         width: width,
         height: height,
         isFullscreenRendering: isFullscreenRendering,
@@ -37774,7 +37872,8 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
                 updatePlannerRendering: this.plannerHandlerFunctions.updatePlannerRendering,
                 updatePlannerHqRenderScriptInView: this.plannerHandlerFunctions.updatePlannerHqRenderScript,
                 setRotationOrbitCubeCallback: this.plannerHandlerFunctions.setRotationOrbitCube,
-                onRoomListLoaded: this.plannerHandlerFunctions.onRoomListLoaded
+                onRoomListLoaded: this.plannerHandlerFunctions.onRoomListLoaded,
+                updateCamInfo: this.plannerHandlerFunctions.updateCamInfo
               });
               this.handler3D.setJwt(initSetState.api.getJwt());
               //Only use if only 1 Planner/Set is used. Not possible in setPlanner
@@ -37953,7 +38052,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context4.next = 10;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-2f823e05.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-01a25f14.js'); });
             case 10:
               _yield$import = _context4.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -37964,7 +38063,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context4.abrupt("break", 21);
             case 15:
               _context4.next = 17;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-059d8dbf.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-bda99ee4.js'); });
             case 17:
               _yield$import2 = _context4.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -38237,7 +38336,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
             case 0:
               DivaUtils__default["default"].startSpanOfApm('DivaPlannerHandler saveSetHQRenderScript');
               _context9.next = 3;
-              return this.request3D(false, true, true);
+              return this.request3D(false, true);
             case 3:
               hashes = _context9.sent;
               if (hashes) {
@@ -38294,7 +38393,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
                 break;
               }
               _context10.next = 4;
-              return this.request3D(true, false, true, false, undefined, true, {
+              return this.request3D(true, false, false, undefined, true, {
                 width: 100,
                 height: 100,
                 isFullscreenRendering: false,
@@ -38707,7 +38806,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
     key: "handle3DVisualizationChanged",
     value: function handle3DVisualizationChanged(mode, params, doShow3DDimensionLines, alternateRenderingsExist) {
       if (mode == 'Nav3DFullScreen') {
-        this.request3D(true, false, true, alternateRenderingsExist, undefined, false, {
+        this.request3D(true, false, alternateRenderingsExist, undefined, false, {
           width: params.nav3DFullScreen.renderWidth,
           height: params.nav3DFullScreen.renderHeight,
           isFullscreenRendering: true,
@@ -38747,7 +38846,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
   }, {
     key: "request3D",
     value: function () {
-      var _request3D = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee16(doRequestRendering, doRequestHqRenderScript, useLatestCamera, alternateRenderingsExist, alternateRenderInfo, forceReloadPlanning, renderRequestInfos, hybrid3DInfo) {
+      var _request3D = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee16(doRequestRendering, doRequestHqRenderScript, alternateRenderingsExist, alternateRenderInfo, forceReloadPlanning, renderRequestInfos, hybrid3DInfo, useLatestHybridInfo) {
         var _this3 = this;
         var plannerData, loadedCatData, plannerExists, savedSetId;
         return _regeneratorRuntime__default["default"].wrap(function _callee16$(_context16) {
@@ -38819,7 +38918,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
                 alternateRenderInfo: alternateRenderInfo,
                 alternateRenderingsExist: alternateRenderingsExist,
                 hybrid3DInfo: hybrid3DInfo,
-                useLatestCamera: useLatestCamera
+                useLatestHybridInfo: useLatestHybridInfo
               });
             case 18:
               return _context16.abrupt("return", _context16.sent);
@@ -38905,6 +39004,31 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
     value: function updateCamPosition(cam) {
       return this.handler3D.updateCamPosition(cam);
     }
+  }, {
+    key: "clonePlannerHandler",
+    value: function clonePlannerHandler(set, origSet) {
+      var _this6 = this;
+      var clone = new DivaPlannerHandler(true);
+      clone.initPlanner(set.getSetState, {
+        updatePlannerRendering: function updatePlannerRendering() {},
+        updatePlannerHqRenderScript: function updatePlannerHqRenderScript() {},
+        setRotationOrbitCube: function setRotationOrbitCube() {},
+        onRoomListLoaded: function onRoomListLoaded() {},
+        getOrigConfiguration: function getOrigConfiguration() {
+          return {};
+        },
+        doAllowSetPlanner: function doAllowSetPlanner() {
+          return false;
+        },
+        updatePlannerMsgContainer: function updatePlannerMsgContainer() {}
+      });
+      var setData = DivaUtils__default["default"].encodeBase64(JSON.stringify(set.plannerHandler.savePlanner(origSet.getSetId())));
+      this.plannerList.forEach(function (v) {
+        clone.plannerList.set(set.getSetId(), v.clonePlanner(set, _this6.plannerIDCount, setData));
+        _this6.plannerIDCount++;
+      });
+      return clone;
+    }
   }]);
 }();
 
@@ -38981,9 +39105,11 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     });
     _defineProperty__default["default"](this, "api", void 0);
     _defineProperty__default["default"](this, "setHQRenderScript", void 0);
+    _defineProperty__default["default"](this, "setCamInfo", void 0);
     _defineProperty__default["default"](this, "initializationType", void 0);
     _defineProperty__default["default"](this, "getPlannerHandlerFunctions", function () {
       return {
+        updateCamInfo: _this.setCamInfo,
         updatePlannerRendering: _this.updatePlannerRendering,
         updatePlannerHqRenderScript: _this.updatePlannerHqRenderScript,
         setRotationOrbitCube: _this.setRotationOrbitCube,
@@ -39721,7 +39847,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
             case 29:
               set = this.actSet();
               oldProductId = this.divaBasketHandler.actBasket.MatchingProductId || this.divaBasketHandler.actBasket.OrigProductId;
-              if (!(oldProductId && set)) {
+              if (!(oldProductId && set && set !== null && set !== void 0 && set.api.doCheckForProductsPrice())) {
                 _context13.next = 38;
                 break;
               }
@@ -40178,6 +40304,11 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     value: function registerSetHQRenderScript(setHQRenderScript) {
       this.setHQRenderScript = setHQRenderScript;
     }
+  }, {
+    key: "registerSetCamInfo",
+    value: function registerSetCamInfo(setCamInfo) {
+      this.setCamInfo = setCamInfo;
+    }
 
     /**
      * This function is called when the planner view should be updated
@@ -40227,7 +40358,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
             focus: hybridInfo.focus,
             forceRTCam: true,
             currentCamera: hybridInfo.currentCamera
-          } : undefined);
+          } : undefined, callingFrom == 'HANDLE_3D_VIS_CHANGED' ? false : true // handle 3d vis changed = start viepointtrue,
+          );
           break;
         case 'RTViewer':
           //Request HQRenderscript + rendering
@@ -40275,7 +40407,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
             }
           }
         }
-        setHandlerInstance.update3DPlannerView(true, !!this.doLoadHQR, set, this.getPlannerRenderingSize(), false, renderSavingMode, (_this$getDoShow3DDime7 = this.getDoShow3DDimensionLines) === null || _this$getDoShow3DDime7 === void 0 ? void 0 : _this$getDoShow3DDime7.call(this));
+        setHandlerInstance.update3DPlannerView(true, !!this.doLoadHQR, set, this.getPlannerRenderingSize(), false, renderSavingMode, (_this$getDoShow3DDime7 = this.getDoShow3DDimensionLines) === null || _this$getDoShow3DDime7 === void 0 ? void 0 : _this$getDoShow3DDime7.call(this), undefined, undefined, false);
       }
     }
   }, {
@@ -40610,6 +40742,12 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     value: function eventIsManagedByClient(event) {
       return this.api.eventIsManagedByClient(event);
     }
+  }, {
+    key: "showModal",
+    value: function showModal(data) {
+      var _this$actions21;
+      (_this$actions21 = this.actions) === null || _this$actions21 === void 0 || _this$actions21.openModal(data);
+    }
   }, {
     key: "logGA",
     value: function logGA(action) {
@@ -40627,25 +40765,25 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "callEvent",
     value: function callEvent(event, param) {
-      var _this$actions21, _this$actions22, _this$actions23, _this$actions24;
+      var _this$actions22, _this$actions23, _this$actions24, _this$actions25;
       switch (event) {
         case 'onFullscreenClose':
-          (_this$actions21 = this.actions) === null || _this$actions21 === void 0 || _this$actions21.onEvent({
+          (_this$actions22 = this.actions) === null || _this$actions22 === void 0 || _this$actions22.onEvent({
             type: 'onFullscreenClose'
           });
           break;
         case 'onWebPlanerClose':
-          (_this$actions22 = this.actions) === null || _this$actions22 === void 0 || _this$actions22.onEvent({
+          (_this$actions23 = this.actions) === null || _this$actions23 === void 0 || _this$actions23.onEvent({
             type: 'onWebPlanerClose'
           });
           break;
         case 'onWebPlanerHelp':
-          (_this$actions23 = this.actions) === null || _this$actions23 === void 0 || _this$actions23.onEvent({
+          (_this$actions24 = this.actions) === null || _this$actions24 === void 0 || _this$actions24.onEvent({
             type: 'onWebPlanerHelp'
           });
           break;
         case 'onWebPlanerZoomClick':
-          (_this$actions24 = this.actions) === null || _this$actions24 === void 0 || _this$actions24.onEvent({
+          (_this$actions25 = this.actions) === null || _this$actions25 === void 0 || _this$actions25.onEvent({
             type: 'onWebPlanerZoomClick',
             data: param
           });
@@ -40656,14 +40794,14 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "saveToBasketWrapper",
     value: function () {
       var _saveToBasketWrapper = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee25(event, repairOnly, force) {
-        var _this$actions26,
-          _this$actions26$toggl,
-          _this$actions27,
+        var _this$actions27,
           _this$actions27$toggl,
+          _this$actions28,
+          _this$actions28$toggl,
           _this2 = this,
-          _this$actions31,
+          _this$actions32,
           _this$i18n14;
-        var returnTo, finalEvent, _this$api$getBarrierC, _this$openLeafeltBarr, product, _this$actSet9, url, _result, _this$actions25, result, _this$actions28, _this$i18n8, _this$i18n9, _this$actions29, _this$i18n10, _this$i18n11, _this$actions30, _this$i18n12, _this$i18n13, _this$updatePlannerMs2;
+        var returnTo, finalEvent, _this$api$getBarrierC, _this$openLeafeltBarr, product, _this$actSet9, url, _result, _this$actions26, result, _this$actions29, _this$i18n8, _this$i18n9, _this$actions30, _this$i18n10, _this$i18n11, _this$actions31, _this$i18n12, _this$i18n13, _this$updatePlannerMs2;
         return _regeneratorRuntime__default["default"].wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -40702,25 +40840,25 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 _context25.next = 20;
                 break;
               }
-              (_this$actions25 = this.actions) === null || _this$actions25 === void 0 || _this$actions25.onEvent({
+              (_this$actions26 = this.actions) === null || _this$actions26 === void 0 || _this$actions26.onEvent({
                 type: finalEvent.event
               });
               return _context25.abrupt("return", 'canceled');
             case 20:
               returnTo = finalEvent.event == 'onAddToBasket' ? 'OPEN_PDF' : returnTo;
             case 21:
-              (_this$actions26 = this.actions) === null || _this$actions26 === void 0 || (_this$actions26$toggl = _this$actions26.toggleLoading) === null || _this$actions26$toggl === void 0 || _this$actions26$toggl.call(_this$actions26, 'Planner_Saving', false, true);
+              (_this$actions27 = this.actions) === null || _this$actions27 === void 0 || (_this$actions27$toggl = _this$actions27.toggleLoading) === null || _this$actions27$toggl === void 0 || _this$actions27$toggl.call(_this$actions27, 'Planner_Saving', false, true);
               _context25.next = 24;
               return this.saveToBasket(finalEvent.event, repairOnly, force);
             case 24:
               result = _context25.sent;
-              (_this$actions27 = this.actions) === null || _this$actions27 === void 0 || (_this$actions27$toggl = _this$actions27.toggleLoading) === null || _this$actions27$toggl === void 0 || _this$actions27$toggl.call(_this$actions27, 'Planner_Saving', false, false);
+              (_this$actions28 = this.actions) === null || _this$actions28 === void 0 || (_this$actions28$toggl = _this$actions28.toggleLoading) === null || _this$actions28$toggl === void 0 || _this$actions28$toggl.call(_this$actions28, 'Planner_Saving', false, false);
               if (!(result === 'canceled')) {
                 _context25.next = 30;
                 break;
               }
               LOG$1.error(new DivaUtils.DivaError('failed to save Basket'));
-              (_this$actions28 = this.actions) === null || _this$actions28 === void 0 || _this$actions28.openModal({
+              (_this$actions29 = this.actions) === null || _this$actions29 === void 0 || _this$actions29.openModal({
                 text: ((_this$i18n8 = this.i18n()) === null || _this$i18n8 === void 0 ? void 0 : _this$i18n8.t('modal.general_error')) + ' --- ' + DivaUtils__default["default"].formatDate(new Date(), true, undefined, true) + ' --- ' + DivaUtils__default["default"].getCurrentTraceId() ? ((_this$i18n9 = this.i18n()) === null || _this$i18n9 === void 0 ? void 0 : _this$i18n9.t('modal.errorcode')) + ': ' + DivaUtils__default["default"].getCurrentTraceId() : '',
                 accept: true
               });
@@ -40734,12 +40872,12 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 LOG$1.error(new DivaUtils.DivaError('PDF url is missing in basket', {
                   code: 'WC_0010'
                 }));
-                (_this$actions29 = this.actions) === null || _this$actions29 === void 0 || _this$actions29.openModal({
+                (_this$actions30 = this.actions) === null || _this$actions30 === void 0 || _this$actions30.openModal({
                   text: ((_this$i18n10 = this.i18n()) === null || _this$i18n10 === void 0 ? void 0 : _this$i18n10.t('modal.general_error')) + ' --- ' + DivaUtils__default["default"].formatDate(new Date(), true, undefined, true) + ' --- ' + DivaUtils__default["default"].getCurrentTraceId() ? ((_this$i18n11 = this.i18n()) === null || _this$i18n11 === void 0 ? void 0 : _this$i18n11.t('modal.errorcode')) + ': ' + DivaUtils__default["default"].getCurrentTraceId() : '',
                   accept: true
                 });
               } else {
-                (_this$actions30 = this.actions) === null || _this$actions30 === void 0 || _this$actions30.openModal({
+                (_this$actions31 = this.actions) === null || _this$actions31 === void 0 || _this$actions31.openModal({
                   text: (_this$i18n12 = this.i18n()) === null || _this$i18n12 === void 0 ? void 0 : _this$i18n12.t(this.divaBasketHandler.actBasket.Status === 'ORDER' ? 'modal.open_order_pdf_now' : 'modal.open_leaflet_pdf_now'),
                   accept: (_this$i18n13 = this.i18n()) === null || _this$i18n13 === void 0 ? void 0 : _this$i18n13.t('modals.open_now'),
                   callback: function callback() {
@@ -40749,7 +40887,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               }
               return _context25.abrupt("break", 36);
             case 35:
-              (_this$actions31 = this.actions) === null || _this$actions31 === void 0 || _this$actions31.openModal({
+              (_this$actions32 = this.actions) === null || _this$actions32 === void 0 || _this$actions32.openModal({
                 text: (_this$i18n14 = this.i18n()) === null || _this$i18n14 === void 0 ? void 0 : _this$i18n14.t('modal.planning_saved'),
                 accept: true
               });
@@ -40777,7 +40915,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "saveToBasket",
     value: function () {
       var _saveToBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee26(event, repairOnly, force) {
-        var _returnTo, _returnTo2, _returnTo3, _this$actions32, _this$actions33, _this$actions34, _this$divaBasketHandl2;
+        var _returnTo, _returnTo2, _returnTo3, _this$actions33, _this$actions34, _this$actions35, _this$divaBasketHandl2;
         var set, actBasket, returnTo, oldReturnTo, result, newDivaNr, _result2, product;
         return _regeneratorRuntime__default["default"].wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
@@ -40834,8 +40972,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _context26.next = _context26.t3 === 'OPEN_SELLER_PRODUCTCREATOR' ? 28 : _context26.t3 === 'OPEN_SELLER_BASKET' ? 31 : _context26.t3 === 'OPEN_PDF' ? 33 : _context26.t3 === 'SAVE_BASKET_WITH_MODAL' ? 33 : _context26.t3 === 'SAVE_BASKET' ? 33 : _context26.t3 === 'SAVE_BASKET_SYNC' ? 33 : _context26.t3 === 'OPEN_LEAFLET_BARRIER' ? 33 : 52;
               break;
             case 28:
-              (_this$actions32 = this.actions) === null || _this$actions32 === void 0 || _this$actions32.toggleLoading('buildScene', false, false);
-              (_this$actions33 = this.actions) === null || _this$actions33 === void 0 || _this$actions33.openComponent({
+              (_this$actions33 = this.actions) === null || _this$actions33 === void 0 || _this$actions33.toggleLoading('buildScene', false, false);
+              (_this$actions34 = this.actions) === null || _this$actions34 === void 0 || _this$actions34.openComponent({
                 type: 'SELLER',
                 parameters: {
                   module: 'PCreator',
@@ -40847,7 +40985,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               });
               return _context26.abrupt("break", 52);
             case 31:
-              (_this$actions34 = this.actions) === null || _this$actions34 === void 0 || _this$actions34.openComponent({
+              (_this$actions35 = this.actions) === null || _this$actions35 === void 0 || _this$actions35.openComponent({
                 type: 'SELLER',
                 parameters: {
                   module: 'Basket',
@@ -40961,7 +41099,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
         }
       }
       if (plannerType === 'JUMP_OVER_PLANNER') {
-        ret = 'PLANNER';
+        if (doShowPlanner) ret = 'PLANNER';
         plannerType = undefined;
       }
       if (plannerType === 'CUSTOMER_OPTIMIZED_PLANNER') {
@@ -40985,7 +41123,6 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       }
       if (plannerType) return plannerType;
       if (doShowPlanner) {
-        // deprected; plannerType should only be used
         ret = 'PLANNER';
       }
       return ret;
@@ -41171,17 +41308,17 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "addToBasket",
     value: function () {
       var _addToBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee28(actBasket) {
-        var _this$actions35,
-          _this$actions36,
+        var _this$actions36,
           _this$actions37,
           _this$actions38,
           _this$actions39,
+          _this$actions40,
           _this$divaBasketHandl4,
           _this3 = this,
-          _this$actions40,
           _this$actions41,
           _this$actions42,
-          _this$actions43;
+          _this$actions43,
+          _this$actions44;
         var event,
           emailConfig,
           _emailConfig$to$split,
@@ -41198,31 +41335,31 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _context28.next = _context28.t0 === 'onWebPlanerPrint' ? 5 : _context28.t0 === 'onWebPlanerSave' ? 7 : _context28.t0 === 'onWebPlanerShare' ? 9 : _context28.t0 === 'onRequestConsulation' ? 11 : _context28.t0 === 'onSave' ? 13 : _context28.t0 === 'onSendEmail' ? 15 : _context28.t0 === 'onSaveProduct' ? 20 : _context28.t0 === 'dontSaveBasket' ? 27 : _context28.t0 === 'onAddToBasket' ? 28 : 30;
               break;
             case 5:
-              (_this$actions35 = this.actions) === null || _this$actions35 === void 0 || _this$actions35.onEvent({
+              (_this$actions36 = this.actions) === null || _this$actions36 === void 0 || _this$actions36.onEvent({
                 type: 'onWebPlanerPrint',
                 data: actBasket.getAsJson()
               });
               return _context28.abrupt("break", 32);
             case 7:
-              (_this$actions36 = this.actions) === null || _this$actions36 === void 0 || _this$actions36.onEvent({
+              (_this$actions37 = this.actions) === null || _this$actions37 === void 0 || _this$actions37.onEvent({
                 type: 'onWebPlanerSave',
                 data: actBasket.getAsJson()
               });
               return _context28.abrupt("break", 32);
             case 9:
-              (_this$actions37 = this.actions) === null || _this$actions37 === void 0 || _this$actions37.onEvent({
+              (_this$actions38 = this.actions) === null || _this$actions38 === void 0 || _this$actions38.onEvent({
                 type: 'onWebPlanerShare',
                 data: actBasket.getAsJson()
               });
               return _context28.abrupt("break", 32);
             case 11:
-              (_this$actions38 = this.actions) === null || _this$actions38 === void 0 || _this$actions38.onEvent({
+              (_this$actions39 = this.actions) === null || _this$actions39 === void 0 || _this$actions39.onEvent({
                 type: 'onRequestConsulation',
                 data: actBasket.getAsJson()
               });
               return _context28.abrupt("break", 32);
             case 13:
-              (_this$actions39 = this.actions) === null || _this$actions39 === void 0 || _this$actions39.onEvent({
+              (_this$actions40 = this.actions) === null || _this$actions40 === void 0 || _this$actions40.onEvent({
                 type: 'onSave',
                 data: actBasket.getAsJson()
               });
@@ -41257,7 +41394,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                   });
                 });
               }
-              (_this$actions40 = this.actions) === null || _this$actions40 === void 0 || _this$actions40.onEvent({
+              (_this$actions41 = this.actions) === null || _this$actions41 === void 0 || _this$actions41.onEvent({
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
@@ -41268,7 +41405,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               return this.api.saveAsProduct(this.sets, actBasket);
             case 23:
               products = _context28.sent;
-              (_this$actions41 = this.actions) === null || _this$actions41 === void 0 || _this$actions41.onEvent({
+              (_this$actions42 = this.actions) === null || _this$actions42 === void 0 || _this$actions42.onEvent({
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
@@ -41279,13 +41416,13 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               return _context28.abrupt("return", products[0]);
             case 27:
             case 28:
-              (_this$actions42 = this.actions) === null || _this$actions42 === void 0 || _this$actions42.onEvent({
+              (_this$actions43 = this.actions) === null || _this$actions43 === void 0 || _this$actions43.onEvent({
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
               return _context28.abrupt("break", 32);
             case 30:
-              (_this$actions43 = this.actions) === null || _this$actions43 === void 0 || _this$actions43.onEvent({
+              (_this$actions44 = this.actions) === null || _this$actions44 === void 0 || _this$actions44.onEvent({
                 type: event,
                 data: actBasket.getAsJson()
               });
@@ -41306,8 +41443,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "openPDFpostAsEvent",
     value: function openPDFpostAsEvent(mongoDBId) {
-      var _this$actions44, _this$actions45, _this$actions46;
-      (_this$actions44 = this.actions) === null || _this$actions44 === void 0 || _this$actions44.updateBreadcrumbs({
+      var _this$actions45, _this$actions46, _this$actions47;
+      (_this$actions45 = this.actions) === null || _this$actions45 === void 0 || _this$actions45.updateBreadcrumbs({
         type: 'update',
         param: {
           groupId: 'SHOWROOM',
@@ -41321,7 +41458,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }
       });
-      (_this$actions45 = this.actions) === null || _this$actions45 === void 0 || _this$actions45.updateBreadcrumbs({
+      (_this$actions46 = this.actions) === null || _this$actions46 === void 0 || _this$actions46.updateBreadcrumbs({
         type: 'update',
         param: {
           groupId: 'SHOWROOM',
@@ -41335,7 +41472,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }
       });
-      (_this$actions46 = this.actions) === null || _this$actions46 === void 0 || _this$actions46.openComponent({
+      (_this$actions47 = this.actions) === null || _this$actions47 === void 0 || _this$actions47.openComponent({
         type: 'REPORT',
         parameters: {
           id: mongoDBId
@@ -41555,14 +41692,14 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "subscribeToWebPlannerEvents",
     value: function subscribeToWebPlannerEvents() {
-      var _this$actions47;
-      (_this$actions47 = this.actions) === null || _this$actions47 === void 0 || _this$actions47.subscribeEvents(this.addToBasketEventFunction);
+      var _this$actions48;
+      (_this$actions48 = this.actions) === null || _this$actions48 === void 0 || _this$actions48.subscribeEvents(this.addToBasketEventFunction);
     }
   }, {
     key: "unsubscribeFromWebPlannerEvents",
     value: function unsubscribeFromWebPlannerEvents() {
-      var _this$actions48;
-      (_this$actions48 = this.actions) === null || _this$actions48 === void 0 || _this$actions48.unSubscribeEvents(this.addToBasketEventFunction);
+      var _this$actions49;
+      (_this$actions49 = this.actions) === null || _this$actions49 === void 0 || _this$actions49.unSubscribeEvents(this.addToBasketEventFunction);
     }
   }, {
     key: "initApiForLogicOnly",
@@ -41630,7 +41767,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "initBasket",
     value: function () {
-      var _initBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee31(init3D, ignoreFavorites, onlyCalcVariants) {
+      var _initBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee31(init3D, ignoreFavorites) {
         var initSetState, set, basket;
         return _regeneratorRuntime__default["default"].wrap(function _callee31$(_context31) {
           while (1) switch (_context31.prev = _context31.next) {
@@ -41643,27 +41780,26 @@ var DivaWebPlanner = /*#__PURE__*/function () {
             case 5:
               //TODO check if when basket gets repaired the product match gets called
               set = this.actSet();
-              if (set) set.onlyCalcVariants = onlyCalcVariants;
               setHandlerInstance.loadConfigStructureOfActSet(set, this.getCurPlannerType());
               if (!(favoritesHandlerInstance.FavoritesDefined(set) && !ignoreFavorites)) {
-                _context31.next = 11;
+                _context31.next = 10;
                 break;
               }
-              _context31.next = 11;
+              _context31.next = 10;
               return this.handleFavorites(init3D ? 'CALC' : 'REPAIR');
-            case 11:
-              _context31.next = 13;
+            case 10:
+              _context31.next = 12;
               return setHandlerInstance.fillOrderLinesAndOrderSets(this.sets, this.divaBasketHandler, !init3D, this.doAllowSetPlanner(), this.ReturnTo);
-            case 13:
+            case 12:
               basket = _context31.sent;
               return _context31.abrupt("return", basket);
-            case 15:
+            case 14:
             case "end":
               return _context31.stop();
           }
         }, _callee31, this);
       }));
-      function initBasket(_x79, _x80, _x81) {
+      function initBasket(_x79, _x80) {
         return _initBasket.apply(this, arguments);
       }
       return initBasket;
@@ -41740,7 +41876,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }, _callee33, this);
       }));
-      function handleFavorites(_x82) {
+      function handleFavorites(_x81) {
         return _handleFavorites.apply(this, arguments);
       }
       return handleFavorites;
@@ -41794,7 +41930,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }, _callee34, this);
       }));
-      function initSapOrderLinesFromBasket(_x83, _x84, _x85) {
+      function initSapOrderLinesFromBasket(_x82, _x83, _x84) {
         return _initSapOrderLinesFromBasket.apply(this, arguments);
       }
       return initSapOrderLinesFromBasket;
@@ -41861,7 +41997,9 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       var articleCodex = [];
       var accesoriesCodex = [];
       var articles = [];
+      var actualBasketvalue = 0;
       if (set) {
+        actualBasketvalue = set === null || set === void 0 ? void 0 : set.getSetPrice();
         for (var _i = 0, _Object$values = Object.values(set.getDivaArticles()); _i < _Object$values.length; _i++) {
           var article = _Object$values[_i];
           if (article.relatedToBasketId) {
@@ -41899,8 +42037,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           article_nested: articles
         }
       });
-      LOG$1.businessEvent('onActualBasketValue', 'Planner', 'Aktueller Basket Value:' + this.getCurSetPrice(), {
-        basketValue: this.getCurSetPrice()
+      LOG$1.businessEvent('onActualBasketValue', 'Planner', 'Aktueller Basket Value:' + actualBasketvalue, {
+        basketValue: actualBasketvalue
       });
     }
   }, {
@@ -41912,7 +42050,9 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       var allOpv = [];
       var latestOpv = {};
       var latestOpt = {};
+      var actualBasketvalue = 0;
       if (set) {
+        actualBasketvalue = set === null || set === void 0 ? void 0 : set.getSetPrice();
         if (myValues) {
           var _set$CatalogData$getO, _set$CatalogData$getO2;
           latestOpt = {
@@ -41992,8 +42132,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           configuration_nested: configuration
         }
       });
-      LOG$1.businessEvent('onActualBasketValue', 'Planner', 'Aktueller Basket Value:' + this.getCurSetPrice(), {
-        basketValue: this.getCurSetPrice()
+      LOG$1.businessEvent('onActualBasketValue', 'Planner', 'Aktueller Basket Value:' + actualBasketvalue, {
+        basketValue: actualBasketvalue
       });
     }
   }, {
@@ -42041,6 +42181,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       this.updateViewButtonsDependigOnConfigStructure = undefined;
       this.initViewApiDependencies = undefined;
       this.setHQRenderScript = undefined;
+      this.setCamInfo = undefined;
     }
   }]);
 }();