@crystaldesign/web-planner-logic 24.13.0-beta.12 → 24.13.0-beta.14

package/build/cjs/{index-55163fb5.js → index-fc87bc19.js}

@@ -900,8 +900,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
       return '/v1/products/' + productId + '/list';
     }
   }, {
-    key: "getProductBasketUrl",
-    value: function getProductBasketUrl(key, value) {
+    key: "getProductByKeyValueUrl",
+    value: function getProductByKeyValueUrl(key, value) {
       return "/v1/products/basket?key=".concat(key, "&value=").concat(value);
     }
   }, {
@@ -1614,6 +1614,16 @@ var ArticleOptionData = /*#__PURE__*/function () {
     get: function get() {
       return this.opt.catalogOPT.contentItemId;
     }
+  }, {
+    key: "showSearchbar",
+    get: function get() {
+      return this.opt.catalogOPT.showSearchbar;
+    }
+  }, {
+    key: "showFilter",
+    get: function get() {
+      return this.opt.catalogOPT.showFilter;
+    }
   }, {
     key: "pdfUrl",
     get: function get() {
@@ -17847,6 +17857,12 @@ var OptionCatalogData = /*#__PURE__*/function () {
         case 'INFO_URL':
           this.opt.url = prop.Value;
           break;
+        case 'SHOW_SEARCHBAR':
+          this.opt.showSearchbar = prop.Value;
+          break;
+        case 'SHOW_FILTER':
+          this.opt.showFilter = prop.Value;
+          break;
         case 'INFO_PDF':
           this.opt.pdfUrl = prop.Value;
           break;
@@ -18047,6 +18063,16 @@ var OptionCatalogData = /*#__PURE__*/function () {
     get: function get() {
       return this.opt.url;
     }
+  }, {
+    key: "showSearchbar",
+    get: function get() {
+      return this.opt.showSearchbar;
+    }
+  }, {
+    key: "showFilter",
+    get: function get() {
+      return this.opt.showFilter;
+    }
   }, {
     key: "pdfUrl",
     get: function get() {
@@ -18143,7 +18169,6 @@ var DivaCatalogData = /*#__PURE__*/function () {
       brandName: json.Brandname,
       mediaUrl: '',
       //                                                https://retail.diva-portal.de/files/33/9680c4a3-fc60-4541-8738-4859d9b24e9d/";
-      imageBaseUrl: '',
       subFolder: json.SubFolder,
       longDescription: json.LongDescription,
       longDescription_locales: json.LongDescription_locales,
@@ -18345,9 +18370,7 @@ var DivaCatalogData = /*#__PURE__*/function () {
     key: "getMediaURL",
     value: function getMediaURL(subFolder) {
       var retval = '';
-      if (this.catalogData.imageBaseUrl != '') {
-        retval = this.catalogData.imageBaseUrl;
-      } else if (this.api.getBaseUrl().substring(0, 4) == 'http') {
+      if (this.api.getBaseUrl().substring(0, 4) == 'http') {
         retval = this.api.getBaseUrl() + '/' + this.api.getServerId() + '/';
       }
       if (subFolder != '') retval += subFolder + '/';
@@ -23578,7 +23601,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-1f6c17bd.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-1f0ad013.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -26921,6 +26944,7 @@ var DivaSet = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "setId", void 0);
     _defineProperty__default["default"](this, "_isActSet", false);
     _defineProperty__default["default"](this, "setData", void 0);
+    _defineProperty__default["default"](this, "_onlyCalcVariants", void 0);
     _defineProperty__default["default"](this, "divaArticles", void 0);
     //Schlüssel ist basketId
     _defineProperty__default["default"](this, "configSingleData", void 0);
@@ -28110,7 +28134,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context4.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-d649d3e0.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-33299e6b.js'); });
             case 3:
               _yield$import = _context4.sent;
               DoorPlanner = _yield$import["default"];
@@ -28175,6 +28199,14 @@ var DivaSet = /*#__PURE__*/function () {
     get: function get() {
       return this.setState;
     }
+  }, {
+    key: "onlyCalcVariants",
+    get: function get() {
+      return this._onlyCalcVariants;
+    },
+    set: function set(val) {
+      this._onlyCalcVariants = val;
+    }
 
     /**
      *
@@ -29615,7 +29647,7 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
     key: "getValidVariants",
     value: function () {
       var _getValidVariants = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(set, useCache) {
-        var allvariants, validVariants, i;
+        var allvariants, validVariants, i, _set$onlyCalcVariants;
         return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -29636,7 +29668,9 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
               validVariants = [];
               for (i = 0; i < allvariants.length; i++) {
                 if (!set.disabledVariants.includes(allvariants[i].id)) {
-                  validVariants.push(allvariants[i]);
+                  if (!((_set$onlyCalcVariants = set.onlyCalcVariants) !== null && _set$onlyCalcVariants !== void 0 && _set$onlyCalcVariants.length) || set.onlyCalcVariants.includes(allvariants[i].id)) {
+                    validVariants.push(allvariants[i]);
+                  }
                 }
               }
               return _context4.abrupt("return", validVariants);
@@ -30741,6 +30775,34 @@ var DivaProductHandler = /*#__PURE__*/function () {
       }
       return updateProducts;
     }()
+  }, {
+    key: "getBestMatch",
+    value: function getBestMatch(articles, products) {
+      var OPTION_CODEX = 'KOPFTEIL';
+      if (!articles) return;
+      for (var key in articles) {
+        var _article$VariantValue;
+        var article = articles[key];
+        var opv = (_article$VariantValue = article.VariantValues['OPT' + OPTION_CODEX]) === null || _article$VariantValue === void 0 ? void 0 : _article$VariantValue.replace('OPV', '');
+        if (!products || !opv) continue;
+        for (var i = 0; i < products.length; i++) {
+          var _products$i$affiliate;
+          if ((_products$i$affiliate = products[i].affiliate) !== null && _products$i$affiliate !== void 0 && _products$i$affiliate.length) if (this.findOPVCodexInVariantValues(products[i], OPTION_CODEX, opv)) {
+            return products[i];
+          }
+        }
+      }
+      return undefined;
+    }
+  }, {
+    key: "findOPVCodexInVariantValues",
+    value: function findOPVCodexInVariantValues(product, opt, opv) {
+      return product.articles.find(function (article) {
+        return article.variantValues.find(function (variant) {
+          return variant.OPT === opt && variant.OPV === opv;
+        });
+      });
+    }
   }]);
 }();
 var productHandlerInstance = new DivaProductHandler();
@@ -31716,8 +31778,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
     key: "deleteElementFromSet",
     value: function () {
       var _deleteElementFromSet = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee14(set, article, autoCorrectAVL_AVR, deletionType, dontReload) {
-        var _deletedArticle$doorP, _set$CatalogData;
-        var setId, deletedArticle, articles, key, newSelectedElement, oldTransform, result, _set$getArticleByBask3, elementDeleted;
+        var setId, allElementsToDelete, success, newSelectedElement, i, _deletedArticle$doorP, _set$CatalogData, deletedArticle, articles, key, oldTransform, result, _set$getArticleByBask3;
         return _regeneratorRuntime__default["default"].wrap(function _callee14$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
@@ -31732,35 +31793,44 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 setId: setId
               });
             case 3:
+              allElementsToDelete = set.plannerHandler.getPlannerElementsInfluencedByDeletion(setId, article.elementId);
+              success = false;
+              newSelectedElement = undefined;
+              i = 0;
+            case 7:
+              if (!(i < allElementsToDelete.length)) {
+                _context16.next = 35;
+                break;
+              }
+              article = set.getArticleByElementId(allElementsToDelete[i]);
               deletedArticle = article; //accessoires löschen
               articles = set.getAccessoiresOfBasketId(article.basketId);
               _context16.t0 = _regeneratorRuntime__default["default"].keys(articles);
-            case 6:
+            case 12:
               if ((_context16.t1 = _context16.t0()).done) {
-                _context16.next = 12;
+                _context16.next = 18;
                 break;
               }
               key = _context16.t1.value;
-              _context16.next = 10;
+              _context16.next = 16;
               return this.deleteElementFromSet(set, articles[key]);
-            case 10:
-              _context16.next = 6;
+            case 16:
+              _context16.next = 12;
               break;
-            case 12:
-              newSelectedElement = undefined;
+            case 18:
               oldTransform = undefined;
               if (deletedArticle) deletedArticle.deleted = true;
               if (!(deletedArticle !== null && deletedArticle !== void 0 && deletedArticle.hasCatalogPlannerArticle)) {
-                _context16.next = 21;
+                _context16.next = 26;
                 break;
               }
-              _context16.next = 18;
+              _context16.next = 23;
               return set.plannerHandler.deletePlannerElement(setId, deletedArticle.elementId, autoCorrectAVL_AVR, deletionType);
-            case 18:
+            case 23:
               result = _context16.sent;
               newSelectedElement = result.newElementToSelect;
               oldTransform = result.transform;
-            case 21:
+            case 26:
               //falls ein Accessoire gelöscht wurde  wird das Accessoire auch wo es beim Parent hinterlegt war auch gelöscht
               if (deletedArticle !== null && deletedArticle !== void 0 && deletedArticle.relatedToBasketId) {
                 (_set$getArticleByBask3 = set.getArticleByBasketId(deletedArticle.relatedToBasketId)) === null || _set$getArticleByBask3 === void 0 || _set$getArticleByBask3.removeAccessoire(deletedArticle.basketId);
@@ -31768,21 +31838,25 @@ var DivaSetHandler = /*#__PURE__*/function () {
 
               //doorplanner resetted
               deletedArticle === null || deletedArticle === void 0 || (_deletedArticle$doorP = deletedArticle.doorPlanner) === null || _deletedArticle$doorP === void 0 || _deletedArticle$doorP.deleteElement(deletedArticle.basketId);
-              elementDeleted = set.deleteArticle(article.basketId);
+              success = set.deleteArticle(article.basketId);
               if (!((set.CatalogData.bundleRules || set.CatalogData.reconfigAfterArticleDocked || set !== null && set !== void 0 && (_set$CatalogData = set.CatalogData) !== null && _set$CatalogData !== void 0 && _set$CatalogData.getOption('OPTLASTSTACKEDARTICLE')) && !dontReload)) {
-                _context16.next = 27;
+                _context16.next = 32;
                 break;
               }
-              _context16.next = 27;
+              _context16.next = 32;
               return this.updateArticlesOptionStatesOfActSet(set, {}, []);
-            case 27:
+            case 32:
+              i++;
+              _context16.next = 7;
+              break;
+            case 35:
               return _context16.abrupt("return", {
-                success: elementDeleted,
+                success: success,
                 selectElementId: newSelectedElement,
                 setId: setId,
                 oldTransform: oldTransform
               });
-            case 28:
+            case 36:
             case "end":
               return _context16.stop();
           }
@@ -32565,7 +32639,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
     value: (function () {
       var _variantsEvaluator = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee23(set, configItems, configStepKey, paletteType) {
         var _set$ViewConfig, _configItems$;
-        var opt, calcVariantsForPricePreview, previewType, _set$CatalogData$show, targetArticles, startTime, variants, endTime;
+        var opt, calcVariantsForPricePreview, previewType, _set$api$ReturnToFrom, _set$CatalogData$show, targetArticles, startTime, variants, endTime;
         return _regeneratorRuntime__default["default"].wrap(function _callee23$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -32579,7 +32653,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               calcVariantsForPricePreview = false;
               previewType = (_set$ViewConfig = set.ViewConfig) === null || _set$ViewConfig === void 0 ? void 0 : _set$ViewConfig.pricePreview;
               if (previewType) {
-                calcVariantsForPricePreview = !set.dontCalcPricePreviewDueToPerformanceIssues && !opt.showOnSeparatTabgroup && (!((_set$CatalogData$show = set.CatalogData.showPricePreviewOnlyOnOptions) !== null && _set$CatalogData$show !== void 0 && _set$CatalogData$show.length) || set.CatalogData.showPricePreviewOnlyOnOptions.includes(opt.codex));
+                calcVariantsForPricePreview = !set.dontCalcPricePreviewDueToPerformanceIssues && !((_set$api$ReturnToFrom = set.api.ReturnToFromParams) !== null && _set$api$ReturnToFrom !== void 0 && _set$api$ReturnToFrom.includes('PRODUCTCREATOR')) && !opt.showOnSeparatTabgroup && (!((_set$CatalogData$show = set.CatalogData.showPricePreviewOnlyOnOptions) !== null && _set$CatalogData$show !== void 0 && _set$CatalogData$show.length) || set.CatalogData.showPricePreviewOnlyOnOptions.includes(opt.codex));
               }
               if (set.PlannerMode === 'BoxPlanner') calcVariantsForPricePreview = false;
               if (paletteType == 'GAL' && ((_configItems$ = configItems[0]) === null || _configItems$ === void 0 ? void 0 : _configItems$.groupName) === undefined || paletteType == 'TEXTBOX' || paletteType == 'NUMBERBOX' || paletteType == 'RANGE') {
@@ -34069,7 +34143,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     key: "initProductId",
     value: function () {
       var _initProductId = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(api, productId) {
-        var result;
+        var result, successful;
         return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -34081,10 +34155,17 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               _context2.next = 6;
               return this.initBasket(api, result.divaNr, {
                 basket: result.configuration
-              }, false);
+              }, false, productId);
             case 6:
-              return _context2.abrupt("return", _context2.sent);
-            case 7:
+              successful = _context2.sent;
+              if (!successful) {
+                _context2.next = 9;
+                break;
+              }
+              return _context2.abrupt("return", result);
+            case 9:
+              return _context2.abrupt("return", false);
+            case 10:
             case "end":
               return _context2.stop();
           }
@@ -34431,7 +34512,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
             case 0:
               _context8.prev = 0;
               _context8.next = 3;
-              return api.getDataCache(api.getProductBasketUrl(key, productId), undefined, undefined, 'catalog', 'POST', {
+              return api.getDataCache(api.getProductByKeyValueUrl(key, productId), undefined, undefined, 'catalog', 'POST', {
                 fields: fields !== null && fields !== void 0 && fields.length ? fields : undefined
               });
             case 3:
@@ -34764,7 +34845,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context12.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-67f6f800.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-6a249328.js'); });
             case 5:
               _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -34772,7 +34853,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 9:
               _context12.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-8b969a35.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-00e56666.js'); });
             case 11:
               _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -34780,7 +34861,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 15:
               _context12.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-cecca329.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-05b6c560.js'); });
             case 17:
               _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -34788,7 +34869,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 21:
               _context12.next = 23;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-84c14168.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-a69ee926.js'); });
             case 23:
               _yield$import4 = _context12.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -36178,7 +36259,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-4ff8a82c.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-694281ef.js'); });
             case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -37533,7 +37614,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               this.plannerHandlerFunctions = plannerHandlerFunctions;
               diva3dServerUrl = initSetState.api.get3DServerUrl();
               divaMediaServiceUrl = initSetState.api.getDivaMediaServiceUrl();
-              mediaServiceApiKey = initSetState.api.getDivaMediaServiceApiKey(); //renderGroup = 'LeaTest';
+              mediaServiceApiKey = initSetState.api.getDivaMediaServiceApiKey(); // renderGroup = 'LeaTest';
               //diva3dServerUrl = "https://test-einkauf-onboarding.pfister.ch/diva3d/diva3dhost2/";
               // diva3dServerUrl = "https://diva3dhost.diva-portal.com/diva3d/diva3dhost2/";
               //diva3dServerUrl = 'https://localhost:44315/';
@@ -37730,7 +37811,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context4.next = 10;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-ec161f05.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-e431ce7c.js'); });
             case 10:
               _yield$import = _context4.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -37741,7 +37822,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context4.abrupt("break", 21);
             case 15:
               _context4.next = 17;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-df030103.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-62ae8c3d.js'); });
             case 17:
               _yield$import2 = _context4.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -38357,6 +38438,20 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
       return this.plannerList.get(setId).getPlannerElementsInfluencedByCopy(elementId, copyInfo);
     }
 
+    /**
+     * This function gets all Elements that are deleted when deleting one element.
+     * @param setId
+     * @param elementId
+     */
+  }, {
+    key: "getPlannerElementsInfluencedByDeletion",
+    value: function getPlannerElementsInfluencedByDeletion(setId, elementId) {
+      if (!this.plannerList.has(setId)) {
+        return [];
+      }
+      return this.plannerList.get(setId).getPlannerElementsInfluencedByDeletion(elementId);
+    }
+
     /**
      * This function is used to copy an element in the planner
      * @param setId
@@ -40418,76 +40513,90 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "saveToBasketWrapper",
     value: function () {
       var _saveToBasketWrapper = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee25(event, repairOnly, force) {
-        var _this$actions25,
-          _this$actions25$toggl,
-          _this$actions26,
+        var _this$actions26,
           _this$actions26$toggl,
+          _this$actions27,
+          _this$actions27$toggl,
           _this2 = this,
-          _this$actions30,
+          _this$actions31,
           _this$i18n14;
-        var returnTo, finalEvent, _this$api$getBarrierC, _this$openLeafeltBarr, product, result, _this$actions27, _this$i18n8, _this$i18n9, _this$actions28, _this$i18n10, _this$i18n11, _this$actions29, _this$i18n12, _this$i18n13, _this$updatePlannerMs2;
+        var returnTo, finalEvent, _this$api$getBarrierC, _this$openLeafeltBarr, product, _this$actSet9, url, _result, _this$actions25, result, _this$actions28, _this$i18n8, _this$i18n9, _this$actions29, _this$i18n10, _this$i18n11, _this$actions30, _this$i18n12, _this$i18n13, _this$updatePlannerMs2;
         return _regeneratorRuntime__default["default"].wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
               returnTo = this.getReturnTo(event);
-              finalEvent = event;
+              finalEvent = {
+                event: event,
+                saveBasket: true
+              };
               if (!(returnTo == 'OPEN_LEAFLET_BARRIER')) {
-                _context25.next = 14;
+                _context25.next = 21;
                 break;
               }
               product = undefined;
               if (!((_this$api$getBarrierC = this.api.getBarrierConfig()) !== null && _this$api$getBarrierC !== void 0 && _this$api$getBarrierC.affiliate)) {
-                _context25.next = 8;
+                _context25.next = 10;
                 break;
               }
-              _context25.next = 7;
-              return this.api.getDataCache(this.api.getCatalogProductUrl(this.actSet().getCatalogCodex()), undefined, undefined, 'catalog');
-            case 7:
-              _context25.sent;
+              url = this.api.getCatalogProductUrl(this.actSet().getCatalogCodex());
+              _context25.next = 8;
+              return this.api.getDataCache(url, url, undefined, 'catalog');
             case 8:
-              _context25.next = 10;
-              return (_this$openLeafeltBarr = this.openLeafeltBarrier) === null || _this$openLeafeltBarr === void 0 ? void 0 : _this$openLeafeltBarr.call(this, this.divaBasketHandler, this.api.getBarrierConfig(), product);
+              _result = _context25.sent;
+              product = productHandlerInstance.getBestMatch((_this$actSet9 = this.actSet()) === null || _this$actSet9 === void 0 ? void 0 : _this$actSet9.getDivaArticles(), _result);
             case 10:
+              _context25.next = 12;
+              return (_this$openLeafeltBarr = this.openLeafeltBarrier) === null || _this$openLeafeltBarr === void 0 ? void 0 : _this$openLeafeltBarr.call(this, this.divaBasketHandler, this.api.getBarrierConfig(), product);
+            case 12:
               finalEvent = _context25.sent;
               if (finalEvent) {
-                _context25.next = 13;
+                _context25.next = 17;
                 break;
               }
               return _context25.abrupt("return", 'canceled');
-            case 13:
-              returnTo = finalEvent == 'onAddToBasket' ? 'OPEN_PDF' : returnTo;
-            case 14:
-              (_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);
-              _context25.next = 17;
-              return this.saveToBasket(finalEvent, repairOnly, force);
             case 17:
+              if (!(!finalEvent.saveBasket && finalEvent.event)) {
+                _context25.next = 20;
+                break;
+              }
+              (_this$actions25 = this.actions) === null || _this$actions25 === void 0 || _this$actions25.onEvent({
+                type: finalEvent.event
+              });
+              return _context25.abrupt("return", 'canceled');
+            case 20:
+              returnTo = finalEvent.event == 'onAddToBasket' ? 'OPEN_PDF' : returnTo;
+            case 21:
+              (_this$actions26 = this.actions) === null || _this$actions26 === void 0 || (_this$actions26$toggl = _this$actions26.toggleLoading) === null || _this$actions26$toggl === void 0 || _this$actions26$toggl.call(_this$actions26, 'Planner_Saving', false, true);
+              _context25.next = 24;
+              return this.saveToBasket(finalEvent.event, repairOnly, force);
+            case 24:
               result = _context25.sent;
-              (_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);
+              (_this$actions27 = this.actions) === null || _this$actions27 === void 0 || (_this$actions27$toggl = _this$actions27.toggleLoading) === null || _this$actions27$toggl === void 0 || _this$actions27$toggl.call(_this$actions27, 'Planner_Saving', false, false);
               if (!(result === 'canceled')) {
-                _context25.next = 23;
+                _context25.next = 30;
                 break;
               }
               LOG$1.error(new DivaUtils.DivaError('failed to save Basket'));
-              (_this$actions27 = this.actions) === null || _this$actions27 === void 0 || _this$actions27.openModal({
+              (_this$actions28 = this.actions) === null || _this$actions28 === void 0 || _this$actions28.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
               });
               return _context25.abrupt("return", result);
-            case 23:
+            case 30:
               _context25.t0 = returnTo;
-              _context25.next = _context25.t0 === 'OPEN_PDF' ? 26 : _context25.t0 === 'SAVE_BASKET_WITH_MODAL' ? 28 : 29;
+              _context25.next = _context25.t0 === 'OPEN_PDF' ? 33 : _context25.t0 === 'SAVE_BASKET_WITH_MODAL' ? 35 : 36;
               break;
-            case 26:
+            case 33:
               if (!this.getBasket().PDFDocumentURL) {
                 LOG$1.error(new DivaUtils.DivaError('PDF url is missing in basket', {
                   code: 'WC_0010'
                 }));
-                (_this$actions28 = this.actions) === null || _this$actions28 === void 0 || _this$actions28.openModal({
+                (_this$actions29 = this.actions) === null || _this$actions29 === void 0 || _this$actions29.openModal({
                   text: ((_this$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$actions29 = this.actions) === null || _this$actions29 === void 0 || _this$actions29.openModal({
+                (_this$actions30 = this.actions) === null || _this$actions30 === void 0 || _this$actions30.openModal({
                   text: (_this$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() {
@@ -40495,22 +40604,22 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                   }
                 });
               }
-              return _context25.abrupt("break", 29);
-            case 28:
-              (_this$actions30 = this.actions) === null || _this$actions30 === void 0 || _this$actions30.openModal({
+              return _context25.abrupt("break", 36);
+            case 35:
+              (_this$actions31 = this.actions) === null || _this$actions31 === void 0 || _this$actions31.openModal({
                 text: (_this$i18n14 = this.i18n()) === null || _this$i18n14 === void 0 ? void 0 : _this$i18n14.t('modal.planning_saved'),
                 accept: true
               });
-            case 29:
+            case 36:
               if (!(result == 'noArticleToSave')) {
-                _context25.next = 32;
+                _context25.next = 39;
                 break;
               }
               (_this$updatePlannerMs2 = this.updatePlannerMsgContainer) === null || _this$updatePlannerMs2 === void 0 || _this$updatePlannerMs2.call(this, 'NOTHING_TO_SAVE', true, 'INFO', 'NOTHING_TO_SAVE', true);
               return _context25.abrupt("return", 'canceled');
-            case 32:
+            case 39:
               return _context25.abrupt("return", result);
-            case 33:
+            case 40:
             case "end":
               return _context25.stop();
           }
@@ -40525,7 +40634,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "saveToBasket",
     value: function () {
       var _saveToBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee26(event, repairOnly, force) {
-        var _returnTo, _event, _event2, _event3, _returnTo2, _returnTo3, _this$actions31, _this$actions32, _this$actions33;
+        var _returnTo, _event, _event2, _event3, _returnTo2, _returnTo3, _this$actions32, _this$actions33, _this$actions34;
         var set, actBasket, returnTo, oldReturnTo, result, newDivaNr, _result2, _event4, product;
         return _regeneratorRuntime__default["default"].wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
@@ -40597,8 +40706,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _context26.next = _context26.t3 === 'OPEN_SELLER_PRODUCTCREATOR' ? 30 : _context26.t3 === 'OPEN_SELLER_BASKET' ? 33 : _context26.t3 === 'OPEN_PDF' ? 35 : _context26.t3 === 'SAVE_BASKET_WITH_MODAL' ? 35 : _context26.t3 === 'SAVE_BASKET' ? 35 : _context26.t3 === 'SAVE_BASKET_SYNC' ? 35 : _context26.t3 === 'OPEN_LEAFLET_BARRIER' ? 35 : 55;
               break;
             case 30:
-              (_this$actions31 = this.actions) === null || _this$actions31 === void 0 || _this$actions31.toggleLoading('buildScene', false, false);
-              (_this$actions32 = this.actions) === null || _this$actions32 === void 0 || _this$actions32.openComponent({
+              (_this$actions32 = this.actions) === null || _this$actions32 === void 0 || _this$actions32.toggleLoading('buildScene', false, false);
+              (_this$actions33 = this.actions) === null || _this$actions33 === void 0 || _this$actions33.openComponent({
                 type: 'SELLER',
                 parameters: {
                   module: 'PCreator',
@@ -40610,7 +40719,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               });
               return _context26.abrupt("break", 55);
             case 33:
-              (_this$actions33 = this.actions) === null || _this$actions33 === void 0 || _this$actions33.openComponent({
+              (_this$actions34 = this.actions) === null || _this$actions34 === void 0 || _this$actions34.openComponent({
                 type: 'SELLER',
                 parameters: {
                   module: 'Basket',
@@ -40664,12 +40773,13 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               return _context26.abrupt("break", 55);
             case 55:
               if (returnTo == 'DONT_SAVE_BASKET') event = 'dontSaveBasket';
-              _context26.next = 58;
+              actBasket = this.divaBasketHandler.getBasketData(actBasket.DivaNr); //get pdf documenturl from saved basket
+              _context26.next = 59;
               return this.addToBasket(actBasket, event);
-            case 58:
+            case 59:
               product = _context26.sent;
               return _context26.abrupt("return", product !== null && product !== void 0 ? product : 'saved');
-            case 60:
+            case 61:
             case "end":
               return _context26.stop();
           }
@@ -40724,8 +40834,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
 
       //if planner is hidden by config but nothing is planned initially
       if (plannerType === 'NONE') {
-        var _this$plannerConfig$a7, _this$actSet9;
-        if (!this.plannerConfig.divaNr && this.plannerConfig.catalogCodex && !((_this$plannerConfig$a7 = this.plannerConfig.articleCodexes) !== null && _this$plannerConfig$a7 !== void 0 && _this$plannerConfig$a7.length) && !this.plannerConfig.productId && !this.plannerConfig.customProductId && !this.plannerConfig.basketData && !((_this$actSet9 = this.actSet()) !== null && _this$actSet9 !== void 0 && (_this$actSet9 = _this$actSet9.CatalogData.startPlannerArticle) !== null && _this$actSet9 !== void 0 && _this$actSet9.length)) {
+        var _this$plannerConfig$a7, _this$actSet10;
+        if (!this.plannerConfig.divaNr && this.plannerConfig.catalogCodex && !((_this$plannerConfig$a7 = this.plannerConfig.articleCodexes) !== null && _this$plannerConfig$a7 !== void 0 && _this$plannerConfig$a7.length) && !this.plannerConfig.productId && !this.plannerConfig.customProductId && !this.plannerConfig.basketData && !((_this$actSet10 = this.actSet()) !== null && _this$actSet10 !== void 0 && (_this$actSet10 = _this$actSet10.CatalogData.startPlannerArticle) !== null && _this$actSet10 !== void 0 && _this$actSet10.length)) {
           plannerType = 'PLANNER';
         }
       }
@@ -40765,38 +40875,38 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getCurCatalogCodex",
     value: function getCurCatalogCodex() {
-      var _this$actSet10;
-      return (_this$actSet10 = this.actSet()) === null || _this$actSet10 === void 0 ? void 0 : _this$actSet10.getCatalogCodex();
+      var _this$actSet11;
+      return (_this$actSet11 = this.actSet()) === null || _this$actSet11 === void 0 ? void 0 : _this$actSet11.getCatalogCodex();
     }
   }, {
     key: "getCurCatalogName",
     value: function getCurCatalogName() {
-      var _this$actSet11;
-      return (_this$actSet11 = this.actSet()) === null || _this$actSet11 === void 0 ? void 0 : _this$actSet11.getCatalogName();
+      var _this$actSet12;
+      return (_this$actSet12 = this.actSet()) === null || _this$actSet12 === void 0 ? void 0 : _this$actSet12.getCatalogName();
     }
   }, {
     key: "getCurAccountName",
     value: function getCurAccountName() {
-      var _this$actSet12;
-      return (_this$actSet12 = this.actSet()) === null || _this$actSet12 === void 0 ? void 0 : _this$actSet12.getAccountName();
+      var _this$actSet13;
+      return (_this$actSet13 = this.actSet()) === null || _this$actSet13 === void 0 ? void 0 : _this$actSet13.getAccountName();
     }
   }, {
     key: "getCurSupplierGuid",
     value: function getCurSupplierGuid() {
-      var _this$actSet13;
-      return (_this$actSet13 = this.actSet()) === null || _this$actSet13 === void 0 ? void 0 : _this$actSet13.getSupplierGuid();
+      var _this$actSet14;
+      return (_this$actSet14 = this.actSet()) === null || _this$actSet14 === void 0 ? void 0 : _this$actSet14.getSupplierGuid();
     }
   }, {
     key: "getCurSetPrice",
     value: function getCurSetPrice() {
-      var _this$actSet$getSetPr, _this$actSet14;
-      return (_this$actSet$getSetPr = (_this$actSet14 = this.actSet()) === null || _this$actSet14 === void 0 ? void 0 : _this$actSet14.getSetPrice()) !== null && _this$actSet$getSetPr !== void 0 ? _this$actSet$getSetPr : 0;
+      var _this$actSet$getSetPr, _this$actSet15;
+      return (_this$actSet$getSetPr = (_this$actSet15 = this.actSet()) === null || _this$actSet15 === void 0 ? void 0 : _this$actSet15.getSetPrice()) !== null && _this$actSet$getSetPr !== void 0 ? _this$actSet$getSetPr : 0;
     }
   }, {
     key: "getCurImageMode",
     value: function getCurImageMode() {
-      var _this$actSet15;
-      return (_this$actSet15 = this.actSet()) !== null && _this$actSet15 !== void 0 && (_this$actSet15 = _this$actSet15.CatalogData) !== null && _this$actSet15 !== void 0 && _this$actSet15.has3dModels ? '3D' : '2D';
+      var _this$actSet16;
+      return (_this$actSet16 = this.actSet()) !== null && _this$actSet16 !== void 0 && (_this$actSet16 = _this$actSet16.CatalogData) !== null && _this$actSet16 !== void 0 && _this$actSet16.has3dModels ? '3D' : '2D';
     }
   }, {
     key: "getViewConfig",
@@ -40827,65 +40937,65 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "doShow3DDimensionLines",
     value: function doShow3DDimensionLines() {
-      var _this$actSet16;
-      return (_this$actSet16 = this.actSet()) === null || _this$actSet16 === void 0 || (_this$actSet16 = _this$actSet16.CatalogData) === null || _this$actSet16 === void 0 ? void 0 : _this$actSet16.doShow3DDimensionLines;
+      var _this$actSet17;
+      return (_this$actSet17 = this.actSet()) === null || _this$actSet17 === void 0 || (_this$actSet17 = _this$actSet17.CatalogData) === null || _this$actSet17 === void 0 ? void 0 : _this$actSet17.doShow3DDimensionLines;
     }
   }, {
     key: "hidePlannerUiIcons",
     value: function hidePlannerUiIcons() {
-      var _this$actSet17;
-      return (_this$actSet17 = this.actSet()) === null || _this$actSet17 === void 0 || (_this$actSet17 = _this$actSet17.CatalogData) === null || _this$actSet17 === void 0 ? void 0 : _this$actSet17.hidePlannerUiIcons;
+      var _this$actSet18;
+      return (_this$actSet18 = this.actSet()) === null || _this$actSet18 === void 0 || (_this$actSet18 = _this$actSet18.CatalogData) === null || _this$actSet18 === void 0 ? void 0 : _this$actSet18.hidePlannerUiIcons;
     }
   }, {
     key: "doShowPlannerReplaceMode",
     value: function doShowPlannerReplaceMode() {
-      var _this$actSet18, _this$api$getViewConf2, _catalogData$PlannerP, _catalogData$PlannerP2;
-      var catalogData = (_this$actSet18 = this.actSet()) === null || _this$actSet18 === void 0 ? void 0 : _this$actSet18.CatalogData;
+      var _this$actSet19, _this$api$getViewConf2, _catalogData$PlannerP, _catalogData$PlannerP2;
+      var catalogData = (_this$actSet19 = this.actSet()) === null || _this$actSet19 === void 0 ? void 0 : _this$actSet19.CatalogData;
       return (catalogData === null || catalogData === void 0 ? void 0 : catalogData.replaceModeActive) && ((_this$api$getViewConf2 = this.api.getViewConfig()) === null || _this$api$getViewConf2 === void 0 ? void 0 : _this$api$getViewConf2.showReplaceFunctionInPlanner) && Object.entries(catalogData.allCatalogPlannerArticles).length > 1 && Object.entries((_catalogData$PlannerP = (_catalogData$PlannerP2 = catalogData.PlannerPaletteViewInfo) === null || _catalogData$PlannerP2 === void 0 ? void 0 : _catalogData$PlannerP2.catalogPlannerArticles) !== null && _catalogData$PlannerP !== void 0 ? _catalogData$PlannerP : {}).length > 1;
     }
   }, {
     key: "doPlannerReplaceAutoSwitch",
     value: function doPlannerReplaceAutoSwitch() {
-      var _this$actSet19, _this$api$getViewConf3;
-      var catalogData = (_this$actSet19 = this.actSet()) === null || _this$actSet19 === void 0 ? void 0 : _this$actSet19.CatalogData;
+      var _this$actSet20, _this$api$getViewConf3;
+      var catalogData = (_this$actSet20 = this.actSet()) === null || _this$actSet20 === void 0 ? void 0 : _this$actSet20.CatalogData;
       return (catalogData === null || catalogData === void 0 ? void 0 : catalogData.catalogPlannsCompletely) && this.doShowPlannerReplaceMode() && ((_this$api$getViewConf3 = this.api.getViewConfig()) === null || _this$api$getViewConf3 === void 0 ? void 0 : _this$api$getViewConf3.allowAutoSwitchInReplaceFunctionInPlanner);
     }
   }, {
     key: "getHidePlanner",
     value: function getHidePlanner() {
-      var _this$actSet20;
-      return this.api.getHidePlanner() || !!((_this$actSet20 = this.actSet()) !== null && _this$actSet20 !== void 0 && _this$actSet20.CatalogData.useBoxPlanner);
+      var _this$actSet21;
+      return this.api.getHidePlanner() || !!((_this$actSet21 = this.actSet()) !== null && _this$actSet21 !== void 0 && _this$actSet21.CatalogData.useBoxPlanner);
     }
   }, {
     key: "getAllowRTV",
     value: function getAllowRTV() {
-      var _this$actSet21, _this$actSet22;
+      var _this$actSet22, _this$actSet23;
       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;
+      if ((_this$actSet22 = this.actSet()) !== null && _this$actSet22 !== void 0 && _this$actSet22.CatalogData.divaForceRTV) return true;
+      if (this.api.getDoShowRTV() && (_this$actSet23 = this.actSet()) !== null && _this$actSet23 !== void 0 && _this$actSet23.CatalogData.divaArReady) return true;
       return false;
     }
   }, {
     key: "geAllowQRCodeAR",
     value: function geAllowQRCodeAR() {
-      var _this$actSet23;
-      if (this.api.getDoShowAR() && (_this$actSet23 = this.actSet()) !== null && _this$actSet23 !== void 0 && _this$actSet23.CatalogData.divaArReady) return true;
+      var _this$actSet24;
+      if (this.api.getDoShowAR() && (_this$actSet24 = this.actSet()) !== null && _this$actSet24 !== void 0 && _this$actSet24.CatalogData.divaArReady) return true;
       return false;
     }
   }, {
     key: "getEnableUnityRtvKombi",
     value: function getEnableUnityRtvKombi() {
-      var _this$actSet24, _this$actSet25;
+      var _this$actSet25, _this$actSet26;
       // 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$actSet25 = this.actSet()) === null || _this$actSet25 === void 0 ? void 0 : _this$actSet25.CatalogData.divaArReady) == true && this.api.getEnableRTVUnityKombi();
+      if ((_this$actSet25 = this.actSet()) !== null && _this$actSet25 !== void 0 && _this$actSet25.CatalogData.divaForceRTV) return false;
+      return ((_this$actSet26 = this.actSet()) === null || _this$actSet26 === void 0 ? void 0 : _this$actSet26.CatalogData.divaArReady) == true && this.api.getEnableRTVUnityKombi();
     }
   }, {
     key: "getShelfPlannerRTV",
     value: function getShelfPlannerRTV() {
-      var _this$actSet26;
-      return (_this$actSet26 = this.actSet()) === null || _this$actSet26 === void 0 ? void 0 : _this$actSet26.CatalogData.useShelfPlannerRTV;
+      var _this$actSet27;
+      return (_this$actSet27 = this.actSet()) === null || _this$actSet27 === void 0 ? void 0 : _this$actSet27.CatalogData.useShelfPlannerRTV;
     }
   }, {
     key: "getBasketData",
@@ -40926,8 +41036,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getCatalogData",
     value: function getCatalogData() {
-      var _this$actSet27;
-      return (_this$actSet27 = this.actSet()) === null || _this$actSet27 === void 0 ? void 0 : _this$actSet27.CatalogData;
+      var _this$actSet28;
+      return (_this$actSet28 = this.actSet()) === null || _this$actSet28 === void 0 ? void 0 : _this$actSet28.CatalogData;
     }
   }, {
     key: "ReturnTo",
@@ -40943,16 +41053,17 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "addToBasket",
     value: function () {
       var _addToBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee28(actBasket) {
-        var _this$actions34,
-          _this$actions35,
+        var _this$actions35,
           _this$actions36,
           _this$actions37,
           _this$actions38,
+          _this$actions39,
           _this$divaBasketHandl3,
           _this3 = this,
-          _this$actions39,
           _this$actions40,
-          _this$actions41;
+          _this$actions41,
+          _this$actions42,
+          _this$actions43;
         var event,
           addToBasketLog,
           emailConfig,
@@ -40968,43 +41079,43 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               event = _args28.length > 1 && _args28[1] !== undefined ? _args28[1] : 'onAddToBasket';
               addToBasketLog = true;
               _context28.t0 = event;
-              _context28.next = _context28.t0 === 'onWebPlanerPrint' ? 5 : _context28.t0 === 'onWebPlanerSave' ? 8 : _context28.t0 === 'onWebPlanerShare' ? 11 : _context28.t0 === 'onRequestConsulation' ? 14 : _context28.t0 === 'onSave' ? 17 : _context28.t0 === 'onSendEmail' ? 20 : _context28.t0 === 'onSaveProduct' ? 25 : _context28.t0 === 'dontSaveBasket' ? 33 : _context28.t0 === 'onAddToBasket' ? 35 : 35;
+              _context28.next = _context28.t0 === 'onWebPlanerPrint' ? 5 : _context28.t0 === 'onWebPlanerSave' ? 8 : _context28.t0 === 'onWebPlanerShare' ? 11 : _context28.t0 === 'onRequestConsulation' ? 14 : _context28.t0 === 'onSave' ? 17 : _context28.t0 === 'onSendEmail' ? 20 : _context28.t0 === 'onSaveProduct' ? 25 : _context28.t0 === 'dontSaveBasket' ? 33 : _context28.t0 === 'onAddToBasket' ? 35 : 38;
               break;
             case 5:
               this.handleSuccessTransaction('onPrintBasket', actBasket);
-              (_this$actions34 = this.actions) === null || _this$actions34 === void 0 || _this$actions34.onEvent({
+              (_this$actions35 = this.actions) === null || _this$actions35 === void 0 || _this$actions35.onEvent({
                 type: 'onWebPlanerPrint',
                 data: actBasket.getAsJson()
               });
-              return _context28.abrupt("break", 38);
+              return _context28.abrupt("break", 40);
             case 8:
               this.handleSuccessTransaction('onSaveBasket', actBasket);
-              (_this$actions35 = this.actions) === null || _this$actions35 === void 0 || _this$actions35.onEvent({
+              (_this$actions36 = this.actions) === null || _this$actions36 === void 0 || _this$actions36.onEvent({
                 type: 'onWebPlanerSave',
                 data: actBasket.getAsJson()
               });
-              return _context28.abrupt("break", 38);
+              return _context28.abrupt("break", 40);
             case 11:
               this.handleSuccessTransaction('onShareBasket', actBasket);
-              (_this$actions36 = this.actions) === null || _this$actions36 === void 0 || _this$actions36.onEvent({
+              (_this$actions37 = this.actions) === null || _this$actions37 === void 0 || _this$actions37.onEvent({
                 type: 'onWebPlanerShare',
                 data: actBasket.getAsJson()
               });
-              return _context28.abrupt("break", 38);
+              return _context28.abrupt("break", 40);
             case 14:
               this.handleSuccessTransaction('onRequestConsulation', actBasket);
-              (_this$actions37 = this.actions) === null || _this$actions37 === void 0 || _this$actions37.onEvent({
+              (_this$actions38 = this.actions) === null || _this$actions38 === void 0 || _this$actions38.onEvent({
                 type: 'onRequestConsulation',
                 data: actBasket.getAsJson()
               });
-              return _context28.abrupt("break", 38);
+              return _context28.abrupt("break", 40);
             case 17:
               this.handleSuccessTransaction('onSave', actBasket);
-              (_this$actions38 = this.actions) === null || _this$actions38 === void 0 || _this$actions38.onEvent({
+              (_this$actions39 = this.actions) === null || _this$actions39 === void 0 || _this$actions39.onEvent({
                 type: 'onSave',
                 data: actBasket.getAsJson()
               });
-              return _context28.abrupt("break", 38);
+              return _context28.abrupt("break", 40);
             case 20:
               emailConfig = (_this$divaBasketHandl3 = this.divaBasketHandler.emailConfig) !== null && _this$divaBasketHandl3 !== void 0 ? _this$divaBasketHandl3 : this.getEmailConfig(); //reset the emailConfig
               this.divaBasketHandler.emailConfig = undefined;
@@ -41036,11 +41147,11 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 });
                 this.handleSuccessTransaction('onSendEmail', actBasket);
               }
-              (_this$actions39 = this.actions) === null || _this$actions39 === void 0 || _this$actions39.onEvent({
+              (_this$actions40 = this.actions) === null || _this$actions40 === void 0 || _this$actions40.onEvent({
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
-              return _context28.abrupt("break", 38);
+              return _context28.abrupt("break", 40);
             case 25:
               this.actSet().CatalogData;
               _context28.next = 28;
@@ -41048,7 +41159,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
             case 28:
               products = _context28.sent;
               this.handleSuccessTransaction('onSaveProduct', actBasket);
-              (_this$actions40 = this.actions) === null || _this$actions40 === void 0 || _this$actions40.onEvent({
+              (_this$actions41 = this.actions) === null || _this$actions41 === void 0 || _this$actions41.onEvent({
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
@@ -41062,14 +41173,20 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               addToBasketLog = false;
             case 35:
               if (addToBasketLog) this.handleSuccessTransaction('onAddToBasket', actBasket);
-              (_this$actions41 = this.actions) === null || _this$actions41 === void 0 || _this$actions41.onEvent({
+              (_this$actions42 = this.actions) === null || _this$actions42 === void 0 || _this$actions42.onEvent({
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
-              return _context28.abrupt("break", 38);
+              return _context28.abrupt("break", 40);
             case 38:
+              (_this$actions43 = this.actions) === null || _this$actions43 === void 0 || _this$actions43.onEvent({
+                type: event,
+                data: actBasket.getAsJson()
+              });
+              return _context28.abrupt("break", 40);
+            case 40:
               return _context28.abrupt("return");
-            case 39:
+            case 41:
             case "end":
               return _context28.stop();
           }
@@ -41094,8 +41211,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "openPDFpostAsEvent",
     value: function openPDFpostAsEvent(mongoDBId) {
-      var _this$actions42, _this$actions43, _this$actions44;
-      (_this$actions42 = this.actions) === null || _this$actions42 === void 0 || _this$actions42.updateBreadcrumbs({
+      var _this$actions44, _this$actions45, _this$actions46;
+      (_this$actions44 = this.actions) === null || _this$actions44 === void 0 || _this$actions44.updateBreadcrumbs({
         type: 'update',
         param: {
           groupId: 'SHOWROOM',
@@ -41109,7 +41226,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }
       });
-      (_this$actions43 = this.actions) === null || _this$actions43 === void 0 || _this$actions43.updateBreadcrumbs({
+      (_this$actions45 = this.actions) === null || _this$actions45 === void 0 || _this$actions45.updateBreadcrumbs({
         type: 'update',
         param: {
           groupId: 'SHOWROOM',
@@ -41123,7 +41240,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }
       });
-      (_this$actions44 = this.actions) === null || _this$actions44 === void 0 || _this$actions44.openComponent({
+      (_this$actions46 = this.actions) === null || _this$actions46 === void 0 || _this$actions46.openComponent({
         type: 'REPORT',
         parameters: {
           id: mongoDBId
@@ -41343,14 +41460,14 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "subscribeToWebPlannerEvents",
     value: function subscribeToWebPlannerEvents() {
-      var _this$actions45;
-      (_this$actions45 = this.actions) === null || _this$actions45 === void 0 || _this$actions45.subscribeEvents(this.addToBasketEventFunction);
+      var _this$actions47;
+      (_this$actions47 = this.actions) === null || _this$actions47 === void 0 || _this$actions47.subscribeEvents(this.addToBasketEventFunction);
     }
   }, {
     key: "unsubscribeFromWebPlannerEvents",
     value: function unsubscribeFromWebPlannerEvents() {
-      var _this$actions46;
-      (_this$actions46 = this.actions) === null || _this$actions46 === void 0 || _this$actions46.unSubscribeEvents(this.addToBasketEventFunction);
+      var _this$actions48;
+      (_this$actions48 = this.actions) === null || _this$actions48 === void 0 || _this$actions48.unSubscribeEvents(this.addToBasketEventFunction);
     }
   }, {
     key: "initApiForLogicOnly",
@@ -41418,7 +41535,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "initBasket",
     value: function () {
-      var _initBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee31(init3D, ignoreFavorites) {
+      var _initBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee31(init3D, ignoreFavorites, onlyCalcVariants) {
         var _initSetState$api$web2;
         var initSetState, sets, result, _sets$, set, basket;
         return _regeneratorRuntime__default["default"].wrap(function _callee31$(_context31) {
@@ -41447,28 +41564,28 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 (_sets$ = sets[0]) === null || _sets$ === void 0 || _sets$.remindPriceForHash(result);
               }
             case 12:
-              //TODO: GLOBAL STUFF
               set = this.actSet();
+              if (set) set.onlyCalcVariants = onlyCalcVariants;
               setHandlerInstance.loadConfigStructureOfActSet(set, this.getCurPlannerType());
               if (!(favoritesHandlerInstance.FavoritesDefined(set) && !ignoreFavorites)) {
-                _context31.next = 17;
+                _context31.next = 18;
                 break;
               }
-              _context31.next = 17;
+              _context31.next = 18;
               return this.handleFavorites(init3D ? 'CALC' : 'REPAIR');
-            case 17:
-              _context31.next = 19;
+            case 18:
+              _context31.next = 20;
               return setHandlerInstance.fillOrderLinesAndOrderSets(this.sets, this.divaBasketHandler, !init3D, this.doAllowSetPlanner(), this.ReturnTo);
-            case 19:
+            case 20:
               basket = _context31.sent;
               return _context31.abrupt("return", basket);
-            case 21:
+            case 22:
             case "end":
               return _context31.stop();
           }
         }, _callee31, this);
       }));
-      function initBasket(_x78, _x79) {
+      function initBasket(_x78, _x79, _x80) {
         return _initBasket.apply(this, arguments);
       }
       return initBasket;
@@ -41545,7 +41662,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }, _callee33, this);
       }));
-      function handleFavorites(_x80) {
+      function handleFavorites(_x81) {
         return _handleFavorites.apply(this, arguments);
       }
       return handleFavorites;
@@ -41599,7 +41716,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }, _callee34, this);
       }));
-      function initSapOrderLinesFromBasket(_x81, _x82, _x83) {
+      function initSapOrderLinesFromBasket(_x82, _x83, _x84) {
         return _initSapOrderLinesFromBasket.apply(this, arguments);
       }
       return initSapOrderLinesFromBasket;