@crystaldesign/web-planner-logic 24.14.0-beta.9 → 24.15.0-beta.1

package/build/cjs/{index-fc73236c.js → index-5f530bbb.js}

@@ -1,12 +1,12 @@
 'use strict';
 
+var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
-var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var axios$1 = require('axios');
 var DivaUtils = require('@crystaldesign/diva-utils');
@@ -17,13 +17,13 @@ var _typeof = require('@babel/runtime/helpers/typeof');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
 var _asyncToGenerator__default = /*#__PURE__*/_interopDefaultLegacy(_asyncToGenerator);
 var _classCallCheck__default = /*#__PURE__*/_interopDefaultLegacy(_classCallCheck);
 var _createClass__default = /*#__PURE__*/_interopDefaultLegacy(_createClass);
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regeneratorRuntime);
 var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
-var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
 var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios$1);
 var DivaUtils__default = /*#__PURE__*/_interopDefaultLegacy(DivaUtils);
@@ -43,9 +43,9 @@ var _typeof__default = /*#__PURE__*/_interopDefaultLegacy(_typeof);
 })();
 
 var _excluded = ["type"];
-function ownKeys$f(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$f(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$f(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$f(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var LOG$g = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
+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$h = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var JsonDataCache = /*#__PURE__*/function () {
   function JsonDataCache() {
     _classCallCheck__default["default"](this, JsonDataCache);
@@ -91,7 +91,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
     if (plannerConfig.settings) {
       this.initalizeWebConfigData(plannerConfig.settings, plannerConfig.lang);
     } else {
-      LOG$g.error(new DivaUtils.DivaError('Fehler beim laden der WebConfig', {
+      LOG$h.error(new DivaUtils.DivaError('Fehler beim laden der WebConfig', {
         code: 'WC_0001'
       }));
       throw Error('Initalize failed!');
@@ -126,7 +126,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               skip = _args.length > 2 && _args[2] !== undefined ? _args[2] : 0;
-              LOG$g.debug('DivaApiHandler.fetchData ' + url, 'DivaApiHandler, fetchData');
+              LOG$h.debug('DivaApiHandler.fetchData ' + url, 'DivaApiHandler, fetchData');
               if (init) {
                 _context.next = 4;
                 break;
@@ -135,32 +135,31 @@ var DivaApiHandler = /*#__PURE__*/function () {
             case 4:
               _context.prev = 4;
               if (!(init.method === 'POST')) {
-                _context.next = 12;
+                _context.next = 11;
                 break;
               }
-              delete init.method;
-              _context.next = 9;
+              _context.next = 8;
               return axios__default["default"].post(url, init.data, init.config);
-            case 9:
+            case 8:
               response = _context.sent;
-              _context.next = 17;
+              _context.next = 16;
               break;
-            case 12:
+            case 11:
               finalUrl = new URL(url);
               if (skip) {
                 finalUrl.searchParams.append('skip', skip.toString());
               }
-              _context.next = 16;
+              _context.next = 15;
               return axios__default["default"].get(finalUrl.toString(), init.config);
-            case 16:
+            case 15:
               response = _context.sent;
-            case 17:
-              _context.next = 19;
+            case 16:
+              _context.next = 18;
               return response.data;
-            case 19:
+            case 18:
               data = _context.sent;
               if (data !== null && data !== void 0 && data.Error) {
-                LOG$g.error(new DivaUtils.DivaError(data.Error, {
+                LOG$h.error(new DivaUtils.DivaError(data.Error, {
                   code: 'WC_0001',
                   custom: {
                     url: url
@@ -169,36 +168,36 @@ var DivaApiHandler = /*#__PURE__*/function () {
               }
               //if data is paginated iterate and fetch all
               if (!(Array.isArray(data.data) && data.total)) {
-                _context.next = 35;
+                _context.next = 34;
                 break;
               }
               if (!(data.data.length + skip < data.total)) {
-                _context.next = 34;
+                _context.next = 33;
                 break;
               }
               nextSkip = skip + 20;
               _context.t0 = [];
               _context.t1 = _toConsumableArray__default["default"](data.data);
               _context.t2 = _toConsumableArray__default["default"];
-              _context.next = 29;
+              _context.next = 28;
               return this.fetchData(url, init, nextSkip);
-            case 29:
+            case 28:
               _context.t3 = _context.sent;
               _context.t4 = (0, _context.t2)(_context.t3);
               return _context.abrupt("return", _context.t0.concat.call(_context.t0, _context.t1, _context.t4));
-            case 34:
+            case 33:
               return _context.abrupt("return", data.data);
-            case 35:
+            case 34:
               return _context.abrupt("return", data);
-            case 38:
-              _context.prev = 38;
+            case 37:
+              _context.prev = 37;
               _context.t5 = _context["catch"](4);
               throw Error('fetch failed! ' + url + ' Error: ' + _context.t5);
-            case 41:
+            case 40:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[4, 38]]);
+        }, _callee, this, [[4, 37]]);
       }));
       function fetchData(_x, _x2) {
         return _fetchData.apply(this, arguments);
@@ -250,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$f;
-              _context2.t1 = _objectSpread$f({}, init.config.headers);
+              _context2.t0 = _objectSpread$g;
+              _context2.t1 = _objectSpread$g({}, init.config.headers);
               _context2.t2 = {};
               _context2.next = 20;
               return this.getSessionGuid('V', undefined, this.OrganizationId, api2Url);
@@ -297,7 +296,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
                 _context3.next = 9;
                 break;
               }
-              LOG$g.debug('getDataFromInternalCache: ' + queryString);
+              LOG$h.debug('getDataFromInternalCache: ' + queryString);
               if (!this.jsonDataCache.get(myQS)) {
                 _context3.next = 8;
                 break;
@@ -362,9 +361,9 @@ var DivaApiHandler = /*#__PURE__*/function () {
               return this.fetchData(url, init);
             case 33:
               result = _context3.sent;
-              this.jsonDataCache.set(myQS, result);
+              if (method !== 'POST') this.jsonDataCache.set(myQS, result);
               if (cacheMD5) this.jsonDataCache.set(cacheMD5, result);
-              LOG$g.debug('getDataFromApi: ' + queryString);
+              LOG$h.debug('getDataFromApi: ' + queryString);
               return _context3.abrupt("return", result);
             case 38:
             case "end":
@@ -400,7 +399,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
             case 5:
               _context4.prev = 5;
               _context4.t0 = _context4["catch"](1);
-              LOG$g.error(new DivaUtils.DivaError('could not create product in Configurator', {
+              LOG$h.error(new DivaUtils.DivaError('could not create product in Configurator', {
                 cause: _context4.t0
               }));
               return _context4.abrupt("return", false);
@@ -431,11 +430,11 @@ var DivaApiHandler = /*#__PURE__*/function () {
         language: lang !== null && lang !== void 0 ? lang : this.getLanguage(),
         abTestCases: data.abTestCases !== undefined ? data.abTestCases : [],
         checkForProductsPrice: data.checkForProductsPrice,
+        checkForProductsMatch: data.checkForProductsMatch,
         doDisablePlanner2D: data.doDisablePlanner2D,
         diva3dStaticBGImage: data.diva3dStaticBGImage != undefined ? data.diva3dStaticBGImage : false,
         diva3dStaticBGImage_DefaultRoomList: data.diva3dStaticBGImage_DefaultRoomList != undefined ? data.diva3dStaticBGImage_DefaultRoomList : '',
         diva3DAllowDefaultCatRoomList: data.diva3DAllowDefaultCatRoomList != undefined ? data.diva3DAllowDefaultCatRoomList : true,
-        doCheckVariantData: data.doCheckVariantData,
         templateConfig: data.templateConfig,
         doAllowSetPlanner: data.doAllowSetPlanner,
         onErrorHandling: data.onErrorHandling,
@@ -501,17 +500,23 @@ var DivaApiHandler = /*#__PURE__*/function () {
       var _this$divaWebConfigDa2;
       return (_this$divaWebConfigDa2 = this.divaWebConfigData) === null || _this$divaWebConfigDa2 === void 0 ? void 0 : _this$divaWebConfigDa2.checkForProductsPrice;
     }
+  }, {
+    key: "doCheckForProductsMatch",
+    value: function doCheckForProductsMatch() {
+      var _this$divaWebConfigDa3;
+      return (_this$divaWebConfigDa3 = this.divaWebConfigData) === null || _this$divaWebConfigDa3 === void 0 ? void 0 : _this$divaWebConfigDa3.checkForProductsMatch;
+    }
   }, {
     key: "getReportConfigIdentifier",
     value: function getReportConfigIdentifier() {
-      var _this$divaWebConfigDa3;
-      return (_this$divaWebConfigDa3 = this.divaWebConfigData) === null || _this$divaWebConfigDa3 === void 0 ? void 0 : _this$divaWebConfigDa3.reportConfigIdentifier;
+      var _this$divaWebConfigDa4;
+      return (_this$divaWebConfigDa4 = this.divaWebConfigData) === null || _this$divaWebConfigDa4 === void 0 ? void 0 : _this$divaWebConfigDa4.reportConfigIdentifier;
     }
   }, {
     key: "getPrintOptions",
     value: function getPrintOptions() {
-      var _this$divaWebConfigDa4;
-      var reportConfig = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : (_this$divaWebConfigDa4 = this.divaWebConfigData) === null || _this$divaWebConfigDa4 === void 0 ? void 0 : _this$divaWebConfigDa4.reportConfig;
+      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;
       return {
         Gdpr: !!(reportConfig !== null && reportConfig !== void 0 && reportConfig.printWithGDPR),
         PlanningSketch: !!(reportConfig !== null && reportConfig !== void 0 && reportConfig.printWithPlanningSketch),
@@ -531,8 +536,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "get3DRenderGroup",
     value: function get3DRenderGroup() {
-      var _this$divaWebConfigDa5, _this$divaWebConfigDa6;
-      return (_this$divaWebConfigDa5 = (_this$divaWebConfigDa6 = this.divaWebConfigData) === null || _this$divaWebConfigDa6 === void 0 ? void 0 : _this$divaWebConfigDa6.diva3dRenderGroup) !== null && _this$divaWebConfigDa5 !== void 0 ? _this$divaWebConfigDa5 : '';
+      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 : '';
     }
   }, {
     key: "getServerId",
@@ -569,86 +574,67 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getDiva3dStaticBGImage",
     value: function getDiva3dStaticBGImage() {
-      var _this$divaWebConfigDa7;
-      return (_this$divaWebConfigDa7 = this.divaWebConfigData) === null || _this$divaWebConfigDa7 === void 0 ? void 0 : _this$divaWebConfigDa7.diva3dStaticBGImage;
+      var _this$divaWebConfigDa8;
+      return (_this$divaWebConfigDa8 = this.divaWebConfigData) === null || _this$divaWebConfigDa8 === void 0 ? void 0 : _this$divaWebConfigDa8.diva3dStaticBGImage;
     }
   }, {
     key: "getDiva3dStaticBGImage_DefaultRoomList",
     value: function getDiva3dStaticBGImage_DefaultRoomList() {
-      var _this$divaWebConfigDa8, _this$divaWebConfigDa9;
-      return ((_this$divaWebConfigDa8 = this.divaWebConfigData) === null || _this$divaWebConfigDa8 === void 0 ? void 0 : _this$divaWebConfigDa8.diva3dStaticBGImage_DefaultRoomList) == '' ? '3D_STATBG_ROOMLIST' : (_this$divaWebConfigDa9 = this.divaWebConfigData) === null || _this$divaWebConfigDa9 === void 0 ? void 0 : _this$divaWebConfigDa9.diva3dStaticBGImage_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;
     }
   }, {
     key: "getDiva3DAllowDefaultCatRoomList",
     value: function getDiva3DAllowDefaultCatRoomList() {
-      var _this$divaWebConfigDa10;
-      return (_this$divaWebConfigDa10 = this.divaWebConfigData) === null || _this$divaWebConfigDa10 === void 0 ? void 0 : _this$divaWebConfigDa10.diva3DAllowDefaultCatRoomList;
+      var _this$divaWebConfigDa11;
+      return (_this$divaWebConfigDa11 = this.divaWebConfigData) === null || _this$divaWebConfigDa11 === void 0 ? void 0 : _this$divaWebConfigDa11.diva3DAllowDefaultCatRoomList;
     }
   }, {
     key: "doAllowSetPlanner",
     value: function doAllowSetPlanner() {
-      var _this$divaWebConfigDa11;
-      return (_this$divaWebConfigDa11 = this.divaWebConfigData) === null || _this$divaWebConfigDa11 === void 0 ? void 0 : _this$divaWebConfigDa11.doAllowSetPlanner;
+      var _this$divaWebConfigDa12;
+      return (_this$divaWebConfigDa12 = this.divaWebConfigData) === null || _this$divaWebConfigDa12 === void 0 ? void 0 : _this$divaWebConfigDa12.doAllowSetPlanner;
     }
   }, {
     key: "getHidePlanner",
     value: function getHidePlanner() {
-      var _this$divaWebConfigDa12;
-      return !!((_this$divaWebConfigDa12 = this.divaWebConfigData) !== null && _this$divaWebConfigDa12 !== void 0 && (_this$divaWebConfigDa12 = _this$divaWebConfigDa12.viewConfig) !== null && _this$divaWebConfigDa12 !== void 0 && _this$divaWebConfigDa12.hidePlanner);
-    }
-  }, {
-    key: "getDoShowAR",
-    value: function getDoShowAR() {
       var _this$divaWebConfigDa13;
-      return (_this$divaWebConfigDa13 = this.divaWebConfigData) === null || _this$divaWebConfigDa13 === void 0 || (_this$divaWebConfigDa13 = _this$divaWebConfigDa13.viewConfig) === null || _this$divaWebConfigDa13 === void 0 ? void 0 : _this$divaWebConfigDa13.enableAR;
-    }
-  }, {
-    key: "forceShowRTV",
-    value: function forceShowRTV() {
-      var _this$divaWebConfigDa14;
-      return (_this$divaWebConfigDa14 = this.divaWebConfigData) === null || _this$divaWebConfigDa14 === void 0 || (_this$divaWebConfigDa14 = _this$divaWebConfigDa14.viewConfig) === null || _this$divaWebConfigDa14 === void 0 ? void 0 : _this$divaWebConfigDa14.forceRTV;
-    }
-  }, {
-    key: "getDoShowRTV",
-    value: function getDoShowRTV() {
-      var _this$divaWebConfigDa15;
-      return (_this$divaWebConfigDa15 = this.divaWebConfigData) === null || _this$divaWebConfigDa15 === void 0 || (_this$divaWebConfigDa15 = _this$divaWebConfigDa15.viewConfig) === null || _this$divaWebConfigDa15 === void 0 ? void 0 : _this$divaWebConfigDa15.enableRTV;
+      return !!((_this$divaWebConfigDa13 = this.divaWebConfigData) !== null && _this$divaWebConfigDa13 !== void 0 && (_this$divaWebConfigDa13 = _this$divaWebConfigDa13.viewConfig) !== null && _this$divaWebConfigDa13 !== void 0 && _this$divaWebConfigDa13.hidePlanner);
     }
   }, {
     key: "getEnableRTVUnityKombi",
     value: function getEnableRTVUnityKombi() {
-      var _this$divaWebConfigDa16;
-      return !!((_this$divaWebConfigDa16 = this.divaWebConfigData) !== null && _this$divaWebConfigDa16 !== void 0 && _this$divaWebConfigDa16.viewConfig.enableRtvUnityKombi);
+      return !!this.organization.settings.enableRTV;
     }
   }, {
     key: "getDoDisablePlanner2D",
     value: function getDoDisablePlanner2D() {
-      var _this$divaWebConfigDa17;
-      return !!((_this$divaWebConfigDa17 = this.divaWebConfigData) !== null && _this$divaWebConfigDa17 !== void 0 && _this$divaWebConfigDa17.doDisablePlanner2D);
+      var _this$divaWebConfigDa14;
+      return !!((_this$divaWebConfigDa14 = this.divaWebConfigData) !== null && _this$divaWebConfigDa14 !== void 0 && _this$divaWebConfigDa14.doDisablePlanner2D);
     }
   }, {
     key: "getRoomListInProduct",
     value: function getRoomListInProduct() {
-      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);
+      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);
     }
   }, {
     key: "getPlannerType",
     value: function getPlannerType() {
-      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;
+      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;
     }
   }, {
     key: "getLoadSupplierColors",
     value: function getLoadSupplierColors() {
-      var _this$divaWebConfigDa20;
-      return !!((_this$divaWebConfigDa20 = this.divaWebConfigData) !== null && _this$divaWebConfigDa20 !== void 0 && _this$divaWebConfigDa20.loadSupplierColors);
+      var _this$divaWebConfigDa17;
+      return !!((_this$divaWebConfigDa17 = this.divaWebConfigData) !== null && _this$divaWebConfigDa17 !== void 0 && _this$divaWebConfigDa17.loadSupplierColors);
     }
   }, {
     key: "showSelectionModeZero",
     value: function showSelectionModeZero() {
-      var _this$divaWebConfigDa21;
-      return !!((_this$divaWebConfigDa21 = this.divaWebConfigData) !== null && _this$divaWebConfigDa21 !== void 0 && _this$divaWebConfigDa21.showSelectionModeZero);
+      var _this$divaWebConfigDa18;
+      return !!((_this$divaWebConfigDa18 = this.divaWebConfigData) !== null && _this$divaWebConfigDa18 !== void 0 && _this$divaWebConfigDa18.showSelectionModeZero);
     }
   }, {
     key: "ruleDescSeperator",
@@ -665,12 +651,6 @@ var DivaApiHandler = /*#__PURE__*/function () {
       var _this$organization3;
       return !!((_this$organization3 = this.organization) !== null && _this$organization3 !== void 0 && (_this$organization3 = _this$organization3.settings) !== null && _this$organization3 !== void 0 && _this$organization3.ruleDescWithoutParenthesis);
     }
-  }, {
-    key: "getDoCheckVariantData",
-    value: function getDoCheckVariantData() {
-      var _this$divaWebConfigDa22;
-      return (_this$divaWebConfigDa22 = this.divaWebConfigData) === null || _this$divaWebConfigDa22 === void 0 ? void 0 : _this$divaWebConfigDa22.doCheckVariantData;
-    }
   }, {
     key: "setI18n",
     value: function setI18n(i18n) {
@@ -762,50 +742,50 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getViewConfig",
     value: function getViewConfig() {
-      var _this$divaWebConfigDa23;
-      return (_this$divaWebConfigDa23 = this.divaWebConfigData) === null || _this$divaWebConfigDa23 === void 0 ? void 0 : _this$divaWebConfigDa23.viewConfig;
+      var _this$divaWebConfigDa19;
+      return (_this$divaWebConfigDa19 = this.divaWebConfigData) === null || _this$divaWebConfigDa19 === void 0 ? void 0 : _this$divaWebConfigDa19.viewConfig;
     }
   }, {
     key: "getEmailConfig",
     value: function getEmailConfig() {
-      var _this$divaWebConfigDa24;
-      return (_this$divaWebConfigDa24 = this.divaWebConfigData) === null || _this$divaWebConfigDa24 === void 0 ? void 0 : _this$divaWebConfigDa24.emailConfig;
+      var _this$divaWebConfigDa20;
+      return (_this$divaWebConfigDa20 = this.divaWebConfigData) === null || _this$divaWebConfigDa20 === void 0 ? void 0 : _this$divaWebConfigDa20.emailConfig;
     }
   }, {
     key: "getABTestCases",
     value: function getABTestCases() {
-      var _this$divaWebConfigDa25, _this$divaWebConfigDa26;
-      return (_this$divaWebConfigDa25 = (_this$divaWebConfigDa26 = this.divaWebConfigData) === null || _this$divaWebConfigDa26 === void 0 ? void 0 : _this$divaWebConfigDa26.abTestCases) !== null && _this$divaWebConfigDa25 !== void 0 ? _this$divaWebConfigDa25 : [];
+      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 : [];
     }
   }, {
     key: "getBarrierConfig",
     value: function getBarrierConfig() {
-      var _this$divaWebConfigDa27;
-      return (_this$divaWebConfigDa27 = this.divaWebConfigData) === null || _this$divaWebConfigDa27 === void 0 ? void 0 : _this$divaWebConfigDa27.barrierConfig;
+      var _this$divaWebConfigDa23;
+      return (_this$divaWebConfigDa23 = this.divaWebConfigData) === null || _this$divaWebConfigDa23 === void 0 ? void 0 : _this$divaWebConfigDa23.barrierConfig;
     }
   }, {
     key: "getTemplateConfig",
     value: function getTemplateConfig() {
-      var _this$divaWebConfigDa28;
-      return (_this$divaWebConfigDa28 = this.divaWebConfigData) === null || _this$divaWebConfigDa28 === void 0 ? void 0 : _this$divaWebConfigDa28.templateConfig;
+      var _this$divaWebConfigDa24;
+      return (_this$divaWebConfigDa24 = this.divaWebConfigData) === null || _this$divaWebConfigDa24 === void 0 ? void 0 : _this$divaWebConfigDa24.templateConfig;
     }
   }, {
     key: "showDivaNr",
     value: function showDivaNr() {
-      var _this$divaWebConfigDa29;
-      return (_this$divaWebConfigDa29 = this.divaWebConfigData) === null || _this$divaWebConfigDa29 === void 0 ? void 0 : _this$divaWebConfigDa29.showDivaNr;
+      var _this$divaWebConfigDa25;
+      return (_this$divaWebConfigDa25 = this.divaWebConfigData) === null || _this$divaWebConfigDa25 === void 0 ? void 0 : _this$divaWebConfigDa25.showDivaNr;
     }
   }, {
     key: "onErrorHandling",
     value: function onErrorHandling() {
-      var _this$divaWebConfigDa30;
-      return (_this$divaWebConfigDa30 = this.divaWebConfigData) === null || _this$divaWebConfigDa30 === void 0 ? void 0 : _this$divaWebConfigDa30.onErrorHandling;
+      var _this$divaWebConfigDa26;
+      return (_this$divaWebConfigDa26 = this.divaWebConfigData) === null || _this$divaWebConfigDa26 === void 0 ? void 0 : _this$divaWebConfigDa26.onErrorHandling;
     }
   }, {
     key: "diva3DRenderingDefault",
     value: function diva3DRenderingDefault() {
-      var _this$divaWebConfigDa31;
-      return (_this$divaWebConfigDa31 = this.divaWebConfigData) === null || _this$divaWebConfigDa31 === void 0 ? void 0 : _this$divaWebConfigDa31.diva3DRenderingDefault;
+      var _this$divaWebConfigDa27;
+      return (_this$divaWebConfigDa27 = this.divaWebConfigData) === null || _this$divaWebConfigDa27 === void 0 ? void 0 : _this$divaWebConfigDa27.diva3DRenderingDefault;
     }
   }, {
     key: "getJwt",
@@ -820,8 +800,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getUseMask",
     value: function getUseMask() {
-      var _this$divaWebConfigDa32;
-      return (_this$divaWebConfigDa32 = this.divaWebConfigData) === null || _this$divaWebConfigDa32 === void 0 ? void 0 : _this$divaWebConfigDa32.useMask;
+      var _this$divaWebConfigDa28;
+      return (_this$divaWebConfigDa28 = this.divaWebConfigData) === null || _this$divaWebConfigDa28 === void 0 ? void 0 : _this$divaWebConfigDa28.useMask;
     }
   }, {
     key: "apiUrl",
@@ -993,11 +973,6 @@ var DivaApiHandler = /*#__PURE__*/function () {
       var qs = 'function=GetJsonArticlePrices' + '&catalogCodex=' + catalogCodex + '&articleCodex=' + articleCodex + (this.useEkPrices ? '&ekPrices=true' : '');
       return DivaUtils.md5(qs.toLowerCase()).toUpperCase();
     }
-  }, {
-    key: "getCheckVariantDataQS",
-    value: function getCheckVariantDataQS(setHash) {
-      return 'function=CheckVariantData&hash=' + setHash;
-    }
   }, {
     key: "getApiAccountLogin",
     value: function getApiAccountLogin(accountGuid) {
@@ -1189,7 +1164,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
             case 9:
               _context10.prev = 9;
               _context10.t0 = _context10["catch"](4);
-              LOG$g.error(new DivaUtils.DivaError('Error Connecting to Support-Service-LivePlanner', {
+              LOG$h.error(new DivaUtils.DivaError('Error Connecting to Support-Service-LivePlanner', {
                 cause: _context10.t0
               }));
             case 12:
@@ -1311,7 +1286,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
             case 14:
               _context12.prev = 14;
               _context12.t0 = _context12["catch"](6);
-              LOG$g.error(new DivaUtils.DivaError('Error Connecting to Report Service', {
+              LOG$h.error(new DivaUtils.DivaError('Error Connecting to Report Service', {
                 cause: _context12.t0
               }));
             case 17:
@@ -1341,14 +1316,14 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "dontLoadAdditionalModelInfos",
     get: function get() {
-      var _this$divaWebConfigDa33;
-      return (_this$divaWebConfigDa33 = this.divaWebConfigData) === null || _this$divaWebConfigDa33 === void 0 ? void 0 : _this$divaWebConfigDa33.dontLoadAdditionalModelInfos;
+      var _this$divaWebConfigDa29;
+      return (_this$divaWebConfigDa29 = this.divaWebConfigData) === null || _this$divaWebConfigDa29 === void 0 ? void 0 : _this$divaWebConfigDa29.dontLoadAdditionalModelInfos;
     }
   }, {
     key: "dontLoadCatalogEditorLiteMask",
     get: function get() {
-      var _this$divaWebConfigDa34;
-      return (_this$divaWebConfigDa34 = this.divaWebConfigData) === null || _this$divaWebConfigDa34 === void 0 ? void 0 : _this$divaWebConfigDa34.dontLoadCatalogEditorLiteMask;
+      var _this$divaWebConfigDa30;
+      return (_this$divaWebConfigDa30 = this.divaWebConfigData) === null || _this$divaWebConfigDa30 === void 0 ? void 0 : _this$divaWebConfigDa30.dontLoadCatalogEditorLiteMask;
     }
   }, {
     key: "OrganizationId",
@@ -1356,6 +1331,12 @@ var DivaApiHandler = /*#__PURE__*/function () {
       var _this$organization4;
       return (_this$organization4 = this.organization) === null || _this$organization4 === void 0 ? void 0 : _this$organization4._id;
     }
+  }, {
+    key: "enableAR",
+    get: function get() {
+      var _this$organization5;
+      return (_this$organization5 = this.organization) === null || _this$organization5 === void 0 || (_this$organization5 = _this$organization5.settings) === null || _this$organization5 === void 0 ? void 0 : _this$organization5.enableAR;
+    }
   }, {
     key: "webConfig",
     get: function get() {
@@ -1661,7 +1642,7 @@ var ArticleOptionData = /*#__PURE__*/function () {
 }();
 
 var ArticleOptionValueData = /*#__PURE__*/function () {
-  function ArticleOptionValueData(codex, jsonOPV, catalogOPV, myArticle, isParentOPVG, parent) {
+  function ArticleOptionValueData(codex, jsonOPV, catalogOPV, myArticle, isParentOPVG, parent, multiselectOptions) {
     _classCallCheck__default["default"](this, ArticleOptionValueData);
     _defineProperty__default["default"](this, "opv", void 0);
     this.opv = {
@@ -1697,7 +1678,7 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
     var mySubArticleReplaceMainArticleNr;
     //Auf Preisliste von PriceArticleCodex zugreifen
     if (this.opv.rul) {
-      this.opv.rul = DivaUtils__default["default"].getRuleByFormula(this.opv.rul);
+      this.opv.rul = DivaUtils__default["default"].getRuleByFormula(this.opv.rul, myArticle.catalogCodex, multiselectOptions);
     }
     if (myArticle.arePricesLoaded) {
       var articlePrices = myArticle.articlePrices;
@@ -16039,7 +16020,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) : '',
+          jsFormula: image.JsFormula ? DivaUtils__default["default"].getRuleByFormula(image.JsFormula, catalog.catalogCodex, catalog.multiselectOptions) : '',
           name: image.Name,
           replaceMainImage: image.ReplaceMainImage
         });
@@ -16370,7 +16351,7 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
   }]);
 }();
 
-var LOG$f = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
+var LOG$g = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 //kaufmännischer Artikel
 var CatalogArticleData = /*#__PURE__*/function () {
   function CatalogArticleData(jsonArticle, catalogData) {
@@ -16667,6 +16648,16 @@ var CatalogArticleData = /*#__PURE__*/function () {
     get: function get() {
       return this.catalogArticle.partListArticles;
     }
+  }, {
+    key: "getPartlistRuleOfArticleCodes",
+    value: function getPartlistRuleOfArticleCodes(articleCodex) {
+      var _this$partlistArticle;
+      return (_this$partlistArticle = this.partlistArticlesRules) === null || _this$partlistArticle === void 0 || (_this$partlistArticle = _this$partlistArticle[0].PartListPos) === null || _this$partlistArticle === void 0 ? void 0 : _this$partlistArticle.find(function (p) {
+        return p.ItemRefArticles.find(function (a) {
+          return a.ArticleCodex === articleCodex;
+        });
+      });
+    }
   }, {
     key: "groupedPartlists",
     get: function get() {
@@ -17071,7 +17062,7 @@ var CatalogArticleData = /*#__PURE__*/function () {
       }
       if (json.Decisions && json.Decisions.length > 0) {
         this.catalogArticle.decisions = json.Decisions;
-        this.initDecisions();
+        this.initDecisions(catalog);
       }
       if (json.TemplateCodex) {
         this.catalogArticle.templateCodex = json.TemplateCodex;
@@ -17091,7 +17082,7 @@ var CatalogArticleData = /*#__PURE__*/function () {
       if (json.ShowroomImages) {
         for (var _i = 0; _i < json.ShowroomImages.length; _i++) {
           if (json.ShowroomImages[_i].JsFormula) {
-            json.ShowroomImages[_i].JsFormula = DivaUtils__default["default"].getRuleByFormula(json.ShowroomImages[_i].JsFormula);
+            json.ShowroomImages[_i].JsFormula = DivaUtils__default["default"].getRuleByFormula(json.ShowroomImages[_i].JsFormula, catalog.catalogCodex, catalog.multiselectOptions);
           }
         }
         this.catalogArticle.showroomImages = json.ShowroomImages;
@@ -17165,6 +17156,12 @@ var CatalogArticleData = /*#__PURE__*/function () {
   }, {
     key: "loadArticleOptions",
     value: function loadArticleOptions(json, set, onlyRunLogic) {
+      var multiselectOptions = json.OPT.filter(function (o) {
+        var _o$OCD;
+        return set.CatalogData.multiselectOptions.includes((_o$OCD = o.OCD) !== null && _o$OCD !== void 0 ? _o$OCD : o.Codex);
+      }).map(function (o) {
+        return o.Codex;
+      });
       if (json.OPT && json.OPT.length != 0) {
         for (var i = 0; i < json.OPT.length; i++) {
           var myOPT = json.OPT[i];
@@ -17189,7 +17186,7 @@ var CatalogArticleData = /*#__PURE__*/function () {
                     catOPV = set.CatalogData.getCatalogOptionValueByCodex(tmpOPV.OCD ? tmpOPV.OCD : tmpOPV.Codex, onlyRunLogic);
                   if (catOPV) {
                     if (!(catOPV !== null && catOPV !== void 0 && catOPV.groupName) && catOPG) catOPV.groupName = catOPG.name;
-                    var myOPV = new ArticleOptionValueData(tmpOPV.Codex, tmpOPV, catOPV, this, true, newOPG);
+                    var myOPV = new ArticleOptionValueData(tmpOPV.Codex, tmpOPV, catOPV, this, true, newOPG, multiselectOptions);
                     allOPVsOfOPG[tmpOPV.Codex] = myOPV;
                   }
                 }
@@ -17202,11 +17199,11 @@ var CatalogArticleData = /*#__PURE__*/function () {
                 var _tmpOPG = myOPT.OPV[_j],
                   _catOPG = set.CatalogData.getCatalogOptionValueByCodex(_tmpOPG.OCD ? _tmpOPG.OCD : _tmpOPG.Codex, onlyRunLogic);
                 if (_catOPG) {
-                  var _newOPG = new ArticleOptionValueData(_tmpOPG.Codex, _tmpOPG, _catOPG, this, false, newOPT);
+                  var _newOPG = new ArticleOptionValueData(_tmpOPG.Codex, _tmpOPG, _catOPG, this, false, newOPT, multiselectOptions);
                   allOPVsOfOPT[_tmpOPG.Codex] = _newOPG;
                   var _catOPV = set.CatalogData.getCatalogOptionValueByCodex(_tmpOPG.OCD ? _tmpOPG.OCD : _tmpOPG.Codex, onlyRunLogic);
                   if (_catOPV) {
-                    var _myOPV = new ArticleOptionValueData(_tmpOPG.Codex, _tmpOPG, _catOPV, this, true, _newOPG);
+                    var _myOPV = new ArticleOptionValueData(_tmpOPG.Codex, _tmpOPG, _catOPV, this, true, _newOPG, multiselectOptions);
                     _allOPVsOfOPG[_tmpOPG.Codex] = _myOPV;
                   }
                   _newOPG.initOPVsInOPG(_allOPVsOfOPG);
@@ -17218,7 +17215,7 @@ var CatalogArticleData = /*#__PURE__*/function () {
               var _tmpOPV = myOPT.OPV[_j2],
                 _catOPV2 = set.CatalogData.getCatalogOptionValueByCodex(_tmpOPV.OCD ? _tmpOPV.OCD : _tmpOPV.Codex, onlyRunLogic);
               if (_catOPV2) {
-                var _myOPV2 = new ArticleOptionValueData(_tmpOPV.Codex, _tmpOPV, _catOPV2, this, true, newOPT);
+                var _myOPV2 = new ArticleOptionValueData(_tmpOPV.Codex, _tmpOPV, _catOPV2, this, true, newOPT, multiselectOptions);
                 allOPVsOfOPT[_tmpOPV.Codex] = _myOPV2;
               }
             }
@@ -17243,7 +17240,7 @@ var CatalogArticleData = /*#__PURE__*/function () {
 
       if (json.Decisions && json.Decisions.length > 0) {
         this.catalogArticle.decisions = JSON.parse(JSON.stringify(json.Decisions));
-        this.initDecisions();
+        this.initDecisions(set.CatalogData);
       }
       if (json.PartLists && json.PartLists.length > 0) {
         this.catalogArticle.partListArticles = json.PartLists;
@@ -17260,7 +17257,7 @@ var CatalogArticleData = /*#__PURE__*/function () {
       }, catalog);
       var articleOPG = new ArticleOptionValueData('OPVSUPPLIER_COLORS', {
         RUL: rule
-      }, catalogOPG, this, false, newOPT);
+      }, catalogOPG, this, false, newOPT, catalog.multiselectOptions);
       allOPVsOfOPT['OPVSUPPLIER_COLORS'] = articleOPG;
       var supplierColorsOpvs = {};
       for (var i = 0; i < supplierColors.length; i++) {
@@ -17271,17 +17268,17 @@ var CatalogArticleData = /*#__PURE__*/function () {
           HexColor: col.HexColor,
           GroupName: 'Lieferantenfarben'
         }, catalog);
-        supplierColorsOpvs['OPV' + col.OptionValueCodex] = new ArticleOptionValueData('OPV' + col.OptionValueCodex, {}, colorCatalogOpv, this, true, articleOPG);
+        supplierColorsOpvs['OPV' + col.OptionValueCodex] = new ArticleOptionValueData('OPV' + col.OptionValueCodex, {}, colorCatalogOpv, this, true, articleOPG, catalog.multiselectOptions);
       }
       articleOPG.initOPVsInOPG(supplierColorsOpvs);
     }
   }, {
     key: "loadPrices",
-    value: function loadPrices(json) {
+    value: function loadPrices(json, catalog) {
       var jsonPrice = JSON.parse(JSON.stringify(json));
       if (jsonPrice.Rules) {
         for (var _key3 in jsonPrice.Rules) {
-          jsonPrice.Rules[_key3].JsFormula = DivaUtils__default["default"].getRuleByFormula(jsonPrice.Rules[_key3].JsFormula);
+          jsonPrice.Rules[_key3].JsFormula = DivaUtils__default["default"].getRuleByFormula(jsonPrice.Rules[_key3].JsFormula, catalog.catalogCodex, catalog.multiselectOptions);
         }
       }
       this.catalogArticle.articlePrices = jsonPrice;
@@ -17289,7 +17286,7 @@ var CatalogArticleData = /*#__PURE__*/function () {
     }
   }, {
     key: "initDecisions",
-    value: function initDecisions() {
+    value: function initDecisions(catalog) {
       var myOptOrder = [];
       if (this.catalogArticle.articleOptions) {
         for (var _key4 in this.catalogArticle.articleOptions) {
@@ -17303,7 +17300,7 @@ var CatalogArticleData = /*#__PURE__*/function () {
         for (var j = 0; j < myDecision.DOC.length; j++) {
           //DecisionOptionCombination
           var myDOC = myDecision.DOC[j];
-          if (myDOC.JsFormula) myDOC.JsFormula = DivaUtils__default["default"].getRuleByFormula(myDOC.JsFormula);
+          if (myDOC.JsFormula) myDOC.JsFormula = DivaUtils__default["default"].getRuleByFormula(myDOC.JsFormula, catalog.catalogCodex, catalog.multiselectOptions);
           if (myDOC.ValidOptionValues) {
             myDOC.ValidOptions = '';
             var a = myDOC.ValidOptionValues.split(',');
@@ -17326,12 +17323,12 @@ var CatalogArticleData = /*#__PURE__*/function () {
                     articleCodex: this.articleCodex
                   };
                   if (myDecision.Type == '0') {
-                    LOG$f.error(new DivaUtils.DivaError(text, {
+                    LOG$g.error(new DivaUtils.DivaError(text, {
                       code: 'WC_0011',
                       custom: stack
                     }));
                   } else {
-                    LOG$f.warn(text, undefined, stack);
+                    LOG$g.warn(text, undefined, stack);
                   }
                   myDecision.Options.splice(m, 1);
                   m--;
@@ -18151,9 +18148,9 @@ var OptionCatalogData = /*#__PURE__*/function () {
   }]);
 }();
 
-function ownKeys$e(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$e(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$e(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$e(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var LOG$e = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
+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 LOG$f = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 
 /*
 Diese KLasse enthält Inforamtion zu einem Catalog (C)
@@ -18992,7 +18989,7 @@ var DivaCatalogData = /*#__PURE__*/function () {
     key: "getCatalogOptionValueByCodex",
     value: function getCatalogOptionValueByCodex(codex, throwError) {
       if (this.optionValues && this.optionValues[codex]) return this.optionValues[codex];
-      LOG$e.error(new DivaUtils.DivaError('CatalogOptionValue: ' + codex + ' does not exist', {
+      LOG$f.error(new DivaUtils.DivaError('CatalogOptionValue: ' + codex + ' does not exist', {
         code: 'WC_0017'
       }));
       if (throwError) {
@@ -19096,7 +19093,7 @@ var DivaCatalogData = /*#__PURE__*/function () {
       if (this.catalogArticles[articleCodex]) {
         return this.catalogArticles[articleCodex];
       } else {
-        LOG$e.error(new DivaUtils.DivaError('Artikelcodex ' + articleCodex + ' existiert nicht im Katalog ' + this.catalogCodex, {
+        LOG$f.error(new DivaUtils.DivaError('Artikelcodex ' + articleCodex + ' existiert nicht im Katalog ' + this.catalogCodex, {
           code: 'WC_0006'
         }));
         if (throwError) {
@@ -19627,6 +19624,16 @@ var DivaCatalogData = /*#__PURE__*/function () {
     get: function get() {
       return this._api;
     }
+  }, {
+    key: "multiselectOptions",
+    get: function get() {
+      var _this$options4;
+      return Object.values((_this$options4 = this.options) !== null && _this$options4 !== void 0 ? _this$options4 : {}).filter(function (o) {
+        return o.isMultiselect;
+      }).map(function (o) {
+        return o.codex;
+      });
+    }
   }, {
     key: "catalogMask",
     get: function get() {
@@ -19693,7 +19700,7 @@ var DivaCatalogData = /*#__PURE__*/function () {
 var mapMask = function mapMask(mask) {
   var _mappedMask$catalog;
   if (!mask) return undefined;
-  var mappedMask = _objectSpread$e({}, mask);
+  var mappedMask = _objectSpread$f({}, mask);
   var mapProperties = function mapProperties(props) {
     if (Array.isArray(props)) return props;
     var mappedProps = [];
@@ -19722,7 +19729,7 @@ var mapMask = function mapMask(mask) {
   return mappedMask;
 };
 
-var LOG$d = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
+var LOG$e = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var DivaCatalogHandler = /*#__PURE__*/function () {
   function DivaCatalogHandler() {
     _classCallCheck__default["default"](this, DivaCatalogHandler);
@@ -19743,7 +19750,7 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
               return _context.abrupt("return", state.divaCatalogs[catalogKey]);
             case 5:
               if (!orderSet) {
-                _context.next = 47;
+                _context.next = 53;
                 break;
               }
               // ab hier parallell laden
@@ -19775,22 +19782,30 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
             case 23:
               mask = _context.sent;
             case 24:
+              _context.next = 29;
+              break;
+            case 26:
+              _context.prev = 26;
+              _context.t0 = _context["catch"](19);
+              LOG$e.debug('no mask found: ' + _context.t0);
+            case 29:
+              _context.prev = 29;
               if (!(!state.api.dontLoadAdditionalModelInfos && catalogApiData.AccountGuid)) {
-                _context.next = 28;
+                _context.next = 34;
                 break;
               }
-              _context.next = 27;
+              _context.next = 33;
               return state.api.getDataCache(state.api.getAdditionalModelInfosQS(catalogApiData.AccountGuid, catalogApiData.GUID), undefined, undefined, 'catalog');
-            case 27:
+            case 33:
               additionalModelInfos = _context.sent;
-            case 28:
-              _context.next = 33;
+            case 34:
+              _context.next = 39;
               break;
-            case 30:
-              _context.prev = 30;
-              _context.t0 = _context["catch"](19);
-              LOG$d.debug('no additionalModelInfos found: ' + _context.t0);
-            case 33:
+            case 36:
+              _context.prev = 36;
+              _context.t1 = _context["catch"](29);
+              LOG$e.debug('no additionalModelInfos found: ' + _context.t1);
+            case 39:
               if (state.catalogMask || mask) {
                 if (!additionalModelInfos) additionalModelInfos = {
                   _id: ''
@@ -19799,19 +19814,19 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
               }
               catalogData = new DivaCatalogData(catalogApiData, orderSet, state.api, additionalModelInfos);
               if (!(catalogArticleListData.Articles && catalogArticleListData.Articles.length > 0)) {
-                _context.next = 39;
+                _context.next = 45;
                 break;
               }
               catalogData.initCatalogArticles(catalogArticleListData.Articles);
-              _context.next = 42;
+              _context.next = 48;
               break;
-            case 39:
+            case 45:
               DivaUtils__default["default"].endSpanOfApm('Catalog initialize');
-              LOG$d.error(new DivaUtils.DivaError('Catalog ' + catalogData.catalogName + ' not listed', {
+              LOG$e.error(new DivaUtils.DivaError('Catalog ' + catalogData.catalogName + ' not listed', {
                 code: 'WC_0002'
               }));
               throw new Error('Articles of Catalog: ' + catalogData.catalogCodex + ' are empty');
-            case 42:
+            case 48:
               if (catalogArticlePlannerListData.PlannerElements && catalogArticlePlannerListData.PlannerElements.length > 0) {
                 catalogData.initCatalogPlannerArticles(catalogArticlePlannerListData.PlannerElements);
               }
@@ -19828,16 +19843,16 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
 
               DivaUtils__default["default"].endSpanOfApm('Catalog initialize');
               return _context.abrupt("return", state.divaCatalogs[catalogKey]);
-            case 47:
-              LOG$d.error(new DivaUtils.DivaError('Catalog: ' + catalogCodex + ' not initialized! and orderSet not set', {
+            case 53:
+              LOG$e.error(new DivaUtils.DivaError('Catalog: ' + catalogCodex + ' not initialized! and orderSet not set', {
                 code: 'WC_0007'
               }));
               return _context.abrupt("return", state.divaCatalogs[catalogKey]);
-            case 49:
+            case 55:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[19, 30]]);
+        }, _callee, null, [[19, 26], [29, 36]]);
       }));
       function getCatalogData(_x, _x2, _x3) {
         return _getCatalogData.apply(this, arguments);
@@ -19979,6 +19994,14 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
     get: function get() {
       return this.val ? this.val.codex : undefined;
     }
+  }, {
+    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 v.codex;
+      })) !== null && _this$multiSelects$ma !== void 0 ? _this$multiSelects$ma : [];
+    }
   }, {
     key: "measureValue",
     get: function get() {
@@ -20452,12 +20475,12 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
   }, {
     key: "getSelectedVals",
     get: function get() {
-      var _this$multiSelects2;
-      if (this.isMultiselect && (_this$multiSelects2 = this.multiSelects) !== null && _this$multiSelects2 !== void 0 && _this$multiSelects2.length) {
-        var _this$multiSelects$ma, _this$multiSelects3;
-        return (_this$multiSelects$ma = (_this$multiSelects3 = this.multiSelects) === null || _this$multiSelects3 === void 0 ? void 0 : _this$multiSelects3.map(function (m) {
+      var _this$multiSelects3;
+      if (this.isMultiselect && (_this$multiSelects3 = this.multiSelects) !== null && _this$multiSelects3 !== void 0 && _this$multiSelects3.length) {
+        var _this$multiSelects$ma2, _this$multiSelects4;
+        return (_this$multiSelects$ma2 = (_this$multiSelects4 = this.multiSelects) === null || _this$multiSelects4 === void 0 ? void 0 : _this$multiSelects4.map(function (m) {
           return m.codex;
-        })) !== null && _this$multiSelects$ma !== void 0 ? _this$multiSelects$ma : [];
+        })) !== null && _this$multiSelects$ma2 !== void 0 ? _this$multiSelects$ma2 : [];
       }
       if (this.val) {
         return [this.val.codex];
@@ -20475,9 +20498,9 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
   }]);
 }();
 
-function ownKeys$d(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$d(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$d(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$d(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var LOG$c = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
+function ownKeys$e(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$e(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$e(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$e(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var LOG$d = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var DivaArticle = /*#__PURE__*/function () {
   //Hier steht die aktuelle Konfiguration
 
@@ -20690,7 +20713,7 @@ var DivaArticle = /*#__PURE__*/function () {
         var partlistArticle = this.partlistArticles[basketId];
         if (!onlyVisible || partlistArticle.partlistArticleVisibleInTree) partlistArticles[basketId] = partlistArticle;
         if (partlistArticle.hasPartlistArticle) {
-          partlistArticles = _objectSpread$d(_objectSpread$d({}, partlistArticles), partlistArticle.getRecursivePartlistArticles(onlyVisible));
+          partlistArticles = _objectSpread$e(_objectSpread$e({}, partlistArticles), partlistArticle.getRecursivePartlistArticles(onlyVisible));
         }
       }
       return partlistArticles;
@@ -20721,10 +20744,20 @@ var DivaArticle = /*#__PURE__*/function () {
         }
       }
       if (Object.entries(partlistArticles).length && !this.CatalogData.bundleRules) {
-        LOG$c.error(new DivaUtils.DivaError('sorting partlistarticles Failed', {
+        LOG$d.error(new DivaUtils.DivaError('sorting partlistarticles Failed', {
           custom: {
-            partlistArticles: partlistArticles,
-            partlistArticlesToLoad: partlistArticlesToLoad
+            partlistArticles: Object.values(partlistArticles).map(function (p) {
+              return {
+                BasketId: p.basketId,
+                ArticleCodex: p.articleCodex
+              };
+            }),
+            partlistArticlesToLoad: partlistArticlesToLoad.map(function (p) {
+              return {
+                BasketId: p.ArticleCodex,
+                ArticleCodex: p.ArticleCodex
+              };
+            })
           }
         }));
       }
@@ -20747,14 +20780,6 @@ var DivaArticle = /*#__PURE__*/function () {
     set: function set(posNr) {
       this.article.posNr = posNr;
     }
-  }, {
-    key: "curProduct",
-    get: function get() {
-      return this.article.curProduct;
-    },
-    set: function set(product) {
-      this.article.curProduct = product;
-    }
   }, {
     key: "isDockable",
     get: function get() {
@@ -20822,18 +20847,25 @@ var DivaArticle = /*#__PURE__*/function () {
       var bruttoPercentage = this.set.getBruttoPercentage(true);
       var price = this.bruttoPrice;
       if (bruttoPercentage) price = price - price * (bruttoPercentage / 100);
-      var discountPercentage = this.set.getCurrentDisountPercentage();
+      var discountPercentage = this.getCurrentDisountPercentage();
       if (discountPercentage) {
         price = price - price * (discountPercentage / 100);
       }
       return price;
     }
+  }, {
+    key: "discountPercentage",
+    get: function get() {
+      return this.article.discountPercentage;
+    },
+    set: function set(val) {
+      this.article.discountPercentage = val;
+    }
   }, {
     key: "bruttoPrice",
     get: function get() {
       if (this.noPrice) return 0;
       var price = this.article.price;
-      if (this.curProduct) return this.curProduct.price;
       if (this.hasPartlistArticle) {
         var partlistPrice = 0;
         for (var key in this.partlistArticles) {
@@ -20849,7 +20881,7 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "mainPrice",
     get: function get() {
-      var discountPercentage = this.set.getCurrentDisountPercentage();
+      var discountPercentage = this.getCurrentDisountPercentage();
       if (discountPercentage) {
         return DivaUtils__default["default"].roundPrice(this.article.price - this.article.price * (discountPercentage / 100), 1, 2);
       }
@@ -20858,7 +20890,7 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "calcPrice",
     value: function calcPrice(dontCalcDiscount) {
-      var discountPercentage = this.set.getCurrentDisountPercentage();
+      var discountPercentage = this.getCurrentDisountPercentage();
       return DivaUtils__default["default"].roundPrice((dontCalcDiscount ? this.bruttoPrice : this.price) * this.quantity, !!discountPercentage ? 1 : this.CatalogData.rounding, !!discountPercentage ? 2 : this.CatalogData.digits);
     }
   }, {
@@ -20938,12 +20970,12 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "discounts",
     get: function get() {
-      var _this$set$getCurrentD;
-      if (!this.set.getCurrentDisountPercentage()) return undefined;
+      var _this$getCurrentDisou;
+      if (!this.getCurrentDisountPercentage()) return undefined;
       var diff = this.bruttoPrice - this.price;
       return [{
         isPercentage: true,
-        percentageDiscount: (_this$set$getCurrentD = this.set.getCurrentDisountPercentage()) !== null && _this$set$getCurrentD !== void 0 ? _this$set$getCurrentD : 0,
+        percentageDiscount: (_this$getCurrentDisou = this.getCurrentDisountPercentage()) !== null && _this$getCurrentDisou !== void 0 ? _this$getCurrentDisou : 0,
         fixDiscount: DivaUtils__default["default"].roundPrice(diff, this.CatalogData.rounding, this.CatalogData.digits),
         fixDiscountFormatted: DivaUtils__default["default"].formatPrice(diff)
       }];
@@ -20953,13 +20985,32 @@ var DivaArticle = /*#__PURE__*/function () {
     get: function get() {
       return this.article.priceRefs;
     }
+  }, {
+    key: "getCurrentDisountPercentage",
+    value: function getCurrentDisountPercentage() {
+      if (this.discountPercentage) return this.discountPercentage;
+      return this.set.getCurrentDisountPercentage();
+    }
+  }, {
+    key: "getArticleOptionStatesWithOptionsForPrint",
+    value: function getArticleOptionStatesWithOptionsForPrint() {
+      var opsObj = _objectSpread$e({}, this.articleOptionStates);
+      if (this.article.optionsForPrint) {
+        for (var i = 0; i < this.article.optionsForPrint.length; i++) {
+          var ops = this.getArticleOptionState(this.article.optionsForPrint[i]);
+          if (ops) opsObj[ops.optionCodex] = ops;
+        }
+      }
+      return opsObj;
+    }
   }, {
     key: "articleVariantDesc",
     value: function articleVariantDesc() {
       var newLine = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ', ';
+      var articleOptions = this.getArticleOptionStatesWithOptionsForPrint();
       var ret = '';
-      for (var key in this.articleOptionStates) {
-        var myOPS = this.articleOptionStates[key];
+      for (var key in articleOptions) {
+        var myOPS = articleOptions[key];
         if (!myOPS.isInvisible && myOPS.selectionmode != 0 && myOPS.isDoShow && (myOPS.visibleCount > 1 || myOPS.option.forceShowVariantDesc)) {
           if (ret != '') ret += newLine;
           if (myOPS.valCodex) {
@@ -21151,13 +21202,13 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "articleOptionStatesWithParents",
     get: function get() {
-      return _objectSpread$d(_objectSpread$d({}, this.getReqursiveArticleOptionStates()), this.articleOptionStatesData);
+      return _objectSpread$e(_objectSpread$e({}, this.getReqursiveArticleOptionStates()), this.articleOptionStatesData);
     }
   }, {
     key: "getReqursiveArticleOptionStates",
     value: function getReqursiveArticleOptionStates() {
       var _this$partListParentA6, _this$partListParentA7, _this$partListParentA8, _this$partListParentA9, _this$accessoireParen3, _this$accessoireParen4, _this$accessoireParen5, _this$accessoireParen6;
-      return _objectSpread$d(_objectSpread$d(_objectSpread$d(_objectSpread$d({}, (_this$partListParentA6 = (_this$partListParentA7 = this.partListParentArticle) === null || _this$partListParentA7 === void 0 ? void 0 : _this$partListParentA7.articleOptionStatesData) !== null && _this$partListParentA6 !== void 0 ? _this$partListParentA6 : {}), (_this$partListParentA8 = (_this$partListParentA9 = this.partListParentArticle) === null || _this$partListParentA9 === void 0 ? void 0 : _this$partListParentA9.getReqursiveArticleOptionStates()) !== null && _this$partListParentA8 !== void 0 ? _this$partListParentA8 : {}), (_this$accessoireParen3 = (_this$accessoireParen4 = this.accessoireParentArticle) === null || _this$accessoireParen4 === void 0 ? void 0 : _this$accessoireParen4.articleOptionStatesData) !== null && _this$accessoireParen3 !== void 0 ? _this$accessoireParen3 : {}), (_this$accessoireParen5 = (_this$accessoireParen6 = this.accessoireParentArticle) === null || _this$accessoireParen6 === void 0 ? void 0 : _this$accessoireParen6.getReqursiveArticleOptionStates()) !== null && _this$accessoireParen5 !== void 0 ? _this$accessoireParen5 : {});
+      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: "clearArticleOptionStates",
@@ -21868,13 +21919,14 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "articleProductHash",
     get: function get() {
       var hash = this.catalogCodex + '_' + this.articleCodex + '_' + this.quantity + '_';
+      var variantValues = [];
       for (var key in this.articleOptionStates) {
         var myArtOption = this.articleOptionStates[key];
         if (myArtOption.isDoShow && (!(myArtOption.idmVariantenArt == 95 || myArtOption.idmVariantenArt == 96 || myArtOption.idmVariantenArt == 97) || myArtOption.isVisibleFreeText) && myArtOption.val && myArtOption.visibleCount > 0 && !myArtOption.isDescribingState) {
-          hash = hash + myArtOption.optionCodex.substring(3) + '_' + myArtOption.val.codex.substring(3) + (myArtOption.measureUnit && myArtOption.freeText !== undefined ? '_' + myArtOption.freeText : '') + (!myArtOption.measureUnit && myArtOption.isFreeText ? '_' + myArtOption.isFreeText : '');
+          variantValues.push(myArtOption.optionCodex.substring(3) + '_' + myArtOption.val.codex.substring(3) + (myArtOption.freeText ? '_' + myArtOption.freeText : myArtOption.measureValue ? '_' + myArtOption.measureValue : ''));
         }
       }
-      return DivaUtils.md5(hash);
+      return DivaUtils.md5(hash + variantValues.join());
     }
   }, {
     key: "VariantValuesWithoutOPTandOPV",
@@ -22686,7 +22738,7 @@ var DivaArticle = /*#__PURE__*/function () {
           this.article.doUpdatePlannerSize = true;
           this.calcHeight = Math.round((newHeight + Number.EPSILON) * 100) / 100;
         } catch (e) {
-          LOG$c.warn('Invalid Planungdepth - IDMVariantenArt 97: ' + myArtOPS.option.name + ' ' + myArtOPS.valName, e);
+          LOG$d.warn('Invalid Planungdepth - IDMVariantenArt 97: ' + myArtOPS.option.name + ' ' + myArtOPS.valName, e);
         }
       }
       //beim article abspeichern. Das Planungselement kann es sich per Funktion von dort dann holen
@@ -22698,7 +22750,7 @@ var DivaArticle = /*#__PURE__*/function () {
           this.article.doUpdatePlannerSize = true;
           this.calcDepth = Math.round((newDepth + Number.EPSILON) * 100) / 100;
         } catch (e) {
-          LOG$c.warn('Invalid Planungdepth - IDMVariantenArt 96: ' + myArtOPS.option.name + ' ' + myArtOPS.valName, e);
+          LOG$d.warn('Invalid Planungdepth - IDMVariantenArt 96: ' + myArtOPS.option.name + ' ' + myArtOPS.valName, e);
         }
       }
       //beim article abspeichern. Das Planungselement kann es sich per Funktion von dort dann holen
@@ -22711,7 +22763,7 @@ var DivaArticle = /*#__PURE__*/function () {
           this.article.doUpdatePlannerSize = true;
           this.calcWidth = Math.round((newWidth + Number.EPSILON) * 100) / 100;
         } catch (e) {
-          LOG$c.warn('Invalid Planungdepth - IDMVariantenArt 95: ' + myArtOPS.option.name + ' ' + myArtOPS.valName, e);
+          LOG$d.warn('Invalid Planungdepth - IDMVariantenArt 95: ' + myArtOPS.option.name + ' ' + myArtOPS.valName, e);
         }
       }
     }
@@ -22746,7 +22798,7 @@ var DivaArticle = /*#__PURE__*/function () {
       var myOptionStates = this.articleOptionStates;
       var myArtOPS = myOptionStates[OptionCodex];
       if (!myArtOPS) {
-        LOG$c.error(new DivaUtils.DivaError('OptionCodex: ' + OptionCodex + ' in articleCodex: ' + this.articleCodex + ' not found!'));
+        LOG$d.error(new DivaUtils.DivaError('OptionCodex: ' + OptionCodex + ' in articleCodex: ' + this.articleCodex + ' not found!'));
         return;
       }
       myArtOPS.val = myOPVItem; //akteull OPV wird gesetzt
@@ -22866,10 +22918,10 @@ var DivaArticle = /*#__PURE__*/function () {
                   }
                 }
                 if (decisions.length === 0) {
-                  LOG$c.log('partlistarticle loaded for haveing 0 decisions: ', myPartListPos.ItemRefArticles);
+                  LOG$d.log('partlistarticle loaded for haveing 0 decisions: ', myPartListPos.ItemRefArticles);
                   partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, newConfigValues);
                 } else if (!partlistAdded && this.CatalogData.useDecisionPosCountValue && myPartListPos.PosCountValue > 0) {
-                  LOG$c.log('partlistarticle loaded for having default PosCountValue ', myPartListPos.ItemRefArticles);
+                  LOG$d.log('partlistarticle loaded for having default PosCountValue ', myPartListPos.ItemRefArticles);
                   partlistArticlesToLoad = this.addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, newConfigValues);
                 }
               }
@@ -22943,13 +22995,13 @@ var DivaArticle = /*#__PURE__*/function () {
             RuleDesc: myRuleDesc,
             RuleDesc_locales: myRuleDesc_locales,
             PosInvisibility: myPartListPos.PosInvisibility,
-            VariantValues: _objectSpread$d(_objectSpread$d({}, (_previousPartlistArti = previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantValues) !== null && _previousPartlistArti !== void 0 ? _previousPartlistArti : {}), newConfigValues !== null && newConfigValues !== void 0 ? newConfigValues : {}),
+            VariantValues: _objectSpread$e(_objectSpread$e({}, (_previousPartlistArti = previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantValues) !== null && _previousPartlistArti !== void 0 ? _previousPartlistArti : {}), newConfigValues !== null && newConfigValues !== void 0 ? newConfigValues : {}),
             VariantItemData: previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantItemData,
             optionImgForPrint: optionImgForPrint,
             optionsForPrint: optionsForPrint
           });
         } else {
-          LOG$c.debug('not loading partlistarticle: ' + articleCodex + ' cause quantity is zero');
+          LOG$d.debug('not loading partlistarticle: ' + articleCodex + ' cause quantity is zero');
         }
       }
       return partlistArticlesToLoad;
@@ -22978,7 +23030,7 @@ var DivaArticle = /*#__PURE__*/function () {
             }
           }
         } else {
-          LOG$c.error(new DivaUtils.DivaError('For article: ' + this.articleCodex + ' name: ' + this.name + ' decisionNr: ' + DecisionNumber + ' was not found as DecisionType 3'));
+          LOG$d.error(new DivaUtils.DivaError('For article: ' + this.articleCodex + ' name: ' + this.name + ' decisionNr: ' + DecisionNumber + ' was not found as DecisionType 3'));
         }
       }
       return {
@@ -23019,7 +23071,7 @@ var DivaArticle = /*#__PURE__*/function () {
       }
       for (var key in this.articleOptionStates) {
         var myOPS = this.articleOptionStates[key];
-        myOPS.visibleOptionValues = _objectSpread$d({}, myOPS.option.articleOptionValues);
+        myOPS.visibleOptionValues = _objectSpread$e({}, myOPS.option.articleOptionValues);
         myOPS.visibleCount = Object.keys(myOPS.option.articleOptionValues).length;
         myOPS.definedBySetFeatureFixed = false;
       }
@@ -23162,7 +23214,7 @@ var DivaArticle = /*#__PURE__*/function () {
                     }
                     break;
                   default:
-                    LOG$c.error(new DivaUtils.DivaError('Action type not supported in DecisionOptionCombination', {
+                    LOG$d.error(new DivaUtils.DivaError('Action type not supported in DecisionOptionCombination', {
                       code: 'WC_0011',
                       custom: {
                         actionType: myDA.Type,
@@ -23250,7 +23302,7 @@ var DivaArticle = /*#__PURE__*/function () {
                   }
                   if (ruleValid) {
                     ruleWasValidOnce = true;
-                    if (m == 0) validOPVs[OPT] = _objectSpread$d({}, possibleOPVs);
+                    if (m == 0) validOPVs[OPT] = _objectSpread$e({}, possibleOPVs);
                     opvCodex = opvCodex.slice(1);
                     if (possibleOPVs[opvCodex] != null) delete validOPVs[OPT][opvCodex];
                   }
@@ -23462,7 +23514,7 @@ var DivaArticle = /*#__PURE__*/function () {
                           case 'ENABLE_DECISION':
                             break;
                           default:
-                            LOG$c.error(new DivaUtils.DivaError('Action type not supported in DecisionOptionCombination', {
+                            LOG$d.error(new DivaUtils.DivaError('Action type not supported in DecisionOptionCombination', {
                               code: 'WC_0011',
                               custom: {
                                 actionType: myDA.Type,
@@ -23646,7 +23698,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-b68a936a.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-47d446eb.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -24007,7 +24059,7 @@ var DivaArticle = /*#__PURE__*/function () {
                   this.article.priceRefs.push(newPriceRef);
                 }
               } else {
-                LOG$c.error(new DivaUtils.DivaError('getPriceRefs - RuleID not defined', {
+                LOG$d.error(new DivaUtils.DivaError('getPriceRefs - RuleID not defined', {
                   code: 'WC_0011',
                   custom: {
                     myRuleID: myRuleID
@@ -24147,7 +24199,9 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "updateArticleSVG",
     value: function updateArticleSVG() {
-      var _this$article$catalog2, _this$article$catalog3;
+      var _this$article$catalog2,
+        _this$article$catalog3,
+        _this4 = this;
       var newSVGFile = null;
       var svgChangedViaSvgTausch = false;
       if (!this.hasCatalogPlannerArticle || ((_this$article$catalog2 = this.article.catalogArticle.catalogPlannerArticle) === null || _this$article$catalog2 === void 0 ? void 0 : _this$article$catalog2.topSvg) == undefined && ((_this$article$catalog3 = this.article.catalogArticle.catalogPlannerArticle) === null || _this$article$catalog3 === void 0 ? void 0 : _this$article$catalog3.topSvgsWithFormula) == undefined) {
@@ -24167,7 +24221,7 @@ var DivaArticle = /*#__PURE__*/function () {
           var svgsWithFormula = plannerCatArt.topSvgsWithFormula;
           for (var i = 0; i < svgsWithFormula.length; i++) {
             var mySVG = svgsWithFormula[i],
-              myRule = DivaUtils__default["default"].getRuleByFormula(mySVG.JsFormula);
+              myRule = DivaUtils__default["default"].getRuleByFormula(mySVG.JsFormula, this.catalogCodex, this.CatalogData.multiselectOptions);
             if (this.evalRule(myRule, '')) {
               newSVGFile = mySVG.SVG;
               svgChangedViaSvgTausch = true;
@@ -24179,7 +24233,7 @@ var DivaArticle = /*#__PURE__*/function () {
               this.actPlannerData.countAVS = mySVG.AVS;
               this.actPlannerData.hasAVL = mySVG.HasAVL;
               this.actPlannerData.hasAVR = mySVG.HasAVR;
-              LOG$c.debug('new SVG by SVG tausch', {
+              LOG$d.debug('new SVG by SVG tausch', {
                 svg: mySVG.SVG,
                 rule: myRule,
                 layer: mySVG.Layer,
@@ -24204,11 +24258,11 @@ var DivaArticle = /*#__PURE__*/function () {
         }
         if (!newSVGFile) {
           var _plannerCatArt$topSvg;
-          LOG$c.error(new DivaUtils.DivaError('No SVG found for current configuration', {
+          LOG$d.error(new DivaUtils.DivaError('No SVG found for current configuration', {
             code: 'WC_0011',
             custom: {
               formulas: (_plannerCatArt$topSvg = plannerCatArt.topSvgsWithFormula) === null || _plannerCatArt$topSvg === void 0 ? void 0 : _plannerCatArt$topSvg.map(function (item) {
-                return DivaUtils__default["default"].getRuleByFormula(item.JsFormula);
+                return DivaUtils__default["default"].getRuleByFormula(item.JsFormula, _this4.catalogCodex, _this4.CatalogData.multiselectOptions);
               }),
               catalogName: this.CatalogData.catalogName,
               catalogCodex: this.catalogCodex,
@@ -24364,8 +24418,7 @@ var DivaArticle = /*#__PURE__*/function () {
         isActive: isActive,
         basketId: this.article.basketId,
         posNr: this.posNr,
-        elementId: this.article.elementId,
-        product: this.curProduct
+        elementId: this.article.elementId
       };
       return ret;
     }
@@ -24385,15 +24438,9 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "getVariantBasketData",
     value: function getVariantBasketData() {
       var variantBasketData = [];
-      var opsObj = _objectSpread$d({}, this.articleOptionStates);
-      if (this.article.optionsForPrint) {
-        for (var i = 0; i < this.article.optionsForPrint.length; i++) {
-          var ops = this.getArticleOptionState(this.article.optionsForPrint[i]);
-          if (ops) opsObj[ops.optionCodex] = ops;
-        }
-      }
-      for (var key in opsObj) {
-        var myArtOption = opsObj[key];
+      var articleOptions = this.getArticleOptionStatesWithOptionsForPrint();
+      for (var key in articleOptions) {
+        var myArtOption = articleOptions[key];
         var OP = myArtOption.optionCodex;
         if (myArtOption) {
           var doHideSizeOption = myArtOption.idmVariantenArt == 95 || myArtOption.idmVariantenArt == 96 || myArtOption.idmVariantenArt == 97;
@@ -24571,9 +24618,9 @@ var DivaArticle = /*#__PURE__*/function () {
   }]);
 }();
 
-function ownKeys$c(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$c(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$c(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$c(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var LOG$b = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
+function ownKeys$d(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$d(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$d(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$d(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var LOG$c = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 
 //Diese Klasse verwaltet den Optionsbaum und ladelogik etc. eines Artikels
 //Diese Klasse beinhaltet alle Artikel eines Sets
@@ -24604,7 +24651,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               return _context.abrupt("return", new DivaArticle(set, newBasketId, initParams, catalogArticle, catalog));
             case 10:
               //articleCodex does not exist anymore in catalog
-              LOG$b.error(new DivaUtils.DivaError('articleCodex not found in article list. Could be due to exclusivity or a bug in the application!', {
+              LOG$c.error(new DivaUtils.DivaError('articleCodex not found in article list. Could be due to exclusivity or a bug in the application!', {
                 code: 'WC_0011',
                 custom: {
                   articleCodex: articleCodex
@@ -24715,7 +24762,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               _yield$Promise$all2 = _slicedToArray__default["default"](_yield$Promise$all, 2);
               jsonPrices = _yield$Promise$all2[0];
               jsonOption = _yield$Promise$all2[1];
-              catalogArticle.loadPrices(jsonPrices);
+              catalogArticle.loadPrices(jsonPrices, set.CatalogData);
               catalogArticle.loadArticleOptions(jsonOption, set, set.onlyRunLogic);
             case 17:
               catalogArticle.areOptionsLoaded = true;
@@ -24829,7 +24876,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               return _context6.abrupt("continue", 37);
             case 11:
               if (targetArticlesWithNewValues.includes(targetArticlesToUpdate[i])) {
-                valuesArray[i] = actArticle.getValidValues(_objectSpread$c({}, myValues), actArticle.CatalogData.mergeOptionsToSameOption);
+                valuesArray[i] = actArticle.getValidValues(_objectSpread$d({}, myValues), actArticle.CatalogData.mergeOptionsToSameOption);
               }
               if (!(Object.entries(valuesArray[i]).length > 0 || from !== null && from !== void 0 && from.startsWith('initializing'))) {
                 _context6.next = 32;
@@ -25468,7 +25515,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               }
               doLoadItem.BasketID = nArticle.basketId;
               _context15.next = 7;
-              return this.toDoAfterArticleLoaded(nArticle, {}, _objectSpread$c(_objectSpread$c({}, doLoadItem.VariantValues), newConfigValues), 'initializingPartlist', doLoadItem.VariantItemData);
+              return this.toDoAfterArticleLoaded(nArticle, {}, _objectSpread$d(_objectSpread$d({}, doLoadItem.VariantValues), newConfigValues), 'initializingPartlist', doLoadItem.VariantItemData);
             case 7:
               article.addPartlistArticle(nArticle);
             case 8:
@@ -25627,7 +25674,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           if (ruleValid) break;
         }
         if (ruleValid) {
-          returnValue.push(_objectSpread$c(_objectSpread$c({}, entry), {}, {
+          returnValue.push(_objectSpread$d(_objectSpread$d({}, entry), {}, {
             index: i
           }));
           break;
@@ -25642,7 +25689,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
       if ((_rule$articles = rule.articles) !== null && _rule$articles !== void 0 && _rule$articles.length && !rule.articles.includes(article.articleCodex)) return false;
       if (rule.variantValues && !this.objectIncudesObject(rule.variantValues, article.VariantValuesWithoutOPTandOPV)) return false;
       if (rule.visitedOptions && !this.arrayIncludesArray(rule.visitedOptions, visitedOptions[article.basketId])) return false;
-      if (rule.jsFormula && !article.evalRule(DivaUtils__default["default"].getRuleByFormula(rule.jsFormula))) return false;
+      if (rule.jsFormula && !article.evalRule(DivaUtils__default["default"].getRuleByFormula(rule.jsFormula, article.catalogCodex, article.CatalogData.multiselectOptions))) return false;
       if (rule.sizes) {
         console.error('size logic not jet implemented');
         return false;
@@ -25809,7 +25856,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     /***************************************Abspeichern orderLines******************************************************/
   }, {
     key: "getOrderLinesOfArticles",
-    value: function getOrderLinesOfArticles(articles, orderLineInitInfos, repairOnly, hasFavorites) {
+    value: function getOrderLinesOfArticles(articles, repairOnly, hasFavorites) {
       var ret = [];
       if (Object.values(articles).length == 0) return ret;
       for (var key in articles) {
@@ -25818,7 +25865,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
         var catalogData = article.CatalogData;
         var variantBasketDatas = article.getVariantBasketData();
         var orderline = new basketModel.OrderLineData({
-          SetID: orderLineInitInfos.setId,
+          SetID: article.set.getSetId(),
           BasketID: article.basketId,
           RelatedToBasketID: article.relatedToBasketId,
           RelatedToSubItem: article.relatedToSubItem,
@@ -25844,7 +25891,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           Quantity: article.quantity,
           TabGroups: article.getTabgroupsAsString,
           DockingPointInfos: setHandlerInstance.getFreeDockingPointsOfArticle(article),
-          ArticleVariantID: DivaUtils.md5("_".concat(article.catalogCodex, "_").concat(orderLineInitInfos.modelCodex, "_").concat(article.articleCodex, "_").concat(article.articleVariantValues.replace(/'/g, '@'))),
+          ArticleVariantID: DivaUtils.md5("_".concat(article.catalogCodex, "_").concat(article.set.modelCodex, "_").concat(article.articleCodex, "_").concat(article.articleVariantValues.replace(/'/g, '@'))),
           VariantDesc: article.articleVariantDesc(),
           VariantDesc_locales: article.articleVariantDesc_locales(),
           Image: article.image ? catalogData.getCatImageURL(article.image, '') : undefined,
@@ -25879,9 +25926,9 @@ var DivaArticleHandler = /*#__PURE__*/function () {
 
         //die Partlistarticle eines Articles auch in die Orderline pushen
         if (article.hasPartlistArticle) {
-          ret = ret.concat(this.getOrderLinesOfArticles(article.partlistArticles, orderLineInitInfos, repairOnly, hasFavorites));
+          ret = ret.concat(this.getOrderLinesOfArticles(article.partlistArticles, repairOnly, hasFavorites));
         }
-        ret = ret.concat(this.getOptiontreeAccessoiresArr(orderLineInitInfos.setId, article));
+        ret = ret.concat(this.getOptiontreeAccessoiresArr(article.set.getSetId(), article));
       }
       return ret;
     }
@@ -25894,7 +25941,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     key: "checkForRoundingError",
     value: function checkForRoundingError(orderlines, set) {
       var _set$CatalogData$disc;
-      var product = set === null || set === void 0 ? void 0 : set.priceForActHash();
+      var product = set === null || set === void 0 ? void 0 : set.getMatchingProduct();
       if (product !== null && product !== void 0 && product.percentage && product.percentage > ((_set$CatalogData$disc = set.CatalogData.discountPercentage) !== null && _set$CatalogData$disc !== void 0 ? _set$CatalogData$disc : 0)) {
         var setPrice = set.getSetPrice();
         var olPrice = orderlines.reduce(function (sum, ol) {
@@ -26209,7 +26256,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
 }();
 var articleHandlerInstance = new DivaArticleHandler();
 
-var LOG$a = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
+var LOG$b = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 //Der in einem Set gemergte Optionsbaum
 var DivaConfigTreeData = /*#__PURE__*/function () {
   function DivaConfigTreeData() {
@@ -26898,7 +26945,7 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
         }
       }
       if (basketIds.length !== basketIdsSorted.length) {
-        LOG$a.error(new DivaUtils.DivaError('something went wrong on build configtree'));
+        LOG$b.error(new DivaUtils.DivaError('something went wrong on build configtree'));
       }
       return basketIdsSorted;
     }
@@ -26978,9 +27025,9 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
 function _createForOfIteratorHelper$1(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$1(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$1(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$1(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$1(r, a) : void 0; } }
 function _arrayLikeToArray$1(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function ownKeys$b(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$b(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$b(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$b(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var LOG$9 = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
+function ownKeys$c(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$c(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$c(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$c(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var LOG$a = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 //plz delete me
 var DivaSet = /*#__PURE__*/function () {
   function DivaSet(catalog, _setId, orderSet, initSetState) {
@@ -27004,7 +27051,8 @@ var DivaSet = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "setType", 'PLANNING');
     _defineProperty__default["default"](this, "configTreeData", void 0);
     _defineProperty__default["default"](this, "doorPlannerHandler", void 0);
-    _defineProperty__default["default"](this, "priceForHash", {});
+    _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 */
@@ -27078,7 +27126,7 @@ var DivaSet = /*#__PURE__*/function () {
                         _context.next = 10;
                         break;
                       }
-                      validValues = repairVariantValuesAndPlanner ? article.getValidValues(_objectSpread$b({}, variantValues), article.CatalogData.mergeOptionsToSameOption) : {};
+                      validValues = repairVariantValuesAndPlanner ? article.getValidValues(_objectSpread$c({}, variantValues), article.CatalogData.mergeOptionsToSameOption) : {};
                       _context.t0 = partlistArticlesToLoad;
                       _context.next = 8;
                       return articleHandlerInstance.updateCfgValues(article, repairVariantValuesAndPlanner ? validValues : variantValues, {}, undefined, loadPlas);
@@ -27460,32 +27508,6 @@ var DivaSet = /*#__PURE__*/function () {
         notPlannedAcc: notPlannedAcc
       };
     }
-  }, {
-    key: "getAccessoiresOfBasketIdAsArray",
-    value: function getAccessoiresOfBasketIdAsArray(basketId, filter) {
-      if (filter) {
-        var acc = this.getSplitPlannedAccessoiresOfBasketId(basketId);
-        if (filter === 'onlyNonPlanner') return Object.values(acc.notPlannedAcc);
-        if (filter === 'onlyPlanner') return Object.values(acc.plannedAcc);
-      }
-      return Object.values(this.getAccessoiresOfBasketId(basketId));
-    }
-  }, {
-    key: "getAccessoiresOfArticleRecursive",
-    value: function getAccessoiresOfArticleRecursive(basketId, filter) {
-      var accArticles = [];
-      var nextAcc = [];
-      nextAcc = this.getAccessoiresOfBasketIdAsArray(basketId, filter);
-      while (nextAcc.length > 0) {
-        accArticles = accArticles.concat(nextAcc);
-        var tmpNextAcc = nextAcc;
-        nextAcc = [];
-        for (var i = 0; i < tmpNextAcc.length; i++) {
-          nextAcc = nextAcc.concat(this.getAccessoiresOfBasketIdAsArray(tmpNextAcc[i].basketId, filter));
-        }
-      }
-      return accArticles;
-    }
   }, {
     key: "getImageOfOnlyElement",
     value: function getImageOfOnlyElement() {
@@ -27498,6 +27520,13 @@ var DivaSet = /*#__PURE__*/function () {
       }
       return null;
     }
+    //this getter includes pricelogics that are specificly only for the view of the configurator
+  }, {
+    key: "getViewSetPrice",
+    value: function getViewSetPrice(dontTakeOverwrittePrice) {
+      if (this.ViewOverwrittenPrice) return this.ViewOverwrittenPrice;
+      return this.getSetPrice(dontTakeOverwrittePrice);
+    }
   }, {
     key: "getSetPrice",
     value: function getSetPrice(dontTakeOverwrittePrice) {
@@ -27508,18 +27537,29 @@ var DivaSet = /*#__PURE__*/function () {
       }
       return setPrice;
     }
+    //this getter includes pricelogics that are specificly only for the view of the configurator
+  }, {
+    key: "getViewBruttoSetPrice",
+    value: function getViewBruttoSetPrice(discountOnly) {
+      var curProduct = this.getMatchingProduct();
+      //1. if curproduct has a discount or if curproduct has no discount but added Price
+      if (curProduct !== null && curProduct !== void 0 && curProduct.origPrice && curProduct !== null && curProduct !== void 0 && curProduct.onlyViewDiscountedPrice && (!discountOnly || (curProduct === null || curProduct === void 0 ? void 0 : curProduct.origPrice) !== (curProduct === null || curProduct === void 0 ? void 0 : curProduct.onlyViewDiscountedPrice))) {
+        return curProduct.origPrice;
+      }
+      return this.getBruttoSetPrice(discountOnly);
+    }
     /**
      *
-     * @param discoultOnly ignore usecase for "verschönerter" price
+     * @param discountOnly ignore usecase for "verschönerter" price
      * @returns
      */
   }, {
     key: "getBruttoSetPrice",
-    value: function getBruttoSetPrice(discoultOnly) {
-      var curProduct = this.priceForActHash();
+    value: function getBruttoSetPrice(discountOnly) {
+      var curProduct = this.getMatchingProduct();
 
       //1. if curproduct has a discount or if curproduct has no discount but added Price
-      if (curProduct !== null && curProduct !== void 0 && curProduct.origPrice && curProduct !== null && curProduct !== void 0 && curProduct.discountPrice && (!discoultOnly || (curProduct === null || curProduct === void 0 ? void 0 : curProduct.origPrice) !== (curProduct === null || curProduct === void 0 ? void 0 : curProduct.discountPrice))) return curProduct.origPrice;
+      if (curProduct !== null && curProduct !== void 0 && curProduct.origPrice && curProduct !== null && curProduct !== void 0 && curProduct.discountPrice && (!discountOnly || (curProduct === null || curProduct === void 0 ? void 0 : curProduct.origPrice) !== (curProduct === null || curProduct === void 0 ? void 0 : curProduct.discountPrice))) return curProduct.origPrice;
 
       //2. if discount exists in catalog
       if (this.catalogData.discountPercentage) {
@@ -27529,6 +27569,16 @@ var DivaSet = /*#__PURE__*/function () {
         }
         return setPrice;
       }
+      //3. if any article has a discount
+      if (Object.values(this.divaArticles).find(function (a) {
+        return a.discountPercentage;
+      })) {
+        var _setPrice = 0;
+        for (var _key4 in this.divaArticles) {
+          _setPrice += this.divaArticles[_key4].bruttoCalcPrice;
+        }
+        return _setPrice;
+      }
       return undefined;
     }
 
@@ -27645,8 +27695,8 @@ var DivaSet = /*#__PURE__*/function () {
       var articles = {};
       for (var basketId in this.divaArticles) {
         articles[basketId] = this.divaArticles[basketId];
-        if (allPartlistArticlesAlso) articles = _objectSpread$b(_objectSpread$b({}, articles), articles[basketId].getRecursivePartlistArticles());
-        if (visiblePartlistArticlesAlso) articles = _objectSpread$b(_objectSpread$b({}, articles), articles[basketId].getRecursivePartlistArticles(true));
+        if (allPartlistArticlesAlso) articles = _objectSpread$c(_objectSpread$c({}, articles), articles[basketId].getRecursivePartlistArticles());
+        if (visiblePartlistArticlesAlso) articles = _objectSpread$c(_objectSpread$c({}, articles), articles[basketId].getRecursivePartlistArticles(true));
       }
       return articles;
     }
@@ -27752,19 +27802,6 @@ var DivaSet = /*#__PURE__*/function () {
       }
       return articleVariantValues;
     }
-  }, {
-    key: "getAllProducts",
-    value: function getAllProducts() {
-      var ret = {};
-      for (var key in this.divaArticles) {
-        var article = this.divaArticles[key];
-        if (article.curProduct) {
-          if (!ret[article.curProduct.productId]) ret[article.curProduct.productId] = 0;
-          ret[article.curProduct.productId] += article.quantity;
-        }
-      }
-      return ret;
-    }
   }, {
     key: "deleteArticle",
     value: function deleteArticle(basketId) {
@@ -27821,7 +27858,7 @@ var DivaSet = /*#__PURE__*/function () {
       for (var _i = 0; _i < sortable.length; _i++) {
         this.divaArticles[sortable[_i][0]] = articles[sortable[_i][0]];
       }
-      LOG$9.debug('articles sorted');
+      LOG$a.debug('articles sorted');
     }
   }, {
     key: "getArticlesWithAccessoires",
@@ -27957,6 +27994,8 @@ var DivaSet = /*#__PURE__*/function () {
     set: function set(val) {
       this.setArticleNrPrefix = val;
     }
+
+    //this getter includes pricelogics that are specificly only for the view of the configurator
   }, {
     key: "doAllowSetPlanner",
     get: function get() {
@@ -27967,16 +28006,21 @@ var DivaSet = /*#__PURE__*/function () {
     get: function get() {
       return this.setState.onlyRunLogic;
     }
+  }, {
+    key: "ViewOverwrittenPrice",
+    get: function get() {
+      var _this$getMatchingProd;
+      var priceFromHash = (_this$getMatchingProd = this.getMatchingProduct()) === null || _this$getMatchingProd === void 0 ? void 0 : _this$getMatchingProd.onlyViewDiscountedPrice;
+      if (priceFromHash) return priceFromHash;
+      return undefined;
+    }
   }, {
     key: "OverwrittenPrice",
     get: function get() {
-      var _this$priceForActHash;
-      var priceFromHash = (_this$priceForActHash = this.priceForActHash()) === null || _this$priceForActHash === void 0 ? void 0 : _this$priceForActHash.discountPrice;
+      var _this$getMatchingProd2;
+      var priceFromHash = (_this$getMatchingProd2 = this.getMatchingProduct()) === null || _this$getMatchingProd2 === void 0 ? void 0 : _this$getMatchingProd2.discountPrice;
       if (priceFromHash) return priceFromHash;
       return this.overwrittenPrice;
-    },
-    set: function set(val) {
-      this.overwrittenPrice = val;
     }
   }, {
     key: "ActConfigStepKey",
@@ -28145,27 +28189,24 @@ var DivaSet = /*#__PURE__*/function () {
       return metaDatas;
     }
   }, {
-    key: "priceForActHash",
-    value: function priceForActHash() {
-      if (Object.values(this.priceForHash).length == 0) return undefined;
-      return this.priceForHash[this.setHash];
+    key: "getMatchingProduct",
+    value: function getMatchingProduct() {
+      return this.matchingProduct;
     }
   }, {
-    key: "remindPriceForHash",
-    value: function remindPriceForHash(product) {
-      var _product$availableFor, _product$discountedPr, _product$discountedPr2;
-      if (!((_product$availableFor = product.availableForOrganizations) !== null && _product$availableFor !== void 0 && _product$availableFor.includes(this.getSetState.organizationId))) return;
-      var claculatedPrice = this.getSetPrice(true);
-      if (!product.discountedPrice && product.addedPrice === product.calculatedPrice && claculatedPrice == product.calculatedPrice) {
-        return;
-      }
-      var discountExists = !!product.discountedPrice || this.catalogData.discountPercentage;
-      this.priceForHash[this.setHash] = {
-        discountPrice: (_product$discountedPr = product.discountedPrice) !== null && _product$discountedPr !== void 0 ? _product$discountedPr : 0,
-        origPrice: product.addedPrice,
-        percentage: (claculatedPrice - ((_product$discountedPr2 = product.discountedPrice) !== null && _product$discountedPr2 !== void 0 ? _product$discountedPr2 : product.addedPrice)) / (claculatedPrice / 100),
-        bruttoPercentage: !!product.addedPrice && discountExists && product.discountedPrice !== product.addedPrice ? (claculatedPrice - product.addedPrice) / (claculatedPrice / 100) : undefined
-      };
+    key: "setMatchingProduct",
+    value: function setMatchingProduct(product) {
+      this.matchingProduct = product;
+    }
+  }, {
+    key: "getMatchingOrigProduct",
+    value: function getMatchingOrigProduct() {
+      return this.matchingOrigProduct;
+    }
+  }, {
+    key: "setMatchingOrigProduct",
+    value: function setMatchingOrigProduct(product) {
+      this.matchingOrigProduct = product;
     }
   }, {
     key: "initializeDoorPlanner",
@@ -28180,7 +28221,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context4.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-cbf256ac.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-e05bdec4.js'); });
             case 3:
               _yield$import = _context4.sent;
               DoorPlanner = _yield$import["default"];
@@ -28262,16 +28303,23 @@ var DivaSet = /*#__PURE__*/function () {
     key: "getCurrentDisountPercentage",
     value: function getCurrentDisountPercentage() {
       var _this$catalogData$dis;
-      var product = this.priceForActHash();
+      var product = this.getMatchingProduct();
       if (product !== null && product !== void 0 && product.percentage && product.percentage > ((_this$catalogData$dis = this.catalogData.discountPercentage) !== null && _this$catalogData$dis !== void 0 ? _this$catalogData$dis : 0)) return product.percentage;
       return this.catalogData.discountPercentage;
     }
   }, {
     key: "getBruttoPercentage",
     value: function getBruttoPercentage(ignoreMainPriceUsecase) {
-      var product = this.priceForActHash();
+      var product = this.getMatchingProduct();
       if ((product === null || product === void 0 ? void 0 : product.bruttoPercentage) !== undefined && (!ignoreMainPriceUsecase || !product.percentage)) return product === null || product === void 0 ? void 0 : product.bruttoPercentage;
       if (this.catalogData.discountPercentage) return 0;
+
+      //3. if any article has a discount
+      if (Object.values(this.divaArticles).find(function (a) {
+        return a.discountPercentage;
+      })) {
+        return 0;
+      }
       return undefined;
     }
   }, {
@@ -29204,8 +29252,8 @@ var SummaryHandler = /*#__PURE__*/function () {
 }();
 var summaryHandlerInstance = new SummaryHandler();
 
-function ownKeys$a(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$a(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$a(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$a(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$b(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$b(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$b(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$b(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var DivaFavoritesHandler = /*#__PURE__*/function () {
   function DivaFavoritesHandler() {
@@ -29897,7 +29945,7 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
                   if (targetArticle[opt] && !variantValues[opt]) variantValues[opt] = targetArticle[opt];
                 }
               }
-              configVariant = new basketModel.ConfigVariantData(variant.id, set.setName, set.setName_locales, setImage, (_hQRenderScript = hQRenderScript) === null || _hQRenderScript === void 0 ? void 0 : _hQRenderScript._id, DivaUtils__default["default"].encodeBase64(set.plannerHandler.getProject3D(set.getSetId())), set.getVariantsDescription(), set.SetArticleNr, set.getSetPrice(), set.setHash, 1, set.getVariantBasketData(), articleHandlerInstance.getCompactOrderLine(_objectSpread$a(_objectSpread$a({}, set.getDivaArticles()), set.getPartlistArticlesOfSet())), variantValues, summaryHandlerInstance.convertSummaryItemsToSummaryInfo(set), plannerData != undefined ? DivaUtils__default["default"].encodeBase64(JSON.stringify(plannerData)) : '', urlToPlanning2D, setHandlerInstance.getBBoxObject(set, dimensions), set.getBruttoSetPrice(), undefined, undefined, set.MetaData, set.MetaData_locales, DivaUtils__default["default"].stripTagsFromDict(set.getVariantsDescription_locales()), (_basket$OrderSets$set = basket.OrderSets[setindex].ConfigVariants) === null || _basket$OrderSets$set === void 0 || (_basket$OrderSets$set = _basket$OrderSets$set[set.basketConfigVariants.length]) === null || _basket$OrderSets$set === void 0 ? void 0 : _basket$OrderSets$set.SetOrderText, (_basket$OrderSets$set2 = basket.OrderSets[setindex].ConfigVariants) === null || _basket$OrderSets$set2 === void 0 || (_basket$OrderSets$set2 = _basket$OrderSets$set2[set.basketConfigVariants.length]) === null || _basket$OrderSets$set2 === void 0 ? void 0 : _basket$OrderSets$set2.SetOrderText_locales);
+              configVariant = new basketModel.ConfigVariantData(variant.id, set.setName, set.setName_locales, setImage, (_hQRenderScript = hQRenderScript) === null || _hQRenderScript === void 0 ? void 0 : _hQRenderScript._id, DivaUtils__default["default"].encodeBase64(set.plannerHandler.getProject3D(set.getSetId())), set.getVariantsDescription(), set.SetArticleNr, set.getSetPrice(), set.setHash, 1, set.getVariantBasketData(), articleHandlerInstance.getCompactOrderLine(_objectSpread$b(_objectSpread$b({}, set.getDivaArticles()), set.getPartlistArticlesOfSet())), variantValues, summaryHandlerInstance.convertSummaryItemsToSummaryInfo(set), plannerData != undefined ? DivaUtils__default["default"].encodeBase64(JSON.stringify(plannerData)) : '', urlToPlanning2D, setHandlerInstance.getBBoxObject(set, dimensions), set.getBruttoSetPrice(), undefined, undefined, set.MetaData, set.MetaData_locales, DivaUtils__default["default"].stripTagsFromDict(set.getVariantsDescription_locales()), (_basket$OrderSets$set = basket.OrderSets[setindex].ConfigVariants) === null || _basket$OrderSets$set === void 0 || (_basket$OrderSets$set = _basket$OrderSets$set[set.basketConfigVariants.length]) === null || _basket$OrderSets$set === void 0 ? void 0 : _basket$OrderSets$set.SetOrderText, (_basket$OrderSets$set2 = basket.OrderSets[setindex].ConfigVariants) === null || _basket$OrderSets$set2 === void 0 || (_basket$OrderSets$set2 = _basket$OrderSets$set2[set.basketConfigVariants.length]) === null || _basket$OrderSets$set2 === void 0 ? void 0 : _basket$OrderSets$set2.SetOrderText_locales);
               set.basketConfigVariants.push(configVariant);
             case 31:
             case "end":
@@ -29991,8 +30039,8 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
 }();
 var favoritesHandlerInstance = new DivaFavoritesHandler();
 
-function ownKeys$9(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$9(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$9(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$9(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$a(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$a(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$a(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$a(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 
 //Diese Klasse beinhaltet die Logik wie eine aktuelle Konfiguration mit allen möglicheen Ausprägungen mit Preisen in einem Set aussieht.
 //Der in einem Set gemergte Optionsbaum
@@ -30553,7 +30601,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
             //get schnittmenge of all the articles
             if (i === 0) {
               constructionRules = myOptionState.constructionRules;
-              configItems = _objectSpread$9({}, myOptionState.visibleOptionValues);
+              configItems = _objectSpread$a({}, myOptionState.visibleOptionValues);
             } else {
               for (var _key2 in configItems) {
                 if (!myOptionState.visibleOptionValues[_key2]) {
@@ -30786,84 +30834,9 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
 }();
 var configTreeHandler = new DivaConfigTreeHandler();
 
-//Diese Klasse verwaltet Productlogiken
-var DivaProductHandler = /*#__PURE__*/function () {
-  function DivaProductHandler() {
-    _classCallCheck__default["default"](this, DivaProductHandler);
-  }
-  return _createClass__default["default"](DivaProductHandler, [{
-    key: "getPrice",
-    value: function getPrice() {
-      var price = 0;
-      return price;
-    }
-  }, {
-    key: "updateProducts",
-    value: function () {
-      var _updateProducts = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(sets, api, from) {
-        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              ({
-                catalogs: sets.map(function (set) {
-                  return {
-                    articles: Object.values(set.getDivaArticles()).map(function (article) {
-                      return {
-                        codex: article.articleCodex,
-                        hash: article.articleProductHash
-                      };
-                    }),
-                    catalogGuid: set.CatalogData.catalogGuid
-                  };
-                })
-              });
-              return _context.abrupt("return");
-            case 2:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      function updateProducts(_x, _x2, _x3) {
-        return _updateProducts.apply(this, arguments);
-      }
-      return updateProducts;
-    }()
-  }, {
-    key: "getBestMatch",
-    value: function getBestMatch(articles, products) {
-      var OPTION_CODEX = 'KOPFTEIL';
-      if (!articles) return;
-      for (var key in articles) {
-        var _article$VariantValue;
-        var article = articles[key];
-        var opv = (_article$VariantValue = article.VariantValues['OPT' + OPTION_CODEX]) === null || _article$VariantValue === void 0 ? void 0 : _article$VariantValue.replace('OPV', '');
-        if (!products || !opv) continue;
-        for (var i = 0; i < products.length; i++) {
-          var _products$i$affiliate;
-          if ((_products$i$affiliate = products[i].affiliate) !== null && _products$i$affiliate !== void 0 && _products$i$affiliate.length) if (this.findOPVCodexInVariantValues(products[i], OPTION_CODEX, opv)) {
-            return products[i];
-          }
-        }
-      }
-      return undefined;
-    }
-  }, {
-    key: "findOPVCodexInVariantValues",
-    value: function findOPVCodexInVariantValues(product, opt, opv) {
-      return product.articles.find(function (article) {
-        return article.variantValues.find(function (variant) {
-          return variant.OPT === opt && variant.OPV === opv;
-        });
-      });
-    }
-  }]);
-}();
-var productHandlerInstance = new DivaProductHandler();
-
-function ownKeys$8(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$8(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$8(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$8(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var LOG$8 = DivaUtils__default["default"].initLog('Planner', 'DIVA-SET-HANDLER');
+function ownKeys$9(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$9(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$9(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$9(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var LOG$9 = DivaUtils__default["default"].initLog('Planner', 'DIVA-SET-HANDLER');
 
 /*
     Diese Klasse speichert alle Sets, die in einer Planung sind
@@ -31061,7 +31034,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               _context4.next = 38;
               break;
             case 37:
-              LOG$8.error(new DivaUtils.DivaError('articleCodex not found in article list. Could be due to exclusivity or a bug in the application!', {
+              LOG$9.error(new DivaUtils.DivaError('articleCodex not found in article list. Could be due to exclusivity or a bug in the application!', {
                 code: 'WC_0011',
                 custom: {
                   articleCodex: toloadArtilce.articleCodex
@@ -31310,7 +31283,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
         return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              LOG$8.debug('DivaSetHandler.initSetsByBasketData: ' + orderSet.SetID);
+              LOG$9.debug('DivaSetHandler.initSetsByBasketData: ' + orderSet.SetID);
               _context6.next = 3;
               return catalogHandlerInstance.getCatalogData(initSetState, orderSet.ModelCatalogCodex ? orderSet.ModelCatalogCodex : orderSet.CatalogCodex, orderSet);
             case 3:
@@ -31326,7 +31299,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               params = {};
               if ((initSetState.initEmptyPlanner || !orderSet.SetPlanData || orderSet.SetPlanData == '') && catalogData.useBoxPlanner) {
                 if (!catalogData.startPlannerArticle) {
-                  LOG$8.error(new DivaUtils.DivaError('No start Article defined for box planner catalog'));
+                  LOG$9.error(new DivaUtils.DivaError('No start Article defined for box planner catalog'));
                 } else {
                   params = {
                     boxElementID: 1,
@@ -31349,7 +31322,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               }
               variantValues = (_initSetState$initVar = initSetState.initVariantValues) !== null && _initSetState$initVar !== void 0 ? _initSetState$initVar : catalogData === null || catalogData === void 0 || (_catalogData$promoted = catalogData.promotedOpvs) === null || _catalogData$promoted === void 0 || (_catalogData$promoted = _catalogData$promoted.articles) === null || _catalogData$promoted === void 0 || (_catalogData$promoted = _catalogData$promoted[articlesToInitialize[j]]) === null || _catalogData$promoted === void 0 || (_catalogData$promoted = _catalogData$promoted[0]) === null || _catalogData$promoted === void 0 ? void 0 : _catalogData$promoted.variantValues;
               _context6.next = 18;
-              return this.addPlannerElement(set, articlesToInitialize[j], _objectSpread$8(_objectSpread$8({}, params), variantValues ? {
+              return this.addPlannerElement(set, articlesToInitialize[j], _objectSpread$9(_objectSpread$9({}, params), variantValues ? {
                 variantValues: variantValues
               } : {}));
             case 18:
@@ -31393,9 +31366,9 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 if (doDestroy3DHostConnection) {
                   set.plannerHandler.clearHandler3D();
                 }
-                LOG$8.debug('PlannerHandler of set ' + set.getSetId() + ' was destroyed successfully');
+                LOG$9.debug('PlannerHandler of set ' + set.getSetId() + ' was destroyed successfully');
               } else {
-                LOG$8.debug('Unable to destroy PlannerHandler of set ' + set.getSetId());
+                LOG$9.debug('Unable to destroy PlannerHandler of set ' + set.getSetId());
               }
             case 2:
             case "end":
@@ -31649,6 +31622,11 @@ var DivaSetHandler = /*#__PURE__*/function () {
           newArticle,
           _set$getArticleByBask2,
           defaultHeaderValues,
+          partlistRule,
+          decisionNr,
+          _newArticle$catalogAr,
+          rule,
+          value,
           _args13 = arguments;
         return _regeneratorRuntime__default["default"].wrap(function _callee11$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
@@ -31677,16 +31655,42 @@ var DivaSetHandler = /*#__PURE__*/function () {
               if (initParams.variantValues) {
                 defaultHeaderValues = Object.assign(defaultHeaderValues, initParams.variantValues);
               }
+              if (initParams.partlistCodexToInit) {
+                partlistRule = newArticle.catalogArticle.getPartlistRuleOfArticleCodes(initParams.partlistCodexToInit);
+                decisionNr = partlistRule === null || partlistRule === void 0 ? void 0 : partlistRule.PartListPosDecisionsAndPosCounts[0].DecisionNumber;
+                if (decisionNr) {
+                  rule = (_newArticle$catalogAr = newArticle.catalogArticle.partlistDecisions) === null || _newArticle$catalogAr === void 0 || (_newArticle$catalogAr = _newArticle$catalogAr['D' + decisionNr]) === null || _newArticle$catalogAr === void 0 || (_newArticle$catalogAr = _newArticle$catalogAr.DOC) === null || _newArticle$catalogAr === void 0 ? void 0 : _newArticle$catalogAr[0].JsFormula;
+                  if (rule) {
+                    value = DivaUtils__default["default"].getVariantValuesFromRule(rule, {});
+                    if (value) defaultHeaderValues = Object.assign(defaultHeaderValues, value);
+                  }
+                }
+              }
               if (!(from !== 'toDeleteShelf')) {
-                _context13.next = 14;
+                _context13.next = 15;
                 break;
               }
               set.addArticle(newArticle);
-              _context13.next = 14;
+              _context13.next = 15;
               return articleHandlerInstance.toDoAfterArticleLoaded(newArticle, defaultHeaderValues, {}, from, undefined, ignorePlanner);
-            case 14:
-              return _context13.abrupt("return", newArticle);
             case 15:
+              if (newArticle.relatedToBasketId) {
+                LOG$9.businessEvent('onClickAccesorie', 'Planner', 'Accesorie wurde geplant', {
+                  article: {
+                    articleCodex: articleCodex,
+                    articleName: newArticle.name
+                  }
+                });
+              } else {
+                LOG$9.businessEvent('onClickArticle', 'Planner', 'Accesorie wurde geplant', {
+                  article: {
+                    articleCodex: articleCodex,
+                    articleName: newArticle.name
+                  }
+                });
+              }
+              return _context13.abrupt("return", newArticle);
+            case 17:
             case "end":
               return _context13.stop();
           }
@@ -31818,8 +31822,9 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "deleteElementFromSet",
     value: function () {
-      var _deleteElementFromSet = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee14(set, article, autoCorrectAVL_AVR, deletionType, dontReload) {
-        var setId, allElementsToDelete, success, newSelectedElement, i, _deletedArticle$doorP, _set$CatalogData, deletedArticle, articles, key, oldTransform, result, _set$getArticleByBask3;
+      var _deleteElementFromSet = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee14(set, article, autoCorrectAVL_AVR, deletionType, dontReload, dontCheckInfluencedPlannerElements) {
+        var _deletedArticle$doorP, _set$CatalogData;
+        var setId, success, newSelectedElement, allElementsToDelete, i, art, deletedArticle, articles, key, oldTransform, result, _set$getArticleByBask3;
         return _regeneratorRuntime__default["default"].wrap(function _callee14$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
@@ -31834,44 +31839,55 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 setId: setId
               });
             case 3:
-              allElementsToDelete = set.plannerHandler.getPlannerElementsInfluencedByDeletion(setId, article.elementId);
               success = false;
               newSelectedElement = undefined;
+              if (dontCheckInfluencedPlannerElements) {
+                _context16.next = 15;
+                break;
+              }
+              allElementsToDelete = set.plannerHandler.getPlannerElementsInfluencedByDeletion(setId, article.elementId);
               i = 0;
-            case 7:
+            case 8:
               if (!(i < allElementsToDelete.length)) {
-                _context16.next = 35;
+                _context16.next = 15;
                 break;
               }
-              article = set.getArticleByElementId(allElementsToDelete[i]);
+              art = set.getArticleByElementId(allElementsToDelete[i]);
+              _context16.next = 12;
+              return this.deleteElementFromSet(set, art, undefined, undefined, true, true);
+            case 12:
+              i++;
+              _context16.next = 8;
+              break;
+            case 15:
               deletedArticle = article; //accessoires löschen
               articles = set.getAccessoiresOfBasketId(article.basketId);
               _context16.t0 = _regeneratorRuntime__default["default"].keys(articles);
-            case 12:
+            case 18:
               if ((_context16.t1 = _context16.t0()).done) {
-                _context16.next = 18;
+                _context16.next = 24;
                 break;
               }
               key = _context16.t1.value;
-              _context16.next = 16;
-              return this.deleteElementFromSet(set, articles[key]);
-            case 16:
-              _context16.next = 12;
+              _context16.next = 22;
+              return this.deleteElementFromSet(set, articles[key], undefined, undefined, true);
+            case 22:
+              _context16.next = 18;
               break;
-            case 18:
+            case 24:
               oldTransform = undefined;
               if (deletedArticle) deletedArticle.deleted = true;
               if (!(deletedArticle !== null && deletedArticle !== void 0 && deletedArticle.hasCatalogPlannerArticle)) {
-                _context16.next = 26;
+                _context16.next = 32;
                 break;
               }
-              _context16.next = 23;
+              _context16.next = 29;
               return set.plannerHandler.deletePlannerElement(setId, deletedArticle.elementId, autoCorrectAVL_AVR, deletionType);
-            case 23:
+            case 29:
               result = _context16.sent;
               newSelectedElement = result.newElementToSelect;
               oldTransform = result.transform;
-            case 26:
+            case 32:
               //falls ein Accessoire gelöscht wurde  wird das Accessoire auch wo es beim Parent hinterlegt war auch gelöscht
               if (deletedArticle !== null && deletedArticle !== void 0 && deletedArticle.relatedToBasketId) {
                 (_set$getArticleByBask3 = set.getArticleByBasketId(deletedArticle.relatedToBasketId)) === null || _set$getArticleByBask3 === void 0 || _set$getArticleByBask3.removeAccessoire(deletedArticle.basketId);
@@ -31881,29 +31897,25 @@ var DivaSetHandler = /*#__PURE__*/function () {
               deletedArticle === null || deletedArticle === void 0 || (_deletedArticle$doorP = deletedArticle.doorPlanner) === null || _deletedArticle$doorP === void 0 || _deletedArticle$doorP.deleteElement(deletedArticle.basketId);
               success = set.deleteArticle(article.basketId);
               if (!((set.CatalogData.bundleRules || set.CatalogData.reconfigAfterArticleDocked || set !== null && set !== void 0 && (_set$CatalogData = set.CatalogData) !== null && _set$CatalogData !== void 0 && _set$CatalogData.getOption('OPTLASTSTACKEDARTICLE')) && !dontReload)) {
-                _context16.next = 32;
+                _context16.next = 38;
                 break;
               }
-              _context16.next = 32;
+              _context16.next = 38;
               return this.updateArticlesOptionStatesOfActSet(set, {}, []);
-            case 32:
-              i++;
-              _context16.next = 7;
-              break;
-            case 35:
+            case 38:
               return _context16.abrupt("return", {
                 success: success,
                 selectElementId: newSelectedElement,
                 setId: setId,
                 oldTransform: oldTransform
               });
-            case 36:
+            case 39:
             case "end":
               return _context16.stop();
           }
         }, _callee14, this);
       }));
-      function deleteElementFromSet(_x41, _x42, _x43, _x44, _x45) {
+      function deleteElementFromSet(_x41, _x42, _x43, _x44, _x45, _x46) {
         return _deleteElementFromSet.apply(this, arguments);
       }
       return deleteElementFromSet;
@@ -31967,7 +31979,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 _context17.next = 24;
                 break;
               }
-              return _context17.abrupt("return", _objectSpread$8(_objectSpread$8({}, doesFit), {}, {
+              return _context17.abrupt("return", _objectSpread$9(_objectSpread$9({}, doesFit), {}, {
                 accessoire: accessoire
               }));
             case 24:
@@ -31978,7 +31990,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee15, this);
       }));
-      function addAccessorieOnShelfPlanner(_x46, _x47, _x48, _x49, _x50) {
+      function addAccessorieOnShelfPlanner(_x47, _x48, _x49, _x50, _x51) {
         return _addAccessorieOnShelfPlanner.apply(this, arguments);
       }
       return addAccessorieOnShelfPlanner;
@@ -32052,7 +32064,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee16, this);
       }));
-      function getFreeShelfGrids(_x51, _x52) {
+      function getFreeShelfGrids(_x52, _x53) {
         return _getFreeShelfGrids.apply(this, arguments);
       }
       return getFreeShelfGrids;
@@ -32188,7 +32200,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee17, this);
       }));
-      function moveShelfItemToGrid(_x53, _x54, _x55, _x56, _x57) {
+      function moveShelfItemToGrid(_x54, _x55, _x56, _x57, _x58) {
         return _moveShelfItemToGrid.apply(this, arguments);
       }
       return moveShelfItemToGrid;
@@ -32222,7 +32234,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee18, this);
       }));
-      function deleteAccessorieOnShelfPlanner(_x58, _x59, _x60, _x61, _x62) {
+      function deleteAccessorieOnShelfPlanner(_x59, _x60, _x61, _x62, _x63) {
         return _deleteAccessorieOnShelfPlanner.apply(this, arguments);
       }
       return deleteAccessorieOnShelfPlanner;
@@ -32248,7 +32260,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee19, this);
       }));
-      function updatePlannerTrans(_x63, _x64, _x65, _x66, _x67, _x68, _x69) {
+      function updatePlannerTrans(_x64, _x65, _x66, _x67, _x68, _x69, _x70) {
         return _updatePlannerTrans.apply(this, arguments);
       }
       return updatePlannerTrans;
@@ -32362,7 +32374,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee20, this);
       }));
-      function deleteAccessoire(_x70, _x71, _x72) {
+      function deleteAccessoire(_x71, _x72, _x73) {
         return _deleteAccessoire.apply(this, arguments);
       }
       return deleteAccessoire;
@@ -32376,18 +32388,18 @@ var DivaSetHandler = /*#__PURE__*/function () {
      */
   }, {
     key: "update3DPlannerView",
-    value: function update3DPlannerView(doRequestRendering, doRequestHqRenderScript, set, renderSize, planner3DGridEnabled, mediaServiceSaveMode, doShow3DDimensionLines, alternateRenderInfo, viewpoint, useLatestViewpoint) {
+    value: function update3DPlannerView(doRequestRendering, doRequestHqRenderScript, set, renderSize, planner3DGridEnabled, mediaServiceSaveMode, doShow3DDimensionLines, alternateRenderInfo, hybrid3DInfo) {
       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, (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, true, (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
-      }, viewpoint, useLatestViewpoint);
+      }, hybrid3DInfo);
     }
   }, {
     key: "getPlannerPaletteViewInfo",
@@ -32399,7 +32411,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
         var articlecodex = plannerElement.articleCodex;
         if (type == 'PLANNERSWITCH' && selectedArticle) {
           if (plannerViewInfo.catalogPlannerArticles[i].filterType == 'Accessoire') continue;
-          cleanedCaltaogPlannerArticles.push(_objectSpread$8(_objectSpread$8({}, plannerElement), {}, {
+          cleanedCaltaogPlannerArticles.push(_objectSpread$9(_objectSpread$9({}, plannerElement), {}, {
             sel: articlecodex == selectedArticle,
             groupName: ''
           }));
@@ -32413,12 +32425,12 @@ var DivaSetHandler = /*#__PURE__*/function () {
               plannerViewInfo.plannerConfiguration.updatePaletteAfterPlanningChanged = true;
             }
           }
-          if (!dontPushElement) cleanedCaltaogPlannerArticles.push(_objectSpread$8(_objectSpread$8({}, plannerElement), {}, {
+          if (!dontPushElement) cleanedCaltaogPlannerArticles.push(_objectSpread$9(_objectSpread$9({}, plannerElement), {}, {
             sel: articlecodex == selectedArticle
           }));
         }
       }
-      return _objectSpread$8(_objectSpread$8({}, plannerViewInfo), {}, {
+      return _objectSpread$9(_objectSpread$9({}, plannerViewInfo), {}, {
         catalogPlannerArticles: cleanedCaltaogPlannerArticles
       });
     }
@@ -32516,7 +32528,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee21, this);
       }));
-      function configSingleIsChanged(_x73, _x74, _x75, _x76) {
+      function configSingleIsChanged(_x74, _x75, _x76, _x77) {
         return _configSingleIsChanged.apply(this, arguments);
       }
       return configSingleIsChanged;
@@ -32571,7 +32583,6 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "loadPaletteInfos",
     value: function loadPaletteInfos(set, configStepKey, activeArticles, targetArticles) {
-      var _articles$activeArtic2;
       if (!activeArticles) {
         //wir befinden uns im planner und die Infos aller Artikel werden benötigt!
         activeArticles = [];
@@ -32608,7 +32619,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
         articleInfos: articleInfos,
         doShowConfigSingle: doShowConfigSingle && groupedArticles.length > 1,
         isConfigSingle: isConfigSingle,
-        articleName: activeArticles[0] ? (_articles$activeArtic2 = articles[activeArticles[0]]) === null || _articles$activeArtic2 === void 0 || (_articles$activeArtic2 = _articles$activeArtic2.curProduct) === null || _articles$activeArtic2 === void 0 ? void 0 : _articles$activeArtic2.shortDescription : ''
+        articleName: ''
       };
     }
   }, {
@@ -32634,7 +32645,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               filterType = set.configTree.getCurFilterType(configStepKey, optionStatesOfArticle, configItems.configItems);
               stepInfo = set.configTree.getStepInfo(configStepKey, optionStatesOfArticle);
               contentItemId = (_configItems$option = configItems.option) === null || _configItems$option === void 0 ? void 0 : _configItems$option.contentItemId;
-              return _context24.abrupt("return", _objectSpread$8(_objectSpread$8(_objectSpread$8({
+              return _context24.abrupt("return", _objectSpread$9(_objectSpread$9(_objectSpread$9({
                 isRenderedNotInSettingPalette: set.configTree.isRenderedNotInSettingPalette(configStepKey),
                 isRenderedInAccessorieStep: set.configTree.isRenderedInAccessorieStep(configStepKey),
                 visible: set.configTree.getVisibility(configStepKey, visible, set.CatalogData)
@@ -32651,7 +32662,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee22, this);
       }));
-      function loadConfigItemsOfActSetByConfigStepKey(_x77, _x78, _x79) {
+      function loadConfigItemsOfActSetByConfigStepKey(_x78, _x79, _x80) {
         return _loadConfigItemsOfActSetByConfigStepKey.apply(this, arguments);
       }
       return loadConfigItemsOfActSetByConfigStepKey;
@@ -32738,7 +32749,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee23, this);
       }));
-      function variantsEvaluator(_x80, _x81, _x82, _x83) {
+      function variantsEvaluator(_x81, _x82, _x83, _x84) {
         return _variantsEvaluator.apply(this, arguments);
       }
       return variantsEvaluator;
@@ -32816,7 +32827,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee24, this);
       }));
-      function calcVariants(_x84, _x85, _x86) {
+      function calcVariants(_x85, _x86, _x87) {
         return _calcVariants.apply(this, arguments);
       }
       return calcVariants;
@@ -32981,7 +32992,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee25, this);
       }));
-      function updateArticlesOptionStatesOfActSet(_x87, _x88, _x89, _x90, _x91, _x92) {
+      function updateArticlesOptionStatesOfActSet(_x88, _x89, _x90, _x91, _x92, _x93) {
         return _updateArticlesOptionStatesOfActSet.apply(this, arguments);
       }
       return updateArticlesOptionStatesOfActSet;
@@ -33072,7 +33083,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 break;
               }
               _context28.next = 17;
-              return this.addArticleToActSet(set, edoArticlesToLoad[_i5].ArticleCodex, _objectSpread$8(_objectSpread$8({}, edoArticlesToLoad[_i5]), {}, {
+              return this.addArticleToActSet(set, edoArticlesToLoad[_i5].ArticleCodex, _objectSpread$9(_objectSpread$9({}, edoArticlesToLoad[_i5]), {}, {
                 basketId: oldBasketIds[_i5]
               }), true);
             case 17:
@@ -33091,7 +33102,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee26, this);
       }));
-      function updateEdoArticles(_x93, _x94) {
+      function updateEdoArticles(_x94, _x95) {
         return _updateEdoArticles.apply(this, arguments);
       }
       return updateEdoArticles;
@@ -33218,70 +33229,24 @@ var DivaSetHandler = /*#__PURE__*/function () {
       }
       return ret;
     }
+
+    /***********************************************Speichern Prozess / OrderSets******************************************************/
   }, {
-    key: "checkVariantData",
-    value: function () {
-      var _checkVariantData = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee27(set) {
-        var somethingChanged, data;
-        return _regeneratorRuntime__default["default"].wrap(function _callee27$(_context29) {
-          while (1) switch (_context29.prev = _context29.next) {
-            case 0:
-              somethingChanged = false;
-              _context29.next = 3;
-              return set.api.getDataCache(set.api.getCheckVariantDataQS(set.setHash), undefined, set.getAccountSessionGuid());
-            case 3:
-              data = _context29.sent;
-              if (data.Found) {
-                if (set.OverwrittenPrice != data.VkPrice) {
-                  somethingChanged = true;
-                }
-                set.OverwrittenPrice = data.VkPrice;
-                set.SetArticleNrPrefix = 'SAP';
-                set.SetArticleNr = data.SapArticleNr;
-              } else {
-                if (set.OverwrittenPrice) {
-                  somethingChanged = true;
-                }
-                set.SetArticleNr = set.CatalogData.retailArticleNr;
-                set.SetArticleNrPrefix = 'ZKAT';
-                set.OverwrittenPrice = undefined;
-              }
-              return _context29.abrupt("return", somethingChanged);
-            case 6:
-            case "end":
-              return _context29.stop();
-          }
-        }, _callee27);
-      }));
-      function checkVariantData(_x95) {
-        return _checkVariantData.apply(this, arguments);
-      }
-      return checkVariantData;
-    }() /***********************************************Speichern Prozess / OrderSets******************************************************/
-  }, {
-    key: "getTotalPrice",
-    value: function getTotalPrice(sets) {
-      var _this$actSet;
+    key: "getTotalViewPrice",
+    value: function getTotalViewPrice(sets) {
       var price = 0;
-      if ((_this$actSet = this.actSet(sets)) !== null && _this$actSet !== void 0 && (_this$actSet = _this$actSet.WebConfig) !== null && _this$actSet !== void 0 && _this$actSet.checkForProductsPrice && productHandlerInstance.getPrice()) {
-        return productHandlerInstance.getPrice();
-      }
       for (var key in sets) {
-        price = price + sets[key].getSetPrice();
+        price = price + sets[key].getViewSetPrice();
       }
       return price;
     }
   }, {
-    key: "getTotalBruttoPrice",
-    value: function getTotalBruttoPrice(sets) {
-      var _this$actSet2;
+    key: "getTotalViewBruttoPrice",
+    value: function getTotalViewBruttoPrice(sets) {
       var price = 0;
       var bruttoActive = false;
-      if ((_this$actSet2 = this.actSet(sets)) !== null && _this$actSet2 !== void 0 && (_this$actSet2 = _this$actSet2.WebConfig) !== null && _this$actSet2 !== void 0 && _this$actSet2.checkForProductsPrice && productHandlerInstance.getPrice()) {
-        return productHandlerInstance.getPrice();
-      }
       for (var key in sets) {
-        var bruttoSetPrice = sets[key].getBruttoSetPrice(true);
+        var bruttoSetPrice = sets[key].getViewBruttoSetPrice(true);
         if (bruttoSetPrice) bruttoActive = true;
         price = price + (bruttoSetPrice !== null && bruttoSetPrice !== void 0 ? bruttoSetPrice : sets[key].getSetPrice());
       }
@@ -33303,51 +33268,47 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "fillOrderLinesAndOrderSets",
     value: function () {
-      var _fillOrderLinesAndOrderSets = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee28(sets, divaBasketHandler, repairOnly, setPlanner, returnTo) {
-        var _set$WebConfig;
-        var orderSets, basketData, set, setPosNr, price, key, _set$basketConfigVari, _OrderLinesOfActSet$, _set, catalogData, articles, orderLineInitInfos, newOrderSet, OrderLinesOfActSet, ret, _key2, i, _basketData$OrderSets, _basketData$SetPlanne, oderSetsIsInActPlanning, setId, j;
-        return _regeneratorRuntime__default["default"].wrap(function _callee28$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+      var _fillOrderLinesAndOrderSets = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee27(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) {
             case 0:
               orderSets = [];
               basketData = divaBasketHandler.actBasket;
               set = this.actSet(sets); //ACHTUNG: Wenn man das nicht zuerst löscht, gibt es beim wiederholten basket Speichern doppelte Einträge
               basketData.setSAPOrderLines([]);
               setPosNr = 0;
-              if (set !== null && set !== void 0 && (_set$WebConfig = set.WebConfig) !== null && _set$WebConfig !== void 0 && _set$WebConfig.checkForProductsPrice) {
-                price = set.priceForActHash();
-                if (!price) {
-                  basketData.OrigProductId = undefined;
-                }
+              if (set !== null && set !== void 0 && set.api.doCheckForProductsPrice()) {
+                // TODO: this need a better solution, to be decided with mathias
+                if (!((_set$getMatchingProdu = set.getMatchingProduct()) !== null && _set$getMatchingProdu !== void 0 && _set$getMatchingProdu._id)) basketData.OrigProductId = undefined;
               }
-              _context30.t0 = _regeneratorRuntime__default["default"].keys(sets);
-            case 7:
-              if ((_context30.t1 = _context30.t0()).done) {
-                _context30.next = 30;
+              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);
+            case 9:
+              if ((_context29.t1 = _context29.t0()).done) {
+                _context29.next = 31;
                 break;
               }
-              key = _context30.t1.value;
+              key = _context29.t1.value;
               setPosNr++;
               _set = sets[key];
               catalogData = _set.CatalogData;
               articles = _set.getDivaArticles();
-              orderLineInitInfos = {
-                setId: _set.getSetId(),
-                modelCodex: _set.modelCodex
-              };
-              _context30.next = 16;
+              _context29.next = 17;
               return this.getOrderSet(_set, catalogData, setPosNr, divaBasketHandler.actDivaNr, repairOnly, returnTo);
-            case 16:
-              newOrderSet = _context30.sent;
+            case 17:
+              newOrderSet = _context29.sent;
               basketData.setIsPlanning(_set.SetType == 'PLANNING' ? '1' : '0');
-              OrderLinesOfActSet = articleHandlerInstance.getOrderLinesOfArticles(articles, orderLineInitInfos, repairOnly, !!((_set$basketConfigVari = _set.basketConfigVariants) !== null && _set$basketConfigVari !== void 0 && _set$basketConfigVari.length));
+              OrderLinesOfActSet = articleHandlerInstance.getOrderLinesOfArticles(articles, repairOnly, !!((_set$basketConfigVari = _set.basketConfigVariants) !== null && _set$basketConfigVari !== void 0 && _set$basketConfigVari.length));
               articleHandlerInstance.checkForRoundingError(OrderLinesOfActSet, _set);
               if (OrderLinesOfActSet.length) {
-                _context30.next = 22;
+                _context29.next = 23;
                 break;
               }
-              return _context30.abrupt("continue", 7);
-            case 22:
+              return _context29.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') {
                 newOrderSet.SetImage = OrderLinesOfActSet[0].Image.replace('_low', '');
@@ -33368,56 +33329,56 @@ var DivaSetHandler = /*#__PURE__*/function () {
               }
               newOrderSet.setOrderLines(OrderLinesOfActSet);
               orderSets.push(newOrderSet);
-              _context30.next = 7;
+              _context29.next = 9;
               break;
-            case 30:
+            case 31:
               //fill diva3DProject for renderings & AR Converter
               basketData.Diva3DProject = DivaUtils__default["default"].encodeBase64(set === null || set === void 0 ? void 0 : set.plannerHandler.getProject3D());
               i = 0;
-            case 32:
+            case 33:
               if (!(i < ((_basketData$OrderSets = basketData.OrderSets) === null || _basketData$OrderSets === void 0 ? void 0 : _basketData$OrderSets.length))) {
-                _context30.next = 47;
+                _context29.next = 48;
                 break;
               }
               oderSetsIsInActPlanning = false;
               setId = basketData.OrderSets[i].SetID;
               j = 0;
-            case 36:
+            case 37:
               if (!(j < orderSets.length)) {
-                _context30.next = 43;
+                _context29.next = 44;
                 break;
               }
               if (!(orderSets[j].SetID == setId)) {
-                _context30.next = 40;
+                _context29.next = 41;
                 break;
               }
               oderSetsIsInActPlanning = true;
-              return _context30.abrupt("break", 43);
-            case 40:
+              return _context29.abrupt("break", 44);
+            case 41:
               j++;
-              _context30.next = 36;
+              _context29.next = 37;
               break;
-            case 43:
+            case 44:
               if (!oderSetsIsInActPlanning && !((_basketData$SetPlanne = basketData.SetPlannerInfos) !== null && _basketData$SetPlanne !== void 0 && _basketData$SetPlanne.InvolvedSetIds.includes(setId))) {
                 orderSets.push(basketData.OrderSets[i]);
               }
-            case 44:
+            case 45:
               i++;
-              _context30.next = 32;
+              _context29.next = 33;
               break;
-            case 47:
+            case 48:
               basketData.SetPlannerInfos = setPlanner ? this.getSetPlannerInfos(Object.keys(sets), orderSets) : undefined;
               if (repairOnly) {
                 this.repairOrderSets(basketData, orderSets);
               } else {
                 basketData.setOrderSets(orderSets);
               }
-              return _context30.abrupt("return", basketData);
-            case 50:
+              return _context29.abrupt("return", basketData);
+            case 51:
             case "end":
-              return _context30.stop();
+              return _context29.stop();
           }
-        }, _callee28, this);
+        }, _callee27, this);
       }));
       function fillOrderLinesAndOrderSets(_x96, _x97, _x98, _x99, _x100) {
         return _fillOrderLinesAndOrderSets.apply(this, arguments);
@@ -33476,7 +33437,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
             var _origOrderSet$ConfigV;
             var configVariant = (_origOrderSet$ConfigV = origOrderSet.ConfigVariants) === null || _origOrderSet$ConfigV === void 0 ? void 0 : _origOrderSet$ConfigV[index];
             if (!configVariant) return variant;
-            return _objectSpread$8(_objectSpread$8({}, variant), {}, {
+            return _objectSpread$9(_objectSpread$9({}, variant), {}, {
               SetImage: configVariant.SetImage,
               HQRenderScript: configVariant.HQRenderScript,
               Set2DImage: configVariant.Set2DImage,
@@ -33503,11 +33464,11 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "getOrderSet",
     value: function () {
-      var _getOrderSet = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee29(set, catalogData, posNr, divaNr, repairOnly, returnTo) {
-        var _hqRenderScript, _set$basketConfigVari2, _set$basketConfigVari3;
+      var _getOrderSet = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee28(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 _callee29$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee28$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
             case 0:
               dontGenerateImages = repairOnly || returnTo == 'DONT_SAVE_BASKET' || returnTo == 'TEST_CONFIGURATORLOGIC';
               DivaUtils__default["default"].startSpanOfApm('GetSet3D und 2D Image');
@@ -33519,7 +33480,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               hqRenderScript = undefined;
               dimensions = {};
               if (dontGenerateImages) {
-                _context31.next = 28;
+                _context30.next = 28;
                 break;
               }
               promise3D = this.getSetImage(set, typeof window === 'undefined');
@@ -33527,10 +33488,10 @@ var DivaSetHandler = /*#__PURE__*/function () {
               if (!catalogData.dontSaveAlternativeRenderings && set.CatalogData.alternateRenderingsForSummary.length) {
                 promise3DAlternate = this.getAlternateSetImages(set);
               }
-              _context31.next = 15;
+              _context30.next = 15;
               return Promise.all([promise3D, promise2D, promise3DAlternate]);
             case 15:
-              _yield$Promise$all = _context31.sent;
+              _yield$Promise$all = _context30.sent;
               _yield$Promise$all2 = _slicedToArray__default["default"](_yield$Promise$all, 3);
               _yield$Promise$all2$ = _yield$Promise$all2[0];
               setImage = _yield$Promise$all2$.url;
@@ -33538,10 +33499,10 @@ var DivaSetHandler = /*#__PURE__*/function () {
               urlToPlanning2D = _yield$Promise$all2[1];
               alternateSetImages = _yield$Promise$all2[2];
               promiseHQRenderScript = this.getHQRenderScript(set, divaNr);
-              _context31.next = 25;
+              _context30.next = 25;
               return Promise.all([promiseHQRenderScript]);
             case 25:
-              _yield$Promise$all3 = _context31.sent;
+              _yield$Promise$all3 = _context30.sent;
               _yield$Promise$all4 = _slicedToArray__default["default"](_yield$Promise$all3, 1);
               hqRenderScript = _yield$Promise$all4[0];
             case 28:
@@ -33572,7 +33533,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 SetArticleNrPrefix: set.SetArticleNrPrefix,
                 BBox: this.getBBoxObject(set, dimensions),
                 SetVariantBasketDatas: set.getVariantBasketData(),
-                SetImage: setImage,
+                SetImage: set.PlannerMode == 'No' ? (_Object$values$ = Object.values((_set$getDivaArticles = set.getDivaArticles()) !== null && _set$getDivaArticles !== void 0 ? _set$getDivaArticles : {})[0]) === null || _Object$values$ === void 0 ? void 0 : _Object$values$.imageUrl : setImage,
                 //Add url string of current rendering.
                 HQRenderScript: (_hqRenderScript = hqRenderScript) === null || _hqRenderScript === void 0 ? void 0 : _hqRenderScript._id,
                 Set2DImage: urlToPlanning2D,
@@ -33603,12 +33564,12 @@ 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 _context31.abrupt("return", orderSet);
+              return _context30.abrupt("return", orderSet);
             case 34:
             case "end":
-              return _context31.stop();
+              return _context30.stop();
           }
-        }, _callee29, this);
+        }, _callee28, this);
       }));
       function getOrderSet(_x101, _x102, _x103, _x104, _x105, _x106) {
         return _getOrderSet.apply(this, arguments);
@@ -33623,31 +33584,31 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "getSetImage",
     value: (function () {
-      var _getSetImage = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee30(set, overwriteLastSavedRendering) {
+      var _getSetImage = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee29(set, overwriteLastSavedRendering) {
         var is3D, _yield$set$plannerHan, dimensions, url;
-        return _regeneratorRuntime__default["default"].wrap(function _callee30$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee29$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
               is3D = ['3DImage', '3DCOMB', 'BoxPlanner', 'RTViewer'].includes(set.getPlannerMode());
               if (!is3D) {
-                _context32.next = 10;
+                _context31.next = 10;
                 break;
               }
-              _context32.next = 4;
+              _context31.next = 4;
               return set.plannerHandler.saveSetImage(overwriteLastSavedRendering);
             case 4:
-              _context32.next = 6;
+              _context31.next = 6;
               return set.plannerHandler.getSetImageAsUrl(set.getSetId());
             case 6:
-              _yield$set$plannerHan = _context32.sent;
+              _yield$set$plannerHan = _context31.sent;
               dimensions = _yield$set$plannerHan.dimensions;
               url = _yield$set$plannerHan.url;
-              return _context32.abrupt("return", {
+              return _context31.abrupt("return", {
                 dimensions: dimensions,
                 url: url
               });
             case 10:
-              return _context32.abrupt("return", {
+              return _context31.abrupt("return", {
                 dimensions: {
                   w: undefined,
                   h: undefined,
@@ -33656,9 +33617,9 @@ var DivaSetHandler = /*#__PURE__*/function () {
               });
             case 11:
             case "end":
-              return _context32.stop();
+              return _context31.stop();
           }
-        }, _callee30);
+        }, _callee29);
       }));
       function getSetImage(_x107, _x108) {
         return _getSetImage.apply(this, arguments);
@@ -33668,43 +33629,43 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "getHQRenderScript",
     value: function () {
-      var _getHQRenderScript = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee31(set, divaNr) {
+      var _getHQRenderScript = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee30(set, divaNr) {
         var is3D, hqRenderScript, createdHQRenderScript;
-        return _regeneratorRuntime__default["default"].wrap(function _callee31$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee30$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
             case 0:
               //if not 3d
               is3D = ['3DImage', '3DCOMB', 'BoxPlanner', 'RTViewer'].includes(set.getPlannerMode());
               if (is3D) {
-                _context33.next = 3;
+                _context32.next = 3;
                 break;
               }
-              return _context33.abrupt("return");
+              return _context32.abrupt("return");
             case 3:
-              _context33.next = 5;
+              _context32.next = 5;
               return set.plannerHandler.saveSetHQRenderScript();
             case 5:
               hqRenderScript = set.plannerHandler.getSetHQRenderScript();
               if (hqRenderScript) {
-                _context33.next = 8;
+                _context32.next = 8;
                 break;
               }
-              return _context33.abrupt("return");
+              return _context32.abrupt("return");
             case 8:
-              _context33.next = 10;
+              _context32.next = 10;
               return set.api.postHQRenderScript({
                 divaNr: divaNr,
                 hqRenderscript: hqRenderScript,
                 organization: set.api.OrganizationId
               });
             case 10:
-              createdHQRenderScript = _context33.sent;
-              return _context33.abrupt("return", createdHQRenderScript);
+              createdHQRenderScript = _context32.sent;
+              return _context32.abrupt("return", createdHQRenderScript);
             case 12:
             case "end":
-              return _context33.stop();
+              return _context32.stop();
           }
-        }, _callee31);
+        }, _callee30);
       }));
       function getHQRenderScript(_x109, _x110) {
         return _getHQRenderScript.apply(this, arguments);
@@ -33720,32 +33681,32 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "getAlternateSetImages",
     value: (function () {
-      var _getAlternateSetImages = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee32(set) {
+      var _getAlternateSetImages = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee31(set) {
         var is2D, catalogData, setImages;
-        return _regeneratorRuntime__default["default"].wrap(function _callee32$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee31$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
             case 0:
               is2D = !['3DImage', '3DCOMB', 'BoxPlanner'].includes(set.getPlannerMode());
               if (!(is2D || set.onlyRunLogic)) {
-                _context34.next = 3;
+                _context33.next = 3;
                 break;
               }
-              return _context34.abrupt("return", []);
+              return _context33.abrupt("return", []);
             case 3:
               catalogData = set.CatalogData;
-              _context34.next = 6;
+              _context33.next = 6;
               return set.plannerHandler.saveAlternateSetImages(catalogData.catalogCodex, catalogData.catalogGuid);
             case 6:
-              _context34.next = 8;
+              _context33.next = 8;
               return set.plannerHandler.getAlternateSetImagesAsSetImageData(set.getSetId());
             case 8:
-              setImages = _context34.sent;
-              return _context34.abrupt("return", setImages);
+              setImages = _context33.sent;
+              return _context33.abrupt("return", setImages);
             case 10:
             case "end":
-              return _context34.stop();
+              return _context33.stop();
           }
-        }, _callee32);
+        }, _callee31);
       }));
       function getAlternateSetImages(_x111) {
         return _getAlternateSetImages.apply(this, arguments);
@@ -33755,28 +33716,28 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "get2DSetImage",
     value: function () {
-      var _get2DSetImage = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee33(set) {
+      var _get2DSetImage = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee32(set) {
         var urlToPlanning2D, catalogData, planning2DAsJPGBase64;
-        return _regeneratorRuntime__default["default"].wrap(function _callee33$(_context35) {
-          while (1) switch (_context35.prev = _context35.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee32$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
               urlToPlanning2D = undefined, catalogData = set.CatalogData;
               planning2DAsJPGBase64 = set.getPlanning2DAsJpg();
               if (!(planning2DAsJPGBase64 != undefined && planning2DAsJPGBase64 != '' && planning2DAsJPGBase64 != 'data:,')) {
-                _context35.next = 6;
+                _context34.next = 6;
                 break;
               }
-              _context35.next = 5;
+              _context34.next = 5;
               return set.plannerHandler.saveSet2DImage(set.getSetId(), catalogData.catalogCodex, catalogData.catalogGuid, planning2DAsJPGBase64);
             case 5:
-              urlToPlanning2D = _context35.sent;
+              urlToPlanning2D = _context34.sent;
             case 6:
-              return _context35.abrupt("return", urlToPlanning2D);
+              return _context34.abrupt("return", urlToPlanning2D);
             case 7:
             case "end":
-              return _context35.stop();
+              return _context34.stop();
           }
-        }, _callee33);
+        }, _callee32);
       }));
       function get2DSetImage(_x112) {
         return _get2DSetImage.apply(this, arguments);
@@ -33793,23 +33754,16 @@ var DivaSetHandler = /*#__PURE__*/function () {
         Y: (_dimensions$d = dimensions === null || dimensions === void 0 ? void 0 : dimensions.d) !== null && _dimensions$d !== void 0 ? _dimensions$d : bbox.depth,
         Z: (_dimensions$h = dimensions === null || dimensions === void 0 ? void 0 : dimensions.h) !== null && _dimensions$h !== void 0 ? _dimensions$h : bbox.height
       };
-      return _objectSpread$8(_objectSpread$8({}, dim), {}, {
-        Info: ((_set$api$getI18n$t = (_set$api$getI18n = set.api.getI18n()) === null || _set$api$getI18n === void 0 || (_set$api$getI18n$t2 = _set$api$getI18n.t) === null || _set$api$getI18n$t2 === void 0 ? void 0 : _set$api$getI18n$t2.call(_set$api$getI18n, 'utils.width_first_letter', 'B')) !== null && _set$api$getI18n$t !== void 0 ? _set$api$getI18n$t : 'B') + ': ' + dim.X + ' cm x ' + ((_set$api$getI18n$t3 = (_set$api$getI18n2 = set.api.getI18n()) === null || _set$api$getI18n2 === void 0 || (_set$api$getI18n2$t = _set$api$getI18n2.t) === null || _set$api$getI18n2$t === void 0 ? void 0 : _set$api$getI18n2$t.call(_set$api$getI18n2, 'utils.depth_first_letter', 'T')) !== null && _set$api$getI18n$t3 !== void 0 ? _set$api$getI18n$t3 : 'T') + ': ' + dim.Y + ' cm' + (dim.Z ? ' x ' + ((_set$api$getI18n$t4 = (_set$api$getI18n3 = set.api.getI18n()) === null || _set$api$getI18n3 === void 0 || (_set$api$getI18n3$t = _set$api$getI18n3.t) === null || _set$api$getI18n3$t === void 0 ? void 0 : _set$api$getI18n3$t.call(_set$api$getI18n3, 'utils.height_first_letter', 'H')) !== null && _set$api$getI18n$t4 !== void 0 ? _set$api$getI18n$t4 : 'H') + ': ' + dim.X + ' cm' : '')
+      if (set.PlannerMode == 'No') {
+        var article = Object.values(set.getDivaArticles())[0];
+        dim.X = article === null || article === void 0 ? void 0 : article.width;
+        dim.Y = article === null || article === void 0 ? void 0 : article.depth;
+        dim.Z = article === null || article === void 0 ? void 0 : article.height;
+      }
+      return _objectSpread$9(_objectSpread$9({}, dim), {}, {
+        Info: ((_set$api$getI18n$t = (_set$api$getI18n = set.api.getI18n()) === null || _set$api$getI18n === void 0 || (_set$api$getI18n$t2 = _set$api$getI18n.t) === null || _set$api$getI18n$t2 === void 0 ? void 0 : _set$api$getI18n$t2.call(_set$api$getI18n, 'utils.width_first_letter', 'B')) !== null && _set$api$getI18n$t !== void 0 ? _set$api$getI18n$t : 'B') + ': ' + dim.X + ' cm x ' + ((_set$api$getI18n$t3 = (_set$api$getI18n2 = set.api.getI18n()) === null || _set$api$getI18n2 === void 0 || (_set$api$getI18n2$t = _set$api$getI18n2.t) === null || _set$api$getI18n2$t === void 0 ? void 0 : _set$api$getI18n2$t.call(_set$api$getI18n2, 'utils.depth_first_letter', 'T')) !== null && _set$api$getI18n$t3 !== void 0 ? _set$api$getI18n$t3 : 'T') + ': ' + dim.Y + ' cm' + (dim.Z ? ' x ' + ((_set$api$getI18n$t4 = (_set$api$getI18n3 = set.api.getI18n()) === null || _set$api$getI18n3 === void 0 || (_set$api$getI18n3$t = _set$api$getI18n3.t) === null || _set$api$getI18n3$t === void 0 ? void 0 : _set$api$getI18n3$t.call(_set$api$getI18n3, 'utils.height_first_letter', 'H')) !== null && _set$api$getI18n$t4 !== void 0 ? _set$api$getI18n$t4 : 'H') + ': ' + dim.Z + ' cm' : '')
       });
     }
-  }, {
-    key: "getAllProducts",
-    value: function getAllProducts(sets) {
-      var ret = {};
-      for (var key in sets) {
-        var productsQuantity = sets[key].getAllProducts();
-        for (var _key3 in productsQuantity) {
-          if (!ret[_key3]) ret[_key3] = 0;
-          ret[_key3] += productsQuantity[_key3];
-        }
-      }
-      return ret;
-    }
   }, {
     key: "findLoadedSet",
     value: function findLoadedSet(sets, catalogCodex, accountGUID) {
@@ -33824,23 +33778,23 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "addOrderSetArticlesToExistingSet",
     value: function () {
-      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) {
+      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) {
             case 0:
               //TODO: GLOBAL STUFF
               //this.updateActSet(set);
               orderSet.changeBasketIds();
-              _context36.next = 3;
+              _context35.next = 3;
               return this.initOrderLineArticles(set, orderSet);
             case 3:
-              _context36.next = 5;
+              _context35.next = 5;
               return set.plannerHandler.extendSet(set, orderSet.SetPlanData, lastSetToInitialize);
             case 5:
             case "end":
-              return _context36.stop();
+              return _context35.stop();
           }
-        }, _callee34, this);
+        }, _callee33, this);
       }));
       function addOrderSetArticlesToExistingSet(_x113, _x114, _x115) {
         return _addOrderSetArticlesToExistingSet.apply(this, arguments);
@@ -33859,9 +33813,9 @@ var DivaSetHandler = /*#__PURE__*/function () {
 }();
 var setHandlerInstance = new DivaSetHandler();
 
-function ownKeys$7(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$7(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$7(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$7(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var LOG$7 = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
+function ownKeys$8(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$8(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$8(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$8(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var LOG$8 = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var DivaBasketHandler = /*#__PURE__*/function () {
   function DivaBasketHandler(plannerConfig) {
     var _this = this,
@@ -33897,7 +33851,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     this.assignNewDivaNr = !!this.plannerConfig.assignNewDivaNr;
     this._handler = plannerConfig.handler;
     if (this.plannerConfig.divaNr == undefined && this.plannerConfig.basketData == undefined && this.plannerConfig.catalogCodex == undefined && this.plannerConfig.productId == undefined && this.plannerConfig.customProductId == undefined && this.plannerConfig.returnTo != 'TEST_CONFIGURATORLOGIC' && !((_this$plannerConfig$s = this.plannerConfig.settings) !== null && _this$plannerConfig$s !== void 0 && (_this$plannerConfig$s = _this$plannerConfig$s.ViewConfig) !== null && _this$plannerConfig$s !== void 0 && (_this$plannerConfig$s = _this$plannerConfig$s.plannerType) !== null && _this$plannerConfig$s !== void 0 && _this$plannerConfig$s.includes('PRODUCTS') || (_this$plannerConfig$s2 = this.plannerConfig.settings) !== null && _this$plannerConfig$s2 !== void 0 && (_this$plannerConfig$s2 = _this$plannerConfig$s2.ViewConfig) !== null && _this$plannerConfig$s2 !== void 0 && (_this$plannerConfig$s2 = _this$plannerConfig$s2.plannerType) !== null && _this$plannerConfig$s2 !== void 0 && _this$plannerConfig$s2.includes('PROMOTED'))) {
-      LOG$7.error(new DivaUtils.DivaError('Keine Öffnungsparameter', {
+      LOG$8.error(new DivaUtils.DivaError('Keine Öffnungsparameter', {
         code: 'WC_0003'
       }));
     }
@@ -33907,7 +33861,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     }
     if ((_this$plannerConfig$a = this.plannerConfig.apiConfig) !== null && _this$plannerConfig$a !== void 0 && _this$plannerConfig$a.basketService) {
       var _this$plannerConfig$a2, _this$plannerConfig$a3;
-      this._basketHandler = new BasketHandler__default["default"](LOG$7, (_this$plannerConfig$a2 = this.plannerConfig.apiConfig) === null || _this$plannerConfig$a2 === void 0 ? void 0 : _this$plannerConfig$a2.basketService, (_this$plannerConfig$a3 = this.plannerConfig.apiConfig) === null || _this$plannerConfig$a3 === void 0 ? void 0 : _this$plannerConfig$a3.api2["default"]);
+      this._basketHandler = new BasketHandler__default["default"](LOG$8, (_this$plannerConfig$a2 = this.plannerConfig.apiConfig) === null || _this$plannerConfig$a2 === void 0 ? void 0 : _this$plannerConfig$a2.basketService, (_this$plannerConfig$a3 = this.plannerConfig.apiConfig) === null || _this$plannerConfig$a3 === void 0 ? void 0 : _this$plannerConfig$a3.api2["default"]);
     }
   }
   return _createClass__default["default"](DivaBasketHandler, [{
@@ -33976,7 +33930,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
             case 0:
               this.basketWasSavedWithCurrentDocVersion = false;
               this.startProductId = undefined;
-              LOG$7.debug("Basket initialising. initObject is: '", this.plannerConfig, "' divaNr to load is: '" + this.loadDivaNr + "'");
+              LOG$8.debug("Basket initialising. initObject is: '", this.plannerConfig, "' divaNr to load is: '" + this.loadDivaNr + "'");
               if (this.ignoreInitObjectWhenInitializing) {
                 _context.next = 37;
                 break;
@@ -34153,7 +34107,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
                 title: (_api$getI18n = api.getI18n()) === null || _api$getI18n === void 0 ? void 0 : _api$getI18n.t('configurator.no_startproduct_defined_title'),
                 text: (_api$getI18n2 = api.getI18n()) === null || _api$getI18n2 === void 0 ? void 0 : _api$getI18n2.t('configurator.no_startproduct_defined_text')
               });
-              LOG$7.error(new DivaUtils.DivaError('it is configured to initialize the startProductForOrganizations if there are no other parameters. But no available product was found with organizationId: "' + this.plannerConfig.currentOrganization._id + '" in the field: "startProductForOrganizations"!'));
+              LOG$8.error(new DivaUtils.DivaError('it is configured to initialize the startProductForOrganizations if there are no other parameters. But no available product was found with organizationId: "' + this.plannerConfig.currentOrganization._id + '" in the field: "startProductForOrganizations"!'));
             case 84:
               _context.next = 91;
               break;
@@ -34321,12 +34275,12 @@ var DivaBasketHandler = /*#__PURE__*/function () {
             case 0:
               basketFromAPI = (_dataFromApi$basket = dataFromApi.basket) !== null && _dataFromApi$basket !== void 0 ? _dataFromApi$basket : dataFromApi.Basket; //evaluateRopoEffect(basketFromAPI,);
               if (origProductId) basketFromAPI.OrigProductId = origProductId;
-              basket = _objectSpread$7({}, basketFromAPI);
+              basket = _objectSpread$8({}, basketFromAPI);
               if (!basketFromAPI) {
                 _context5.next = 48;
                 break;
               }
-              LOG$7.debug('divaNr: ' + divaNr + ' was loaded successfully from server!');
+              LOG$8.debug('divaNr: ' + divaNr + ' was loaded successfully from server!');
               if (basketFromAPI.OrigDivaNr) {
                 this.origConfiguration.originDivaNr = basketFromAPI.OrigDivaNr;
               } else if (basketFromAPI.OrigCatalogCodex) {
@@ -34449,8 +34403,9 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     }
   }, {
     key: "getBasketData",
-    value: function getBasketData(divaNr) {
-      return this.baskets[divaNr];
+    value: function getBasketData(divaNr, variantId) {
+      var _this$baskets;
+      return (_this$baskets = this.baskets[divaNr + '-' + variantId]) !== null && _this$baskets !== void 0 ? _this$baskets : this.baskets[divaNr];
     }
   }, {
     key: "setBasketData",
@@ -34537,7 +34492,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
             case 9:
               _context7.prev = 9;
               _context7.t0 = _context7["catch"](0);
-              LOG$7.error(new DivaUtils.DivaError('DivaNr cannot be found in Database', {
+              LOG$8.error(new DivaUtils.DivaError('DivaNr cannot be found in Database', {
                 code: 'WC_0004',
                 custom: {
                   divaNr: divaNr
@@ -34574,7 +34529,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
                 _context8.next = 9;
                 break;
               }
-              LOG$7.error(new DivaUtils.DivaError('CustomProductId cannot be found in Database', {
+              LOG$8.error(new DivaUtils.DivaError('CustomProductId cannot be found in Database', {
                 code: 'WC_0005',
                 custom: {
                   key: key,
@@ -34590,7 +34545,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
             case 12:
               _context8.prev = 12;
               _context8.t0 = _context8["catch"](0);
-              LOG$7.error(new DivaUtils.DivaError('Error while fetching product data', {
+              LOG$8.error(new DivaUtils.DivaError('Error while fetching product data', {
                 code: 'WC_0005',
                 custom: {
                   productId: productId
@@ -34624,7 +34579,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
                 _context9.next = 6;
                 break;
               }
-              LOG$7.error(new DivaUtils.DivaError('ProductId konnte in der Datenbank nicht gefunden werden', {
+              LOG$8.error(new DivaUtils.DivaError('ProductId konnte in der Datenbank nicht gefunden werden', {
                 code: 'WC_0005',
                 custom: {
                   productId: productId
@@ -34867,7 +34822,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
         if (_loop2()) continue;
       }
       var variantValues = article.VariantValuesParentOption;
-      var data = _objectSpread$7(_objectSpread$7({}, this.actBasket), {}, {
+      var data = _objectSpread$8(_objectSpread$8({}, this.actBasket), {}, {
         changedValues: changedValues,
         variantValues: variantValues,
         isInit: isInit,
@@ -34892,7 +34847,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context12.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-a19fb640.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-93d9fb4d.js'); });
             case 5:
               _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -34900,7 +34855,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 9:
               _context12.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-5968a440.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-4bad8cba.js'); });
             case 11:
               _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -34908,7 +34863,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 15:
               _context12.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-afe39b25.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-f1feae09.js'); });
             case 17:
               _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -34916,7 +34871,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 21:
               _context12.next = 23;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-d56e153f.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-1e7710d3.js'); });
             case 23:
               _yield$import4 = _context12.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -34936,6 +34891,175 @@ var DivaBasketHandler = /*#__PURE__*/function () {
   }]);
 }();
 
+function ownKeys$7(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$7(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$7(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$7(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var LOG$7 = DivaUtils__default["default"].initLog('Products', 'WEB-PLANNER-LOGIC');
+var DivaProductHandler = /*#__PURE__*/function () {
+  function DivaProductHandler() {
+    _classCallCheck__default["default"](this, DivaProductHandler);
+  }
+  return _createClass__default["default"](DivaProductHandler, [{
+    key: "updateProducts",
+    value: function () {
+      var _updateProducts = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(sets, api, wwsHandler, from) {
+        var set, _ref, customProductNrsPair, matchPrefix, data, _ref2, products, customProducts;
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (!(sets.length > 1)) {
+                _context.next = 3;
+                break;
+              }
+              console.error('matching product logic with more than one set needs to implemented');
+              return _context.abrupt("return");
+            case 3:
+              set = sets[0];
+              set.setMatchingProduct();
+              set.SetArticleNr = undefined;
+              set.SetArticleNrPrefix = undefined;
+              this.setCustonProductNrFieldsOnArticles(set, [], []);
+              _ref = wwsHandler.getCustomIdsForProductsMatch(set), customProductNrsPair = _ref.customProductNrsPair, matchPrefix = _ref.matchPrefix;
+              data = {
+                catalogs: sets.map(function (set) {
+                  return {
+                    articles: Object.values(set.getDivaArticles()).map(function (article) {
+                      return {
+                        codex: article.articleCodex,
+                        hash: article.articleProductHash
+                      };
+                    }),
+                    catalogGuid: set.CatalogData.catalogGuid
+                  };
+                }),
+                organizationId: api.OrganizationId,
+                customProductNrs: customProductNrsPair.map(function (c) {
+                  return c.customProductNrs;
+                })
+              };
+              _context.next = 12;
+              return api.getDataCache(api.checkMatchingProducts(), DivaUtils.md5(JSON.stringify(_objectSpread$7(_objectSpread$7({}, data), {}, {
+                organizationId: api.OrganizationId
+              }))), '', 'catalog', 'POST', data);
+            case 12:
+              _ref2 = _context.sent;
+              products = _ref2.products;
+              customProducts = _ref2.customProducts;
+              LOG$7.debug('matchingProducts triggered by: ' + from, products, customProducts);
+              if (products.length) this.handleFountMatchingProducts(set, products, undefined, matchPrefix);else if (customProducts.length) this.setCustonProductNrFieldsOnArticles(set, customProducts, customProductNrsPair);
+            case 17:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function updateProducts(_x, _x2, _x3, _x4) {
+        return _updateProducts.apply(this, arguments);
+      }
+      return updateProducts;
+    }()
+  }, {
+    key: "handleFountMatchingProducts",
+    value: function handleFountMatchingProducts(set, products, setHash, matchPrefix) {
+      var _product$retailerArti, _product$discountedPr, _product$discountedPr2, _product$discountedPr3;
+      var product = this.cheapestOfMatchingProducts(products);
+      var calculatedPrice = set.getSetPrice(true);
+      set.SetArticleNr = (_product$retailerArti = product.retailerArticleNr) === null || _product$retailerArti === void 0 ? void 0 : _product$retailerArti.toString();
+      set.SetArticleNrPrefix = matchPrefix;
+      if (!product.discountedPrice && product.addedPrice === product.calculatedPrice && calculatedPrice == product.calculatedPrice) {
+        //no discount
+        set.setMatchingProduct({
+          discountPrice: 0,
+          origPrice: product.addedPrice,
+          percentage: 0
+        });
+        return;
+      }
+      var discountExists = !!product.discountedPrice || set.CatalogData.discountPercentage;
+      //hier ist noch zu unterscheide ob der Rabatt nur angeziegt werden soll oder auch in der WWS logic angewendet werden soll
+      var currentProduct = {
+        discountPrice: (_product$discountedPr = product.discountedPrice) !== null && _product$discountedPr !== void 0 ? _product$discountedPr : 0,
+        onlyViewDiscountedPrice: (_product$discountedPr2 = product.discountedPrice) !== null && _product$discountedPr2 !== void 0 ? _product$discountedPr2 : 0,
+        origPrice: product.addedPrice,
+        percentage: (calculatedPrice - ((_product$discountedPr3 = product.discountedPrice) !== null && _product$discountedPr3 !== void 0 ? _product$discountedPr3 : product.addedPrice)) / (calculatedPrice / 100),
+        bruttoPercentage: !!product.addedPrice && discountExists && product.discountedPrice !== product.addedPrice ? (calculatedPrice - product.addedPrice) / (calculatedPrice / 100) : undefined,
+        retailerArticleNr: product.retailerArticleNr,
+        setHash: setHash,
+        _id: product._id
+      };
+      if (setHash) set.setMatchingOrigProduct(currentProduct);
+      set.setMatchingProduct(currentProduct);
+    }
+  }, {
+    key: "setCustonProductNrFieldsOnArticles",
+    value: function setCustonProductNrFieldsOnArticles(set, customProducts, customProductNrsPair) {
+      var articles = set.getDivaArticles(false, true);
+      for (var key in articles) {
+        articles[key].discountPercentage = undefined;
+      }
+      var _loop = function _loop() {
+        var _customProductNrsPair, _customProductNrsPair2;
+        var customNr = customProducts[i];
+        var basketIds = (_customProductNrsPair = (_customProductNrsPair2 = customProductNrsPair.find(function (c) {
+          return c.customProductNrs == customNr.retailerArticleNr.toString();
+        })) === null || _customProductNrsPair2 === void 0 ? void 0 : _customProductNrsPair2.basketIds) !== null && _customProductNrsPair !== void 0 ? _customProductNrsPair : [];
+        for (var j = 0; j < basketIds.length; j++) {
+          articles[basketIds[j]].discountPercentage = customNr.percentageDiscount;
+        }
+      };
+      for (var i = 0; i < customProducts.length; i++) {
+        _loop();
+      }
+    }
+  }, {
+    key: "cheapestOfMatchingProducts",
+    value: function cheapestOfMatchingProducts(products) {
+      var bestIndex = 0;
+      for (var i = 1; i < products.length; i++) {
+        var _currentBestProduct$d, _potencialBetterProdu;
+        var currentBestProduct = products[bestIndex];
+        var potencialBetterProduct = products[i];
+        if (((_currentBestProduct$d = currentBestProduct.discountedPrice) !== null && _currentBestProduct$d !== void 0 ? _currentBestProduct$d : currentBestProduct.addedPrice) > ((_potencialBetterProdu = potencialBetterProduct.discountedPrice) !== null && _potencialBetterProdu !== void 0 ? _potencialBetterProdu : potencialBetterProduct.addedPrice)) {
+          bestIndex = i;
+        }
+      }
+      return products[bestIndex];
+    }
+
+    /**
+     * Schlaraffia specific code
+     */
+  }, {
+    key: "getBestMatch",
+    value: function getBestMatch(articles, products) {
+      var OPTION_CODEX = 'KOPFTEIL';
+      if (!articles) return;
+      for (var key in articles) {
+        var _article$VariantValue;
+        var article = articles[key];
+        var opv = (_article$VariantValue = article.VariantValues['OPT' + OPTION_CODEX]) === null || _article$VariantValue === void 0 ? void 0 : _article$VariantValue.replace('OPV', '');
+        if (!products || !opv) continue;
+        for (var i = 0; i < products.length; i++) {
+          var _products$i$affiliate;
+          if ((_products$i$affiliate = products[i].affiliate) !== null && _products$i$affiliate !== void 0 && _products$i$affiliate.length) if (this.findOPVCodexInVariantValues(products[i], OPTION_CODEX, opv)) {
+            return products[i];
+          }
+        }
+      }
+      return undefined;
+    }
+  }, {
+    key: "findOPVCodexInVariantValues",
+    value: function findOPVCodexInVariantValues(product, opt, opv) {
+      return product.articles.find(function (article) {
+        return article.variantValues.find(function (variant) {
+          return variant.OPT === opt && variant.OPV === opv;
+        });
+      });
+    }
+  }]);
+}();
+var productHandlerInstance = new DivaProductHandler();
+
 var LOG$6 = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var ViewPointHandler = /*#__PURE__*/function () {
   function ViewPointHandler() {
@@ -35568,6 +35692,14 @@ var Rendering = /*#__PURE__*/function () {
         return this.uiInfo[setId] != undefined && this.uiInfo[setId]['E' + elementid] != undefined;
       }
     }
+
+    /**This function returns the entry of the BBOXGEO from the UIPolygon Information in order to process when working with hybrid3D Viewer */
+  }, {
+    key: "getBBoxGeoFromUnity",
+    value: function getBBoxGeoFromUnity() {
+      if (this.uiInfo && this.uiInfo['BBOXGEO']) return this.uiInfo['BBOXGEO'];
+      return null;
+    }
   }, {
     key: "getOutlinePolygonForSVG",
     value: function getOutlinePolygonForSVG(setId, elementId, viewPortSize) {
@@ -36044,8 +36176,9 @@ var PlannerHandler3D = /*#__PURE__*/function () {
     //function called when no render client is found when only updating view
     _defineProperty__default["default"](this, "renderSettings", void 0);
     _defineProperty__default["default"](this, "todoAfterLogin", void 0);
+    _defineProperty__default["default"](this, "currentCamera", void 0);
     _defineProperty__default["default"](this, "jwt", void 0);
-    _defineProperty__default["default"](this, "latestCamera", void 0);
+    _defineProperty__default["default"](this, "latestHybridInfo", void 0);
     /**
      * This function is called from the connectionHandler when something happens during requesting rendering.
      * Eg. there is no free renderClient
@@ -36251,7 +36384,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-38042dd4.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-908946a2.js'); });
             case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -36343,7 +36476,8 @@ var PlannerHandler3D = /*#__PURE__*/function () {
     value: function onReceiveHQRenderScript(planningHash, hqRenderScriptString) {
       if (!this.waitForHQRenderScript.has(planningHash)) return;
       var hqRenderScript = this.waitForHQRenderScript.get(planningHash);
-      this.lastSavedHQRenderScript = JSON.parse(hqRenderScriptString);
+      var hqr = JSON.parse(hqRenderScriptString);
+      this.lastSavedHQRenderScript = hqr;
       hqRenderScript.HqRenderScript = hqRenderScriptString;
       this.hqRenderScriptCache.set(planningHash, hqRenderScript);
       this.waitForHQRenderScript["delete"](planningHash);
@@ -36353,9 +36487,9 @@ var PlannerHandler3D = /*#__PURE__*/function () {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var _step$value = _slicedToArray__default["default"](_step.value, 2),
             key = _step$value[0],
-            hqr = _step$value[1];
-          if (!(hqr !== null && hqr !== void 0 && hqr.CreationTime)) continue;
-          if (hqr.CreationTime < hqRenderScript.CreationTime) this.waitForHQRenderScript["delete"](key);
+            _hqr = _step$value[1];
+          if (!(_hqr !== null && _hqr !== void 0 && _hqr.CreationTime)) continue;
+          if (_hqr.CreationTime < hqRenderScript.CreationTime) this.waitForHQRenderScript["delete"](key);
         }
       } catch (err) {
         _iterator.e(err);
@@ -36704,7 +36838,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
     value: (function () {
       var _request3D = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7(params) {
         var _params$renderRequest, _params$renderRequest2, _params$renderRequest3, _params$renderRequest4, _params$renderRequest5, _params$renderRequest6, _this$viewPointHandle;
-        var room, newRenderSize, doReloadWholePlanning, camera, planningHash, requestRenderingFrom3DHost, requestHqRenderScriptFrom3DHost, rendering, renderHash, viewPointName, functionType, sizeInfo, _rendering, fullscreenRendering, renderingInCacheFound, _this$connectionHandl6, _plannerMeasureDigits, returnRequest;
+        var room, newRenderSize, doReloadWholePlanning, hybridInfo, planningHash, requestRenderingFrom3DHost, requestHqRenderScriptFrom3DHost, rendering, renderHash, viewPointName, functionType, sizeInfo, _rendering, fullscreenRendering, renderingInCacheFound, _this$connectionHandl6, _plannerMeasureDigits, returnRequest;
         return _regeneratorRuntime__default["default"].wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -36717,23 +36851,32 @@ var PlannerHandler3D = /*#__PURE__*/function () {
               this.todoAfterLogin.request3D.doRequest3D = true;
               return _context7.abrupt("return");
             case 5:
-              LOG$4.debug('Request New 3D rendering: ' + (params === null || params === void 0 ? void 0 : params.doRequestRendering) + ', hqRenderScript: ' + (params === null || params === void 0 ? void 0 : params.doRequestHqRenderScript), 'PlannerHandler3D');
               room = this.viewPointHandler.getCurRoomCodex();
               newRenderSize = this.setRoomInfoInPlanningData(params.planningData, (_params$renderRequest = (_params$renderRequest2 = params.renderRequestInfos) === null || _params$renderRequest2 === void 0 ? void 0 : _params$renderRequest2.width) !== null && _params$renderRequest !== void 0 ? _params$renderRequest : 500, (_params$renderRequest3 = (_params$renderRequest4 = params.renderRequestInfos) === null || _params$renderRequest4 === void 0 ? void 0 : _params$renderRequest4.height) !== null && _params$renderRequest3 !== void 0 ? _params$renderRequest3 : 500, (_params$renderRequest5 = (_params$renderRequest6 = params.renderRequestInfos) === null || _params$renderRequest6 === void 0 ? void 0 : _params$renderRequest6.mediaServiceSaveMode) !== null && _params$renderRequest5 !== void 0 ? _params$renderRequest5 : undefined);
               doReloadWholePlanning = true;
               if (params.doRequestRendering) {
                 params.renderRequestInfos.width = newRenderSize.newRenderWidth;
                 params.renderRequestInfos.height = newRenderSize.newRenderHeight;
-                if (params.renderRequestInfos.mediaServiceSaveMode == 'PERMANENT') doReloadWholePlanning = true;
               }
 
               //Check if viewPoint is changed based on alternateRendering
               //Do check if viewpoint has to be changed
               if (params.alternateRenderInfo && (params.alternateRenderInfo.overwrittenViewPointName || params.alternateRenderInfo.viewPointName)) this.handleStaticVP(params.alternateRenderInfo.overwrittenViewPointName ? params.alternateRenderInfo.overwrittenViewPointName : params.alternateRenderInfo.viewPointName);
-              camera = params.camera ? params.camera : params.useLatestCamera ? this.latestCamera : undefined;
-              planningHash = DivaUtils.md5(JSON.stringify(params.planningData) + JSON.stringify(camera));
+              hybridInfo = params.hybrid3DInfo || !this.latestHybridInfo ? params.hybrid3DInfo : _objectSpread$6(_objectSpread$6({}, this.latestHybridInfo), {}, {
+                focus: _objectSpread$6(_objectSpread$6({}, this.latestHybridInfo.focus), {}, {
+                  rotationCenter: this.currentCamera.targetPos,
+                  adjustZoomInUnity: true,
+                  onlyAdjustZoomBBChanged: true
+                }),
+                currentCamera: this.currentCamera
+              }); //When we do need to adjust the zoom in unity based on Bbox changed - send last bboxinformation
+              if (this.currRendering && hybridInfo && hybridInfo.focus.adjustZoomInUnity && hybridInfo.focus.onlyAdjustZoomBBChanged) {
+                hybridInfo.bboxgeoInfoLastFrame = this.currRendering.getBBoxGeoFromUnity();
+              }
+              planningHash = DivaUtils.md5(JSON.stringify(params.planningData));
               if (planningHash == this.lastFramePlanningHash) doReloadWholePlanning = false;
               if (params.forceReloadPlanning || (_this$viewPointHandle = this.viewPointHandler.getCurRoomlistVP()) !== null && _this$viewPointHandle !== void 0 && _this$viewPointHandle.isStatic) doReloadWholePlanning = true;
+              if (params.renderRequestInfos && params.renderRequestInfos.mediaServiceSaveMode == 'PERMANENT') doReloadWholePlanning = true;
               this.lastFramePlanningHash = planningHash;
               requestRenderingFrom3DHost = false;
               requestHqRenderScriptFrom3DHost = false;
@@ -36760,7 +36903,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
               if (params.doRequestRendering) {
                 viewPointName = this.viewPointHandler.getCurViewPointToRender();
                 sizeInfo = params.renderRequestInfos.width + ':' + params.renderRequestInfos.height;
-                renderHash = DivaUtils.md5(JSON.stringify(params.planningData) + '#' + room + '#' + viewPointName + '#' + sizeInfo + '#' + JSON.stringify(camera));
+                renderHash = DivaUtils.md5(JSON.stringify(params.planningData) + '#' + room + '#' + viewPointName + '#' + sizeInfo + '#' + JSON.stringify(hybridInfo === null || hybridInfo === void 0 ? void 0 : hybridInfo.currentCamera));
                 this.lastRequestedRenderHash = renderHash;
                 LOG$4.debug('Request New Rendering with hash ' + renderHash + '; and planningHash: ' + planningHash, 'PlannerHandler3D');
                 if (this.checkIsRenderingCached(renderHash, params.renderRequestInfos.planner3DGridEnabled, params.renderRequestInfos.mediaServiceSaveMode)) {
@@ -36793,7 +36936,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
                 }
               }
               if (!(requestHqRenderScriptFrom3DHost || requestRenderingFrom3DHost)) {
-                _context7.next = 32;
+                _context7.next = 34;
                 break;
               }
               if (params.catalogData.lang) params.planningData.SCE.Lang = params.catalogData.lang;
@@ -36820,20 +36963,20 @@ var PlannerHandler3D = /*#__PURE__*/function () {
                   viewPointInfo: this.viewPointHandler.getCurRoomlistVP(),
                   alternateRenderingsExist: params.alternateRenderingsExist,
                   alternateRenderInfo: params.alternateRenderInfo,
-                  camera: camera,
-                  forceUseCam: !!camera
+                  hybrid3DInfo: hybridInfo
                 } : undefined
               });
-              if (params.camera) this.latestCamera = params.camera;
+              if (hybridInfo !== null && hybridInfo !== void 0 && hybridInfo.currentCamera) this.currentCamera = hybridInfo === null || hybridInfo === void 0 ? void 0 : hybridInfo.currentCamera;
+              if (hybridInfo) this.latestHybridInfo = hybridInfo;
               if (!(returnRequest === undefined || requestHqRenderScriptFrom3DHost && returnRequest.hqRenderScript == undefined || requestRenderingFrom3DHost && returnRequest.rendering == undefined)) {
-                _context7.next = 30;
+                _context7.next = 32;
                 break;
               }
               LOG$4.error(new DivaUtils.DivaError('Error requesting the 3D from host. RequestHqRenderScript: ' + requestHqRenderScriptFrom3DHost + '; RequestRendering: ' + requestRenderingFrom3DHost, {
                 code: 'WC_0013'
               }));
               return _context7.abrupt("return");
-            case 30:
+            case 32:
               if (requestHqRenderScriptFrom3DHost) {
                 if (this.waitForHQRenderScript.has(planningHash)) this.waitForHQRenderScript["delete"](planningHash);
                 this.waitForHQRenderScript.set(planningHash, returnRequest.hqRenderScript);
@@ -36845,12 +36988,12 @@ var PlannerHandler3D = /*#__PURE__*/function () {
                   if (returnRequest.rendering.getIsAlternateRendering()) this.addAlternateRenderingToSavedAlternateRenderings(returnRequest.rendering);else this.lastSavedRendering = returnRequest.rendering;
                 }
               }
-            case 32:
+            case 34:
               return _context7.abrupt("return", {
                 planningHash: planningHash,
                 renderHash: renderHash
               });
-            case 33:
+            case 35:
             case "end":
               return _context7.stop();
           }
@@ -37034,6 +37177,11 @@ var PlannerHandler3D = /*#__PURE__*/function () {
     value: function setOrigConfigurationCallback(callback) {
       this.getOrigConfiguration = callback;
     }
+  }, {
+    key: "updateCamPosition",
+    value: function updateCamPosition(cam) {
+      this.currentCamera = cam;
+    }
   }, {
     key: "getLastSavedHQRenderScript",
     value: function getLastSavedHQRenderScript() {
@@ -37093,7 +37241,8 @@ var PlannerHandler3D = /*#__PURE__*/function () {
                             _this2.liveArSocket.auth = _objectSpread$6(_objectSpread$6({}, _this2.liveArSocket.auth), {}, {
                               connectionId: data.connectionId
                             });
-                            resolve(_this2.liveArViewerUrl + '?liveArConnectionId=' + data.connectionId + '&organizationId=' + _this2.renderSettings.OrganizationId + '&divaSessionId=' + DivaUtils__default["default"].SessionId + DivaUtils__default["default"].ConfigurationId ? '&configurationId=' + DivaUtils__default["default"].ConfigurationId : '');
+                            var apllyConfiguratorSessionId = DivaUtils__default["default"].ConfigurationId ? '&configurationId=' + DivaUtils__default["default"].ConfigurationId : '';
+                            resolve(_this2.liveArViewerUrl + '?liveArConnectionId=' + data.connectionId + '&organizationId=' + _this2.renderSettings.OrganizationId + '&divaSessionId=' + DivaUtils__default["default"].SessionId + apllyConfiguratorSessionId);
                           });
                           _this2.liveArSocket.on('connect_error', function (err) {
                             return reject(err);
@@ -37566,7 +37715,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, !!alternateRenderingsExist, alternateRendererInfo, true, {
+      _this.request3D(doMakeRendering, doMakeHQRenderScript, true, !!alternateRenderingsExist, alternateRendererInfo, true, {
         width: width,
         height: height,
         isFullscreenRendering: isFullscreenRendering,
@@ -37598,7 +37747,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               renderGroup = initSetState.api.get3DRenderGroup();
               this.plannerHandlerFunctions = plannerHandlerFunctions;
               diva3dServerUrl = initSetState.api.get3DServerUrl();
-              divaMediaServiceUrl = initSetState.api.getDivaMediaServiceUrl(); // renderGroup = 'LeaTest';
+              divaMediaServiceUrl = initSetState.api.getDivaMediaServiceUrl(); //renderGroup = 'LeaTest';
               //diva3dServerUrl = "https://test-einkauf-onboarding.pfister.ch/diva3d/diva3dhost2/";
               // diva3dServerUrl = "https://diva3dhost.diva-portal.com/diva3d/diva3dhost2/";
               //diva3dServerUrl = 'https://localhost:44315/';
@@ -37794,18 +37943,18 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context4.next = 10;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-d545a524.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-dbdb4ba0.js'); });
             case 10:
               _yield$import = _context4.sent;
               DivaStandardPlanner = _yield$import["default"];
-              planner = new DivaStandardPlanner(set, this.plannerHandlerFunctions.updatePlannerMsgContainer, this.plannerIDCount, this.setPlannerHandler.getGlobalBoundingBox(), set.api.getHidePlanner(), !!set.api.getDoShowAR(), set.api.getDoDisablePlanner2D(), hasStaticBackground);
+              planner = new DivaStandardPlanner(set, this.plannerHandlerFunctions.updatePlannerMsgContainer, this.plannerIDCount, this.setPlannerHandler.getGlobalBoundingBox(), set.api.getHidePlanner(), !!set.api.enableAR, set.api.getDoDisablePlanner2D(), hasStaticBackground);
               if (catalogData.isIDM3DCat) {
                 planner.initIDM3DMeta(catalogData.IDM3DCatCodex);
               }
               return _context4.abrupt("break", 21);
             case 15:
               _context4.next = 17;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-b8c943f9.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-4789bc0a.js'); });
             case 17:
               _yield$import2 = _context4.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -38078,7 +38227,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
             case 0:
               DivaUtils__default["default"].startSpanOfApm('DivaPlannerHandler saveSetHQRenderScript');
               _context9.next = 3;
-              return this.request3D(false, true);
+              return this.request3D(false, true, true);
             case 3:
               hashes = _context9.sent;
               if (hashes) {
@@ -38135,7 +38284,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
                 break;
               }
               _context10.next = 4;
-              return this.request3D(true, false, false, undefined, true, {
+              return this.request3D(true, false, true, false, undefined, true, {
                 width: 100,
                 height: 100,
                 isFullscreenRendering: false,
@@ -38548,14 +38697,14 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
     key: "handle3DVisualizationChanged",
     value: function handle3DVisualizationChanged(mode, params, doShow3DDimensionLines, alternateRenderingsExist) {
       if (mode == 'Nav3DFullScreen') {
-        this.request3D(true, false, alternateRenderingsExist, undefined, false, {
+        this.request3D(true, false, true, alternateRenderingsExist, undefined, false, {
           width: params.nav3DFullScreen.renderWidth,
           height: params.nav3DFullScreen.renderHeight,
           isFullscreenRendering: true,
           planner3DGridEnabled: false,
           mediaServiceSaveMode: 'STREAM',
           doShow3DDimensionLines: !!doShow3DDimensionLines
-        }, undefined, true);
+        }, undefined);
       } else {
         this.handler3D.handle3DVisualizationChanged(mode, params);
       }
@@ -38588,7 +38737,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
   }, {
     key: "request3D",
     value: function () {
-      var _request3D = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee16(doRequestRendering, doRequestHqRenderScript, alternateRenderingsExist, alternateRenderInfo, forceReloadPlanning, renderRequestInfos, viewpoint, useLatestCamera) {
+      var _request3D = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee16(doRequestRendering, doRequestHqRenderScript, useLatestCamera, alternateRenderingsExist, alternateRenderInfo, forceReloadPlanning, renderRequestInfos, hybrid3DInfo) {
         var _this3 = this;
         var plannerData, loadedCatData, plannerExists, savedSetId;
         return _regeneratorRuntime__default["default"].wrap(function _callee16$(_context16) {
@@ -38659,7 +38808,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
                 forceReloadPlanning: forceReloadPlanning,
                 alternateRenderInfo: alternateRenderInfo,
                 alternateRenderingsExist: alternateRenderingsExist,
-                camera: viewpoint,
+                hybrid3DInfo: hybrid3DInfo,
                 useLatestCamera: useLatestCamera
               });
             case 18:
@@ -38741,6 +38890,11 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
     value: function openARObserverConnection(handleNoHqrs) {
       return this.handler3D.openARObserverConnection(handleNoHqrs);
     }
+  }, {
+    key: "updateCamPosition",
+    value: function updateCamPosition(cam) {
+      return this.handler3D.updateCamPosition(cam);
+    }
   }]);
 }();
 
@@ -39050,13 +39204,10 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _this.updateViewButtonsDependigOnConfigStructure();
               baseArticle = setHandlerInstance.getBaseParentArticleOfAccessoire(set, newArticle.basketId);
               if (!dontUpdateView) (_this$updateElementSe = _this.updateElementSelectionPlanner) === null || _this$updateElementSe === void 0 || _this$updateElementSe.call(_this, [baseArticle.setId], [baseArticle.elementId], true);
-              productHandlerInstance.updateProducts(_this.setsAsArray, _this.api, 'onAdd');
-              _context3.next = 29;
-              return _this.checkVariantData();
-            case 29:
+              _this.checkMatchingProducts('onAdd');
               _this.plannerChangeLog('onAddPlanner');
               return _context3.abrupt("return", 'ElementAdded');
-            case 31:
+            case 29:
             case "end":
               return _context3.stop();
           }
@@ -39104,8 +39255,9 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               (_this$updateElementSe2 = _this.updateElementSelectionPlanner) === null || _this$updateElementSe2 === void 0 || _this$updateElementSe2.call(_this, [article.setId], [article.elementId], true);
               _this.updatePriceInView();
               _this.updateViewButtonsDependigOnConfigStructure();
+              _this.checkMatchingProducts('onSwitch');
               _this.plannerChangeLog('onSwitchPlanner');
-            case 23:
+            case 24:
             case "end":
               return _context4.stop();
           }
@@ -39137,11 +39289,10 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 (_this$updateViewPlann3 = _this.updateViewPlannerElements) === null || _this$updateViewPlann3 === void 0 || _this$updateViewPlann3.call(_this, setHandlerInstance.getAllViewPlannerElements(set), setHandlerInstance.getAllVisualiedNotPlannedElements(set));
                 _this.updatePlannerView('ADD_ACC_ON_SHELF_PLANNER');
               }
+              _this.checkMatchingProducts('onShelfAdd');
               _this.plannerChangeLog('onAddPlanner');
-              productHandlerInstance.updateProducts(_this.setsAsArray, _this.api, 'onShelfAdd');
-              _this.checkVariantData();
               return _context5.abrupt("return", retVal);
-            case 11:
+            case 10:
             case "end":
               return _context5.stop();
           }
@@ -39185,10 +39336,9 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _this.updateViewButtonsDependigOnConfigStructure();
               (_this$updateViewPlann5 = _this.updateViewPlannerElements) === null || _this$updateViewPlann5 === void 0 || _this$updateViewPlann5.call(_this, setHandlerInstance.getAllViewPlannerElements(set), setHandlerInstance.getAllVisualiedNotPlannedElements(set));
               _this.updatePlannerView('DELETE_ACC_ON_SHELF_PLANNER');
+              _this.checkMatchingProducts('onShelfDelete');
               _this.plannerChangeLog('onDeletePlanner');
-              productHandlerInstance.updateProducts(_this.setsAsArray, _this.api, 'onShelfDelete');
-              _this.checkVariantData();
-            case 12:
+            case 11:
             case "end":
               return _context6.stop();
           }
@@ -39261,10 +39411,9 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _this.updatePlannerView('UPDATE_ACC_QUANTITY');
               _this.updatePriceInView();
               _this.updateViewButtonsDependigOnConfigStructure();
-              productHandlerInstance.updateProducts(_this.setsAsArray, _this.api, 'onAccessoireUpdate');
-              _this.checkVariantData();
+              _this.checkMatchingProducts('onAccessoireUpdate');
               _this.plannerChangeLog('onUpdateAccessoireQuantity');
-            case 13:
+            case 12:
             case "end":
               return _context8.stop();
           }
@@ -39292,11 +39441,10 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 _this.updatePriceInView();
                 _this.updateViewButtonsDependigOnConfigStructure();
               }
-              productHandlerInstance.updateProducts(_this.setsAsArray, _this.api, 'onAccessoireDelete');
-              _this.checkVariantData();
+              _this.checkMatchingProducts('onAccessoireDelete');
               _this.plannerChangeLog('onDeletePlanner');
               return _context9.abrupt("return", wasDeleted);
-            case 9:
+            case 8:
             case "end":
               return _context9.stop();
           }
@@ -39378,10 +39526,9 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               returnValues = _context11.sent;
               (_this$actions14 = _this.actions) === null || _this$actions14 === void 0 || (_this$actions14$toggl = _this$actions14.toggleLoading) === null || _this$actions14$toggl === void 0 || _this$actions14$toggl.call(_this$actions14, 'doConfigure', false, false);
               structure = setHandlerInstance.loadConfigStructureOfActSet(set, _this.getCurPlannerType());
-              productHandlerInstance.updateProducts(_this.setsAsArray, _this.api, 'onConfig');
-              _this.checkVariantData();
+              _this.checkMatchingProducts('onConfig');
               if (dontUpdatePlannerView) {
-                _context11.next = 19;
+                _context11.next = 18;
                 break;
               }
               _this.updateConfiguratorStructure(structure);
@@ -39395,18 +39542,18 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _this.updateViewButtonsDependigOnConfigStructure();
               _this.updatePlannerView('DO_CONFIGURE', myValues);
               _this.updateWebConfiguratorTitle();
-              _context11.next = 19;
+              _context11.next = 18;
               return _this.getFreePlacesOnGrids(undefined, 'doConfigure');
-            case 19:
+            case 18:
               if (dontCallEvents) {
-                _context11.next = 22;
+                _context11.next = 21;
                 break;
               }
-              _context11.next = 22;
+              _context11.next = 21;
               return _this.fillBaksetforOnWebPlanerConfigChange(myValues);
+            case 21:
+              _this.configuratorChangeLog('onConfiguratorStep', myValues);
             case 22:
-              _this.configuratorChangeLog('onConfiguratorStep');
-            case 23:
             case "end":
               return _context11.stop();
           }
@@ -39506,7 +39653,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee13() {
-        var viewReadyPromise, loadSuccessful, _initSetState$api$web, _this$actions16, _set$getDivaArticles, _this$actions15, _this$actions15$toggl, initSetState, set, products, result, _this$actions17, catalogData, initializationId, _this$plannerConfig$a;
+        var viewReadyPromise, loadSuccessful, _this$actions16, _set$getDivaArticles, _this$actions15, _this$actions15$toggl, initSetState, set, oldProductId, result, _this$actions17, catalogData, initializationId, _this$plannerConfig$a;
         return _regeneratorRuntime__default["default"].wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -39531,71 +39678,63 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               return this.divaBasketHandler.initializeBasket(this.api);
             case 12:
               loadSuccessful = _context13.sent;
+              if (!this.divaBasketHandler.hasConfiguratorSessionIdGetter || DivaUtils__default["default"].businessMetrics.getConfiguratorSessionId() == undefined) {
+                DivaUtils__default["default"].businessMetrics.setConfiguratorSessionId();
+              }
               if (!loadSuccessful) {
-                _context13.next = 61;
+                _context13.next = 56;
                 break;
               }
               if (!(typeof loadSuccessful != 'boolean')) {
-                _context13.next = 25;
+                _context13.next = 24;
                 break;
               }
               if (!(loadSuccessful.type == 'ProductList')) {
-                _context13.next = 23;
+                _context13.next = 24;
                 break;
               }
-              _context13.next = 18;
+              _context13.next = 19;
               return viewReadyPromise;
-            case 18:
-              _context13.next = 20;
+            case 19:
+              _context13.next = 21;
               return this.initView();
-            case 20:
+            case 21:
               this.subscribeToWebPlannerEvents();
               (_this$actions15 = this.actions) === null || _this$actions15 === void 0 || (_this$actions15$toggl = _this$actions15.toggleLoading) === null || _this$actions15$toggl === void 0 || _this$actions15$toggl.call(_this$actions15, 'Planner_Loading', false, false);
               return _context13.abrupt("return", true);
-            case 23:
-              _context13.next = 26;
-              break;
-            case 25:
-              if (this.api.doCheckForProductsPrice()) ;
-            case 26:
+            case 24:
               this.divaNr = this.divaBasketHandler.actDivaNr;
               initSetState = this.getInitStateForSet();
               this.plannerHandler.initPlanner(initSetState, this.getPlannerHandlerFunctions());
-              _context13.next = 31;
+              _context13.next = 29;
               return setHandlerInstance.initSetsByOrderSet(this.divaBasketHandler.getOrderSetsByDivaNr(this.divaNr), initSetState);
-            case 31:
+            case 29:
               set = this.actSet();
-              if (!((_initSetState$api$web = initSetState.api.webConfig) !== null && _initSetState$api$web !== void 0 && _initSetState$api$web.checkForProductsPrice)) {
-                _context13.next = 43;
-                break;
-              }
-              if (!(typeof loadSuccessful != 'boolean' && loadSuccessful.type == 'ProductId')) {
+              oldProductId = this.divaBasketHandler.actBasket.MatchingProductId || this.divaBasketHandler.actBasket.OrigProductId;
+              if (!(oldProductId && set)) {
                 _context13.next = 38;
                 break;
               }
-              products = loadSuccessful;
-              set === null || set === void 0 || set.remindPriceForHash(products);
-              _context13.next = 43;
+              _context13.next = 34;
+              return this.divaBasketHandler.getProduct(this.api, oldProductId);
+            case 34:
+              result = _context13.sent;
+              if (result) productHandlerInstance.handleFountMatchingProducts(set, [result], set.setHash);
+              _context13.next = 39;
               break;
             case 38:
-              if (!this.divaBasketHandler.actBasket.OrigProductId) {
-                _context13.next = 43;
-                break;
+              if (typeof loadSuccessful != 'boolean' && set !== null && set !== void 0 && set.api.doCheckForProductsPrice()) {
+                if (loadSuccessful.type != 'ProductList') {
+                  productHandlerInstance.handleFountMatchingProducts(set, [loadSuccessful], set.setHash);
+                }
               }
+            case 39:
               _context13.next = 41;
-              return this.divaBasketHandler.getProduct(this.api, this.divaBasketHandler.actBasket.OrigProductId);
-            case 41:
-              result = _context13.sent;
-              if (result) {
-                set === null || set === void 0 || set.remindPriceForHash(result);
-              }
-            case 43:
-              _context13.next = 45;
               return viewReadyPromise;
-            case 45:
-              _context13.next = 47;
+            case 41:
+              _context13.next = 43;
               return this.initView();
-            case 47:
+            case 43:
               (_this$actions16 = this.actions) === null || _this$actions16 === void 0 || _this$actions16.onEvent({
                 type: 'onConfiguratorReady'
               });
@@ -39607,9 +39746,6 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               this.subscribeToWebPlannerEvents();
               this.divaBasketHandler.actBasket;
               catalogData = set === null || set === void 0 ? void 0 : set.CatalogData;
-              if (!this.divaBasketHandler.hasConfiguratorSessionIdGetter || DivaUtils__default["default"].businessMetrics.getConfiguratorSessionId() == undefined) {
-                DivaUtils__default["default"].businessMetrics.setConfiguratorSessionId();
-              }
               initializationId = undefined;
               if (this.divaBasketHandler.initializationTypeGetter == 'PRODUCT_ID') {
                 //KONFIGURATOR LOADED BY PRODUCT. LOG THIS HERE! WITH PRODUCT NAME AND PRODUCT ID
@@ -39626,23 +39762,23 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 catalogCodex: catalogData === null || catalogData === void 0 ? void 0 : catalogData.catalogCodex,
                 catalogName: catalogData === null || catalogData === void 0 ? void 0 : catalogData.catalogName,
                 accountName: catalogData === null || catalogData === void 0 ? void 0 : catalogData.accountName,
-                supplierId: catalogData === null || catalogData === void 0 ? void 0 : catalogData.supplierGuid,
+                supplierId: catalogData === null || catalogData === void 0 ? void 0 : catalogData.accountGuid,
                 plannerInitialization: this.divaBasketHandler.initializationTypeGetter,
                 productGroup: catalogData === null || catalogData === void 0 ? void 0 : catalogData.mainCategory,
                 hasPlannerInitialization: this.initMode ? false : true,
                 initializationType: this.divaBasketHandler.initializationTypeGetter,
                 initializationId: initializationId
               }, false);
-              _context13.next = 58;
+              _context13.next = 53;
               return this.fillBaksetforOnWebPlanerConfigChange(undefined, true);
-            case 58:
+            case 53:
               return _context13.abrupt("return", true);
-            case 61:
+            case 56:
               this.onInitializationError();
               //fehler beim laden vom basket..
               LOG$1.errorTransaction('LOADING_BASKET', 'BASKET_0002', 'Fehler beim Laden des Baskets', {}, true);
               return _context13.abrupt("return", false);
-            case 64:
+            case 59:
             case "end":
               return _context13.stop();
           }
@@ -39804,7 +39940,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 break;
               }
               (_this$initConfigurato = this.initConfiguratorStructure) === null || _this$initConfigurato === void 0 || _this$initConfigurato.call(this, setHandlerInstance.loadConfigStructureForOnlyProductsList());
-              _context15.next = 18;
+              _context15.next = 17;
               break;
             case 7:
               _context15.next = 9;
@@ -39819,12 +39955,11 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               (_this$updateViewPlann9 = this.updateViewPlannerElements) === null || _this$updateViewPlann9 === void 0 || _this$updateViewPlann9.call(this, setHandlerInstance.getAllViewPlannerElements(set), setHandlerInstance.getAllVisualiedNotPlannedElements(set), set.getSetId(), set.firstElementId);
               this.updatePlannerView('INIT_VIEW');
               this.onBasketInitialized();
-              productHandlerInstance.updateProducts(this.setsAsArray, this.api, 'onInit');
-              this.checkVariantData();
-            case 18:
-              _context15.next = 20;
+              this.checkMatchingProducts('onInit');
+            case 17:
+              _context15.next = 19;
               return this.runInitMode(plannerMode);
-            case 20:
+            case 19:
             case "end":
               return _context15.stop();
           }
@@ -39850,39 +39985,36 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "runInitMode",
     value: function () {
       var _runInitMode = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee16(plannerMode) {
-        var _this$navigateToTabGr2;
-        var doDefault, configStepKey, _this$actSet6, _this$navigateToTabGr3, _this$navigateToTabGr4, _this$navigateToTabGr5;
+        var doDefault, _this$navigateToTabGr2, configStepKey, _this$actSet6, _this$navigateToTabGr3, _this$navigateToTabGr4, _this$navigateToTabGr5;
         return _regeneratorRuntime__default["default"].wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
               doDefault = true;
-              if (!this.plannerConfig.initMode) {
-                _context16.next = 15;
+              if (!(this.plannerConfig.initMode == 'OPEN_LEAFLET_BARRIER' || this.plannerConfig.initMode == 'SHOW_PDF')) {
+                _context16.next = 10;
                 break;
               }
-              _context16.t0 = this.plannerConfig.initMode;
-              _context16.next = _context16.t0 === 'OPEN_LEAFLET_BARRIER' ? 5 : _context16.t0 === 'SHOW_PDF' ? 5 : _context16.t0 === 'OPENCONFIGTABGROUP' ? 12 : 15;
-              break;
-            case 5:
               if (this.plannerConfig.initMode == 'OPEN_LEAFLET_BARRIER') this.ReturnTo = 'OPEN_LEAFLET_BARRIER';
               if (this.plannerConfig.initMode == 'SHOW_PDF') this.ReturnTo = 'OPEN_PDF';
               (_this$navigateToTabGr2 = this.navigateToTabGroup) === null || _this$navigateToTabGr2 === void 0 || _this$navigateToTabGr2.call(this, 'SUMMARY', undefined, true);
               //TODO lea bug das hier ist nur ein temporäre lößung https://app.asana.com/0/1200869909950432/1200998848659806
-              _context16.next = 10;
+              _context16.next = 7;
               return this.saveToBasketWrapper();
-            case 10:
+            case 7:
               doDefault = false;
-              return _context16.abrupt("break", 15);
-            case 12:
-              configStepKey = this.plannerConfig.opt ? setHandlerInstance.getConfigStepKeyOfOption(this.actSet(), this.plannerConfig.opt) : setHandlerInstance.getFirstConfigStep(this.actSet());
-              if (configStepKey) {
-                this.navigateToConfigStep(configStepKey, !this.plannerConfig.opt, true);
-                doDefault = false;
-              } else {
-                LOG$1.warn('Option: ' + this.plannerConfig.opt + ' could not be found');
+              _context16.next = 11;
+              break;
+            case 10:
+              if (this.plannerConfig.initMode == 'OPENCONFIGTABGROUP' || this.api.getPlannerType() == 'JUMP_OVER_PLANNER') {
+                configStepKey = this.plannerConfig.opt ? setHandlerInstance.getConfigStepKeyOfOption(this.actSet(), this.plannerConfig.opt) : setHandlerInstance.getFirstConfigStep(this.actSet());
+                if (configStepKey) {
+                  this.navigateToConfigStep(configStepKey, !this.plannerConfig.opt, true);
+                  doDefault = false;
+                } else {
+                  LOG$1.warn('Option: ' + this.plannerConfig.opt + ' could not be found');
+                }
               }
-              return _context16.abrupt("break", 15);
-            case 15:
+            case 11:
               if (doDefault) {
                 if (plannerMode == 'ProductList') {
                   (_this$navigateToTabGr3 = this.navigateToTabGroup) === null || _this$navigateToTabGr3 === void 0 || _this$navigateToTabGr3.call(this, 'PRODUCTS');
@@ -39892,7 +40024,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                   (_this$navigateToTabGr5 = this.navigateToTabGroup) === null || _this$navigateToTabGr5 === void 0 || _this$navigateToTabGr5.call(this, this.getCurPlannerType(true), true);
                 }
               }
-            case 16:
+            case 12:
             case "end":
               return _context16.stop();
           }
@@ -39936,7 +40068,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _context17.next = 15;
               return setHandlerInstance.addOrderSetArticlesToExistingSet(loadedSet, orderset, lastSetToInitialize);
             case 15:
-              productHandlerInstance.updateProducts(this.setsAsArray, this.api, 'onAdd');
+              this.checkMatchingProducts('onAdd');
               _context17.next = 20;
               break;
             case 18:
@@ -40044,7 +40176,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
      */
   }, {
     key: "updatePlannerView",
-    value: function updatePlannerView(callingFrom, onDoConfigureValues, viewpoint) {
+    value: function updatePlannerView(callingFrom, onDoConfigureValues, hybridInfo) {
       var _this$getCurrentAlter, _set$getAlternateRend, _this$getDoShow3DDime2, _this$getDoShow3DDime3, _this$getDoShow3DDime4;
       var set = this.actSet();
       if (!set) return;
@@ -40081,12 +40213,16 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       LOG$1.debug('lvl 1: ', this.getCurPlannerViewMode());
       switch (this.getCurPlannerViewMode()) {
         case '3DCOMB':
-          setHandlerInstance.update3DPlannerView(true, true, set, this.getPlannerRenderingSize(), this.getPlanner3DGridEnabled(), 'STREAM', (_this$getDoShow3DDime2 = this.getDoShow3DDimensionLines) === null || _this$getDoShow3DDime2 === void 0 ? void 0 : _this$getDoShow3DDime2.call(this), alternateRenderInfo, viewpoint, callingFrom != 'HANDLE_3D_VIS_CHANGED');
+          setHandlerInstance.update3DPlannerView(true, !hybridInfo || hybridInfo && hybridInfo.focus.adjustZoomInUnity, set, this.getPlannerRenderingSize(), this.getPlanner3DGridEnabled(), 'STREAM', (_this$getDoShow3DDime2 = this.getDoShow3DDimensionLines) === null || _this$getDoShow3DDime2 === void 0 ? void 0 : _this$getDoShow3DDime2.call(this), alternateRenderInfo, hybridInfo ? {
+            focus: hybridInfo.focus,
+            forceRTCam: true,
+            currentCamera: hybridInfo.currentCamera
+          } : undefined);
           break;
         case 'RTViewer':
           //Request HQRenderscript + rendering
           //Request new Rendering
-          setHandlerInstance.update3DPlannerView(true, true, set, this.getPlannerRenderingSize(), this.getPlanner3DGridEnabled(), 'STREAM', (_this$getDoShow3DDime3 = this.getDoShow3DDimensionLines) === null || _this$getDoShow3DDime3 === void 0 ? void 0 : _this$getDoShow3DDime3.call(this), alternateRenderInfo, viewpoint);
+          setHandlerInstance.update3DPlannerView(true, true, set, this.getPlannerRenderingSize(), this.getPlanner3DGridEnabled(), 'STREAM', (_this$getDoShow3DDime3 = this.getDoShow3DDimensionLines) === null || _this$getDoShow3DDime3 === void 0 ? void 0 : _this$getDoShow3DDime3.call(this), alternateRenderInfo, undefined);
           break;
         case '3DImage':
           //Request new Rendering
@@ -40175,13 +40311,12 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 if (result.selectElementId) (_this$updateElementSe5 = this.updateElementSelectionPlanner) === null || _this$updateElementSe5 === void 0 || _this$updateElementSe5.call(this, [result.setId], [result.selectElementId], true);else (_this$updateElementSe6 = this.updateElementSelectionPlanner) === null || _this$updateElementSe6 === void 0 || _this$updateElementSe6.call(this, [], [], true);
               }
               this.updatePriceInView();
-              productHandlerInstance.updateProducts(this.setsAsArray, this.api, 'onDelete');
-              this.checkVariantData();
-              _context19.next = 15;
+              this.checkMatchingProducts('onDelete');
+              _context19.next = 14;
               return this.getFreePlacesOnGrids(undefined, 'deleteElement');
-            case 15:
+            case 14:
               this.plannerChangeLog('onDeletePlanner');
-            case 16:
+            case 15:
             case "end":
               return _context19.stop();
           }
@@ -40224,12 +40359,9 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 baseArticle = setHandlerInstance.getBaseParentArticleOfAccessoire(set, newSelectedArticle.basketId);
                 (_this$updateElementSe7 = this.updateElementSelectionPlanner) === null || _this$updateElementSe7 === void 0 || _this$updateElementSe7.call(this, [baseArticle.setId], [baseArticle.elementId], true);
               }
-              productHandlerInstance.updateProducts(this.setsAsArray, this.api, 'onCopy');
-              _context20.next = 14;
-              return this.checkVariantData();
-            case 14:
+              this.checkMatchingProducts('onCopy');
               return _context20.abrupt("return", newConfigStepKey);
-            case 15:
+            case 13:
             case "end":
               return _context20.stop();
           }
@@ -40387,36 +40519,6 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       }
       return resetArticle;
     }()
-  }, {
-    key: "checkVariantData",
-    value: function () {
-      var _checkVariantData = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee24() {
-        var somethingChanged;
-        return _regeneratorRuntime__default["default"].wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
-            case 0:
-              if (!this.api.getDoCheckVariantData()) {
-                _context24.next = 5;
-                break;
-              }
-              _context24.next = 3;
-              return setHandlerInstance.checkVariantData(this.actSet());
-            case 3:
-              somethingChanged = _context24.sent;
-              if (somethingChanged) {
-                this.updatePriceInView();
-              }
-            case 5:
-            case "end":
-              return _context24.stop();
-          }
-        }, _callee24, this);
-      }));
-      function checkVariantData() {
-        return _checkVariantData.apply(this, arguments);
-      }
-      return checkVariantData;
-    }()
   }, {
     key: "defineArticlesOnOptions",
     value: function defineArticlesOnOptions(basketIdsOnOptions) {
@@ -40439,7 +40541,44 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       var _this$actSet8;
       (_this$actSet8 = this.actSet()) === null || _this$actSet8 === void 0 || _this$actSet8.setDifferentOptions(options);
     }
-
+  }, {
+    key: "checkMatchingProducts",
+    value: function () {
+      var _checkMatchingProducts = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee24(from) {
+        var set, _set$getMatchingProdu, _set$getMatchingOrigP, _set$getMatchingOrigP2, _set$getMatchingProdu2;
+        return _regeneratorRuntime__default["default"].wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
+            case 0:
+              set = this.actSet();
+              if (set !== null && set !== void 0 && set.api.doCheckForProductsPrice()) {
+                if (((_set$getMatchingProdu = set.getMatchingProduct()) === null || _set$getMatchingProdu === void 0 ? void 0 : _set$getMatchingProdu.setHash) !== set.setHash) {
+                  set.setMatchingProduct();
+                  this.updatePriceInView();
+                }
+                if (set.getMatchingOrigProduct() && ((_set$getMatchingOrigP = set.getMatchingOrigProduct()) === null || _set$getMatchingOrigP === void 0 ? void 0 : _set$getMatchingOrigP.setHash) === set.setHash && ((_set$getMatchingOrigP2 = set.getMatchingOrigProduct()) === null || _set$getMatchingOrigP2 === void 0 ? void 0 : _set$getMatchingOrigP2.setHash) !== ((_set$getMatchingProdu2 = set.getMatchingProduct()) === null || _set$getMatchingProdu2 === void 0 ? void 0 : _set$getMatchingProdu2.setHash)) {
+                  set.setMatchingProduct(set.getMatchingOrigProduct());
+                  this.updatePriceInView();
+                }
+              }
+              if (!(set !== null && set !== void 0 && set.api.doCheckForProductsMatch())) {
+                _context24.next = 6;
+                break;
+              }
+              _context24.next = 5;
+              return productHandlerInstance.updateProducts(this.setsAsArray, this.api, this.divaBasketHandler.divaWWSHandler, from);
+            case 5:
+              this.updatePriceInView();
+            case 6:
+            case "end":
+              return _context24.stop();
+          }
+        }, _callee24, this);
+      }));
+      function checkMatchingProducts(_x64) {
+        return _checkMatchingProducts.apply(this, arguments);
+      }
+      return checkMatchingProducts;
+    }()
     /**
      * Updated the Price in the View.
      * Should always be called after something was changed!
@@ -40449,7 +40588,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     value: function updatePriceInView() {
       var _this$updatePrice;
       setHandlerInstance.getActSetPriceFormat(this.actSet());
-      (_this$updatePrice = this.updatePrice) === null || _this$updatePrice === void 0 || _this$updatePrice.call(this, setHandlerInstance.getTotalPrice(this.sets), this.actSet().getSetPrice(), setHandlerInstance.getTotalBruttoPrice(this.sets));
+      (_this$updatePrice = this.updatePrice) === null || _this$updatePrice === void 0 || _this$updatePrice.call(this, setHandlerInstance.getTotalViewPrice(this.sets), this.actSet().getViewSetPrice(), setHandlerInstance.getTotalViewBruttoPrice(this.sets));
     }
 
     /**
@@ -40619,7 +40758,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }, _callee25, this);
       }));
-      function saveToBasketWrapper(_x64, _x65, _x66) {
+      function saveToBasketWrapper(_x65, _x66, _x67) {
         return _saveToBasketWrapper.apply(this, arguments);
       }
       return saveToBasketWrapper;
@@ -40628,7 +40767,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;
+        var _returnTo, _returnTo2, _returnTo3, _this$actions32, _this$actions33, _this$actions34, _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) {
@@ -40746,7 +40885,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               return _context26.abrupt("break", 52);
             case 52:
               if (returnTo == 'DONT_SAVE_BASKET') event = 'dontSaveBasket';
-              actBasket = this.divaBasketHandler.getBasketData(actBasket.DivaNr); //get pdf documenturl from saved basket
+              actBasket = (_this$divaBasketHandl2 = this.divaBasketHandler.getBasketData(actBasket.DivaNr, actBasket.DocumentVersion)) !== null && _this$divaBasketHandl2 !== void 0 ? _this$divaBasketHandl2 : actBasket; //get pdf documenturl from saved basket
               _context26.next = 56;
               return this.addToBasket(actBasket, event);
             case 56:
@@ -40758,7 +40897,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }, _callee26, this);
       }));
-      function saveToBasket(_x67, _x68, _x69) {
+      function saveToBasket(_x68, _x69, _x70) {
         return _saveToBasket.apply(this, arguments);
       }
       return saveToBasket;
@@ -40811,6 +40950,10 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           plannerType = 'PLANNER';
         }
       }
+      if (plannerType === 'JUMP_OVER_PLANNER') {
+        ret = 'PLANNER';
+        plannerType = undefined;
+      }
       if (plannerType === 'CUSTOMER_OPTIMIZED_PLANNER') {
         var _set$CatalogData$allC;
         var optimizationReason = undefined;
@@ -40896,8 +41039,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "doAllowSetPlanner",
     value: function doAllowSetPlanner() {
-      var _this$returnTo, _this$divaBasketHandl2;
-      return this.api.doAllowSetPlanner() || ((_this$returnTo = this.returnTo) === null || _this$returnTo === void 0 ? void 0 : _this$returnTo.startsWith('SETPLANNER')) || !!((_this$divaBasketHandl2 = this.divaBasketHandler) !== null && _this$divaBasketHandl2 !== void 0 && (_this$divaBasketHandl2 = _this$divaBasketHandl2.actBasket) !== null && _this$divaBasketHandl2 !== void 0 && _this$divaBasketHandl2.SetPlannerInfos);
+      var _this$returnTo, _this$divaBasketHandl3;
+      return this.api.doAllowSetPlanner() || ((_this$returnTo = this.returnTo) === null || _this$returnTo === void 0 ? void 0 : _this$returnTo.startsWith('SETPLANNER')) || !!((_this$divaBasketHandl3 = this.divaBasketHandler) !== null && _this$divaBasketHandl3 !== void 0 && (_this$divaBasketHandl3 = _this$divaBasketHandl3.actBasket) !== null && _this$divaBasketHandl3 !== void 0 && _this$divaBasketHandl3.SetPlannerInfos);
     }
   }, {
     key: "doShow3DDimensionLines",
@@ -40934,18 +41077,18 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getAllowRTV",
     value: function getAllowRTV() {
-      var _this$actSet22, _this$actSet23;
+      var _this$state3, _this$actSet22, _this$state4, _this$actSet23;
       if (this.getEnableUnityRtvKombi()) return false;
-      if (this.api.forceShowRTV()) return true;
+      if ((_this$state3 = this.state) !== null && _this$state3 !== void 0 && _this$state3.organization.settings.forceRTV) return true;
       if ((_this$actSet22 = this.actSet()) !== null && _this$actSet22 !== void 0 && _this$actSet22.CatalogData.divaForceRTV) return true;
-      if (this.api.getDoShowRTV() && (_this$actSet23 = this.actSet()) !== null && _this$actSet23 !== void 0 && _this$actSet23.CatalogData.divaArReady) return true;
+      if ((_this$state4 = this.state) !== null && _this$state4 !== void 0 && _this$state4.organization.settings.enableRTV && (_this$actSet23 = this.actSet()) !== null && _this$actSet23 !== void 0 && _this$actSet23.CatalogData.divaArReady) return true;
       return false;
     }
   }, {
-    key: "geAllowQRCodeAR",
-    value: function geAllowQRCodeAR() {
+    key: "getAllowQRCodeAR",
+    value: function getAllowQRCodeAR() {
       var _this$actSet24;
-      if (this.api.getDoShowAR() && (_this$actSet24 = this.actSet()) !== null && _this$actSet24 !== void 0 && _this$actSet24.CatalogData.divaArReady) return true;
+      if (this.api.enableAR && (_this$actSet24 = this.actSet()) !== null && _this$actSet24 !== void 0 && _this$actSet24.CatalogData.divaArReady) return true;
       return false;
     }
   }, {
@@ -41023,7 +41166,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           _this$actions37,
           _this$actions38,
           _this$actions39,
-          _this$divaBasketHandl3,
+          _this$divaBasketHandl4,
           _this3 = this,
           _this$actions40,
           _this$actions41,
@@ -41075,7 +41218,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               });
               return _context28.abrupt("break", 32);
             case 15:
-              emailConfig = (_this$divaBasketHandl3 = this.divaBasketHandler.emailConfig) !== null && _this$divaBasketHandl3 !== void 0 ? _this$divaBasketHandl3 : this.getEmailConfig(); //reset the emailConfig
+              emailConfig = (_this$divaBasketHandl4 = this.divaBasketHandler.emailConfig) !== null && _this$divaBasketHandl4 !== void 0 ? _this$divaBasketHandl4 : this.getEmailConfig(); //reset the emailConfig
               this.divaBasketHandler.emailConfig = undefined;
               if (emailConfig) {
                 to = (_emailConfig$to$split = (_emailConfig$to = emailConfig.to) === null || _emailConfig$to === void 0 ? void 0 : _emailConfig$to.split(',').map(function (mail) {
@@ -41145,7 +41288,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }, _callee28, this);
       }));
-      function addToBasket(_x70) {
+      function addToBasket(_x71) {
         return _addToBasket.apply(this, arguments);
       }
       return addToBasket;
@@ -41440,7 +41583,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }, _callee29, this);
       }));
-      function initApiForLogicOnly(_x71, _x72, _x73, _x74, _x75, _x76, _x77) {
+      function initApiForLogicOnly(_x72, _x73, _x74, _x75, _x76, _x77, _x78) {
         return _initApiForLogicOnly.apply(this, arguments);
       }
       return initApiForLogicOnly;
@@ -41478,8 +41621,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 _initSetState$api$web2;
-        var initSetState, sets, result, _sets$, set, basket;
+        var initSetState, set, basket;
         return _regeneratorRuntime__default["default"].wrap(function _callee31$(_context31) {
           while (1) switch (_context31.prev = _context31.next) {
             case 0:
@@ -41489,45 +41631,29 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _context31.next = 5;
               return setHandlerInstance.initSetsByOrderSet(this.divaBasketHandler.getOrderSetsByDivaNr(this.divaNr), initSetState);
             case 5:
-              sets = _context31.sent;
-              if (!((_initSetState$api$web2 = initSetState.api.webConfig) !== null && _initSetState$api$web2 !== void 0 && _initSetState$api$web2.checkForProductsPrice)) {
-                _context31.next = 12;
-                break;
-              }
-              if (!this.divaBasketHandler.actBasket.OrigProductId) {
-                _context31.next = 12;
-                break;
-              }
-              _context31.next = 10;
-              return this.divaBasketHandler.getProduct(this.api, this.divaBasketHandler.actBasket.OrigProductId);
-            case 10:
-              result = _context31.sent;
-              if (result) {
-                (_sets$ = sets[0]) === null || _sets$ === void 0 || _sets$.remindPriceForHash(result);
-              }
-            case 12:
+              //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 = 18;
+                _context31.next = 11;
                 break;
               }
-              _context31.next = 18;
+              _context31.next = 11;
               return this.handleFavorites(init3D ? 'CALC' : 'REPAIR');
-            case 18:
-              _context31.next = 20;
+            case 11:
+              _context31.next = 13;
               return setHandlerInstance.fillOrderLinesAndOrderSets(this.sets, this.divaBasketHandler, !init3D, this.doAllowSetPlanner(), this.ReturnTo);
-            case 20:
+            case 13:
               basket = _context31.sent;
               return _context31.abrupt("return", basket);
-            case 22:
+            case 15:
             case "end":
               return _context31.stop();
           }
         }, _callee31, this);
       }));
-      function initBasket(_x78, _x79, _x80) {
+      function initBasket(_x79, _x80, _x81) {
         return _initBasket.apply(this, arguments);
       }
       return initBasket;
@@ -41604,7 +41730,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }, _callee33, this);
       }));
-      function handleFavorites(_x81) {
+      function handleFavorites(_x82) {
         return _handleFavorites.apply(this, arguments);
       }
       return handleFavorites;
@@ -41658,7 +41784,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }, _callee34, this);
       }));
-      function initSapOrderLinesFromBasket(_x82, _x83, _x84) {
+      function initSapOrderLinesFromBasket(_x83, _x84, _x85) {
         return _initSapOrderLinesFromBasket.apply(this, arguments);
       }
       return initSapOrderLinesFromBasket;
@@ -41705,6 +41831,11 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     value: function openARObserverConnection(handleNoHqrs) {
       return this.getPlannerHandler().openARObserverConnection(handleNoHqrs);
     }
+  }, {
+    key: "updateCameraInformation",
+    value: function updateCameraInformation(cam) {
+      return this.getPlannerHandler().updateCamPosition(cam);
+    }
   }, {
     key: "doLoadHQR",
     get: function get() {
@@ -41717,13 +41848,15 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "plannerChangeLog",
     value: function plannerChangeLog(action) {
       var set = this.actSet();
+      var articleCodex = [];
+      var accesoriesCodex = [];
       var articles = [];
       if (set) {
         for (var _i = 0, _Object$values = Object.values(set.getDivaArticles()); _i < _Object$values.length; _i++) {
           var article = _Object$values[_i];
           if (article.relatedToBasketId) {
             var toAdd = {
-              articleCodex: article.configArticleCodex,
+              codex: article.configArticleCodex,
               basketId: article.basketId,
               relatedBasektId: article.relatedToBasketId,
               type: 'ACCESSORIE'
@@ -41733,9 +41866,10 @@ var DivaWebPlanner = /*#__PURE__*/function () {
             } else {
               articles.push(toAdd);
             }
+            if (article.configArticleCodex) accesoriesCodex.push(article.configArticleCodex);
           } else {
             var _toAdd = {
-              articleCodex: article.configArticleCodex,
+              codex: article.configArticleCodex,
               basketId: article.basketId,
               type: 'ARTICLE'
             };
@@ -41744,36 +41878,112 @@ var DivaWebPlanner = /*#__PURE__*/function () {
             } else {
               articles.push(_toAdd);
             }
+            if (article.configArticleCodex) articleCodex.push(article.configArticleCodex);
           }
         }
       }
       LOG$1.businessEvent(action, 'Planner', 'Planner wurde verändert', {
-        articles: articles
+        article: {
+          articleCodex: articleCodex,
+          accesoriesCodex: accesoriesCodex,
+          article_nested: articles
+        }
+      });
+      LOG$1.businessEvent('onActualBasketValue', 'Planner', 'Aktueller Basket Value:' + this.getCurSetPrice(), {
+        basketValue: this.getCurSetPrice()
       });
     }
   }, {
     key: "configuratorChangeLog",
-    value: function configuratorChangeLog(action) {
+    value: function configuratorChangeLog(action, myValues) {
       var set = this.actSet();
       var configuration = [];
+      var allOpt = [];
+      var allOpv = [];
+      var latestOpv = {};
+      var latestOpt = {};
       if (set) {
+        if (myValues) {
+          var _set$CatalogData$getO, _set$CatalogData$getO2;
+          latestOpt = {
+            codex: Object.keys(myValues)[0],
+            name: (_set$CatalogData$getO = set.CatalogData.getOption(Object.keys(myValues)[0])) === null || _set$CatalogData$getO === void 0 ? void 0 : _set$CatalogData$getO.name
+          };
+          latestOpv = {
+            codex: Object.values(myValues)[0],
+            name: (_set$CatalogData$getO2 = set.CatalogData.getOptionValue(Object.values(myValues)[0])) === null || _set$CatalogData$getO2 === void 0 ? void 0 : _set$CatalogData$getO2.name
+          };
+        }
         for (var _i2 = 0, _Object$values2 = Object.values(set.getDivaArticles()); _i2 < _Object$values2.length; _i2++) {
           var article = _Object$values2[_i2];
           if (!configuration) {
             configuration = [{
               varientValues: article.VariantValues,
-              basketId: article.basketId
+              basketId: article.basketId,
+              opt: Object.keys(article.VariantValues).map(function (key) {
+                var _set$CatalogData$getO3;
+                return {
+                  codex: key,
+                  name: (_set$CatalogData$getO3 = set.CatalogData.getOption(key)) === null || _set$CatalogData$getO3 === void 0 ? void 0 : _set$CatalogData$getO3.name
+                };
+              }),
+              opv: Object.values(article.VariantValues).map(function (value) {
+                var _set$CatalogData$getO4;
+                return {
+                  codex: value,
+                  name: (_set$CatalogData$getO4 = set.CatalogData.getOption(value)) === null || _set$CatalogData$getO4 === void 0 ? void 0 : _set$CatalogData$getO4.name
+                };
+              })
             }];
           } else {
             configuration.push({
               varientValues: article.VariantValues,
-              basketId: article.basketId
+              basketId: article.basketId,
+              opt: Object.keys(article.VariantValues).map(function (key) {
+                var _set$CatalogData$getO5;
+                return {
+                  codex: key,
+                  name: (_set$CatalogData$getO5 = set.CatalogData.getOption(key)) === null || _set$CatalogData$getO5 === void 0 ? void 0 : _set$CatalogData$getO5.name
+                };
+              }),
+              opv: Object.values(article.VariantValues).map(function (value) {
+                var _set$CatalogData$getO6;
+                return {
+                  codex: value,
+                  name: (_set$CatalogData$getO6 = set.CatalogData.getOptionValue(value)) === null || _set$CatalogData$getO6 === void 0 ? void 0 : _set$CatalogData$getO6.name
+                };
+              })
+            });
+          }
+          for (var _i3 = 0, _Object$entries = Object.entries(article.VariantValues); _i3 < _Object$entries.length; _i3++) {
+            var _set$CatalogData$getO7, _set$CatalogData$getO8;
+            var _Object$entries$_i = _slicedToArray__default["default"](_Object$entries[_i3], 2),
+              opt = _Object$entries$_i[0],
+              opv = _Object$entries$_i[1];
+            allOpt.push({
+              codex: opt,
+              name: (_set$CatalogData$getO7 = set.CatalogData.getOption(opt)) === null || _set$CatalogData$getO7 === void 0 ? void 0 : _set$CatalogData$getO7.name
+            });
+            allOpv.push({
+              codex: opv,
+              name: (_set$CatalogData$getO8 = set.CatalogData.getOptionValue(opv)) === null || _set$CatalogData$getO8 === void 0 ? void 0 : _set$CatalogData$getO8.name
             });
           }
         }
       }
       LOG$1.businessEvent(action, 'Planner', 'Configurator wurde verändert', {
-        configuration: configuration
+        configuration: {
+          latest: {
+            opv: latestOpv,
+            opt: latestOpt
+          },
+          opt: allOpt,
+          opv: allOpv,
+          configuration_nested: configuration
+        }
+      });
+      LOG$1.businessEvent('onActualBasketValue', 'Planner', 'Aktueller Basket Value:' + this.getCurSetPrice(), {
+        basketValue: this.getCurSetPrice()
       });
     }
   }, {
@@ -42271,7 +42481,7 @@ var Grid = /*#__PURE__*/function () {
     if (this.heightGridCellCountOnRule) {
       for (var i = 0; i < this.heightGridCellCountOnRule.length; i++) {
         var gridOnRule = this.heightGridCellCountOnRule[i];
-        if (this.article.evalRule(DivaUtils__default["default"].getRuleByFormula(gridOnRule.Rule))) {
+        if (this.article.evalRule(DivaUtils__default["default"].getRuleByFormula(gridOnRule.Rule, article.catalogCodex, article.CatalogData.multiselectOptions))) {
           var _gridOnRule$HeightGri, _gridOnRule$ArticleRe;
           cellCount = (_gridOnRule$HeightGri = gridOnRule.HeightGridCellCount) !== null && _gridOnRule$HeightGri !== void 0 ? _gridOnRule$HeightGri : grid.HeightGridCellCount;
           this.articleRelations = (_gridOnRule$ArticleRe = gridOnRule.ArticleRelations) !== null && _gridOnRule$ArticleRe !== void 0 ? _gridOnRule$ArticleRe : grid.ArticleRelations;