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

package/build/cjs/{index-696ee323.js → index-c9a480dc.js}

@@ -16667,6 +16667,12 @@ var CatalogArticleData = /*#__PURE__*/function () {
     get: function get() {
       return this.catalogArticle.hasPartlistArticle;
     }
+  }, {
+    key: "possiblePartlistCodexes",
+    get: function get() {
+      var _this$catalogArticle$2;
+      return (_this$catalogArticle$2 = this.catalogArticle.partListArticles) === null || _this$catalogArticle$2 === void 0 ? void 0 : _this$catalogArticle$2.join(';');
+    }
   }, {
     key: "articleDecisions",
     get: function get() {
@@ -16933,8 +16939,8 @@ var CatalogArticleData = /*#__PURE__*/function () {
   }, {
     key: "metaDataView",
     get: function get() {
-      var _this$catalogArticle$2;
-      return (_this$catalogArticle$2 = this.catalogArticle.metaData) !== null && _this$catalogArticle$2 !== void 0 ? _this$catalogArticle$2 : [];
+      var _this$catalogArticle$3;
+      return (_this$catalogArticle$3 = this.catalogArticle.metaData) !== null && _this$catalogArticle$3 !== void 0 ? _this$catalogArticle$3 : [];
     }
   }, {
     key: "getMergesToOPG",
@@ -18304,7 +18310,8 @@ var DivaCatalogData = /*#__PURE__*/function () {
           DE: 'Achtung alle änderungen gehen verlohren... Bist du sicher?'
         }
       }],
-      warningRule: [],
+      warningRules: [],
+      bannerRules: [],
       summaryTabGroupPosition: undefined,
       onConfigSingleDontGeneralize: false,
       ignoreMaxPriceAsBP: false,
@@ -18609,7 +18616,9 @@ var DivaCatalogData = /*#__PURE__*/function () {
         } else if (item.Codex == 'NOTIFICATIONS') {
           _this.catalogData.notificationsRules = JSON.parse(item.Value);
         } else if (item.Codex == 'WARNINGS') {
-          _this.catalogData.warningRule = JSON.parse(item.Value);
+          _this.catalogData.warningRules = JSON.parse(item.Value);
+        } else if (item.Codex == 'BANNER') {
+          _this.catalogData.bannerRules = JSON.parse(item.Value);
         } else if (item.Codex == 'IGNORE_MAX_PRICE_AS_BASEPRICE') {
           _this.catalogData.ignoreMaxPriceAsBP = item.Value == '1';
         } else if (item.Codex == 'DONT_USE_VCODEX_FOR_BASKET') {
@@ -18810,7 +18819,8 @@ var DivaCatalogData = /*#__PURE__*/function () {
               is3DModell: catPlanArticle.modelName3D && catPlanArticle.modelName3D != '' ? true : false,
               groupName: groupTitle,
               metaData: this.catalogArticles[catPlanArticle.codex].metaDataView,
-              contentItemId: this.catalogArticles[catPlanArticle.codex].contentItemId
+              contentItemId: this.catalogArticles[catPlanArticle.codex].contentItemId,
+              partlistcodexes: this.catalogArticles[catPlanArticle.codex].possiblePartlistCodexes
             };
             this.plannerPaletteViewInfo.catalogPlannerArticles.push(catPlanArtView);
           }
@@ -18867,7 +18877,8 @@ var DivaCatalogData = /*#__PURE__*/function () {
           is3DModell: catPlanArticle.modelName3D && catPlanArticle.modelName3D != '' ? true : false,
           groupName: groupTitle,
           metaData: this.catalogArticles[catPlanArticle.codex].metaDataView,
-          contentItemId: this.catalogArticles[catPlanArticle.codex].contentItemId
+          contentItemId: this.catalogArticles[catPlanArticle.codex].contentItemId,
+          partlistcodexes: this.catalogArticles[catPlanArticle.codex].possiblePartlistCodexes
         };
         //nicht ausmultiplizierte Elemente
         this.plannerPaletteViewInfo.catalogPlannerArticles.push(_catPlanArtView);
@@ -19475,9 +19486,14 @@ var DivaCatalogData = /*#__PURE__*/function () {
       return this.catalogData.notificationsRules;
     }
   }, {
-    key: "warningRule",
+    key: "warningRules",
+    get: function get() {
+      return this.catalogData.warningRules;
+    }
+  }, {
+    key: "bannerRules",
     get: function get() {
-      return this.catalogData.warningRule;
+      return this.catalogData.bannerRules;
     }
   }, {
     key: "dontSaveAlternativeRenderings",
@@ -22574,6 +22590,7 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "updateIDMSpecificFeature",
     value: function updateIDMSpecificFeature(myArtOPS) {
+      if (!this.parentHasSameOption(myArtOPS.optionCodex)) return;
       if (myArtOPS.option.idmVariantenArt == 90) {
         //R (Anschlusstyp R) - AVR
         var newAVRFilter = [],
@@ -23559,7 +23576,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-e68dfee7.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-7177a33a.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -23623,7 +23640,6 @@ var DivaArticle = /*#__PURE__*/function () {
         calcUnitPrice = 0,
         calcUnit2Price = 0,
         firstUnit2Param = 0,
-        secondUnit2Param = 0,
         idmPriceMeasureFactor = 1;
       //CalcPreise berechnen
       for (var i = 0; i < maxPriceOfGroupCodex.length; i++) {
@@ -23657,75 +23673,70 @@ var DivaArticle = /*#__PURE__*/function () {
         if (!tmpOPT.useMaxPriceOfGroup) {
           myArtOPS.calcPrice = myArtOPS.price * myArtOPS.quantity;
         }
-        if (pUnit !== null && pUnit !== void 0 && pUnit.includes('2') && calcUnit2Price && firstUnit2Param && secondUnit2Param) {
-          var unit2Price = this.getCalcPerUnit(pUnit, myArtOPS.calcPrice);
-          myArtOPS.usedCalcPrice = unit2Price * firstUnit2Param * secondUnit2Param;
-        } else {
-          switch (pUnit) {
-            case 'm':
-              calcUnitPrice += myArtOPS.calcPrice / 100;
-              break;
-            case 'cm':
-              calcUnitPrice += myArtOPS.calcPrice;
-              break;
-            case 'm2':
-              calcUnit2Price += myArtOPS.calcPrice / 10000;
-              break;
-            case 'cm2':
-              calcUnit2Price += myArtOPS.calcPrice;
-              break;
-            default:
-              if (myArtOPS.isPercentage) {
-                //hier myArtOPS.TargetOption auswerten
-                if (myArtOPS.targetOption && myArtOPS.targetOption != '') ; else {
-                  myArtOPS.usedCalcPrice = myArtOPS.calcPrice;
-                }
+        switch (pUnit) {
+          case 'm':
+            calcUnitPrice += myArtOPS.calcPrice / 100;
+            break;
+          case 'cm':
+            calcUnitPrice += myArtOPS.calcPrice;
+            break;
+          case 'm2':
+            calcUnit2Price += myArtOPS.calcPrice / 10000;
+            break;
+          case 'cm2':
+            calcUnit2Price += myArtOPS.calcPrice;
+            break;
+          default:
+            if (myArtOPS.isPercentage) {
+              //hier myArtOPS.TargetOption auswerten
+              if (myArtOPS.targetOption && myArtOPS.targetOption != '') ; else {
+                myArtOPS.usedCalcPrice = myArtOPS.calcPrice;
+              }
+            } else {
+              myArtOPS.usedCalcPrice = DivaUtils__default["default"].decimalAdjust('round', myArtOPS.calcPrice, digits);
+            }
+            break;
+        }
+        if ((mUnit || OP == 'OPTUMFANG' || OP == 'OPTUMFANG_KREIS') && this.parentHasSameOption(OP)) {
+          var freeTextMeasure = parseFloat(myArtOPS.freeText ? myArtOPS.freeText : '');
+          if (freeTextMeasure || OP == 'OPTUMFANG' || OP == 'OPTUMFANG_KREIS') {
+            if (calcUnitPrice != 0) {
+              var quantity = 0;
+              if (OP == 'OPTUMFANG') {
+                mUnit = 'cm';
+                quantity = this.calcWidth * 2 + this.calcDepth * 2;
+              } else if (OP == 'OPTUMFANG_KREIS') {
+                mUnit = 'cm';
+                quantity = this.calcWidth * Math.PI;
               } else {
-                myArtOPS.usedCalcPrice = DivaUtils__default["default"].decimalAdjust('round', myArtOPS.calcPrice, digits);
+                quantity = freeTextMeasure;
               }
-              break;
-          }
-          if (mUnit || OP == 'OPTUMFANG' || OP == 'OPTUMFANG_KREIS') {
-            var freeTextMeasure = parseFloat(myArtOPS.freeText ? myArtOPS.freeText : '');
-            if (freeTextMeasure || (OP == 'OPTUMFANG' || OP == 'OPTUMFANG_KREIS') && calcUnitPrice != 0) {
-              if (calcUnitPrice != 0) {
-                var quantity = 0;
-                if (OP == 'OPTUMFANG') {
-                  mUnit = 'cm';
-                  quantity = this.calcWidth * 2 + this.calcDepth * 2;
-                } else if (OP == 'OPTUMFANG_KREIS') {
-                  mUnit = 'cm';
-                  quantity = this.calcWidth * Math.PI;
+              if (mUnit == 'cm') myArtOPS.usedCalcPrice = calcUnitPrice * quantity;else if (mUnit == 'm') myArtOPS.usedCalcPrice = calcUnitPrice * quantity * 100;
+            } else if (calcUnit2Price != 0) {
+              //for diamter option
+              if (myArtOPS.option.diameter) {
+                myArtOPS.usedCalcPrice = calcUnit2Price * this.calcWidth * this.calcDepth;
+              } else {
+                if (firstUnit2Param == 0) {
+                  firstUnit2Param = freeTextMeasure;
+                  if (mUnit == 'm') firstUnit2Param = firstUnit2Param * 100;
                 } else {
-                  quantity = freeTextMeasure;
-                }
-                if (mUnit == 'cm') myArtOPS.usedCalcPrice = calcUnitPrice * quantity;else if (mUnit == 'm') myArtOPS.usedCalcPrice = calcUnitPrice * quantity * 100;
-              } else if (calcUnit2Price != 0) {
-                //for diamter option
-                if (myArtOPS.option.diameter) {
-                  myArtOPS.usedCalcPrice = calcUnit2Price * this.calcWidth * this.calcDepth;
-                } else {
-                  if (firstUnit2Param == 0) {
-                    firstUnit2Param = freeTextMeasure;
-                    if (mUnit == 'm') firstUnit2Param = firstUnit2Param * 100;
-                  } else {
-                    secondUnit2Param = freeTextMeasure;
-                    if (mUnit == 'm') secondUnit2Param = secondUnit2Param * 100;
-                    myArtOPS.usedCalcPrice = calcUnit2Price * firstUnit2Param * secondUnit2Param;
-                  }
+                  var secondUnit2Param = freeTextMeasure;
+                  if (mUnit == 'm') secondUnit2Param = secondUnit2Param * 100;
+                  myArtOPS.usedCalcPrice = calcUnit2Price * firstUnit2Param * secondUnit2Param;
                 }
               }
             }
           }
-          if (OP == 'OPT95' && !!this.catalogArticle.widthHasPrice) {
-            idmPriceMeasureFactor = idmPriceMeasureFactor * this.calcWidth;
-          }
-          if (OP == 'OPT96' && !!this.catalogArticle.depthHasPrice) {
-            idmPriceMeasureFactor = idmPriceMeasureFactor * this.calcDepth;
-          }
-          if (OP == 'OPT97' && !!this.catalogArticle.heightHasPrice) {
-            idmPriceMeasureFactor = idmPriceMeasureFactor * this.calcHeight;
-          }
+        }
+        if (OP == 'OPT95' && !!this.catalogArticle.widthHasPrice) {
+          idmPriceMeasureFactor = idmPriceMeasureFactor * this.calcWidth;
+        }
+        if (OP == 'OPT96' && !!this.catalogArticle.depthHasPrice) {
+          idmPriceMeasureFactor = idmPriceMeasureFactor * this.calcDepth;
+        }
+        if (OP == 'OPT97' && !!this.catalogArticle.heightHasPrice) {
+          idmPriceMeasureFactor = idmPriceMeasureFactor * this.calcHeight;
         }
       }
       //jetzt nochmal prozentuelle Preise mit TargetOption berechnen
@@ -23824,19 +23835,10 @@ var DivaArticle = /*#__PURE__*/function () {
       this.article.price = articleUsedCalcPrice;
     }
   }, {
-    key: "getCalcPerUnit",
-    value: function getCalcPerUnit(unit, calcPrice) {
-      switch (unit) {
-        case 'm':
-          return calcPrice / 100;
-        case 'cm':
-          return calcPrice;
-        case 'm2':
-          return calcPrice / 10000;
-        case 'cm2':
-          return calcPrice;
-      }
-      return 0;
+    key: "parentHasSameOption",
+    value: function parentHasSameOption(opt) {
+      if (!this.partListParentArticle) return true;
+      return !!this.partListParentArticle.articleOptionStates[opt] || this.partlistArticleVisibleInTree;
     }
   }, {
     key: "getOptionPrice",
@@ -24988,72 +24990,89 @@ var DivaArticleHandler = /*#__PURE__*/function () {
                   }
                 }
               }
-              if (!(Object.keys(article.articleOptionStates).length === 0)) {
-                //infos eines Basisconfigurats initialisieren
-                if (!(Object.keys(variantValues).length === 0)) {
-                  //Hier werden dann die neuen OPT Werte beim aktuell selektierten Artikel gesetzt!
-                  for (attr in variantValues) {
-                    foundItem = article.checkOptionAndOptionValue(attr, variantValues[attr]);
-                    if (foundItem.opt) {
-                      if (foundItem.opv instanceof ArticleOptionValueData) {
-                        freeText = variantValues[attr + '_val'];
-                        article.setOP(foundItem.opt.codex, foundItem.opv, freeText, true);
-                        if ((_foundItem$opt = foundItem.opt) !== null && _foundItem$opt !== void 0 && _foundItem$opt.isDefaultValueForOptions) {
-                          //falls eine Golbale Option Initialisiert wird soll hier der Default value bei dessen abhängigen Optionen gesetzt werden deshalb 2. parameter = true
-                          article.checkDefaultGlobalOpt(_defineProperty__default["default"]({}, foundItem.opt.codex, foundItem.opv.codex), true);
-                        }
+              if (Object.keys(article.articleOptionStates).length === 0) {
+                _context8.next = 19;
+                break;
+              }
+              //infos eines Basisconfigurats initialisieren
+              if (!(Object.keys(variantValues).length === 0)) {
+                //Hier werden dann die neuen OPT Werte beim aktuell selektierten Artikel gesetzt!
+                for (attr in variantValues) {
+                  foundItem = article.checkOptionAndOptionValue(attr, variantValues[attr]);
+                  if (foundItem.opt) {
+                    if (foundItem.opv instanceof ArticleOptionValueData) {
+                      freeText = variantValues[attr + '_val'];
+                      article.setOP(foundItem.opt.codex, foundItem.opv, freeText, true);
+                      if ((_foundItem$opt = foundItem.opt) !== null && _foundItem$opt !== void 0 && _foundItem$opt.isDefaultValueForOptions) {
+                        //falls eine Golbale Option Initialisiert wird soll hier der Default value bei dessen abhängigen Optionen gesetzt werden deshalb 2. parameter = true
+                        article.checkDefaultGlobalOpt(_defineProperty__default["default"]({}, foundItem.opt.codex, foundItem.opv.codex), true);
                       }
                     }
                   }
                 }
+              }
 
-                //defaultValues for FreeText
-                if (article.articleOptionStates) {
-                  for (_key in article.articleOptionStates) {
-                    myArtOPS = article.articleOptionStates[_key];
-                    value = undefined;
-                    optionValueCodex = Object.keys(myArtOPS.option.articleOptionValues)[0];
-                    if (variantItems && myArtOPS.isFreeText && myArtOPS.measureUnit) {
-                      for (i = 0; i < variantItems.length && value == undefined; i++) {
-                        variantItem = variantItems[i];
-                        if ('OPT' + variantItem.OPT == myArtOPS.optionCodex && variantItem.OPVName) {
-                          if (variantItem.MeasureValue) {
-                            //measureValue from new Bakset
-                            value = variantItem.MeasureValue;
-                            optionValueCodex = 'OPV' + variantItem.OPV;
-                          } else {
-                            //measureValue from old Bakset. we have to find out the value in the opvName // WCTODEL this code can be deleted after 1 year
-                            possibleValues = variantItem.OPVName.split(': ');
-                            for (j = 0; j < possibleValues.length && value == undefined; j++) {
-                              possibleValue = possibleValues[j].replace(' cm', '').replace(' mm', '').replace(' m', '').replace('cm', '').replace('mm', '').replace('m', '');
-                              if (!isNaN(Number(possibleValue))) {
-                                value = possibleValue;
-                              }
-                            }
-                          }
-                        }
-                      }
-                    } else if (variantItems && myArtOPS.isFreeText) {
-                      for (_i2 = 0; _i2 < variantItems.length && value == undefined; _i2++) {
-                        _variantItem = variantItems[_i2];
-                        if (_variantItem.isFreeText && _variantItem.FreeText && 'OPT' + _variantItem.OPT == myArtOPS.optionCodex) {
-                          value = _variantItem.FreeText;
-                          optionValueCodex = 'OPV' + _variantItem.OPV;
+              //defaultValues for FreeText
+              if (!article.articleOptionStates) {
+                _context8.next = 19;
+                break;
+              }
+              _context8.t0 = _regeneratorRuntime__default["default"].keys(article.articleOptionStates);
+            case 7:
+              if ((_context8.t1 = _context8.t0()).done) {
+                _context8.next = 19;
+                break;
+              }
+              _key = _context8.t1.value;
+              myArtOPS = article.articleOptionStates[_key];
+              if (!variantValues[_key + '_val']) {
+                _context8.next = 12;
+                break;
+              }
+              return _context8.abrupt("continue", 7);
+            case 12:
+              value = undefined;
+              optionValueCodex = Object.keys(myArtOPS.option.articleOptionValues)[0];
+              if (variantItems && myArtOPS.isFreeText && myArtOPS.measureUnit) {
+                for (i = 0; i < variantItems.length && value == undefined; i++) {
+                  variantItem = variantItems[i];
+                  if ('OPT' + variantItem.OPT == myArtOPS.optionCodex && variantItem.OPVName) {
+                    if (variantItem.MeasureValue) {
+                      //measureValue from new Bakset
+                      value = variantItem.MeasureValue;
+                      optionValueCodex = 'OPV' + variantItem.OPV;
+                    } else {
+                      //measureValue from old Bakset. we have to find out the value in the opvName // WCTODEL this code can be deleted after 1 year
+                      possibleValues = variantItem.OPVName.split(': ');
+                      for (j = 0; j < possibleValues.length && value == undefined; j++) {
+                        possibleValue = possibleValues[j].replace(' cm', '').replace(' mm', '').replace(' m', '').replace('cm', '').replace('mm', '').replace('m', '');
+                        if (!isNaN(Number(possibleValue))) {
+                          value = possibleValue;
                         }
                       }
                     }
-                    if (value == undefined) {
-                      val = myArtOPS.option.freetextDefaultValue;
-                      if (val) {
-                        value = val;
-                        myArtOPS.freeText = val;
-                      }
-                    }
-                    if (value != undefined) article.setOP(myArtOPS.option.codex, myArtOPS.option.articleOptionValues[optionValueCodex], value, true);
+                  }
+                }
+              } else if (variantItems && myArtOPS.isFreeText) {
+                for (_i2 = 0; _i2 < variantItems.length && value == undefined; _i2++) {
+                  _variantItem = variantItems[_i2];
+                  if (_variantItem.isFreeText && _variantItem.FreeText && 'OPT' + _variantItem.OPT == myArtOPS.optionCodex) {
+                    value = _variantItem.FreeText;
+                    optionValueCodex = 'OPV' + _variantItem.OPV;
                   }
                 }
               }
-            case 4:
+              if (value == undefined) {
+                val = myArtOPS.option.freetextDefaultValue;
+                if (val) {
+                  value = val;
+                  myArtOPS.freeText = val;
+                }
+              }
+              if (value != undefined) article.setOP(myArtOPS.option.codex, myArtOPS.option.articleOptionValues[optionValueCodex], value, true);
+              _context8.next = 7;
+              break;
+            case 19:
             case "end":
               return _context8.stop();
           }
@@ -25421,6 +25440,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
   }, {
     key: "evalOpvsOnOpvsConstructionRules",
     value: function evalOpvsOnOpvsConstructionRules(article) {
+      var _article$CatalogData$;
       var somethingChanged = false;
       var previousRules = {};
       if (article.updatedOPVbyOPVConstructionRules) {
@@ -25484,19 +25504,20 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           }
         }
       }
-      var notifications = this.checkNotificationRules(article.CatalogData.warningRule, _defineProperty__default["default"]({}, article.basketId, article), {});
-      if (notifications !== null && notifications !== void 0 && notifications.length) {
-        for (var _i3 = 0; _i3 < notifications.length; _i3++) {
-          var _item = notifications[_i3];
-          if (!_item.showAsWarning) continue;
-          article.addUpdatedOPVbyOPVConstructionRules(_item.showAsWarning.option + ';' + _item.showAsWarning.optionValue, article.updateOPVConstruction('OPT' + _item.showAsWarning.option, 'OPV' + _item.showAsWarning.optionValue, {
-            message: _item.message,
-            type: _item.type == 'error' ? 'DISABLE' : 'WARNING'
-          }));
+      if ((_article$CatalogData$ = article.CatalogData.warningRules) !== null && _article$CatalogData$ !== void 0 && _article$CatalogData$.length) {
+        var notifications = this.checkNotificationRules(article.CatalogData.warningRules, _defineProperty__default["default"]({}, article.basketId, article), {});
+        if (notifications !== null && notifications !== void 0 && notifications.length) {
+          for (var _i3 = 0; _i3 < notifications.length; _i3++) {
+            var _item = notifications[_i3];
+            if (!_item.showAsWarning) continue;
+            article.addUpdatedOPVbyOPVConstructionRules(_item.showAsWarning.option + ';' + _item.showAsWarning.optionValue, article.updateOPVConstruction('OPT' + _item.showAsWarning.option, 'OPV' + _item.showAsWarning.optionValue, {
+              message: _item.message,
+              type: _item.type == 'error' ? 'DISABLE' : 'WARNING'
+            }));
+          }
+          somethingChanged = true;
         }
-        somethingChanged = true;
       }
-
       //falls die vorherigen reglen anders sind wie die neuen, artiklekonfiguration neu laden
       if (somethingChanged && JSON.stringify(previousRules) != JSON.stringify(article.updatedOPVbyOPVConstructionRules)) {
         this.updateCfgValues(article, {}, {});
@@ -25512,7 +25533,6 @@ var DivaArticleHandler = /*#__PURE__*/function () {
   }, {
     key: "checkNotificationRules",
     value: function checkNotificationRules(toCheckRules, articles, visitedOptions, event) {
-      if (!(toCheckRules !== null && toCheckRules !== void 0 && toCheckRules.length)) return;
       var returnValue = [];
       for (var i = 0; i < toCheckRules.length; i++) {
         var entry = toCheckRules[i];
@@ -25520,27 +25540,12 @@ var DivaArticleHandler = /*#__PURE__*/function () {
         var ruleValid = false;
         for (var j = 0; j < rules.length; j++) {
           for (var basketId in articles) {
-            var _rule$articles;
             ruleValid = false;
             var rule = rules[j];
             var article = articles[basketId];
-            if ((_rule$articles = rule.articles) !== null && _rule$articles !== void 0 && _rule$articles.length && !rule.articles.includes(article.articleCodex)) continue;
-            if (rule.variantValues && !this.objectIncudesObject(rule.variantValues, article.VariantValuesWithoutOPTandOPV)) continue;
-            if (rule.visitedOptions && !this.arrayIncludesArray(rule.visitedOptions, visitedOptions[basketId])) continue;
-            if (rule.jsFormula && !article.evalRule(DivaUtils__default["default"].getRuleByFormula(rule.jsFormula))) continue;
-            if (rule.sizes) console.error('size logic not jet implemented');
+            if (!this.checkRule(rule, article, visitedOptions)) continue;
             if ((event === null || event === void 0 ? void 0 : event.type) == 'config' && entry.type == 'notification') {
-              var _entry$checkOnEvents, _entry$checkOnEvents2, _entry$checkOnEvents3, _entry$checkOnEvents4;
-              var checkOPT = (_entry$checkOnEvents = entry.checkOnEvents) !== null && _entry$checkOnEvents !== void 0 && _entry$checkOnEvents.option ? 'OPT' + ((_entry$checkOnEvents2 = entry.checkOnEvents) === null || _entry$checkOnEvents2 === void 0 ? void 0 : _entry$checkOnEvents2.option) : undefined;
-              var checkOPV = (_entry$checkOnEvents3 = entry.checkOnEvents) !== null && _entry$checkOnEvents3 !== void 0 && _entry$checkOnEvents3.optionValue ? 'OPV' + ((_entry$checkOnEvents4 = entry.checkOnEvents) === null || _entry$checkOnEvents4 === void 0 ? void 0 : _entry$checkOnEvents4.optionValue) : undefined;
-              if (checkOPT) {
-                if (Array.isArray(checkOPT) && !checkOPT.includes(event.data.optionCodex)) continue;
-                if (!Array.isArray(checkOPT) && checkOPT !== event.data.optionCodex) continue;
-              }
-              if (checkOPV) {
-                if (Array.isArray(checkOPV) && !checkOPV.includes(event.data.optionValueCodex)) continue;
-                if (!Array.isArray(checkOPV) && checkOPV !== event.data.optionValueCodex) continue;
-              }
+              if (!this.checkOnEvent(event.checkOnEvents, event.data)) continue;
             }
             ruleValid = true;
             break;
@@ -25556,6 +25561,35 @@ var DivaArticleHandler = /*#__PURE__*/function () {
       }
       return returnValue;
     }
+  }, {
+    key: "checkRule",
+    value: function checkRule(rule, article, visitedOptions) {
+      var _rule$articles;
+      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.sizes) {
+        console.error('size logic not jet implemented');
+        return false;
+      }
+      return true;
+    }
+  }, {
+    key: "checkOnEvent",
+    value: function checkOnEvent(event, data) {
+      var checkOPT = event !== null && event !== void 0 && event.option ? 'OPT' + (event === null || event === void 0 ? void 0 : event.option) : undefined;
+      var checkOPV = event !== null && event !== void 0 && event.optionValue ? 'OPV' + (event === null || event === void 0 ? void 0 : event.optionValue) : undefined;
+      if (checkOPT) {
+        if (Array.isArray(checkOPT) && !checkOPT.includes(data.optionCodex)) return false;
+        if (!Array.isArray(checkOPT) && checkOPT !== data.optionCodex) return false;
+      }
+      if (checkOPV) {
+        if (Array.isArray(checkOPV) && !checkOPV.includes(data.optionValueCodex)) return false;
+        if (!Array.isArray(checkOPV) && checkOPV !== data.optionValueCodex) return false;
+      }
+      return true;
+    }
   }, {
     key: "objectIncudesObject",
     value: function objectIncudesObject(smallerObject, biggerObject) {
@@ -26876,6 +26910,7 @@ function _arrayLikeToArray$1(r, a) { (null == a || a > r.length) && (a = r.lengt
 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');
+//plz delete me
 var DivaSet = /*#__PURE__*/function () {
   function DivaSet(catalog, _setId, orderSet, initSetState) {
     var _this = this,
@@ -27017,14 +27052,9 @@ var DivaSet = /*#__PURE__*/function () {
         return _ref.apply(this, arguments);
       };
     }());
-    _defineProperty__default["default"](this, "setPosNr", function (elementId, posNr, accNr) {
+    _defineProperty__default["default"](this, "setPosNr", function (elementId, posNr) {
       var article = _this.getArticleByElementId(elementId);
-      if (article) {
-        article.posNr = posNr;
-        if (accNr != undefined) {
-          article.posNr = Number(posNr + '.' + (accNr < 10 ? '0' : '') + accNr.toString());
-        }
-      }
+      if (article) article.posNr = posNr;
       _this.sortDivaArticlesByArticlePosNr();
     });
     _defineProperty__default["default"](this, "setElementId", function (basketID, elementId) {
@@ -27275,54 +27305,56 @@ var DivaSet = /*#__PURE__*/function () {
   }, {
     key: "giveAccNewPosNrByBasketId",
     value: function giveAccNewPosNrByBasketId(BasketIdParent) {
-      var curNum = this.giveNotPlannedAccPosNrByBasketId(BasketIdParent);
+      var curNum = this.giveAccPosNrByBasketId(BasketIdParent);
       this.givePartlistAccPosNrByBasketId(BasketIdParent, curNum);
       this.sortDivaArticlesByArticlePosNr();
     }
   }, {
-    key: "giveNotPlannedAccPosNrByBasketId",
-    value: function giveNotPlannedAccPosNrByBasketId(BasketIdParent, BasketId, curNum) {
+    key: "giveAccPosNrByBasketId",
+    value: function giveAccPosNrByBasketId(basketId) {
+      var curNum = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
       var allAccs = [];
       var articles = this.getDivaArticles();
-      if (!BasketId) BasketId = BasketIdParent;
-      var myParentArticle = articles[BasketIdParent];
-      var _this$getSplitPlanned = this.getSplitPlannedAccessoiresOfBasketId(BasketId),
+      var article = articles[basketId];
+      if (!article) throw new Error('article ' + basketId + ' does not exist');
+      var myParentArticle = article.getBaseParent();
+      var _this$getSplitPlanned = this.getSplitPlannedAccessoiresOfBasketId(basketId),
         notPlannedAcc = _this$getSplitPlanned.notPlannedAcc,
         plannedAcc = _this$getSplitPlanned.plannedAcc;
-      if (curNum === undefined) curNum = this.getStartingPosNr(BasketIdParent);
-      for (var key in notPlannedAcc) {
-        allAccs.push(notPlannedAcc[key]);
+      for (var key in plannedAcc) {
+        allAccs.push(plannedAcc[key]);
+      }
+      for (var _key3 in notPlannedAcc) {
+        allAccs.push(notPlannedAcc[_key3]);
       }
       for (var i = 0; i < allAccs.length; i++) {
+        var accessoire = allAccs[i];
         curNum++;
-        allAccs[i].posNr = Number(parseFloat((myParentArticle.posNr + curNum / 100).toString()).toFixed(2));
-        if (allAccs[i].shelfAccessoires || Object.keys(allAccs[i].accessoires).length !== 0) {
-          curNum = this.giveNotPlannedAccPosNrByBasketId(BasketIdParent, allAccs[i].basketId, curNum);
+        accessoire.posNr = Number(parseFloat((myParentArticle.posNr + curNum / 100).toString()).toFixed(2));
+        if (accessoire.shelfAccessoires || Object.keys(accessoire.accessoires).length !== 0) {
+          curNum = this.giveAccPosNrByBasketId(accessoire.basketId, curNum);
+        }
+        if (accessoire.hasPartlistArticle) {
+          curNum = this.givePartlistAccPosNrByBasketId(accessoire.basketId, curNum);
         }
-      }
-      for (var _key3 in plannedAcc) {
-        curNum = this.giveNotPlannedAccPosNrByBasketId(BasketIdParent, _key3, curNum);
       }
       return curNum;
     }
   }, {
     key: "givePartlistAccPosNrByBasketId",
-    value: function givePartlistAccPosNrByBasketId(BasketIdParent, curNum) {
-      var articles = this.getDivaArticles();
-      if (!Object.entries(articles).length) return;
-      var myParentArticle = articles[BasketIdParent];
-      var allAcc = [myParentArticle];
-      allAcc = allAcc.concat(this.getAccessoiresOfArticleRecursive(BasketIdParent));
-      for (var i = 0; i < allAcc.length; i++) {
-        var partlistArticles = this.getPartlistArticlesOfArticle(allAcc[i]);
-        if (!(partlistArticles !== null && partlistArticles !== void 0 && partlistArticles.length)) continue;
-        for (var j = 0; j < partlistArticles.length; j++) {
-          var accessoire = partlistArticles[j];
-          if (accessoire.hasPartlistArticle && accessoire.isPartListArticle && !accessoire.partlistArticleVisibleInTree) continue;
-          curNum++;
-          accessoire.posNr = Number(parseFloat((myParentArticle.posNr + curNum / 100).toString()).toFixed(2));
-        }
+    value: function givePartlistAccPosNrByBasketId(basketId, curNum) {
+      var article = this.getArticleByBasketId(basketId);
+      if (!article) return curNum;
+      var baseParent = article.getBaseParent();
+      var partlistArticles = this.getPartlistArticlesOfArticle(article);
+      for (var j = 0; j < ((_partlistArticles$len = partlistArticles === null || partlistArticles === void 0 ? void 0 : partlistArticles.length) !== null && _partlistArticles$len !== void 0 ? _partlistArticles$len : 0); j++) {
+        var _partlistArticles$len;
+        var accessoire = partlistArticles[j];
+        if (accessoire.hasPartlistArticle && accessoire.isPartListArticle && !accessoire.partlistArticleVisibleInTree) continue;
+        curNum++;
+        accessoire.posNr = Number(parseFloat((baseParent.posNr + curNum / 100).toString()).toFixed(2));
       }
+      return curNum;
     }
   }, {
     key: "getAccessoiresOfBasketId",
@@ -27354,11 +27386,6 @@ var DivaSet = /*#__PURE__*/function () {
         notPlannedAcc: notPlannedAcc
       };
     }
-  }, {
-    key: "getStartingPosNr",
-    value: function getStartingPosNr(basketid) {
-      return this.getAccessoiresOfArticleRecursive(basketid, 'onlyPlanner').length;
-    }
   }, {
     key: "getAccessoiresOfBasketIdAsArray",
     value: function getAccessoiresOfBasketIdAsArray(basketId, filter) {
@@ -27679,7 +27706,9 @@ var DivaSet = /*#__PURE__*/function () {
     value: function getArticleByBasketId(basketId) {
       if (this.divaArticles[basketId]) return this.divaArticles[basketId];
       for (var key in this.divaArticles) {
-        if (this.divaArticles[key].partlistArticles[basketId]) return this.divaArticles[key].partlistArticles[basketId];
+        var article = this.divaArticles[key];
+        var plArticles = article.getRecursivePartlistArticles();
+        if (plArticles[basketId]) return plArticles[basketId];
       }
       return undefined;
     }
@@ -28077,7 +28106,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context4.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-2b3e1289.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-40c989b0.js'); });
             case 3:
               _yield$import = _context4.sent;
               DoorPlanner = _yield$import["default"];
@@ -30341,46 +30370,49 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
     value: function () {
       var _saveConfigVariantsInBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(set, basket, variant, repairOnly) {
         var _hQRenderScript, _basket$OrderSets$set, _basket$OrderSets$set2;
-        var setindex, setImage, urlToPlanning2D, hQRenderScript, plannerData, promises, _yield$Promise$all, _yield$Promise$all2, i, optionsSorted, variantValues, _i3, opt, key, targetArticle, configVariant;
+        var setindex, setImage, dimensions, urlToPlanning2D, hQRenderScript, plannerData, promises, _yield$Promise$all, _yield$Promise$all2, _yield$Promise$all2$, i, optionsSorted, variantValues, _i3, opt, key, targetArticle, configVariant;
         return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               setindex = -1;
               setImage = undefined;
+              dimensions = {};
               urlToPlanning2D = undefined;
               hQRenderScript = undefined;
               plannerData = set.plannerHandler.savePlanner(set.getSetId());
               if (repairOnly) {
-                _context6.next = 14;
+                _context6.next = 17;
                 break;
               }
               promises = [setHandlerInstance.getSetImage(set, true), setHandlerInstance.get2DSetImage(set), setHandlerInstance.getHQRenderScript(set, basket.DivaNr)];
-              _context6.next = 9;
+              _context6.next = 10;
               return Promise.all(promises);
-            case 9:
+            case 10:
               _yield$Promise$all = _context6.sent;
               _yield$Promise$all2 = _slicedToArray__default["default"](_yield$Promise$all, 3);
-              setImage = _yield$Promise$all2[0];
+              _yield$Promise$all2$ = _yield$Promise$all2[0];
+              setImage = _yield$Promise$all2$.url;
+              dimensions = _yield$Promise$all2$.dimensions;
               urlToPlanning2D = _yield$Promise$all2[1];
               hQRenderScript = _yield$Promise$all2[2];
-            case 14:
+            case 17:
               i = 0;
-            case 15:
+            case 18:
               if (!(i < basket.OrderSets.length)) {
-                _context6.next = 22;
+                _context6.next = 25;
                 break;
               }
               if (!(set.getSetId() == basket.OrderSets[i].SetID)) {
-                _context6.next = 19;
+                _context6.next = 22;
                 break;
               }
               setindex = i;
-              return _context6.abrupt("break", 22);
-            case 19:
+              return _context6.abrupt("break", 25);
+            case 22:
               i++;
-              _context6.next = 15;
+              _context6.next = 18;
               break;
-            case 22:
+            case 25:
               if (!basket.OrderSets[setindex].ConfigVariants) basket.OrderSets[setindex].ConfigVariants = [];
               optionsSorted = set.CatalogData.getOptionsPosition();
               variantValues = {};
@@ -30391,9 +30423,9 @@ 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), set.getBruttoSetPrice(), undefined, undefined, set.MetaData, set.MetaData_locales, DivaUtils__default["default"].stripTagsFromDict(set.getVariantsDescription_locales()), (_basket$OrderSets$set = basket.OrderSets[setindex].ConfigVariants) === null || _basket$OrderSets$set === void 0 || (_basket$OrderSets$set = _basket$OrderSets$set[set.basketConfigVariants.length]) === null || _basket$OrderSets$set === void 0 ? void 0 : _basket$OrderSets$set.SetOrderText, (_basket$OrderSets$set2 = basket.OrderSets[setindex].ConfigVariants) === null || _basket$OrderSets$set2 === void 0 || (_basket$OrderSets$set2 = _basket$OrderSets$set2[set.basketConfigVariants.length]) === null || _basket$OrderSets$set2 === void 0 ? void 0 : _basket$OrderSets$set2.SetOrderText_locales);
+              configVariant = new basketModel.ConfigVariantData(variant.id, set.setName, set.setName_locales, setImage, (_hQRenderScript = hQRenderScript) === null || _hQRenderScript === void 0 ? void 0 : _hQRenderScript._id, DivaUtils__default["default"].encodeBase64(set.plannerHandler.getProject3D(set.getSetId())), set.getVariantsDescription(), set.SetArticleNr, set.getSetPrice(), set.setHash, 1, set.getVariantBasketData(), articleHandlerInstance.getCompactOrderLine(_objectSpread$a(_objectSpread$a({}, set.getDivaArticles()), set.getPartlistArticlesOfSet())), variantValues, summaryHandlerInstance.convertSummaryItemsToSummaryInfo(set), plannerData != undefined ? DivaUtils__default["default"].encodeBase64(JSON.stringify(plannerData)) : '', urlToPlanning2D, setHandlerInstance.getBBoxObject(set, 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 28:
+            case 31:
             case "end":
               return _context6.stop();
           }
@@ -32795,7 +32827,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
      */
   }, {
     key: "update3DPlannerView",
-    value: function update3DPlannerView(doRequestRendering, doRequestHqRenderScript, set, renderSize, planner3DGridEnabled, mediaServiceSaveMode, doShow3DDimensionLines, alternateRenderInfo, viewpoint) {
+    value: function update3DPlannerView(doRequestRendering, doRequestHqRenderScript, set, renderSize, planner3DGridEnabled, mediaServiceSaveMode, doShow3DDimensionLines, alternateRenderInfo, viewpoint, useLatestViewpoint) {
       var _set$plannerHandler, _set$getAlternateRend2;
       var width = renderSize.imgWidth;
       var height = renderSize.imgHeight;
@@ -32806,7 +32838,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
         planner3DGridEnabled: planner3DGridEnabled,
         mediaServiceSaveMode: mediaServiceSaveMode,
         doShow3DDimensionLines: !!doShow3DDimensionLines
-      }, viewpoint);
+      }, viewpoint, useLatestViewpoint);
     }
   }, {
     key: "getPlannerPaletteViewInfo",
@@ -33155,21 +33187,31 @@ var DivaSetHandler = /*#__PURE__*/function () {
     key: "calcVariants",
     value: function () {
       var _calcVariants = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee24(set, configItems, targetArticles) {
-        var variantInfo, origConfig, i, item, variantValues, doUseConfigs, key;
+        var variantInfo, articles, origConfigs, i, item, variantValues, doUseConfigs, targetIndex, origConfig, key, _targetIndex;
         return _regeneratorRuntime__default["default"].wrap(function _callee24$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
               variantInfo = [];
-              origConfig = set.getDivaArticles()[targetArticles[0]].VariantValues;
+              articles = set.getDivaArticles();
+              origConfigs = targetArticles.map(function (basketId) {
+                return articles[basketId].VariantValues;
+              });
               i = 0;
-            case 3:
+            case 4:
               if (!(i < configItems.length)) {
-                _context26.next = 16;
+                _context26.next = 23;
                 break;
               }
               item = configItems[i];
               variantValues = {};
               doUseConfigs = false;
+              targetIndex = 0;
+            case 9:
+              if (!(targetIndex < origConfigs.length)) {
+                _context26.next = 19;
+                break;
+              }
+              origConfig = origConfigs[targetIndex];
               for (key in origConfig) {
                 if (key == item.op || key == item.idmOpgOptionCodex) {
                   doUseConfigs = true;
@@ -33177,24 +33219,38 @@ var DivaSetHandler = /*#__PURE__*/function () {
               }
               variantValues[item.op] = item.codex;
               if (item.idmOpgOptionCodex) variantValues[item.idmOpgOptionCodex] = item.idmOpgValCodex;
-              _context26.next = 12;
-              return this.updateArticlesOptionStatesOfActSet(set, variantValues, targetArticles, true, 'calcVariant');
-            case 12:
+              _context26.next = 16;
+              return this.updateArticlesOptionStatesOfActSet(set, variantValues, [targetArticles[targetIndex]], true, 'calcVariant');
+            case 16:
+              targetIndex++;
+              _context26.next = 9;
+              break;
+            case 19:
               variantInfo.push({
                 price: set.getSetPrice(),
                 variants: set.getGeneralVariantValues(targetArticles),
                 opt: item.op
               });
-            case 13:
+            case 20:
               i++;
-              _context26.next = 3;
+              _context26.next = 4;
               break;
-            case 16:
-              _context26.next = 18;
-              return this.updateArticlesOptionStatesOfActSet(set, origConfig, targetArticles, true);
-            case 18:
+            case 23:
+              _targetIndex = 0;
+            case 24:
+              if (!(_targetIndex < origConfigs.length)) {
+                _context26.next = 30;
+                break;
+              }
+              _context26.next = 27;
+              return this.updateArticlesOptionStatesOfActSet(set, origConfigs[_targetIndex], [targetArticles[_targetIndex]], true);
+            case 27:
+              _targetIndex++;
+              _context26.next = 24;
+              break;
+            case 30:
               return _context26.abrupt("return", variantInfo);
-            case 19:
+            case 31:
             case "end":
               return _context26.stop();
           }
@@ -33403,12 +33459,19 @@ var DivaSetHandler = /*#__PURE__*/function () {
         _loop3();
       }
     }
+  }, {
+    key: "checkBannerRules",
+    value: function checkBannerRules(set, visitedOptions, event) {
+      var bannerRules = set.CatalogData.bannerRules;
+      if (!bannerRules) return;
+      var rules = articleHandlerInstance.checkNotificationRules(bannerRules, set.getDivaArticles(), visitedOptions, event);
+      return rules === null || rules === void 0 ? void 0 : rules[0];
+    }
   }, {
     key: "checkNotificationRules",
     value: function checkNotificationRules(set, targetArticles, visitedOptions, event) {
       var _set$CatalogData$noti;
       if (!((_set$CatalogData$noti = set.CatalogData.notificationsRules) !== null && _set$CatalogData$noti !== void 0 && _set$CatalogData$noti.length)) return;
-      console.log('checking');
       var allArticles = set.getDivaArticles(true);
       var articles = {};
       for (var i = 0; i < targetArticles.length; i++) {
@@ -33892,7 +33955,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
     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 dontGenerateImages, orderSet, GroupType, plannerData, setImage, urlToPlanning2D, alternateSetImages, hqRenderScript, promise3D, promise2D, promise3DAlternate, _yield$Promise$all, _yield$Promise$all2, promiseHQRenderScript, _yield$Promise$all3, _yield$Promise$all4, plannerWarnings, bruttoPrice;
+        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) {
             case 0:
@@ -33904,8 +33967,9 @@ var DivaSetHandler = /*#__PURE__*/function () {
               urlToPlanning2D = undefined;
               alternateSetImages = undefined;
               hqRenderScript = undefined;
+              dimensions = {};
               if (dontGenerateImages) {
-                _context31.next = 25;
+                _context31.next = 28;
                 break;
               }
               promise3D = this.getSetImage(set, typeof window === 'undefined');
@@ -33913,22 +33977,24 @@ var DivaSetHandler = /*#__PURE__*/function () {
               if (!catalogData.dontSaveAlternativeRenderings && set.CatalogData.alternateRenderingsForSummary.length) {
                 promise3DAlternate = this.getAlternateSetImages(set);
               }
-              _context31.next = 14;
+              _context31.next = 15;
               return Promise.all([promise3D, promise2D, promise3DAlternate]);
-            case 14:
+            case 15:
               _yield$Promise$all = _context31.sent;
               _yield$Promise$all2 = _slicedToArray__default["default"](_yield$Promise$all, 3);
-              setImage = _yield$Promise$all2[0];
+              _yield$Promise$all2$ = _yield$Promise$all2[0];
+              setImage = _yield$Promise$all2$.url;
+              dimensions = _yield$Promise$all2$.dimensions;
               urlToPlanning2D = _yield$Promise$all2[1];
               alternateSetImages = _yield$Promise$all2[2];
               promiseHQRenderScript = this.getHQRenderScript(set, divaNr);
-              _context31.next = 22;
+              _context31.next = 25;
               return Promise.all([promiseHQRenderScript]);
-            case 22:
+            case 25:
               _yield$Promise$all3 = _context31.sent;
               _yield$Promise$all4 = _slicedToArray__default["default"](_yield$Promise$all3, 1);
               hqRenderScript = _yield$Promise$all4[0];
-            case 25:
+            case 28:
               LOG$8.startTransaction({
                 event: 'FillBakset',
                 eventId: 'FILL_BASKET',
@@ -33960,7 +34026,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 OfflineData: catalogData.offlineData,
                 SetArticleNr: set.SetArticleNr ? set.SetArticleNr : catalogData.retailArticleNr,
                 SetArticleNrPrefix: set.SetArticleNrPrefix,
-                BBox: this.getBBoxObject(set),
+                BBox: this.getBBoxObject(set, dimensions),
                 SetVariantBasketDatas: set.getVariantBasketData(),
                 SetImage: setImage,
                 //Add url string of current rendering.
@@ -33994,7 +34060,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 MetaData_locales: !((_set$basketConfigVari3 = set.basketConfigVariants) !== null && _set$basketConfigVari3 !== void 0 && _set$basketConfigVari3.length) ? set.MetaData_locales : undefined
               });
               return _context31.abrupt("return", orderSet);
-            case 32:
+            case 35:
             case "end":
               return _context31.stop();
           }
@@ -34014,14 +34080,13 @@ var DivaSetHandler = /*#__PURE__*/function () {
     key: "getSetImage",
     value: (function () {
       var _getSetImage = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee30(set, overwriteLastSavedRendering) {
-        var setImage, is3D;
+        var is3D, _yield$set$plannerHan, dimensions, url;
         return _regeneratorRuntime__default["default"].wrap(function _callee30$(_context32) {
           while (1) switch (_context32.prev = _context32.next) {
             case 0:
-              setImage = undefined;
-              is3D = ['3DImage', 'BoxPlanner', 'RTViewer'].includes(set.getPlannerMode());
+              is3D = ['3DImage', '3DCOMB', 'BoxPlanner', 'RTViewer'].includes(set.getPlannerMode());
               if (!is3D) {
-                _context32.next = 10;
+                _context32.next = 12;
                 break;
               }
               LOG$8.startTransaction({
@@ -34029,17 +34094,29 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 message: 'render 3D Image',
                 eventId: 'RENDER_3D_IMAGE'
               });
-              _context32.next = 6;
+              _context32.next = 5;
               return set.plannerHandler.saveSetImage(overwriteLastSavedRendering);
-            case 6:
-              _context32.next = 8;
+            case 5:
+              _context32.next = 7;
               return set.plannerHandler.getSetImageAsUrl(set.getSetId());
-            case 8:
-              setImage = _context32.sent;
+            case 7:
+              _yield$set$plannerHan = _context32.sent;
+              dimensions = _yield$set$plannerHan.dimensions;
+              url = _yield$set$plannerHan.url;
               LOG$8.successTransaction('RENDER_3D_IMAGE');
-            case 10:
-              return _context32.abrupt("return", setImage);
-            case 11:
+              return _context32.abrupt("return", {
+                dimensions: dimensions,
+                url: url
+              });
+            case 12:
+              return _context32.abrupt("return", {
+                dimensions: {
+                  w: undefined,
+                  h: undefined,
+                  d: undefined
+                }
+              });
+            case 13:
             case "end":
               return _context32.stop();
           }
@@ -34059,7 +34136,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           while (1) switch (_context33.prev = _context33.next) {
             case 0:
               //if not 3d
-              is3D = ['3DImage', 'BoxPlanner', 'RTViewer'].includes(set.getPlannerMode());
+              is3D = ['3DImage', '3DCOMB', 'BoxPlanner', 'RTViewer'].includes(set.getPlannerMode());
               if (is3D) {
                 _context33.next = 3;
                 break;
@@ -34115,7 +34192,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 message: 'render 3D alternative Image',
                 eventId: 'RENDER_3D_ALTERNATIVE_IMAGE'
               });
-              is2D = !['3DImage', 'BoxPlanner'].includes(set.getPlannerMode());
+              is2D = !['3DImage', '3DCOMB', 'BoxPlanner'].includes(set.getPlannerMode());
               if (!(is2D || set.onlyRunLogic)) {
                 _context34.next = 4;
                 break;
@@ -34182,14 +34259,17 @@ var DivaSetHandler = /*#__PURE__*/function () {
     }()
   }, {
     key: "getBBoxObject",
-    value: function getBBoxObject(set) {
+    value: function getBBoxObject(set, dimensions) {
+      var _dimensions$w, _dimensions$d, _dimensions$h, _set$api$getI18n$t, _set$api$getI18n, _set$api$getI18n$t2, _set$api$getI18n$t3, _set$api$getI18n2, _set$api$getI18n2$t, _set$api$getI18n$t4, _set$api$getI18n3, _set$api$getI18n3$t;
       var bbox = set.plannerHandler.getSetBoundingBox(set.getSetId());
-      return {
-        X: bbox.width,
-        Y: bbox.depth,
-        Z: bbox.height,
-        Info: bbox.width + 'cm x ' + bbox.depth + 'cm'
+      var dim = {
+        X: (_dimensions$w = dimensions === null || dimensions === void 0 ? void 0 : dimensions.w) !== null && _dimensions$w !== void 0 ? _dimensions$w : bbox.width,
+        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' : '')
+      });
     }
   }, {
     key: "loadProductsOfSets",
@@ -34916,7 +34996,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
             case 9:
               _context7.prev = 9;
               _context7.t0 = _context7["catch"](0);
-              LOG$7.error(new DivaUtils.DivaError('DivaNr konnte in der Datenbank nicht gefunden werden', {
+              LOG$7.error(new DivaUtils.DivaError('ProductId cannot be found in Database', {
                 code: 'WC_0004',
                 custom: {
                   divaNr: divaNr
@@ -34942,30 +35022,44 @@ var DivaBasketHandler = /*#__PURE__*/function () {
         return _regeneratorRuntime__default["default"].wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _context8.next = 2;
+              _context8.prev = 0;
+              _context8.next = 3;
               return api.getDataCache(api.getProductBasketUrl(key, productId), undefined, undefined, 'catalog', 'POST', {
                 fields: fields !== null && fields !== void 0 && fields.length ? fields : undefined
               });
-            case 2:
+            case 3:
               variantData = _context8.sent;
               if (!(variantData.Error || !variantData.basket)) {
-                _context8.next = 8;
+                _context8.next = 9;
                 break;
               }
-              LOG$7.error(new DivaUtils.DivaError('ProductId konnte in der Datenbank nicht gefunden werden', {
+              LOG$7.error(new DivaUtils.DivaError('ProductId cannot be found in Database', {
                 code: 'WC_0005',
                 custom: {
                   productId: productId
                 }
               }));
               return _context8.abrupt("return", false);
-            case 8:
-              return _context8.abrupt("return", this.initBasket(api, variantData.basket.DivaNr, variantData, undefined, productId));
             case 9:
+              return _context8.abrupt("return", this.initBasket(api, variantData.basket.DivaNr, variantData, undefined, productId));
+            case 10:
+              _context8.next = 16;
+              break;
+            case 12:
+              _context8.prev = 12;
+              _context8.t0 = _context8["catch"](0);
+              LOG$7.error(new DivaUtils.DivaError('Error while fetching product data', {
+                code: 'WC_0005',
+                custom: {
+                  productId: productId
+                }
+              }));
+              return _context8.abrupt("return", false);
+            case 16:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this);
+        }, _callee8, this, [[0, 12]]);
       }));
       function loadBasketByCustomProductId(_x17, _x18, _x19, _x20) {
         return _loadBasketByCustomProductId.apply(this, arguments);
@@ -35298,7 +35392,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context13.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-cb1313d4.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-c542faae.js'); });
             case 5:
               _yield$import = _context13.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -35306,7 +35400,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context13.abrupt("break", 33);
             case 9:
               _context13.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-22b25127.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-84f677cc.js'); });
             case 11:
               _yield$import2 = _context13.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -35314,7 +35408,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context13.abrupt("break", 33);
             case 15:
               _context13.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-0c288b72.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-cf892a55.js'); });
             case 17:
               _yield$import3 = _context13.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -35322,7 +35416,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context13.abrupt("break", 33);
             case 21:
               _context13.next = 23;
-              return Promise.resolve().then(function () { return require('./ProductBasketHandler-2e320139.js'); });
+              return Promise.resolve().then(function () { return require('./ProductBasketHandler-8cfcadcd.js'); });
             case 23:
               _yield$import4 = _context13.sent;
               ProductWWSHandler = _yield$import4["default"];
@@ -35330,7 +35424,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context13.abrupt("break", 33);
             case 27:
               _context13.next = 29;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-ac69df0a.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-c4d2c718.js'); });
             case 29:
               _yield$import5 = _context13.sent;
               StandardWWSHandler = _yield$import5["default"];
@@ -36715,7 +36809,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-22e2b075.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-f9b0c4f0.js'); });
             case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -37160,13 +37254,15 @@ var PlannerHandler3D = /*#__PURE__*/function () {
      * @param catalogCodex              The CatalogCodex in the planning
      * @param catalogGUID               The CatalogGUID in the planning
      * @param forceReloadPlanning       Force reload whole planning even if only viewPoint has changed. This is used when for example no 3D Render Client has loaded the current planning
+     * @param camera  The RTV Camera Information for Unity/RTV KOMBI
+     * @param useLatestCamera should the latest camera be used ? default yes when requesting the start viewpoint via the configurator button not
      */
   }, {
     key: "request3D",
     value: (function () {
       var _request3D = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7(params) {
         var _params$renderRequest, _params$renderRequest2, _params$renderRequest3, _params$renderRequest4, _params$renderRequest5, _params$renderRequest6, _this$viewPointHandle;
-        var room, newRenderSize, doReloadWholePlanning, planningHash, requestRenderingFrom3DHost, requestHqRenderScriptFrom3DHost, rendering, renderHash, viewPointName, functionType, _params$camera, sizeInfo, _rendering, fullscreenRendering, renderingInCacheFound, _this$connectionHandl6, _plannerMeasureDigits, _params$camera2, _params$camera3, returnRequest;
+        var room, newRenderSize, doReloadWholePlanning, camera, 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:
@@ -37192,7 +37288,8 @@ var PlannerHandler3D = /*#__PURE__*/function () {
               //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);
-              planningHash = DivaUtils.md5(JSON.stringify(params.planningData));
+              camera = params.camera ? params.camera : params.useLatestCamera ? this.latestCamera : undefined;
+              planningHash = DivaUtils.md5(JSON.stringify(params.planningData) + JSON.stringify(camera));
               if (planningHash == this.lastFramePlanningHash) doReloadWholePlanning = false;
               if (params.forceReloadPlanning || (_this$viewPointHandle = this.viewPointHandler.getCurRoomlistVP()) !== null && _this$viewPointHandle !== void 0 && _this$viewPointHandle.isStatic) doReloadWholePlanning = true;
               this.lastFramePlanningHash = planningHash;
@@ -37200,7 +37297,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
               requestHqRenderScriptFrom3DHost = false;
               if (params.doRequestHqRenderScript) {
                 rendering = this.hqRenderScriptCache.get(planningHash);
-                if (rendering) {
+                if (rendering && !params.useLatestCamera) {
                   LOG$4.debug('Get HQRenderScript from cache');
                   this.lastSavedHQRenderScript = JSON.parse(rendering.HQRenderScript);
                   this.updatePlannerHqRenderScriptInView(rendering);
@@ -37221,7 +37318,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((_params$camera = params.camera) !== null && _params$camera !== void 0 ? _params$camera : this.latestCamera));
+                renderHash = DivaUtils.md5(JSON.stringify(params.planningData) + '#' + room + '#' + viewPointName + '#' + sizeInfo + '#' + JSON.stringify(camera));
                 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)) {
@@ -37254,7 +37351,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
                 }
               }
               if (!(requestHqRenderScriptFrom3DHost || requestRenderingFrom3DHost)) {
-                _context7.next = 31;
+                _context7.next = 32;
                 break;
               }
               if (params.catalogData.lang) params.planningData.SCE.Lang = params.catalogData.lang;
@@ -37281,20 +37378,20 @@ var PlannerHandler3D = /*#__PURE__*/function () {
                   viewPointInfo: this.viewPointHandler.getCurRoomlistVP(),
                   alternateRenderingsExist: params.alternateRenderingsExist,
                   alternateRenderInfo: params.alternateRenderInfo,
-                  camera: (_params$camera2 = params.camera) !== null && _params$camera2 !== void 0 ? _params$camera2 : this.latestCamera,
-                  forceUseCam: !!((_params$camera3 = params.camera) !== null && _params$camera3 !== void 0 ? _params$camera3 : this.latestCamera)
+                  camera: camera,
+                  forceUseCam: !!camera
                 } : undefined
               });
               if (params.camera) this.latestCamera = params.camera;
               if (!(returnRequest === undefined || requestHqRenderScriptFrom3DHost && returnRequest.hqRenderScript == undefined || requestRenderingFrom3DHost && returnRequest.rendering == undefined)) {
-                _context7.next = 29;
+                _context7.next = 30;
                 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 29:
+            case 30:
               if (requestHqRenderScriptFrom3DHost) {
                 if (this.waitForHQRenderScript.has(planningHash)) this.waitForHQRenderScript["delete"](planningHash);
                 this.waitForHQRenderScript.set(planningHash, returnRequest.hqRenderScript);
@@ -37306,12 +37403,12 @@ var PlannerHandler3D = /*#__PURE__*/function () {
                   if (returnRequest.rendering.getIsAlternateRendering()) this.addAlternateRenderingToSavedAlternateRenderings(returnRequest.rendering);else this.lastSavedRendering = returnRequest.rendering;
                 }
               }
-            case 31:
+            case 32:
               return _context7.abrupt("return", {
                 planningHash: planningHash,
                 renderHash: renderHash
               });
-            case 32:
+            case 33:
             case "end":
               return _context7.stop();
           }
@@ -38264,7 +38361,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context4.next = 10;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-e0c04f0c.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-4f6be897.js'); });
             case 10:
               _yield$import = _context4.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -38275,7 +38372,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context4.abrupt("break", 21);
             case 15:
               _context4.next = 17;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-c59ee416.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-13d3daa2.js'); });
             case 17:
               _yield$import2 = _context4.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -38409,6 +38506,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
     key: "getSetImageAsUrl",
     value: (function () {
       var _getSetImageAsUrl = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee6(setId) {
+        var _rendering$get3DDimIn, _rendering$get3DDimIn2, _rendering$get3DDimIn3;
         var rendering;
         return _regeneratorRuntime__default["default"].wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
@@ -38418,7 +38516,14 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
             case 2:
               rendering = _context6.sent;
               LOG$2.debug('SAVE SET IMAGE DIM3D width: ' + (rendering === null || rendering === void 0 ? void 0 : rendering.get3DDimInfo().w) + ', height: ' + (rendering === null || rendering === void 0 ? void 0 : rendering.get3DDimInfo().h) + ', depth: ' + (rendering === null || rendering === void 0 ? void 0 : rendering.get3DDimInfo().d));
-              return _context6.abrupt("return", rendering != undefined ? rendering.UrlToSavedRendering : '');
+              return _context6.abrupt("return", {
+                url: rendering === null || rendering === void 0 ? void 0 : rendering.UrlToSavedRendering,
+                dimensions: {
+                  w: ((_rendering$get3DDimIn = rendering === null || rendering === void 0 ? void 0 : rendering.get3DDimInfo().w) !== null && _rendering$get3DDimIn !== void 0 ? _rendering$get3DDimIn : 0) > 0 ? rendering === null || rendering === void 0 ? void 0 : rendering.get3DDimInfo().w : undefined,
+                  h: ((_rendering$get3DDimIn2 = rendering === null || rendering === void 0 ? void 0 : rendering.get3DDimInfo().h) !== null && _rendering$get3DDimIn2 !== void 0 ? _rendering$get3DDimIn2 : 0) > 0 ? rendering === null || rendering === void 0 ? void 0 : rendering.get3DDimInfo().h : undefined,
+                  d: ((_rendering$get3DDimIn3 = rendering === null || rendering === void 0 ? void 0 : rendering.get3DDimInfo().d) !== null && _rendering$get3DDimIn3 !== void 0 ? _rendering$get3DDimIn3 : 0) > 0 ? rendering === null || rendering === void 0 ? void 0 : rendering.get3DDimInfo().d : undefined
+                }
+              });
             case 5:
             case "end":
               return _context6.stop();
@@ -38534,7 +38639,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
     key: "saveSetHQRenderScript",
     value: function () {
       var _saveSetHQRenderScript = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee9() {
-        var hashes, planningHash, checkingTimes, i;
+        var hashes, planningHash, checkingTimes, i, sumWaitingMS;
         return _regeneratorRuntime__default["default"].wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
@@ -38550,25 +38655,27 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context9.abrupt("return");
             case 6:
               planningHash = hashes.planningHash;
-              checkingTimes = 50;
+              checkingTimes = 200;
               i = 0;
-            case 9:
+              sumWaitingMS = 0;
+            case 10:
               if (!(this.handler3D.getWaitForHqRenderScript(planningHash) && checkingTimes > i)) {
-                _context9.next = 15;
+                _context9.next = 17;
                 break;
               }
-              _context9.next = 12;
+              sumWaitingMS += 50;
+              _context9.next = 14;
               return DivaUtils__default["default"].Sleep(50);
-            case 12:
+            case 14:
               i++;
-              _context9.next = 9;
+              _context9.next = 10;
               break;
-            case 15:
-              LOG$2.debug('saving performance: HQ Renderscript recieved after ' + i * checkingTimes + ' ms');
+            case 17:
+              LOG$2.debug('saving performance: HQ Renderscript recieved after ' + sumWaitingMS + ' ms');
               if (this.handler3D.checkIsWaitingForHQRenderScript() && checkingTimes == i) {
                 LOG$2.error(new DivaUtils.DivaError('could not saveSetHQRenderScript'));
               }
-            case 17:
+            case 19:
             case "end":
               return _context9.stop();
           }
@@ -39001,7 +39108,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
           planner3DGridEnabled: false,
           mediaServiceSaveMode: 'STREAM',
           doShow3DDimensionLines: !!doShow3DDimensionLines
-        });
+        }, undefined, true);
       } else {
         this.handler3D.handle3DVisualizationChanged(mode, params);
       }
@@ -39034,7 +39141,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) {
+      var _request3D = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee16(doRequestRendering, doRequestHqRenderScript, alternateRenderingsExist, alternateRenderInfo, forceReloadPlanning, renderRequestInfos, viewpoint, useLatestCamera) {
         var _this3 = this;
         var plannerData, loadedCatData, plannerExists, savedSetId;
         return _regeneratorRuntime__default["default"].wrap(function _callee16$(_context16) {
@@ -39105,7 +39212,8 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
                 forceReloadPlanning: forceReloadPlanning,
                 alternateRenderInfo: alternateRenderInfo,
                 alternateRenderingsExist: alternateRenderingsExist,
-                camera: viewpoint
+                camera: viewpoint,
+                useLatestCamera: useLatestCamera
               });
             case 18:
               return _context16.abrupt("return", _context16.sent);
@@ -39117,7 +39225,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
           }
         }, _callee16, this);
       }));
-      function request3D(_x33, _x34, _x35, _x36, _x37, _x38, _x39) {
+      function request3D(_x33, _x34, _x35, _x36, _x37, _x38, _x39, _x40) {
         return _request3D.apply(this, arguments);
       }
       return request3D;
@@ -39796,19 +39904,22 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     //onConfigItemClick ist ein Click auf das Item der ConfigPalette um die OPV zu ändern
     _defineProperty__default["default"](this, "doConfigure", /*#__PURE__*/function () {
       var _ref11 = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee11(myValues, targetArticles, dontUpdatePlannerView, dontCallEvents) {
+        var _this$actions13, _this$actions13$toggl, _this$actions14, _this$actions14$toggl;
         var set, returnValues, structure, _returnValues$element, _this$updateViewPlann8, _this$updateElementSe4;
         return _regeneratorRuntime__default["default"].wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
               set = _this.actSet();
-              _context11.next = 3;
+              (_this$actions13 = _this.actions) === null || _this$actions13 === void 0 || (_this$actions13$toggl = _this$actions13.toggleLoading) === null || _this$actions13$toggl === void 0 || _this$actions13$toggl.call(_this$actions13, 'doConfigure', false, true);
+              _context11.next = 4;
               return setHandlerInstance.updateArticlesOptionStatesOfActSet(set, myValues, targetArticles, undefined, 'FromViewClick');
-            case 3:
+            case 4:
               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());
               _this.checkVariantData();
               if (dontUpdatePlannerView) {
-                _context11.next = 16;
+                _context11.next = 18;
                 break;
               }
               _this.updateConfiguratorStructure(structure);
@@ -39822,16 +39933,16 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _this.updateViewButtonsDependigOnConfigStructure();
               _this.updatePlannerView('DO_CONFIGURE', myValues);
               _this.updateWebConfiguratorTitle();
-              _context11.next = 16;
+              _context11.next = 18;
               return _this.getFreePlacesOnGrids(undefined, 'doConfigure');
-            case 16:
+            case 18:
               if (dontCallEvents) {
-                _context11.next = 19;
+                _context11.next = 21;
                 break;
               }
-              _context11.next = 19;
+              _context11.next = 21;
               return _this.fillBaksetforOnWebPlanerConfigChange(myValues);
-            case 19:
+            case 21:
             case "end":
               return _context11.stop();
           }
@@ -39895,6 +40006,12 @@ var DivaWebPlanner = /*#__PURE__*/function () {
         return _ref12.apply(this, arguments);
       };
     }());
+    _defineProperty__default["default"](this, "getPosNr", function (basketId) {
+      var _set$getArticleByBask;
+      var set = _this.actSet();
+      if (!set) throw new Error('set undefined');
+      return (_set$getArticleByBask = set.getArticleByBasketId(basketId)) === null || _set$getArticleByBask === void 0 ? void 0 : _set$getArticleByBask.posNr;
+    });
     _defineProperty__default["default"](this, "getReturnTo", function (event) {
       var returnTo = _this.ReturnTo;
       if (returnTo == undefined) {
@@ -39925,7 +40042,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$actions14, _set$getDivaArticles, _set$getSetPrice, _this$actions13, _this$actions13$toggl, initSetState, set, products, result, _this$actions15, basket, catalogData;
+        var viewReadyPromise, loadSuccessful, _initSetState$api$web, _this$actions16, _set$getDivaArticles, _set$getSetPrice, _this$actions15, _this$actions15$toggl, initSetState, set, products, result, _this$actions17, basket, catalogData;
         return _regeneratorRuntime__default["default"].wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -39969,7 +40086,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               return this.initView();
             case 20:
               this.subscribeToWebPlannerEvents();
-              (_this$actions13 = this.actions) === null || _this$actions13 === void 0 || (_this$actions13$toggl = _this$actions13.toggleLoading) === null || _this$actions13$toggl === void 0 || _this$actions13$toggl.call(_this$actions13, 'Planner_Loading', false, false);
+              (_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:
               //TODO: get prices of matching product with more than one element
@@ -40019,11 +40136,11 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _context13.next = 44;
               return this.initView();
             case 44:
-              (_this$actions14 = this.actions) === null || _this$actions14 === void 0 || _this$actions14.onEvent({
+              (_this$actions16 = this.actions) === null || _this$actions16 === void 0 || _this$actions16.onEvent({
                 type: 'onConfiguratorReady'
               });
               if (Object.keys((_set$getDivaArticles = set === null || set === void 0 ? void 0 : set.getDivaArticles()) !== null && _set$getDivaArticles !== void 0 ? _set$getDivaArticles : {}).length) {
-                (_this$actions15 = this.actions) === null || _this$actions15 === void 0 || _this$actions15.onEvent({
+                (_this$actions17 = this.actions) === null || _this$actions17 === void 0 || _this$actions17.onEvent({
                   type: 'onArticleInitialized'
                 });
               }
@@ -40118,11 +40235,11 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "onInitializationError",
     value: function onInitializationError() {
-      var _this$state2, _this$actions17, _this$actions17$toggl;
+      var _this$state2, _this$actions19, _this$actions19$toggl;
       var onErrorHandling = this.api.onErrorHandling();
       if ((_this$state2 = this.state) !== null && _this$state2 !== void 0 && _this$state2.isFullscreenComponent) {
-        var _this$actions16;
-        (_this$actions16 = this.actions) === null || _this$actions16 === void 0 || _this$actions16.closeComponentInFullscreen();
+        var _this$actions18;
+        (_this$actions18 = this.actions) === null || _this$actions18 === void 0 || _this$actions18.closeComponentInFullscreen();
         return;
       }
       if (onErrorHandling) {
@@ -40163,7 +40280,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           });
         }
       }
-      (_this$actions17 = this.actions) === null || _this$actions17 === void 0 || (_this$actions17$toggl = _this$actions17.toggleLoading) === null || _this$actions17$toggl === void 0 || _this$actions17$toggl.call(_this$actions17, 'Planner_Loading', false, false);
+      (_this$actions19 = this.actions) === null || _this$actions19 === void 0 || (_this$actions19$toggl = _this$actions19.toggleLoading) === null || _this$actions19$toggl === void 0 || _this$actions19$toggl.call(_this$actions19, 'Planner_Loading', false, false);
     }
   }, {
     key: "getDivaArticles",
@@ -40496,7 +40613,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "updatePlannerView",
     value: function updatePlannerView(callingFrom, onDoConfigureValues, viewpoint) {
-      var _this$getCurrentAlter, _set$getAlternateRend, _this$getDoShow3DDime2, _this$getDoShow3DDime3;
+      var _this$getCurrentAlter, _set$getAlternateRend, _this$getDoShow3DDime2, _this$getDoShow3DDime3, _this$getDoShow3DDime4;
       var set = this.actSet();
       if (!set) return;
       var alternateRenderInfo = (_this$getCurrentAlter = this.getCurrentAlternativRendering) === null || _this$getCurrentAlter === void 0 || (_this$getCurrentAlter = _this$getCurrentAlter.call(this)) === null || _this$getCurrentAlter === void 0 ? void 0 : _this$getCurrentAlter[0];
@@ -40531,24 +40648,27 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       //delete me if you see this
       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');
+          break;
         case 'RTViewer':
           //Request HQRenderscript + rendering
           //Request new Rendering
-          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);
+          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);
           break;
         case '3DImage':
           //Request new Rendering
-          setHandlerInstance.update3DPlannerView(true, !!this.doLoadHQR, set, this.getPlannerRenderingSize(), this.getPlanner3DGridEnabled(), 'STREAM', (_this$getDoShow3DDime3 = this.getDoShow3DDimensionLines) === null || _this$getDoShow3DDime3 === void 0 ? void 0 : _this$getDoShow3DDime3.call(this), alternateRenderInfo);
+          setHandlerInstance.update3DPlannerView(true, !!this.doLoadHQR, set, this.getPlannerRenderingSize(), this.getPlanner3DGridEnabled(), 'STREAM', (_this$getDoShow3DDime4 = this.getDoShow3DDimensionLines) === null || _this$getDoShow3DDime4 === void 0 ? void 0 : _this$getDoShow3DDime4.call(this), alternateRenderInfo);
           break;
         case '2DGrid':
           var boundingBox = setHandlerInstance.get2DViewPlannerBoundingBox(set);
           if (boundingBox) {
             this.updatePlanner2DGrid(boundingBox);
           }
-          if (['3DImage'].includes(this.getInitPlannerViewMode())) {
-            var _this$getDoShow3DDime4;
+          if (['3DImage', '3DCOMB'].includes(this.getInitPlannerViewMode())) {
+            var _this$getDoShow3DDime5;
             //update 3D image always even if you are in the 2DGrid mode
-            setHandlerInstance.update3DPlannerView(true, !!this.doLoadHQR, set, this.getPlannerRenderingSize(), this.getPlanner3DGridEnabled(), 'STREAM', (_this$getDoShow3DDime4 = this.getDoShow3DDimensionLines) === null || _this$getDoShow3DDime4 === void 0 ? void 0 : _this$getDoShow3DDime4.call(this), alternateRenderInfo);
+            setHandlerInstance.update3DPlannerView(true, !!this.doLoadHQR, set, this.getPlannerRenderingSize(), this.getPlanner3DGridEnabled(), 'STREAM', (_this$getDoShow3DDime5 = this.getDoShow3DDimensionLines) === null || _this$getDoShow3DDime5 === void 0 ? void 0 : _this$getDoShow3DDime5.call(this), alternateRenderInfo);
           }
           break;
       }
@@ -40566,18 +40686,18 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     value: function forceUpdatePlannerView(renderSavingMode, doLoadAllAlternateRenderings) {
       var set = this.actSet();
       this.update2DGrid(set);
-      if (['3DImage', 'BoxPlanner'].includes(this.getInitPlannerViewMode())) {
-        var _this$getDoShow3DDime6;
+      if (['3DImage', '3DCOMB', 'BoxPlanner'].includes(this.getInitPlannerViewMode())) {
+        var _this$getDoShow3DDime7;
         if (doLoadAllAlternateRenderings) {
           var alternateRenderings = set.CatalogData.alternateRenderingsForSummary;
           for (var i = 0; i < alternateRenderings.length; i++) {
             if (alternateRenderings[i].hideOptionsIn3DImage && alternateRenderings[i].hideOptionsIn3DImage.length > 0) {
-              var _this$getDoShow3DDime5;
-              setHandlerInstance.update3DPlannerView(true, !!this.doLoadHQR, set, this.getPlannerRenderingSize(), false, renderSavingMode, (_this$getDoShow3DDime5 = this.getDoShow3DDimensionLines) === null || _this$getDoShow3DDime5 === void 0 ? void 0 : _this$getDoShow3DDime5.call(this), alternateRenderings[i]);
+              var _this$getDoShow3DDime6;
+              setHandlerInstance.update3DPlannerView(true, !!this.doLoadHQR, set, this.getPlannerRenderingSize(), false, renderSavingMode, (_this$getDoShow3DDime6 = this.getDoShow3DDimensionLines) === null || _this$getDoShow3DDime6 === void 0 ? void 0 : _this$getDoShow3DDime6.call(this), alternateRenderings[i]);
             }
           }
         }
-        setHandlerInstance.update3DPlannerView(true, !!this.doLoadHQR, set, this.getPlannerRenderingSize(), false, renderSavingMode, (_this$getDoShow3DDime6 = this.getDoShow3DDimensionLines) === null || _this$getDoShow3DDime6 === void 0 ? void 0 : _this$getDoShow3DDime6.call(this));
+        setHandlerInstance.update3DPlannerView(true, !!this.doLoadHQR, set, this.getPlannerRenderingSize(), false, renderSavingMode, (_this$getDoShow3DDime7 = this.getDoShow3DDimensionLines) === null || _this$getDoShow3DDime7 === void 0 ? void 0 : _this$getDoShow3DDime7.call(this));
       }
     }
   }, {
@@ -40874,8 +40994,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "changeOnFavorites",
     value: function changeOnFavorites(opt, opvs, targetArticles, remove) {
-      var _this$actions18;
-      favoritesHandlerInstance.changeOnFavorites(this.actSet(), opt, opvs, targetArticles, remove, (_this$actions18 = this.actions) === null || _this$actions18 === void 0 ? void 0 : _this$actions18.openModal);
+      var _this$actions20;
+      favoritesHandlerInstance.changeOnFavorites(this.actSet(), opt, opvs, targetArticles, remove, (_this$actions20 = this.actions) === null || _this$actions20 === void 0 ? void 0 : _this$actions20.openModal);
     }
   }, {
     key: "setDifferentOptions",
@@ -40922,25 +41042,25 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "callEvent",
     value: function callEvent(event, param) {
-      var _this$actions19, _this$actions20, _this$actions21, _this$actions22;
+      var _this$actions21, _this$actions22, _this$actions23, _this$actions24;
       switch (event) {
         case 'onFullscreenClose':
-          (_this$actions19 = this.actions) === null || _this$actions19 === void 0 || _this$actions19.onEvent({
+          (_this$actions21 = this.actions) === null || _this$actions21 === void 0 || _this$actions21.onEvent({
             type: 'onFullscreenClose'
           });
           break;
         case 'onWebPlanerClose':
-          (_this$actions20 = this.actions) === null || _this$actions20 === void 0 || _this$actions20.onEvent({
+          (_this$actions22 = this.actions) === null || _this$actions22 === void 0 || _this$actions22.onEvent({
             type: 'onWebPlanerClose'
           });
           break;
         case 'onWebPlanerHelp':
-          (_this$actions21 = this.actions) === null || _this$actions21 === void 0 || _this$actions21.onEvent({
+          (_this$actions23 = this.actions) === null || _this$actions23 === void 0 || _this$actions23.onEvent({
             type: 'onWebPlanerHelp'
           });
           break;
         case 'onWebPlanerZoomClick':
-          (_this$actions22 = this.actions) === null || _this$actions22 === void 0 || _this$actions22.onEvent({
+          (_this$actions24 = this.actions) === null || _this$actions24 === void 0 || _this$actions24.onEvent({
             type: 'onWebPlanerZoomClick',
             data: param
           });
@@ -40951,14 +41071,14 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "saveToBasketWrapper",
     value: function () {
       var _saveToBasketWrapper = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee26(event, repairOnly, force) {
-        var _this$actions23,
-          _this$actions23$toggl,
-          _this$actions24,
-          _this$actions24$toggl,
+        var _this$actions25,
+          _this$actions25$toggl,
+          _this$actions26,
+          _this$actions26$toggl,
           _this2 = this,
-          _this$actions28,
+          _this$actions30,
           _this$i18n14;
-        var returnTo, finalEvent, _this$api$getBarrierC, _this$openLeafeltBarr, product, _result, result, _this$actions25, _this$i18n8, _this$i18n9, _this$actions26, _this$i18n10, _this$i18n11, _this$actions27, _this$i18n12, _this$i18n13, _this$updatePlannerMs2, _this$actions29, _this$i18n15;
+        var returnTo, finalEvent, _this$api$getBarrierC, _this$openLeafeltBarr, product, _result, result, _this$actions27, _this$i18n8, _this$i18n9, _this$actions28, _this$i18n10, _this$i18n11, _this$actions29, _this$i18n12, _this$i18n13, _this$updatePlannerMs2, _this$actions31, _this$i18n15;
         return _regeneratorRuntime__default["default"].wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
@@ -40992,18 +41112,18 @@ var DivaWebPlanner = /*#__PURE__*/function () {
             case 15:
               returnTo = finalEvent == 'onAddToBasket' ? 'OPEN_PDF' : returnTo;
             case 16:
-              (_this$actions23 = this.actions) === null || _this$actions23 === void 0 || (_this$actions23$toggl = _this$actions23.toggleLoading) === null || _this$actions23$toggl === void 0 || _this$actions23$toggl.call(_this$actions23, 'Planner_Saving', false, true);
+              (_this$actions25 = this.actions) === null || _this$actions25 === void 0 || (_this$actions25$toggl = _this$actions25.toggleLoading) === null || _this$actions25$toggl === void 0 || _this$actions25$toggl.call(_this$actions25, 'Planner_Saving', false, true);
               _context26.next = 19;
               return this.saveToBasket(finalEvent, repairOnly, force);
             case 19:
               result = _context26.sent;
-              (_this$actions24 = this.actions) === null || _this$actions24 === void 0 || (_this$actions24$toggl = _this$actions24.toggleLoading) === null || _this$actions24$toggl === void 0 || _this$actions24$toggl.call(_this$actions24, 'Planner_Saving', false, false);
+              (_this$actions26 = this.actions) === null || _this$actions26 === void 0 || (_this$actions26$toggl = _this$actions26.toggleLoading) === null || _this$actions26$toggl === void 0 || _this$actions26$toggl.call(_this$actions26, 'Planner_Saving', false, false);
               if (!(result === 'canceled')) {
                 _context26.next = 25;
                 break;
               }
               LOG$1.error(new DivaUtils.DivaError('failed to save Basket'));
-              (_this$actions25 = this.actions) === null || _this$actions25 === void 0 || _this$actions25.openModal({
+              (_this$actions27 = this.actions) === null || _this$actions27 === void 0 || _this$actions27.openModal({
                 text: ((_this$i18n8 = this.i18n()) === null || _this$i18n8 === void 0 ? void 0 : _this$i18n8.t('modal.general_error')) + ' --- ' + DivaUtils__default["default"].formatDate(new Date(), true, undefined, true) + ' --- ' + DivaUtils__default["default"].getCurrentTraceId() ? ((_this$i18n9 = this.i18n()) === null || _this$i18n9 === void 0 ? void 0 : _this$i18n9.t('modal.errorcode')) + ': ' + DivaUtils__default["default"].getCurrentTraceId() : '',
                 accept: true
               });
@@ -41017,12 +41137,12 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 LOG$1.error(new DivaUtils.DivaError('PDF url is missing in basket', {
                   code: 'WC_0010'
                 }));
-                (_this$actions26 = this.actions) === null || _this$actions26 === void 0 || _this$actions26.openModal({
+                (_this$actions28 = this.actions) === null || _this$actions28 === void 0 || _this$actions28.openModal({
                   text: ((_this$i18n10 = this.i18n()) === null || _this$i18n10 === void 0 ? void 0 : _this$i18n10.t('modal.general_error')) + ' --- ' + DivaUtils__default["default"].formatDate(new Date(), true, undefined, true) + ' --- ' + DivaUtils__default["default"].getCurrentTraceId() ? ((_this$i18n11 = this.i18n()) === null || _this$i18n11 === void 0 ? void 0 : _this$i18n11.t('modal.errorcode')) + ': ' + DivaUtils__default["default"].getCurrentTraceId() : '',
                   accept: true
                 });
               } else {
-                (_this$actions27 = this.actions) === null || _this$actions27 === void 0 || _this$actions27.openModal({
+                (_this$actions29 = this.actions) === null || _this$actions29 === void 0 || _this$actions29.openModal({
                   text: (_this$i18n12 = this.i18n()) === null || _this$i18n12 === void 0 ? void 0 : _this$i18n12.t(this.divaBasketHandler.actBasket.Status === 'ORDER' ? 'modal.open_order_pdf_now' : 'modal.open_leaflet_pdf_now'),
                   accept: (_this$i18n13 = this.i18n()) === null || _this$i18n13 === void 0 ? void 0 : _this$i18n13.t('modals.open_now'),
                   callback: function callback() {
@@ -41032,7 +41152,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               }
               return _context26.abrupt("break", 31);
             case 30:
-              (_this$actions28 = this.actions) === null || _this$actions28 === void 0 || _this$actions28.openModal({
+              (_this$actions30 = this.actions) === null || _this$actions30 === void 0 || _this$actions30.openModal({
                 text: (_this$i18n14 = this.i18n()) === null || _this$i18n14 === void 0 ? void 0 : _this$i18n14.t('modal.planning_saved'),
                 accept: true
               });
@@ -41048,7 +41168,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 _context26.next = 37;
                 break;
               }
-              (_this$actions29 = this.actions) === null || _this$actions29 === void 0 || _this$actions29.openModal({
+              (_this$actions31 = this.actions) === null || _this$actions31 === void 0 || _this$actions31.openModal({
                 accept: true,
                 text: (_this$i18n15 = this.i18n()) === null || _this$i18n15 === void 0 ? void 0 : _this$i18n15.t('configurator.PAYLOAD_TO_BIG'),
                 title: 'modals.error_saving'
@@ -41071,7 +41191,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "saveToBasket",
     value: function () {
       var _saveToBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee27(event, repairOnly, force) {
-        var _returnTo, _event, _event2, _event3, _returnTo2, _returnTo3, _this$actions30, _this$actions31;
+        var _returnTo, _event, _event2, _event3, _returnTo2, _returnTo3, _this$actions32, _this$actions33;
         var set, actBasket, returnTo, oldReturnTo, count, basketData, bytes, result, newDivaNr, _result2, _event4, product;
         return _regeneratorRuntime__default["default"].wrap(function _callee27$(_context27) {
           while (1) switch (_context27.prev = _context27.next) {
@@ -41158,7 +41278,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _context27.next = _context27.t3 === 'OPEN_SELLER_PRODUCTCREATOR' ? 39 : _context27.t3 === 'OPEN_SELLER_BASKET' ? 41 : _context27.t3 === 'OPEN_PDF' ? 43 : _context27.t3 === 'SAVE_BASKET_WITH_MODAL' ? 43 : _context27.t3 === 'SAVE_BASKET' ? 43 : _context27.t3 === 'SAVE_BASKET_SYNC' ? 43 : _context27.t3 === 'OPEN_LEAFLET_BARRIER' ? 43 : 63;
               break;
             case 39:
-              (_this$actions30 = this.actions) === null || _this$actions30 === void 0 || _this$actions30.openComponent({
+              (_this$actions32 = this.actions) === null || _this$actions32 === void 0 || _this$actions32.openComponent({
                 type: 'SELLER',
                 parameters: {
                   module: 'PCreator',
@@ -41171,7 +41291,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               });
               return _context27.abrupt("break", 63);
             case 41:
-              (_this$actions31 = this.actions) === null || _this$actions31 === void 0 || _this$actions31.openComponent({
+              (_this$actions33 = this.actions) === null || _this$actions33 === void 0 || _this$actions33.openComponent({
                 type: 'SELLER',
                 parameters: {
                   module: 'Basket',
@@ -41253,6 +41373,13 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       if (!set) return;
       return setHandlerInstance.checkNotificationRules(set, targetArticles, visitedOptions, event);
     }
+  }, {
+    key: "checkBannerRules",
+    value: function checkBannerRules(visitedOptions, event) {
+      var set = this.actSet();
+      if (!set) return;
+      return setHandlerInstance.checkBannerRules(set, visitedOptions, event);
+    }
 
     /**
      * This function returns true if the Planner Mode should be visible and the planner Step should be shown.
@@ -41414,6 +41541,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "getAllowRTV",
     value: function getAllowRTV() {
       var _this$actSet21, _this$actSet22;
+      if (this.getEnableUnityRtvKombi()) return false;
       if (this.api.forceShowRTV()) return true;
       if ((_this$actSet21 = this.actSet()) !== null && _this$actSet21 !== void 0 && _this$actSet21.CatalogData.divaForceRTV) return true;
       if (this.api.getDoShowRTV() && (_this$actSet22 = this.actSet()) !== null && _this$actSet22 !== void 0 && _this$actSet22.CatalogData.divaArReady) return true;
@@ -41429,16 +41557,16 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getEnableUnityRtvKombi",
     value: function getEnableUnityRtvKombi() {
-      var _this$actSet24;
+      var _this$actSet24, _this$actSet25;
       // if force rtv disable unity kombi - biohort
       if ((_this$actSet24 = this.actSet()) !== null && _this$actSet24 !== void 0 && _this$actSet24.CatalogData.divaForceRTV) return false;
-      return this.api.getEnableRTVUnityKombi();
+      return ((_this$actSet25 = this.actSet()) === null || _this$actSet25 === void 0 ? void 0 : _this$actSet25.CatalogData.divaArReady) == true && this.api.getEnableRTVUnityKombi();
     }
   }, {
     key: "getShelfPlannerRTV",
     value: function getShelfPlannerRTV() {
-      var _this$actSet25;
-      return (_this$actSet25 = this.actSet()) === null || _this$actSet25 === void 0 ? void 0 : _this$actSet25.CatalogData.useShelfPlannerRTV;
+      var _this$actSet26;
+      return (_this$actSet26 = this.actSet()) === null || _this$actSet26 === void 0 ? void 0 : _this$actSet26.CatalogData.useShelfPlannerRTV;
     }
   }, {
     key: "getBasketData",
@@ -41479,8 +41607,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getCatalogData",
     value: function getCatalogData() {
-      var _this$actSet26;
-      return (_this$actSet26 = this.actSet()) === null || _this$actSet26 === void 0 ? void 0 : _this$actSet26.CatalogData;
+      var _this$actSet27;
+      return (_this$actSet27 = this.actSet()) === null || _this$actSet27 === void 0 ? void 0 : _this$actSet27.CatalogData;
     }
   }, {
     key: "ReturnTo",
@@ -41496,16 +41624,16 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "addToBasket",
     value: function () {
       var _addToBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee29(actBasket) {
-        var _this$actions32,
-          _this$actions33,
-          _this$actions34,
+        var _this$actions34,
           _this$actions35,
           _this$actions36,
-          _this$divaBasketHandl3,
-          _this3 = this,
           _this$actions37,
           _this$actions38,
-          _this$actions39;
+          _this$divaBasketHandl3,
+          _this3 = this,
+          _this$actions39,
+          _this$actions40,
+          _this$actions41;
         var event,
           addToBasketLog,
           emailConfig,
@@ -41525,35 +41653,35 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               break;
             case 5:
               this.handleSuccessTransaction('onPrintBasket', actBasket);
-              (_this$actions32 = this.actions) === null || _this$actions32 === void 0 || _this$actions32.onEvent({
+              (_this$actions34 = this.actions) === null || _this$actions34 === void 0 || _this$actions34.onEvent({
                 type: 'onWebPlanerPrint',
                 data: actBasket.getAsJson()
               });
               return _context29.abrupt("break", 38);
             case 8:
               this.handleSuccessTransaction('onSaveBasket', actBasket);
-              (_this$actions33 = this.actions) === null || _this$actions33 === void 0 || _this$actions33.onEvent({
+              (_this$actions35 = this.actions) === null || _this$actions35 === void 0 || _this$actions35.onEvent({
                 type: 'onWebPlanerSave',
                 data: actBasket.getAsJson()
               });
               return _context29.abrupt("break", 38);
             case 11:
               this.handleSuccessTransaction('onShareBasket', actBasket);
-              (_this$actions34 = this.actions) === null || _this$actions34 === void 0 || _this$actions34.onEvent({
+              (_this$actions36 = this.actions) === null || _this$actions36 === void 0 || _this$actions36.onEvent({
                 type: 'onWebPlanerShare',
                 data: actBasket.getAsJson()
               });
               return _context29.abrupt("break", 38);
             case 14:
               this.handleSuccessTransaction('onRequestConsulation', actBasket);
-              (_this$actions35 = this.actions) === null || _this$actions35 === void 0 || _this$actions35.onEvent({
+              (_this$actions37 = this.actions) === null || _this$actions37 === void 0 || _this$actions37.onEvent({
                 type: 'onRequestConsulation',
                 data: actBasket.getAsJson()
               });
               return _context29.abrupt("break", 38);
             case 17:
               this.handleSuccessTransaction('onSave', actBasket);
-              (_this$actions36 = this.actions) === null || _this$actions36 === void 0 || _this$actions36.onEvent({
+              (_this$actions38 = this.actions) === null || _this$actions38 === void 0 || _this$actions38.onEvent({
                 type: 'onSave',
                 data: actBasket.getAsJson()
               });
@@ -41589,7 +41717,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 });
                 this.handleSuccessTransaction('onSendEmail', actBasket);
               }
-              (_this$actions37 = this.actions) === null || _this$actions37 === void 0 || _this$actions37.onEvent({
+              (_this$actions39 = this.actions) === null || _this$actions39 === void 0 || _this$actions39.onEvent({
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
@@ -41601,7 +41729,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
             case 28:
               products = _context29.sent;
               this.handleSuccessTransaction('onSaveProduct', actBasket);
-              (_this$actions38 = this.actions) === null || _this$actions38 === void 0 || _this$actions38.onEvent({
+              (_this$actions40 = this.actions) === null || _this$actions40 === void 0 || _this$actions40.onEvent({
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
@@ -41615,7 +41743,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               addToBasketLog = false;
             case 35:
               if (addToBasketLog) this.handleSuccessTransaction('onAddToBasket', actBasket);
-              (_this$actions39 = this.actions) === null || _this$actions39 === void 0 || _this$actions39.onEvent({
+              (_this$actions41 = this.actions) === null || _this$actions41 === void 0 || _this$actions41.onEvent({
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
@@ -41647,8 +41775,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "openPDFpostAsEvent",
     value: function openPDFpostAsEvent(mongoDBId) {
-      var _this$actions40, _this$actions41, _this$actions42;
-      (_this$actions40 = this.actions) === null || _this$actions40 === void 0 || _this$actions40.updateBreadcrumbs({
+      var _this$actions42, _this$actions43, _this$actions44;
+      (_this$actions42 = this.actions) === null || _this$actions42 === void 0 || _this$actions42.updateBreadcrumbs({
         type: 'update',
         param: {
           groupId: 'SHOWROOM',
@@ -41662,7 +41790,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }
       });
-      (_this$actions41 = this.actions) === null || _this$actions41 === void 0 || _this$actions41.updateBreadcrumbs({
+      (_this$actions43 = this.actions) === null || _this$actions43 === void 0 || _this$actions43.updateBreadcrumbs({
         type: 'update',
         param: {
           groupId: 'SHOWROOM',
@@ -41676,7 +41804,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }
       });
-      (_this$actions42 = this.actions) === null || _this$actions42 === void 0 || _this$actions42.openComponent({
+      (_this$actions44 = this.actions) === null || _this$actions44 === void 0 || _this$actions44.openComponent({
         type: 'REPORT',
         parameters: {
           id: mongoDBId
@@ -41896,14 +42024,14 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "subscribeToWebPlannerEvents",
     value: function subscribeToWebPlannerEvents() {
-      var _this$actions43;
-      (_this$actions43 = this.actions) === null || _this$actions43 === void 0 || _this$actions43.subscribeEvents(this.addToBasketEventFunction);
+      var _this$actions45;
+      (_this$actions45 = this.actions) === null || _this$actions45 === void 0 || _this$actions45.subscribeEvents(this.addToBasketEventFunction);
     }
   }, {
     key: "unsubscribeFromWebPlannerEvents",
     value: function unsubscribeFromWebPlannerEvents() {
-      var _this$actions44;
-      (_this$actions44 = this.actions) === null || _this$actions44 === void 0 || _this$actions44.unSubscribeEvents(this.addToBasketEventFunction);
+      var _this$actions46;
+      (_this$actions46 = this.actions) === null || _this$actions46 === void 0 || _this$actions46.unSubscribeEvents(this.addToBasketEventFunction);
     }
   }, {
     key: "initApiForLogicOnly",