@crystaldesign/web-planner-logic 24.12.0-beta.9 → 24.12.0-rc.1

package/build/cjs/{index-bceec53b.js → index-2758bcda.js}

@@ -431,7 +431,6 @@ var DivaApiHandler = /*#__PURE__*/function () {
         mediaServiceApiKey: data.divaMediaServiceApiKey,
         language: lang !== null && lang !== void 0 ? lang : this.getLanguage(),
         abTestCases: data.abTestCases !== undefined ? data.abTestCases : [],
-        checkForProductsInStock: data.checkForProductsInStock,
         checkForProductsPrice: data.checkForProductsPrice,
         doDisablePlanner2D: data.doDisablePlanner2D,
         diva3dStaticBGImage: data.diva3dStaticBGImage != undefined ? data.diva3dStaticBGImage : false,
@@ -503,29 +502,23 @@ var DivaApiHandler = /*#__PURE__*/function () {
       var _this$apiConfig$host, _this$apiConfig10;
       return (_this$apiConfig$host = (_this$apiConfig10 = this.apiConfig) === null || _this$apiConfig10 === void 0 ? void 0 : _this$apiConfig10.host3d) !== null && _this$apiConfig$host !== void 0 ? _this$apiConfig$host : '';
     }
-  }, {
-    key: "doCheckForProductsInStock",
-    value: function doCheckForProductsInStock() {
-      var _this$divaWebConfigDa4;
-      return (_this$divaWebConfigDa4 = this.divaWebConfigData) === null || _this$divaWebConfigDa4 === void 0 ? void 0 : _this$divaWebConfigDa4.checkForProductsInStock;
-    }
   }, {
     key: "doCheckForProductsPrice",
     value: function doCheckForProductsPrice() {
-      var _this$divaWebConfigDa5;
-      return this.doCheckForProductsInStock() || ((_this$divaWebConfigDa5 = this.divaWebConfigData) === null || _this$divaWebConfigDa5 === void 0 ? void 0 : _this$divaWebConfigDa5.checkForProductsPrice);
+      var _this$divaWebConfigDa4;
+      return (_this$divaWebConfigDa4 = this.divaWebConfigData) === null || _this$divaWebConfigDa4 === void 0 ? void 0 : _this$divaWebConfigDa4.checkForProductsPrice;
     }
   }, {
     key: "getReportConfigIdentifier",
     value: function getReportConfigIdentifier() {
-      var _this$divaWebConfigDa6;
-      return (_this$divaWebConfigDa6 = this.divaWebConfigData) === null || _this$divaWebConfigDa6 === void 0 ? void 0 : _this$divaWebConfigDa6.reportConfigIdentifier;
+      var _this$divaWebConfigDa5;
+      return (_this$divaWebConfigDa5 = this.divaWebConfigData) === null || _this$divaWebConfigDa5 === void 0 ? void 0 : _this$divaWebConfigDa5.reportConfigIdentifier;
     }
   }, {
     key: "getPrintOptions",
     value: function getPrintOptions() {
-      var _this$divaWebConfigDa7;
-      var reportConfig = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : (_this$divaWebConfigDa7 = this.divaWebConfigData) === null || _this$divaWebConfigDa7 === void 0 ? void 0 : _this$divaWebConfigDa7.reportConfig;
+      var _this$divaWebConfigDa6;
+      var reportConfig = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : (_this$divaWebConfigDa6 = this.divaWebConfigData) === null || _this$divaWebConfigDa6 === void 0 ? void 0 : _this$divaWebConfigDa6.reportConfig;
       return {
         Gdpr: !!(reportConfig !== null && reportConfig !== void 0 && reportConfig.printWithGDPR),
         PlanningSketch: !!(reportConfig !== null && reportConfig !== void 0 && reportConfig.printWithPlanningSketch),
@@ -545,8 +538,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "get3DRenderGroup",
     value: function get3DRenderGroup() {
-      var _this$divaWebConfigDa8, _this$divaWebConfigDa9;
-      return (_this$divaWebConfigDa8 = (_this$divaWebConfigDa9 = this.divaWebConfigData) === null || _this$divaWebConfigDa9 === void 0 ? void 0 : _this$divaWebConfigDa9.diva3dRenderGroup) !== null && _this$divaWebConfigDa8 !== void 0 ? _this$divaWebConfigDa8 : '';
+      var _this$divaWebConfigDa7, _this$divaWebConfigDa8;
+      return (_this$divaWebConfigDa7 = (_this$divaWebConfigDa8 = this.divaWebConfigData) === null || _this$divaWebConfigDa8 === void 0 ? void 0 : _this$divaWebConfigDa8.diva3dRenderGroup) !== null && _this$divaWebConfigDa7 !== void 0 ? _this$divaWebConfigDa7 : '';
     }
   }, {
     key: "getServerId",
@@ -583,86 +576,86 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getDiva3dStaticBGImage",
     value: function getDiva3dStaticBGImage() {
-      var _this$divaWebConfigDa10;
-      return (_this$divaWebConfigDa10 = this.divaWebConfigData) === null || _this$divaWebConfigDa10 === void 0 ? void 0 : _this$divaWebConfigDa10.diva3dStaticBGImage;
+      var _this$divaWebConfigDa9;
+      return (_this$divaWebConfigDa9 = this.divaWebConfigData) === null || _this$divaWebConfigDa9 === void 0 ? void 0 : _this$divaWebConfigDa9.diva3dStaticBGImage;
     }
   }, {
     key: "getDiva3dStaticBGImage_DefaultRoomList",
     value: function getDiva3dStaticBGImage_DefaultRoomList() {
-      var _this$divaWebConfigDa11, _this$divaWebConfigDa12;
-      return ((_this$divaWebConfigDa11 = this.divaWebConfigData) === null || _this$divaWebConfigDa11 === void 0 ? void 0 : _this$divaWebConfigDa11.diva3dStaticBGImage_DefaultRoomList) == '' ? '3D_STATBG_ROOMLIST' : (_this$divaWebConfigDa12 = this.divaWebConfigData) === null || _this$divaWebConfigDa12 === void 0 ? void 0 : _this$divaWebConfigDa12.diva3dStaticBGImage_DefaultRoomList;
+      var _this$divaWebConfigDa10, _this$divaWebConfigDa11;
+      return ((_this$divaWebConfigDa10 = this.divaWebConfigData) === null || _this$divaWebConfigDa10 === void 0 ? void 0 : _this$divaWebConfigDa10.diva3dStaticBGImage_DefaultRoomList) == '' ? '3D_STATBG_ROOMLIST' : (_this$divaWebConfigDa11 = this.divaWebConfigData) === null || _this$divaWebConfigDa11 === void 0 ? void 0 : _this$divaWebConfigDa11.diva3dStaticBGImage_DefaultRoomList;
     }
   }, {
     key: "getDiva3DAllowDefaultCatRoomList",
     value: function getDiva3DAllowDefaultCatRoomList() {
-      var _this$divaWebConfigDa13;
-      return (_this$divaWebConfigDa13 = this.divaWebConfigData) === null || _this$divaWebConfigDa13 === void 0 ? void 0 : _this$divaWebConfigDa13.diva3DAllowDefaultCatRoomList;
+      var _this$divaWebConfigDa12;
+      return (_this$divaWebConfigDa12 = this.divaWebConfigData) === null || _this$divaWebConfigDa12 === void 0 ? void 0 : _this$divaWebConfigDa12.diva3DAllowDefaultCatRoomList;
     }
   }, {
     key: "doAllowSetPlanner",
     value: function doAllowSetPlanner() {
-      var _this$divaWebConfigDa14;
-      return (_this$divaWebConfigDa14 = this.divaWebConfigData) === null || _this$divaWebConfigDa14 === void 0 ? void 0 : _this$divaWebConfigDa14.doAllowSetPlanner;
+      var _this$divaWebConfigDa13;
+      return (_this$divaWebConfigDa13 = this.divaWebConfigData) === null || _this$divaWebConfigDa13 === void 0 ? void 0 : _this$divaWebConfigDa13.doAllowSetPlanner;
     }
   }, {
     key: "getHidePlanner",
     value: function getHidePlanner() {
-      var _this$divaWebConfigDa15;
-      return !!((_this$divaWebConfigDa15 = this.divaWebConfigData) !== null && _this$divaWebConfigDa15 !== void 0 && (_this$divaWebConfigDa15 = _this$divaWebConfigDa15.viewConfig) !== null && _this$divaWebConfigDa15 !== void 0 && _this$divaWebConfigDa15.hidePlanner);
+      var _this$divaWebConfigDa14;
+      return !!((_this$divaWebConfigDa14 = this.divaWebConfigData) !== null && _this$divaWebConfigDa14 !== void 0 && (_this$divaWebConfigDa14 = _this$divaWebConfigDa14.viewConfig) !== null && _this$divaWebConfigDa14 !== void 0 && _this$divaWebConfigDa14.hidePlanner);
     }
   }, {
     key: "getDoShowAR",
     value: function getDoShowAR() {
-      var _this$divaWebConfigDa16;
-      return (_this$divaWebConfigDa16 = this.divaWebConfigData) === null || _this$divaWebConfigDa16 === void 0 || (_this$divaWebConfigDa16 = _this$divaWebConfigDa16.viewConfig) === null || _this$divaWebConfigDa16 === void 0 ? void 0 : _this$divaWebConfigDa16.enableAR;
+      var _this$divaWebConfigDa15;
+      return (_this$divaWebConfigDa15 = this.divaWebConfigData) === null || _this$divaWebConfigDa15 === void 0 || (_this$divaWebConfigDa15 = _this$divaWebConfigDa15.viewConfig) === null || _this$divaWebConfigDa15 === void 0 ? void 0 : _this$divaWebConfigDa15.enableAR;
     }
   }, {
     key: "forceShowRTV",
     value: function forceShowRTV() {
-      var _this$divaWebConfigDa17;
-      return (_this$divaWebConfigDa17 = this.divaWebConfigData) === null || _this$divaWebConfigDa17 === void 0 || (_this$divaWebConfigDa17 = _this$divaWebConfigDa17.viewConfig) === null || _this$divaWebConfigDa17 === void 0 ? void 0 : _this$divaWebConfigDa17.forceRTV;
+      var _this$divaWebConfigDa16;
+      return (_this$divaWebConfigDa16 = this.divaWebConfigData) === null || _this$divaWebConfigDa16 === void 0 || (_this$divaWebConfigDa16 = _this$divaWebConfigDa16.viewConfig) === null || _this$divaWebConfigDa16 === void 0 ? void 0 : _this$divaWebConfigDa16.forceRTV;
     }
   }, {
     key: "getDoShowRTV",
     value: function getDoShowRTV() {
-      var _this$divaWebConfigDa18;
-      return (_this$divaWebConfigDa18 = this.divaWebConfigData) === null || _this$divaWebConfigDa18 === void 0 || (_this$divaWebConfigDa18 = _this$divaWebConfigDa18.viewConfig) === null || _this$divaWebConfigDa18 === void 0 ? void 0 : _this$divaWebConfigDa18.enableRTV;
+      var _this$divaWebConfigDa17;
+      return (_this$divaWebConfigDa17 = this.divaWebConfigData) === null || _this$divaWebConfigDa17 === void 0 || (_this$divaWebConfigDa17 = _this$divaWebConfigDa17.viewConfig) === null || _this$divaWebConfigDa17 === void 0 ? void 0 : _this$divaWebConfigDa17.enableRTV;
     }
   }, {
     key: "getEnableRTVUnityKombi",
     value: function getEnableRTVUnityKombi() {
-      var _this$divaWebConfigDa19;
-      return !!((_this$divaWebConfigDa19 = this.divaWebConfigData) !== null && _this$divaWebConfigDa19 !== void 0 && _this$divaWebConfigDa19.viewConfig.enableRtvUnityKombi);
+      var _this$divaWebConfigDa18;
+      return !!((_this$divaWebConfigDa18 = this.divaWebConfigData) !== null && _this$divaWebConfigDa18 !== void 0 && _this$divaWebConfigDa18.viewConfig.enableRtvUnityKombi);
     }
   }, {
     key: "getDoDisablePlanner2D",
     value: function getDoDisablePlanner2D() {
-      var _this$divaWebConfigDa20;
-      return !!((_this$divaWebConfigDa20 = this.divaWebConfigData) !== null && _this$divaWebConfigDa20 !== void 0 && _this$divaWebConfigDa20.doDisablePlanner2D);
+      var _this$divaWebConfigDa19;
+      return !!((_this$divaWebConfigDa19 = this.divaWebConfigData) !== null && _this$divaWebConfigDa19 !== void 0 && _this$divaWebConfigDa19.doDisablePlanner2D);
     }
   }, {
     key: "getRoomListInProduct",
     value: function getRoomListInProduct() {
-      var _this$divaWebConfigDa21;
-      return !!((_this$divaWebConfigDa21 = this.divaWebConfigData) !== null && _this$divaWebConfigDa21 !== void 0 && (_this$divaWebConfigDa21 = _this$divaWebConfigDa21.viewConfig) !== null && _this$divaWebConfigDa21 !== void 0 && _this$divaWebConfigDa21.roomListInProduct);
+      var _this$divaWebConfigDa20;
+      return !!((_this$divaWebConfigDa20 = this.divaWebConfigData) !== null && _this$divaWebConfigDa20 !== void 0 && (_this$divaWebConfigDa20 = _this$divaWebConfigDa20.viewConfig) !== null && _this$divaWebConfigDa20 !== void 0 && _this$divaWebConfigDa20.roomListInProduct);
     }
   }, {
     key: "getPlannerType",
     value: function getPlannerType() {
-      var _this$divaWebConfigDa22;
-      return (_this$divaWebConfigDa22 = this.divaWebConfigData) === null || _this$divaWebConfigDa22 === void 0 || (_this$divaWebConfigDa22 = _this$divaWebConfigDa22.viewConfig) === null || _this$divaWebConfigDa22 === void 0 ? void 0 : _this$divaWebConfigDa22.plannerType;
+      var _this$divaWebConfigDa21;
+      return (_this$divaWebConfigDa21 = this.divaWebConfigData) === null || _this$divaWebConfigDa21 === void 0 || (_this$divaWebConfigDa21 = _this$divaWebConfigDa21.viewConfig) === null || _this$divaWebConfigDa21 === void 0 ? void 0 : _this$divaWebConfigDa21.plannerType;
     }
   }, {
     key: "getLoadSupplierColors",
     value: function getLoadSupplierColors() {
-      var _this$divaWebConfigDa23;
-      return !!((_this$divaWebConfigDa23 = this.divaWebConfigData) !== null && _this$divaWebConfigDa23 !== void 0 && _this$divaWebConfigDa23.loadSupplierColors);
+      var _this$divaWebConfigDa22;
+      return !!((_this$divaWebConfigDa22 = this.divaWebConfigData) !== null && _this$divaWebConfigDa22 !== void 0 && _this$divaWebConfigDa22.loadSupplierColors);
     }
   }, {
     key: "showSelectionModeZero",
     value: function showSelectionModeZero() {
-      var _this$divaWebConfigDa24;
-      return !!((_this$divaWebConfigDa24 = this.divaWebConfigData) !== null && _this$divaWebConfigDa24 !== void 0 && _this$divaWebConfigDa24.showSelectionModeZero);
+      var _this$divaWebConfigDa23;
+      return !!((_this$divaWebConfigDa23 = this.divaWebConfigData) !== null && _this$divaWebConfigDa23 !== void 0 && _this$divaWebConfigDa23.showSelectionModeZero);
     }
   }, {
     key: "ruleDescSeperator",
@@ -682,8 +675,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getDoCheckVariantData",
     value: function getDoCheckVariantData() {
-      var _this$divaWebConfigDa25;
-      return (_this$divaWebConfigDa25 = this.divaWebConfigData) === null || _this$divaWebConfigDa25 === void 0 ? void 0 : _this$divaWebConfigDa25.doCheckVariantData;
+      var _this$divaWebConfigDa24;
+      return (_this$divaWebConfigDa24 = this.divaWebConfigData) === null || _this$divaWebConfigDa24 === void 0 ? void 0 : _this$divaWebConfigDa24.doCheckVariantData;
     }
   }, {
     key: "setI18n",
@@ -763,7 +756,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getBasketDataUrlCacheKey",
     value: function getBasketDataUrlCacheKey(divaNr) {
-      //if divaNr is a variant of a divaNr (saves with favorites) divaNr looks like: "Diva-123456_0001". Here we got do build the querystring differently
+      //this is only used for testing logic to stiff match the query hash so moched calls are used
       var qs;
       if (divaNr.includes('_') && divaNr.substring(divaNr.indexOf('_') + 1).length == 4) {
         var splittedDivaNr = divaNr.split('_');
@@ -776,50 +769,50 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getViewConfig",
     value: function getViewConfig() {
-      var _this$divaWebConfigDa26;
-      return (_this$divaWebConfigDa26 = this.divaWebConfigData) === null || _this$divaWebConfigDa26 === void 0 ? void 0 : _this$divaWebConfigDa26.viewConfig;
+      var _this$divaWebConfigDa25;
+      return (_this$divaWebConfigDa25 = this.divaWebConfigData) === null || _this$divaWebConfigDa25 === void 0 ? void 0 : _this$divaWebConfigDa25.viewConfig;
     }
   }, {
     key: "getEmailConfig",
     value: function getEmailConfig() {
-      var _this$divaWebConfigDa27;
-      return (_this$divaWebConfigDa27 = this.divaWebConfigData) === null || _this$divaWebConfigDa27 === void 0 ? void 0 : _this$divaWebConfigDa27.emailConfig;
+      var _this$divaWebConfigDa26;
+      return (_this$divaWebConfigDa26 = this.divaWebConfigData) === null || _this$divaWebConfigDa26 === void 0 ? void 0 : _this$divaWebConfigDa26.emailConfig;
     }
   }, {
     key: "getABTestCases",
     value: function getABTestCases() {
-      var _this$divaWebConfigDa28, _this$divaWebConfigDa29;
-      return (_this$divaWebConfigDa28 = (_this$divaWebConfigDa29 = this.divaWebConfigData) === null || _this$divaWebConfigDa29 === void 0 ? void 0 : _this$divaWebConfigDa29.abTestCases) !== null && _this$divaWebConfigDa28 !== void 0 ? _this$divaWebConfigDa28 : [];
+      var _this$divaWebConfigDa27, _this$divaWebConfigDa28;
+      return (_this$divaWebConfigDa27 = (_this$divaWebConfigDa28 = this.divaWebConfigData) === null || _this$divaWebConfigDa28 === void 0 ? void 0 : _this$divaWebConfigDa28.abTestCases) !== null && _this$divaWebConfigDa27 !== void 0 ? _this$divaWebConfigDa27 : [];
     }
   }, {
     key: "getBarrierConfig",
     value: function getBarrierConfig() {
-      var _this$divaWebConfigDa30;
-      return (_this$divaWebConfigDa30 = this.divaWebConfigData) === null || _this$divaWebConfigDa30 === void 0 ? void 0 : _this$divaWebConfigDa30.barrierConfig;
+      var _this$divaWebConfigDa29;
+      return (_this$divaWebConfigDa29 = this.divaWebConfigData) === null || _this$divaWebConfigDa29 === void 0 ? void 0 : _this$divaWebConfigDa29.barrierConfig;
     }
   }, {
     key: "getTemplateConfig",
     value: function getTemplateConfig() {
-      var _this$divaWebConfigDa31;
-      return (_this$divaWebConfigDa31 = this.divaWebConfigData) === null || _this$divaWebConfigDa31 === void 0 ? void 0 : _this$divaWebConfigDa31.templateConfig;
+      var _this$divaWebConfigDa30;
+      return (_this$divaWebConfigDa30 = this.divaWebConfigData) === null || _this$divaWebConfigDa30 === void 0 ? void 0 : _this$divaWebConfigDa30.templateConfig;
     }
   }, {
     key: "showDivaNr",
     value: function showDivaNr() {
-      var _this$divaWebConfigDa32;
-      return (_this$divaWebConfigDa32 = this.divaWebConfigData) === null || _this$divaWebConfigDa32 === void 0 ? void 0 : _this$divaWebConfigDa32.showDivaNr;
+      var _this$divaWebConfigDa31;
+      return (_this$divaWebConfigDa31 = this.divaWebConfigData) === null || _this$divaWebConfigDa31 === void 0 ? void 0 : _this$divaWebConfigDa31.showDivaNr;
     }
   }, {
     key: "onErrorHandling",
     value: function onErrorHandling() {
-      var _this$divaWebConfigDa33;
-      return (_this$divaWebConfigDa33 = this.divaWebConfigData) === null || _this$divaWebConfigDa33 === void 0 ? void 0 : _this$divaWebConfigDa33.onErrorHandling;
+      var _this$divaWebConfigDa32;
+      return (_this$divaWebConfigDa32 = this.divaWebConfigData) === null || _this$divaWebConfigDa32 === void 0 ? void 0 : _this$divaWebConfigDa32.onErrorHandling;
     }
   }, {
     key: "diva3DRenderingDefault",
     value: function diva3DRenderingDefault() {
-      var _this$divaWebConfigDa34;
-      return (_this$divaWebConfigDa34 = this.divaWebConfigData) === null || _this$divaWebConfigDa34 === void 0 ? void 0 : _this$divaWebConfigDa34.diva3DRenderingDefault;
+      var _this$divaWebConfigDa33;
+      return (_this$divaWebConfigDa33 = this.divaWebConfigData) === null || _this$divaWebConfigDa33 === void 0 ? void 0 : _this$divaWebConfigDa33.diva3DRenderingDefault;
     }
   }, {
     key: "getJwt",
@@ -834,8 +827,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getUseMask",
     value: function getUseMask() {
-      var _this$divaWebConfigDa35;
-      return (_this$divaWebConfigDa35 = this.divaWebConfigData) === null || _this$divaWebConfigDa35 === void 0 ? void 0 : _this$divaWebConfigDa35.useMask;
+      var _this$divaWebConfigDa34;
+      return (_this$divaWebConfigDa34 = this.divaWebConfigData) === null || _this$divaWebConfigDa34 === void 0 ? void 0 : _this$divaWebConfigDa34.useMask;
     }
   }, {
     key: "apiUrl",
@@ -895,22 +888,10 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getBasketDataUrl",
     value: function getBasketDataUrl(divaNr) {
-      //if divaNr is a variant of a divaNr (saves with favorites) divaNr looks like: "Diva-123456_0001". Here we got do build the querystring differently
-      if (divaNr.includes('_') && divaNr.substring(divaNr.indexOf('_') + 1).length == 4) {
-        var _divaNr$split = divaNr.split('_'),
-          _divaNr$split2 = _slicedToArray__default["default"](_divaNr$split, 2),
-          DivaNrAndDoc = _divaNr$split2[0],
-          variantId = _divaNr$split2[1];
-        var _DivaNrAndDoc$split = DivaNrAndDoc.split('-'),
-          _DivaNrAndDoc$split2 = _slicedToArray__default["default"](_DivaNrAndDoc$split, 3),
-          _onlyDivaNr = _DivaNrAndDoc$split2[1],
-          _version = _DivaNrAndDoc$split2[2];
-        return '/baskets/configuration?divaNr=' + 'DIVA-' + _onlyDivaNr + (_version ? '&version=' + _version : '') + '&variantId=' + Number(variantId) + '&dontRepairBasket=true';
-      }
-      var _divaNr$split3 = divaNr.split('-'),
-        _divaNr$split4 = _slicedToArray__default["default"](_divaNr$split3, 3),
-        onlyDivaNr = _divaNr$split4[1],
-        version = _divaNr$split4[2];
+      var _divaNr$split = divaNr.split('-'),
+        _divaNr$split2 = _slicedToArray__default["default"](_divaNr$split, 3),
+        onlyDivaNr = _divaNr$split2[1],
+        version = _divaNr$split2[2];
       return '/baskets/configuration?divaNr=' + 'DIVA-' + onlyDivaNr + (version ? '&version=' + version : '') + '&dontRepairBasket=true';
     }
   }, {
@@ -1040,9 +1021,9 @@ var DivaApiHandler = /*#__PURE__*/function () {
       return '/baskets/uniqueDivaNr';
     }
   }, {
-    key: "fillBasketEkText",
-    value: function fillBasketEkText() {
-      return '/baskets/fillektext';
+    key: "checkMatchingProducts",
+    value: function checkMatchingProducts() {
+      return '/v1/products/matching';
     }
   }, {
     key: "getAccountList",
@@ -1367,14 +1348,14 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "dontLoadAdditionalModelInfos",
     get: function get() {
-      var _this$divaWebConfigDa36;
-      return (_this$divaWebConfigDa36 = this.divaWebConfigData) === null || _this$divaWebConfigDa36 === void 0 ? void 0 : _this$divaWebConfigDa36.dontLoadAdditionalModelInfos;
+      var _this$divaWebConfigDa35;
+      return (_this$divaWebConfigDa35 = this.divaWebConfigData) === null || _this$divaWebConfigDa35 === void 0 ? void 0 : _this$divaWebConfigDa35.dontLoadAdditionalModelInfos;
     }
   }, {
     key: "dontLoadCatalogEditorLiteMask",
     get: function get() {
-      var _this$divaWebConfigDa37;
-      return (_this$divaWebConfigDa37 = this.divaWebConfigData) === null || _this$divaWebConfigDa37 === void 0 ? void 0 : _this$divaWebConfigDa37.dontLoadCatalogEditorLiteMask;
+      var _this$divaWebConfigDa36;
+      return (_this$divaWebConfigDa36 = this.divaWebConfigData) === null || _this$divaWebConfigDa36 === void 0 ? void 0 : _this$divaWebConfigDa36.dontLoadCatalogEditorLiteMask;
     }
   }, {
     key: "OrganizationId",
@@ -1633,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() {
@@ -17866,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;
@@ -18066,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() {
@@ -18527,6 +18534,8 @@ var DivaCatalogData = /*#__PURE__*/function () {
         //Warnings
         else if (item.Codex == 'HIDECONSTRUCTIONWARNING') {
           _this.catalogData.doCheckConstructionWarnings = item.Value == '0';
+        } else if (item.Codex == 'FORCECONSTRUCTIONWARNINGARTICLES') {
+          _this.catalogData.forceConstructionWarningForArticles = item.Value.split(';');
         } else if (item.Codex == 'HIDECOMPLETENESSWARNING') {
           _this.catalogData.hideCompletenessWarning = item.Value == '1';
         }
@@ -19347,6 +19356,11 @@ var DivaCatalogData = /*#__PURE__*/function () {
     get: function get() {
       return this.catalogData.doCheckConstructionWarnings;
     }
+  }, {
+    key: "forceConstructionWarningForArticles",
+    get: function get() {
+      return this.catalogData.forceConstructionWarningForArticles;
+    }
   }, {
     key: "doHideCompletenessWarning",
     get: function get() {
@@ -20491,7 +20505,7 @@ var DivaArticle = /*#__PURE__*/function () {
       ruleDesc_locales: initParams.RuleDesc_locales,
       toDeleteAfterInit: false,
       doUpdatePlannerSize: false,
-      shelfPlanData: initParams.ShelfPlanData ? DivaUtils__default["default"].DecodeBasketJson(initParams.ShelfPlanData) : undefined,
+      shelfPlanData: initParams.ShelfPlandata ? DivaUtils__default["default"].DecodeBasketJson(initParams.ShelfPlandata) : undefined,
       typeNr: articleData.typeNr,
       initDecisions: initParams.initDecisions,
       previousPartlistArticles: initParams.PreviousPartlistArticles,
@@ -21808,6 +21822,18 @@ var DivaArticle = /*#__PURE__*/function () {
     get: function get() {
       return DivaUtils.md5(this.CatalogData.catalogGuid + '_' + this.articleCodex + '_' + JSON.stringify(this.VariantValuesWithoutOPTandOPV).replace(/"/g, '@'));
     }
+  }, {
+    key: "articleProductHash",
+    get: function get() {
+      var hash = this.catalogCodex + '_' + this.articleCodex + '_' + this.quantity + '_';
+      for (var key in this.articleOptionStates) {
+        var myArtOption = this.articleOptionStates[key];
+        if (myArtOption.isDoShow && (!(myArtOption.idmVariantenArt == 95 || myArtOption.idmVariantenArt == 96 || myArtOption.idmVariantenArt == 97) || myArtOption.isVisibleFreeText) && myArtOption.val && myArtOption.visibleCount > 0 && !myArtOption.isDescribingState) {
+          hash = hash + myArtOption.optionCodex.substring(3) + '_' + myArtOption.val.codex.substring(3) + (myArtOption.measureUnit && myArtOption.freeText !== undefined ? '_' + myArtOption.freeText : '') + (!myArtOption.measureUnit && myArtOption.isFreeText ? '_' + myArtOption.isFreeText : '');
+        }
+      }
+      return DivaUtils.md5(hash);
+    }
   }, {
     key: "VariantValuesWithoutOPTandOPV",
     get: function get() {
@@ -22880,6 +22906,8 @@ var DivaArticle = /*#__PURE__*/function () {
             optionImgForPrint: optionImgForPrint,
             optionsForPrint: optionsForPrint
           });
+        } else {
+          LOG$c.debug('not loading partlistarticle: ' + articleCodex + ' cause quantity is zero');
         }
       }
       return partlistArticlesToLoad;
@@ -23576,7 +23604,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-4b697826.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-8db07a13.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -24348,12 +24376,12 @@ var DivaArticle = /*#__PURE__*/function () {
               }
               var myOptItem = {
                 BasketID: this.basketId,
-                OPTCodex: OP.substring(3),
+                OPT: OP.substring(3),
                 OPTName: myArtOption.optionOrigName,
                 OPTName_locales: myArtOption.optionName_locales,
                 OptionOCD: myArtOption.optionOcd,
                 OCD: myArtOption.ocd,
-                OPVCodex: myArtOption.val.codex.substring(3),
+                OPV: myArtOption.val.codex.substring(3),
                 vOPV: !this.CatalogData.dontUseVCodexInBasket ? myArtOption.vCodex : undefined,
                 OPVName: DivaUtils__default["default"].stripTags(myArtOption.name),
                 OPVName_locales: DivaUtils__default["default"].stripTagsFromDict((_myArtOption$valName_ = myArtOption.valName_locales) !== null && _myArtOption$valName_ !== void 0 ? _myArtOption$valName_ : {}),
@@ -24389,7 +24417,7 @@ var DivaArticle = /*#__PURE__*/function () {
     }
   }, {
     key: "getConfigPriceData",
-    value: function getConfigPriceData(VariantBasketData) {
+    value: function getConfigPriceData(VariantBasketDatas) {
       var myPriceData = new basketModel.JsonConfigPriceData();
       myPriceData.BasePrices = [];
       if (this.price != 0) {
@@ -24415,12 +24443,12 @@ var DivaArticle = /*#__PURE__*/function () {
             } else {
               if (checkPrice.IsPercentage) {
                 //Check if variantBasketdata is set as addPercentage
-                //TODO klären mit Franz - ist das schon der richtige Ort? In dem Fall wird VariantBasketData nicht als AddPercentage gekennzeichnet und im Checkout 1 wird CHF stattt % angezeigt.
-                for (var _i10 = 0; _i10 < VariantBasketData.length; _i10++) {
+                //TODO klären mit Franz - ist das schon der richtige Ort? In dem Fall wird VariantBasketDatas nicht als AddPercentage gekennzeichnet und im Checkout 1 wird CHF stattt % angezeigt.
+                for (var _i10 = 0; _i10 < VariantBasketDatas.length; _i10++) {
                   var priceOPT = checkPrice.OPT.startsWith('OPT') ? checkPrice.OPT.substring(3) : checkPrice;
-                  if (VariantBasketData[_i10].OPT == priceOPT) {
+                  if (VariantBasketDatas[_i10].OPT == priceOPT) {
                     if (!isNaN(checkPrice.Price)) {
-                      VariantBasketData[_i10].AddPercentage = checkPrice.Price * 100;
+                      VariantBasketDatas[_i10].AddPercentage = checkPrice.Price * 100;
                     }
                   }
                 }
@@ -24436,18 +24464,18 @@ var DivaArticle = /*#__PURE__*/function () {
       var maxPrice = 0,
         maxPriceOPT = '';
       if (!myPriceData.BasePrice && !this.CatalogData.ignoreMaxPriceAsBP) {
-        for (var _i11 = 0; _i11 < VariantBasketData.length; _i11++) {
-          var variant = VariantBasketData[_i11];
+        for (var _i11 = 0; _i11 < VariantBasketDatas.length; _i11++) {
+          var variant = VariantBasketDatas[_i11];
           if (variant.AddPrice && (!variant.AddPrice || variant.AddPrice > maxPrice)) {
             maxPrice = variant.AddPrice;
             maxPriceOPT = variant.OPT;
           }
         }
       }
-      for (var _i12 = 0; _i12 < VariantBasketData.length; _i12++) {
+      for (var _i12 = 0; _i12 < VariantBasketDatas.length; _i12++) {
         //WCTODO Prio 2 bei Maßauswahl
         var CalcPrice = void 0,
-          _variant = VariantBasketData[_i12],
+          _variant = VariantBasketDatas[_i12],
           isPercentage = false;
         if (_variant.AddPercentage) {
           isPercentage = true;
@@ -25062,7 +25090,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
                   }
                 }
               }
-              if (value == undefined) {
+              if (value == undefined && myArtOPS.isFreeText && !variantValues[_key + '_val']) {
                 val = myArtOPS.option.freetextDefaultValue;
                 if (val) {
                   value = val;
@@ -26937,7 +26965,9 @@ var DivaSet = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "_supplierColors", void 0);
     /**Favorits state */
     _defineProperty__default["default"](this, "_handlelingCurrentFavorites", false);
-    _defineProperty__default["default"](this, "_favorites", void 0);
+    _defineProperty__default["default"](this, "_favorites", {
+      VariantValues: {}
+    });
     //disabledVariants holds the state for explicitly variants that the user did not like so they got unselected in der summary
     _defineProperty__default["default"](this, "_disabledVariants", []);
     //for viewSummarylist to not always calc all the different valid variants we cache them and reset them when favoritesselection is changes
@@ -28106,7 +28136,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context4.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-ffa7af62.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-4eb75da2.js'); });
             case 3:
               _yield$import = _context4.sent;
               DoorPlanner = _yield$import["default"];
@@ -28150,8 +28180,6 @@ var DivaSet = /*#__PURE__*/function () {
     set: function set(favorites) {
       this._favorites = favorites;
     }
-
-    //private disabledVariants: number[] = [];
   }, {
     key: "disabledVariants",
     get: function get() {
@@ -28160,7 +28188,6 @@ var DivaSet = /*#__PURE__*/function () {
     set: function set(val) {
       this._disabledVariants = val;
     }
-    //private allVariantsCache FavoritesVariants[]
   }, {
     key: "allVariantsCache",
     get: function get() {
@@ -28283,558 +28310,6 @@ var DivaSet = /*#__PURE__*/function () {
   }]);
 }();
 
-//Diese Klasse verwaltet Productlogiken
-var Product = /*#__PURE__*/function () {
-  function Product(id, divaNr, articles, price, image, shortDescription, childProducts, dockingPointInfos, affiliate, retailerArticleNr, minQuantity, increments) {
-    _classCallCheck__default["default"](this, Product);
-    _defineProperty__default["default"](this, "id", void 0);
-    _defineProperty__default["default"](this, "productPrice", void 0);
-    _defineProperty__default["default"](this, "_divaNr", void 0);
-    _defineProperty__default["default"](this, "shortDescriptionData", void 0);
-    _defineProperty__default["default"](this, "imageData", void 0);
-    _defineProperty__default["default"](this, "articles", void 0);
-    _defineProperty__default["default"](this, "families", []);
-    _defineProperty__default["default"](this, "childProductsData", void 0);
-    _defineProperty__default["default"](this, "childProductsGroupedData", void 0);
-    _defineProperty__default["default"](this, "dockingPointInfos", void 0);
-    _defineProperty__default["default"](this, "_affiliate", void 0);
-    _defineProperty__default["default"](this, "_retailerArticleNr", void 0);
-    _defineProperty__default["default"](this, "_minQuantity", void 0);
-    _defineProperty__default["default"](this, "_increments", void 0);
-    _defineProperty__default["default"](this, "_curTargetArticles", void 0);
-    this.id = id;
-    this._divaNr = divaNr;
-    this.articles = articles;
-    this.productPrice = price;
-    this.childProductsData = childProducts;
-    this.shortDescriptionData = shortDescription;
-    this.imageData = image;
-    this.dockingPointInfos = dockingPointInfos;
-    this._affiliate = affiliate;
-    this._retailerArticleNr = retailerArticleNr;
-    this._minQuantity = minQuantity === 1 ? undefined : minQuantity;
-    this._increments = increments === 1 ? undefined : increments;
-    this._curTargetArticles = [];
-    if (this.childProductsData) {
-      this.childProductsGroupedData = {};
-      for (var i = 0; i < this.childProductsData.length; i++) {
-        if (!this.childProductsGroupedData[this.childProductsData[i]]) this.childProductsGroupedData[this.childProductsData[i]] = 0;
-        this.childProductsGroupedData[this.childProductsData[i]]++;
-      }
-    }
-  }
-  return _createClass__default["default"](Product, [{
-    key: "initFamilies",
-    value: function initFamilies(families) {
-      for (var i = 0; i < families.length; i++) {
-        var _families$i$childProd;
-        if ((_families$i$childProd = families[i].childProducts) !== null && _families$i$childProd !== void 0 && _families$i$childProd.includes(this.id)) this.families.push();
-      }
-      this.families = families;
-    }
-  }, {
-    key: "price",
-    get: function get() {
-      return this.productPrice;
-    }
-  }, {
-    key: "productId",
-    get: function get() {
-      return this.id;
-    }
-  }, {
-    key: "divaNr",
-    get: function get() {
-      return this._divaNr;
-    }
-  }, {
-    key: "isFamily",
-    get: function get() {
-      return this.childProducts !== undefined;
-    }
-  }, {
-    key: "variantValues",
-    get: function get() {
-      return this.articles[0].variantValues;
-    }
-  }, {
-    key: "childProducts",
-    get: function get() {
-      return this.childProductsData;
-    }
-  }, {
-    key: "childProductsGrouped",
-    get: function get() {
-      return this.childProductsGroupedData;
-    }
-  }, {
-    key: "shortDescription",
-    get: function get() {
-      return this.shortDescriptionData;
-    }
-  }, {
-    key: "image",
-    get: function get() {
-      return this.imageData;
-    }
-  }, {
-    key: "affiliate",
-    get: function get() {
-      return this._affiliate;
-    }
-  }, {
-    key: "retailerArticleNr",
-    get: function get() {
-      return this._retailerArticleNr;
-    }
-  }, {
-    key: "increments",
-    get: function get() {
-      // return 2;
-      return this._increments;
-    }
-  }, {
-    key: "minQuantity",
-    get: function get() {
-      // return 3;
-      return this._minQuantity;
-    }
-  }, {
-    key: "curTargetArticles",
-    get: function get() {
-      return this._curTargetArticles;
-    },
-    set: function set(targentArticles) {
-      this._curTargetArticles = targentArticles;
-    }
-  }, {
-    key: "DockingPointInfos",
-    get: function get() {
-      return this.dockingPointInfos;
-    }
-  }, {
-    key: "CatalogCodexes",
-    get: function get() {
-      var catalogCodexes = [];
-      for (var i = 0; i < this.articles.length; i++) {
-        catalogCodexes.push(this.articles[i].catalogCodex);
-      }
-      return catalogCodexes;
-    }
-  }, {
-    key: "findOPVCodexInVariantValues",
-    value: function findOPVCodexInVariantValues(opt, opv) {
-      return this.articles.find(function (article) {
-        return article.variantValues.find(function (variant) {
-          return variant.OPT === opt && variant.OPV === opv;
-        });
-      });
-    }
-  }]);
-}();
-
-var DivaProductHandler = /*#__PURE__*/function () {
-  function DivaProductHandler() {
-    _classCallCheck__default["default"](this, DivaProductHandler);
-    _defineProperty__default["default"](this, "singleProducts", {});
-    _defineProperty__default["default"](this, "familyProducts", {});
-    _defineProperty__default["default"](this, "singleProductsGrouped", {});
-    // key is CatalogCodex and ArticleCodex
-    //the number is the qunaitity of the current loaded product
-    _defineProperty__default["default"](this, "currentFamilies", {});
-    _defineProperty__default["default"](this, "currentSingleProducts", {});
-  }
-  return _createClass__default["default"](DivaProductHandler, [{
-    key: "addProducts",
-    value: function addProducts(variants, families) {
-      var newProducts = [];
-      var newFamilies = [];
-      for (var i = 0; i < variants.length; i++) {
-        var _variant$discountedPr;
-        var article = variants[i].articles[0];
-        var variant = variants[i];
-        var codex = article.catalogCodex + '_' + article.articleCodex;
-        if (!this.singleProductsGrouped[codex]) this.singleProductsGrouped[codex] = {};
-        this.singleProductsGrouped[codex][variants[i]._id] = new Product(variant._id, variant.divaNr, variant.articles, (_variant$discountedPr = variant.discountedPrice) !== null && _variant$discountedPr !== void 0 ? _variant$discountedPr : variant.addedPrice, variant.image, variant.shortDescription, undefined, variant.dockingPointInfos, variant.affiliate, variant.retailerArticleNr, variant.minQuantity, variant.increments);
-        this.singleProducts[variant._id] = this.singleProductsGrouped[codex][variant._id];
-        newProducts.push(this.singleProductsGrouped[codex][variant._id]);
-      }
-      if (families !== null && families !== void 0 && families.length) for (var _i = 0; _i < families.length; _i++) {
-        var _family$discountedPri;
-        var family = families[_i];
-        this.familyProducts[family._id] = new Product(family._id, family.divaNr, family.articles, (_family$discountedPri = family.discountedPrice) !== null && _family$discountedPri !== void 0 ? _family$discountedPri : family.addedPrice, family.image, family.shortDescription, family.childProducts, family.dockingPointInfos, family.affiliate, family.retailerArticleNr, family.minQuantity, family.increments);
-        newFamilies.push(this.familyProducts[family._id]);
-      }
-      for (var _i2 = 0; _i2 < newProducts.length; _i2++) {
-        newProducts[_i2].initFamilies(newFamilies);
-      }
-    }
-  }, {
-    key: "loadProductsOfSets",
-    value: function () {
-      var _loadProductsOfSets = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(orderSets, involvedSetIds) {
-        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      function loadProductsOfSets(_x, _x2) {
-        return _loadProductsOfSets.apply(this, arguments);
-      }
-      return loadProductsOfSets;
-    }()
-  }, {
-    key: "updateProducts",
-    value: function () {
-      var _updateProducts = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(set, from, productId) {
-        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }));
-      function updateProducts(_x3, _x4, _x5) {
-        return _updateProducts.apply(this, arguments);
-      }
-      return updateProducts;
-    }()
-  }, {
-    key: "updateArticleProducts",
-    value: function updateArticleProducts(set) {
-      var articles = set.getDivaArticles();
-      var targetArticles = Object.keys(articles);
-      for (var i = 0; i < targetArticles.length; i++) {
-        var article = articles[targetArticles[i]];
-        var productVariants = this.singleProductsGrouped[article.catalogCodex + '_' + article.articleCodex];
-        for (var key in productVariants) {
-          var product = productVariants[key];
-          product.curTargetArticles = [];
-        }
-      }
-      for (var _i3 = 0; _i3 < targetArticles.length; _i3++) {
-        var _article = articles[targetArticles[_i3]];
-        if (!_article) continue;
-        var _productVariants = this.singleProductsGrouped[_article.catalogCodex + '_' + _article.articleCodex];
-        var newProduct = undefined;
-        var _loop = function _loop() {
-          var product = _productVariants[_key];
-          var productVariantValues = _article.VariantValuesWithoutOPTandOPVInObject;
-          var notFound = false;
-          var _loop2 = function _loop2(j) {
-            if (!productVariantValues.find(function (item) {
-              return item.OPT == product.variantValues[j].OPT && item.OPV == product.variantValues[j].OPV;
-            })) {
-              //only notFound set to true when the opt in general does exist in the productVariants only the value of it is different
-              if (productVariantValues.find(function (item) {
-                return item.OPT == product.variantValues[j].OPT;
-              })) {
-                notFound = true;
-                return 1; // break
-              }
-            }
-          };
-          for (var j = 0; j < product.variantValues.length; j++) {
-            if (_loop2(j)) break;
-          }
-          if (!notFound) {
-            newProduct = product;
-            newProduct.curTargetArticles.push(_article.basketId);
-            return 1; // break
-          }
-        };
-        for (var _key in _productVariants) {
-          if (_loop()) break;
-        }
-        _article.curProduct = newProduct;
-      }
-    }
-  }, {
-    key: "updateFamilyProducts",
-    value: function updateFamilyProducts() {
-      this.currentFamilies = {};
-      var familiesToCheck = this.getFamiliesToCheck();
-      var biggestFamily;
-      do {
-        biggestFamily = this.findBiggestFamily(familiesToCheck);
-        if (biggestFamily) {
-          if (!this.currentFamilies[biggestFamily.productId]) this.currentFamilies[biggestFamily.productId] = 0;
-          this.currentFamilies[biggestFamily.productId]++;
-        }
-      } while (biggestFamily);
-    }
-  }, {
-    key: "getFamiliesToCheck",
-    value: function getFamiliesToCheck() {
-      var familiesToCheck = {};
-      for (var key in this.familyProducts) {
-        var familiy = this.familyProducts[key];
-        if (!familiy.childProducts) continue;
-        for (var i = 0; i < familiy.childProducts.length; i++) {
-          if (this.currentSingleProducts[familiy.childProducts[i]]) {
-            familiesToCheck[familiy.productId] = familiy;
-            break;
-          }
-        }
-      }
-      return familiesToCheck;
-    }
-  }, {
-    key: "findBiggestFamily",
-    value: function findBiggestFamily(familiesToCheck) {
-      var matchingFamilies = [];
-      var biggestFamily = false;
-      for (var iKey in familiesToCheck) {
-        var family = familiesToCheck[iKey];
-        var notFit = false;
-        for (var jKey in family.childProductsGrouped) {
-          //if product does not currently exist or the quantity is to small
-          if (!this.currentSingleProducts[jKey] || this.currentSingleProducts[jKey] < family.childProductsGrouped[jKey]) {
-            notFit = true;
-            break;
-          }
-        }
-        if (!notFit) matchingFamilies.push(family);
-      }
-
-      //from all the matching families find the bigges one
-      for (var i = 0; i < matchingFamilies.length; i++) {
-        if (!biggestFamily || biggestFamily.childProducts.length > matchingFamilies[i].childProducts.length) {
-          biggestFamily = matchingFamilies[i];
-        }
-      }
-      if (biggestFamily) {
-        //we found a final bigges familiy. Now subtract the familiy products quantity in the dictionary products for the next run
-        for (var key in biggestFamily.childProductsGrouped) {
-          biggestFamily.childProductsGrouped;
-          this.currentSingleProducts[key] = this.currentSingleProducts[key] - biggestFamily.childProductsGrouped[key];
-        }
-      }
-      return biggestFamily;
-    }
-  }, {
-    key: "checkQuantitySteps",
-    value: function () {
-      var _checkQuantitySteps = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(set, from, productId) {
-        var articles, somethingChanged, key, product, currentQuantity, deltaQuantity, whatToDo, article;
-        return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              articles = set.getDivaArticles();
-              somethingChanged = false;
-              _context3.t0 = _regeneratorRuntime__default["default"].keys(this.currentSingleProducts);
-            case 3:
-              if ((_context3.t1 = _context3.t0()).done) {
-                _context3.next = 38;
-                break;
-              }
-              key = _context3.t1.value;
-              product = this.singleProducts[key];
-              currentQuantity = this.currentSingleProducts[key];
-              deltaQuantity = 0;
-              whatToDo = undefined;
-              if (product.minQuantity !== undefined) {
-                if (product.minQuantity > currentQuantity || product.increments !== undefined && product.increments > currentQuantity) {
-                  if (from == 'onDelete') {
-                    whatToDo = 'deleteArticle';
-                    deltaQuantity = currentQuantity;
-                  } else {
-                    whatToDo = 'increaseQunatity';
-                    deltaQuantity = product.minQuantity - currentQuantity;
-                  }
-                  somethingChanged = 'byMinQuantity';
-                }
-              }
-              if (!(product.increments && whatToDo !== 'deleteArticle')) {
-                _context3.next = 22;
-                break;
-              }
-            case 11:
-              if (!((currentQuantity + deltaQuantity) % product.increments !== 0 || from == 'onDelete' && productId == key)) {
-                _context3.next = 22;
-                break;
-              }
-              deltaQuantity++;
-              somethingChanged = 'byImcrement';
-              if (!(whatToDo !== 'increaseQunatity')) {
-                _context3.next = 20;
-                break;
-              }
-              if (!((currentQuantity - deltaQuantity) % product.increments === 0 && from != 'onAdd')) {
-                _context3.next = 19;
-                break;
-              }
-              if (!(product.minQuantity === undefined || product.minQuantity <= currentQuantity - deltaQuantity || currentQuantity - deltaQuantity === 0)) {
-                _context3.next = 19;
-                break;
-              }
-              whatToDo = 'decreaseQunatity';
-              return _context3.abrupt("break", 22);
-            case 19:
-              if ((currentQuantity + deltaQuantity) % product.increments === 0 && from != 'onDelete') {
-                whatToDo = 'increaseQunatity';
-              }
-            case 20:
-              _context3.next = 11;
-              break;
-            case 22:
-              if (!(whatToDo !== undefined)) {
-                _context3.next = 36;
-                break;
-              }
-            case 23:
-              if (!(deltaQuantity !== 0)) {
-                _context3.next = 36;
-                break;
-              }
-              article = articles[product.curTargetArticles[0]]; //attention!! If an article has a quantity bigger than 1 this wont work!
-              if (!(whatToDo === 'increaseQunatity')) {
-                _context3.next = 30;
-                break;
-              }
-              _context3.next = 28;
-              return setHandlerInstance.addPlannerElement(set, article.articleCodex, {
-                variantValues: article.VariantValues
-              }, 'initializingProduct');
-            case 28:
-              _context3.next = 33;
-              break;
-            case 30:
-              _context3.next = 32;
-              return setHandlerInstance.deleteElementFromSet(set, article, false, undefined, true);
-            case 32:
-              product.curTargetArticles.splice(0, 1);
-            case 33:
-              deltaQuantity--;
-              _context3.next = 23;
-              break;
-            case 36:
-              _context3.next = 3;
-              break;
-            case 38:
-              return _context3.abrupt("return", somethingChanged);
-            case 39:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3, this);
-      }));
-      function checkQuantitySteps(_x6, _x7, _x8) {
-        return _checkQuantitySteps.apply(this, arguments);
-      }
-      return checkQuantitySteps;
-    }()
-    /**
-     * this functions controlls if the list of configItems is available or not
-     * @param configItems
-     * @param variantsInfo
-     * @param articles
-     * @param targetArticles
-     * @returns
-     */
-  }, {
-    key: "checkProductInStock",
-    value: function checkProductInStock(configItems, variantsInfo, articles, targetArticles) {
-      var productsKey = articles[targetArticles[0]].catalogCodex + '_' + articles[targetArticles[0]].articleCodex;
-      var products = this.singleProductsGrouped[productsKey];
-      var indexesToDelete = [];
-      for (var i = 0; i < variantsInfo.length; i++) {
-        var variantInStock = false;
-        var variantInfo = variantsInfo[i];
-        for (var key in products) {
-          //***GUF***DEBUG HERE
-          var productVariantValues = products[key].variantValues;
-          var notFound = false;
-          var _loop3 = function _loop3() {
-            var variant = variantInfo.variants[j];
-            if (!productVariantValues.find(function (item) {
-              return variant.OPT === item.OPT && variant.OPV === item.OPV;
-            })) {
-              //only notFound set to true when the opt in general does exist in the productVariants only the value of it is different
-              if (productVariantValues.find(function (item) {
-                return variant.OPT === item.OPT;
-              })) {
-                notFound = true;
-                return 1; // break
-              }
-            }
-          };
-          for (var j = 0; j < variantInfo.variants.length; j++) {
-            if (_loop3()) break;
-          }
-          if (!notFound) {
-            variantInStock = true;
-            break;
-          }
-        }
-        if (!variantInStock) {
-          if (configItems[i]) {
-            indexesToDelete.push(i);
-          }
-        }
-      }
-      for (var _i4 = indexesToDelete.length - 1; _i4 >= 0; _i4--) {
-        configItems.splice(indexesToDelete[_i4], 1);
-      }
-      return configItems;
-    }
-  }, {
-    key: "getPrice",
-    value: function getPrice() {
-      var price = 0;
-      for (var key in this.currentSingleProducts) {
-        price += this.singleProducts[key].price * this.currentSingleProducts[key];
-      }
-      for (var _key2 in this.currentFamilies) {
-        price += this.singleProducts[_key2].price * this.currentFamilies[_key2];
-      }
-      return price;
-    }
-  }, {
-    key: "getCurrentProducts",
-    value: function getCurrentProducts() {
-      var products = this.currentSingleProducts;
-      for (var key in this.currentFamilies) {
-        products[key] = this.currentFamilies[key];
-      }
-      return products;
-    }
-  }, {
-    key: "getProductById",
-    value: function getProductById(productId) {
-      var product;
-      product = this.singleProducts[productId];
-      if (!product) this.familyProducts[productId];
-      return product;
-    }
-  }, {
-    key: "getBestMatch",
-    value: function getBestMatch(articles) {
-      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', '');
-        var products = this.singleProductsGrouped[article.catalogCodex + '_' + article.articleCodex];
-        if (!products || !opv) continue;
-        for (var pId in products) {
-          var _products$pId$affilia;
-          if ((_products$pId$affilia = products[pId].affiliate) !== null && _products$pId$affilia !== void 0 && _products$pId$affilia.length) if (products[pId].findOPVCodexInVariantValues(OPTION_CODEX, opv)) {
-            return products[pId];
-          }
-        }
-      }
-      return undefined;
-    }
-  }]);
-}();
-var productHandlerInstance = new DivaProductHandler();
-
 var SummaryHandler = /*#__PURE__*/function () {
   function SummaryHandler() {
     _classCallCheck__default["default"](this, SummaryHandler);
@@ -29172,30 +28647,16 @@ var SummaryHandler = /*#__PURE__*/function () {
   }, {
     key: "getSummaryItems",
     value: function () {
-      var _getSummaryItems = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(sets, doConfigure, doAllowSetPlanner) {
+      var _getSummaryItems = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(sets, doConfigure) {
         var ret, _key5, set, items, type;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               ret = [];
-              if (!doAllowSetPlanner) {
-                _context.next = 5;
-                break;
-              }
-              ret = [{
-                items: this.getArticlesForSummary(sets),
-                type: 'SUMMARY_ARTICLES',
-                name: 'ARTICLELIST',
-                price: setHandlerInstance.getTotalPrice(sets),
-                quantity: 1
-              }];
-              _context.next = 29;
-              break;
-            case 5:
               _context.t0 = _regeneratorRuntime__default["default"].keys(sets);
-            case 6:
+            case 2:
               if ((_context.t1 = _context.t0()).done) {
-                _context.next = 29;
+                _context.next = 25;
                 break;
               }
               _key5 = _context.t1.value;
@@ -29203,9 +28664,9 @@ var SummaryHandler = /*#__PURE__*/function () {
               items = void 0;
               type = this.getSummaryType(set);
               _context.t2 = type;
-              _context.next = _context.t2 === 'SUMMARY_PARTLIST' ? 14 : _context.t2 === 'SUMMARY_OPTIONTREE' ? 17 : _context.t2 === 'VARIANTS' ? 19 : _context.t2 === 'PARTLIST_AND_SPECIALOPTIONS' ? 25 : 27;
+              _context.next = _context.t2 === 'SUMMARY_PARTLIST' ? 10 : _context.t2 === 'SUMMARY_OPTIONTREE' ? 13 : _context.t2 === 'VARIANTS' ? 15 : _context.t2 === 'PARTLIST_AND_SPECIALOPTIONS' ? 21 : 23;
               break;
-            case 14:
+            case 10:
               items = this.buildSummaryItemsOfPartlist(set);
               ret.push({
                 items: items,
@@ -29214,33 +28675,33 @@ var SummaryHandler = /*#__PURE__*/function () {
                 price: set.getSetPrice(),
                 quantity: 1
               });
-              return _context.abrupt("break", 27);
-            case 17:
+              return _context.abrupt("break", 23);
+            case 13:
               ret = ret.concat(this.getOptionTreeSummary(set));
-              return _context.abrupt("break", 27);
-            case 19:
+              return _context.abrupt("break", 23);
+            case 15:
               _context.t3 = ret;
-              _context.next = 22;
+              _context.next = 18;
               return this.getVariantsSummary(doConfigure, set);
-            case 22:
+            case 18:
               _context.t4 = _context.sent;
               _context.t3.push.call(_context.t3, _context.t4);
-              return _context.abrupt("break", 27);
-            case 25:
+              return _context.abrupt("break", 23);
+            case 21:
               ret.push(this.buildSummaryItemsOfPartlistWithSpecialOptions(set));
-              return _context.abrupt("break", 27);
-            case 27:
-              _context.next = 6;
+              return _context.abrupt("break", 23);
+            case 23:
+              _context.next = 2;
               break;
-            case 29:
+            case 25:
               return _context.abrupt("return", ret);
-            case 30:
+            case 26:
             case "end":
               return _context.stop();
           }
         }, _callee, this);
       }));
-      function getSummaryItems(_x, _x2, _x3) {
+      function getSummaryItems(_x, _x2) {
         return _getSummaryItems.apply(this, arguments);
       }
       return getSummaryItems;
@@ -29344,69 +28805,15 @@ var SummaryHandler = /*#__PURE__*/function () {
       }
       return ret;
     }
-  }, {
-    key: "getArticlesForSummary",
-    value: function getArticlesForSummary(sets) {
-      var ret = {};
-      for (var setId in sets) {
-        var set = sets[setId];
-        var articles = set.getDivaArticles();
-        for (var basketId in articles) {
-          var article = articles[basketId];
-          if (!article.curProduct) {
-            var _key9 = article.catalogCodex + '_' + article.articleCodex + '_' + article.articleVariantDesc();
-            if (ret[_key9]) {
-              var _ret$_key9$targetArti;
-              ret[_key9].quantity = ret[_key9].quantity + article.quantity;
-              ret[_key9].targetBasketIds.push(article.basketId);
-              (_ret$_key9$targetArti = ret[_key9].targetArticlePosNrs) === null || _ret$_key9$targetArti === void 0 || _ret$_key9$targetArti.push(article.posNr);
-            } else {
-              ret[_key9] = {
-                setId: setId,
-                title: article.name,
-                title_locales: article.name_locales,
-                description: article.actSizeText,
-                isDefined: true,
-                price: article.price,
-                quantity: article.quantity,
-                codex: article.articleCodex,
-                targetBasketIds: [article.basketId],
-                posNr: Object.keys(ret).length,
-                image: article.imageUrl,
-                targetArticlePosNrs: [article.posNr]
-              };
-            }
-          }
-        }
-      }
-      var curProducts = productHandlerInstance.getCurrentProducts();
-      for (var _key10 in curProducts) {
-        var product = productHandlerInstance.getProductById(_key10);
-        ret[_key10] = {
-          setId: 'PRODUCTS',
-          title: product.shortDescription,
-          description: '',
-          isDefined: true,
-          price: product.price,
-          quantity: curProducts[_key10],
-          codex: product.productId,
-          targetBasketIds: [],
-          posNr: Object.keys(ret).length,
-          image: product.image,
-          targetArticlePosNrs: []
-        };
-      }
-      return ret;
-    }
   }, {
     key: "getSummaryItemsOfAllSets",
     value: function getSummaryItemsOfAllSets(sets, set) {
       var summaryItemsOfAllSets = {};
-      for (var _key11 in sets) {
-        var _set = sets[_key11];
+      for (var _key9 in sets) {
+        var _set = sets[_key9];
         var articlePosNrs = this.getArticlesPosNr(_set.getDivaArticles(true));
         var summaryItems = this.buildSummaryItems(articlePosNrs, _set);
-        summaryItemsOfAllSets[_key11] = {
+        summaryItemsOfAllSets[_key9] = {
           setName: _set.CatalogData.catalogName,
           setPrice: _set.getSetPrice(),
           summaryItems: summaryItems
@@ -29420,10 +28827,10 @@ var SummaryHandler = /*#__PURE__*/function () {
       var groupedArticles = setHandlerInstance.getDockedGroupedArticles(set);
       var retGroups = {};
       var articlesCodexesOnIndex = {};
-      for (var _key12 in groupedArticles) {
-        var basketId = groupedArticles[_key12][Object.keys(groupedArticles[_key12])[0]].basketId;
+      for (var _key10 in groupedArticles) {
+        var basketId = groupedArticles[_key10][Object.keys(groupedArticles[_key10])[0]].basketId;
         retGroups[basketId] = {
-          articles: groupedArticles[_key12],
+          articles: groupedArticles[_key10],
           quantity: 1
         };
       }
@@ -29438,12 +28845,12 @@ var SummaryHandler = /*#__PURE__*/function () {
           articlesCodexesOnIndex[articleCodex].push(i);
         }
       }
-      for (var _key13 in articlesCodexesOnIndex) {
-        if (articlesCodexesOnIndex[_key13].length > 1) {
+      for (var _key11 in articlesCodexesOnIndex) {
+        if (articlesCodexesOnIndex[_key11].length > 1) {
           //group the single groups by the aricleCodex
           var articles = [];
-          for (var _i4 = 0; _i4 < articlesCodexesOnIndex[_key13].length; _i4++) {
-            var _group = groupedArticles[articlesCodexesOnIndex[_key13][_i4]];
+          for (var _i4 = 0; _i4 < articlesCodexesOnIndex[_key11].length; _i4++) {
+            var _group = groupedArticles[articlesCodexesOnIndex[_key11][_i4]];
             articles.push({
               article: _group[Object.keys(_group)[0]]
             });
@@ -29499,12 +28906,12 @@ var SummaryHandler = /*#__PURE__*/function () {
       }
 
       //old logic TODO: Delete in 2024
-      if (Object.keys(tabGroups).length === 0) for (var _key14 in article.articleOptionStates) {
-        var _ops = article.articleOptionStates[_key14];
+      if (Object.keys(tabGroups).length === 0) for (var _key12 in article.articleOptionStates) {
+        var _ops = article.articleOptionStates[_key12];
         if (!_ops.isInvisible && (_ops.selectionmode != 0 || (_ops.visibleCount > 1 || _ops.isFreeText) && article.set.api.showSelectionModeZero()) && _ops.isDoShow && _ops.valCodex != 'OPVNR') {
           var tabGroup = _ops.option.addOptionToTabgroupInPartlistSummary;
           if (tabGroup) tabGroups.push({
-            optionCodex: _key14,
+            optionCodex: _key12,
             tabGroup: tabGroup
           });
         }
@@ -29539,8 +28946,8 @@ var SummaryHandler = /*#__PURE__*/function () {
       }
 
       //old logic TODO: Delete in 2024
-      for (var _key15 in article.articleOptionStates) {
-        var _optionState = article.articleOptionStates[_key15];
+      for (var _key13 in article.articleOptionStates) {
+        var _optionState = article.articleOptionStates[_key13];
         if (_optionState.option.addOptionToTabgroupInPartlistSummary == tabGroup && !_optionState.isInvisible && _optionState.isDoShow && _optionState.visibleCount > 0 && _optionState.valCodex != 'OPVNR') {
           opss.push(_optionState);
         }
@@ -29704,7 +29111,7 @@ var SummaryHandler = /*#__PURE__*/function () {
           }
         }, _callee3);
       }));
-      function getVariantsSummary(_x4, _x5) {
+      function getVariantsSummary(_x3, _x4) {
         return _getVariantsSummary.apply(this, arguments);
       }
       return getVariantsSummary;
@@ -29732,8 +29139,8 @@ var SummaryHandler = /*#__PURE__*/function () {
     key: "getArticlesPrice",
     value: function getArticlesPrice(articles) {
       var price = 0;
-      for (var _key16 in articles) {
-        price = price + articles[_key16].price * articles[_key16].quantity;
+      for (var _key14 in articles) {
+        price = price + articles[_key14].price * articles[_key14].quantity;
       }
       return price;
     }
@@ -29753,10 +29160,11 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
   return _createClass__default["default"](DivaFavoritesHandler, [{
     key: "initSet",
     value: function initSet(set, orderSet) {
-      var _orderSet$ConfigVaria;
+      var _orderSet$TinyVariant;
       set.favorites = orderSet !== null && orderSet !== void 0 && orderSet.Favorites ? orderSet.Favorites : new basketModel.Favorites();
-      if ((_orderSet$ConfigVaria = orderSet.ConfigVariants) !== null && _orderSet$ConfigVaria !== void 0 && _orderSet$ConfigVaria.length) {
-        set.oldConfigVariants = _toConsumableArray__default["default"](orderSet.ConfigVariants);
+      if ((_orderSet$TinyVariant = orderSet.TinyVariantConfiguration) !== null && _orderSet$TinyVariant !== void 0 && _orderSet$TinyVariant.length) {
+        var _orderSet$TinyVariant2;
+        set.oldConfigVariants = _toConsumableArray__default["default"]((_orderSet$TinyVariant2 = orderSet.TinyVariantConfiguration) !== null && _orderSet$TinyVariant2 !== void 0 ? _orderSet$TinyVariant2 : []);
       }
       set.disabledVariants = [];
     }
@@ -29773,33 +29181,35 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
     key: "getVariantsForSummary",
     value: function () {
       var _getVariantsForSummary = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(set) {
-        var _set$allVariantsCache;
+        var _set$actions, _set$allVariantsCache, _set$actions2;
         var variants;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               this.isCalcForSummary = true;
+              (_set$actions = set.actions) === null || _set$actions === void 0 || _set$actions.toggleLoading('calcfavorites', false, true);
               if (!((_set$allVariantsCache = set.allVariantsCache) !== null && _set$allVariantsCache !== void 0)) {
-                _context.next = 5;
+                _context.next = 6;
                 break;
               }
               _context.t0 = _set$allVariantsCache;
-              _context.next = 8;
+              _context.next = 9;
               break;
-            case 5:
-              _context.next = 7;
+            case 6:
+              _context.next = 8;
               return this.getAllValidVariants(set);
-            case 7:
-              _context.t0 = _context.sent;
             case 8:
+              _context.t0 = _context.sent;
+            case 9:
               variants = _context.t0;
+              (_set$actions2 = set.actions) === null || _set$actions2 === void 0 || _set$actions2.toggleLoading('calcfavorites', false, false);
               this.isCalcForSummary = false;
               return _context.abrupt("return", {
                 disabled: set.disabledVariants,
                 variants: variants,
                 singleOptions: this.repairFavorites(set).singleOptions
               });
-            case 11:
+            case 13:
             case "end":
               return _context.stop();
           }
@@ -29976,8 +29386,9 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
       if (!((_set$oldConfigVariant = set.oldConfigVariants) !== null && _set$oldConfigVariant !== void 0 && _set$oldConfigVariant.length)) return 0;
       var highestId = 0;
       for (var i = 0; i < set.oldConfigVariants.length; i++) {
-        if (highestId < set.oldConfigVariants[i].VariantID) {
-          highestId = set.oldConfigVariants[i].VariantID;
+        var variant = set.oldConfigVariants[i];
+        if (variant.VariantID && highestId < variant.VariantID) {
+          highestId = variant.VariantID;
         }
       }
       return highestId + 1;
@@ -29990,15 +29401,17 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
       for (var i = 0; i < set.oldConfigVariants.length; i++) {
         var oldConfigVariant = set.oldConfigVariants[i];
         var tryNext = false;
-        for (var basketId in variant.targetArticles) {
+        var _loop2 = function _loop2(basketId) {
           var articleNew = variant.targetArticles[basketId];
-          var articleOld = oldConfigVariant.SetVariantData[basketId];
+          var articleOld = oldConfigVariant.OrderSets[0].OrderLines.find(function (ol) {
+            return ol.BasketID == basketId;
+          });
           if (!articleOld) {
             tryNext = true;
-            continue;
+            return 1; // continue
           }
-          var _loop2 = function _loop2(opt) {
-              var option = articleOld.VariantValues.find(function (v) {
+          var _loop3 = function _loop3(opt) {
+              var option = articleOld.VariantBasketDatas.find(function (v) {
                 return 'OPT' + v.OPT == opt;
               });
               if (!option) {
@@ -30012,9 +29425,12 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
             },
             _ret;
           for (var opt in articleNew) {
-            _ret = _loop2(opt);
+            _ret = _loop3(opt);
             if (_ret === 0) continue;
           }
+        };
+        for (var basketId in variant.targetArticles) {
+          if (_loop2(basketId)) continue;
         }
         if (tryNext) continue;
         return oldConfigVariant.VariantID;
@@ -30059,7 +29475,7 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
         var optionValue = set.CatalogData.getOptionValue(opvs[i]);
         var optionValueName = optionValue === null || optionValue === void 0 ? void 0 : optionValue.name;
         var optionValueImage = optionValue === null || optionValue === void 0 ? void 0 : optionValue.image;
-        favorit = new basketModel.Favorit(opt, opvs[i], targetArticles, optionName, optionValueName, optionValueImage);
+        favorit = new basketModel.Favorite(opt, opvs[i], targetArticles, optionName, optionValueName, optionValueImage);
         this.setFavorites(set, opt, opvs[i], favorit, remove);
       }
       set.disabledVariants = [];
@@ -30455,14 +29871,28 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
           var optionsMatching = {};
           for (var basketId in variant.targetArticles) {
             var articleVariantValues = variant.targetArticles[basketId];
+            var _loop4 = function _loop4(opt) {
+                var _articleWithOption$Va;
+                if (optionsMatching[opt]) return 0; // continue
+                var articleWithOption = oldConfig.OrderSets[0].OrderLines.find(function (ol) {
+                  return ol.VariantBasketDatas.find(function (v) {
+                    return 'OPT' + v.OPT === opt;
+                  });
+                });
+                if ('OPV' + (articleWithOption === null || articleWithOption === void 0 || (_articleWithOption$Va = articleWithOption.VariantBasketDatas.find(function (v) {
+                  return 'OPT' + v.OPT === opt;
+                })) === null || _articleWithOption$Va === void 0 ? void 0 : _articleWithOption$Va.OPV) == articleVariantValues[opt]) {
+                  optionsMatching[opt] = true;
+                } else {
+                  tryNext = true;
+                  return 1; // break
+                }
+              },
+              _ret2;
             for (var opt in articleVariantValues) {
-              if (optionsMatching[opt]) continue;
-              if (oldConfig.Variant[opt] == articleVariantValues[opt]) {
-                optionsMatching[opt] = true;
-              } else {
-                tryNext = true;
-                break;
-              }
+              _ret2 = _loop4(opt);
+              if (_ret2 === 0) continue;
+              if (_ret2 === 1) break;
             }
             if (tryNext) break;
           }
@@ -31294,6 +30724,53 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
 }();
 var configTreeHandler = new DivaConfigTreeHandler();
 
+//Diese Klasse verwaltet Productlogiken
+var DivaProductHandler = /*#__PURE__*/function () {
+  function DivaProductHandler() {
+    _classCallCheck__default["default"](this, DivaProductHandler);
+  }
+  return _createClass__default["default"](DivaProductHandler, [{
+    key: "getPrice",
+    value: function getPrice() {
+      var price = 0;
+      return price;
+    }
+  }, {
+    key: "updateProducts",
+    value: function () {
+      var _updateProducts = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(sets, api, from) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              ({
+                catalogs: sets.map(function (set) {
+                  return {
+                    articles: Object.values(set.getDivaArticles()).map(function (article) {
+                      return {
+                        codex: article.articleCodex,
+                        hash: article.articleProductHash
+                      };
+                    }),
+                    catalogGuid: set.CatalogData.catalogGuid
+                  };
+                })
+              });
+              return _context.abrupt("return");
+            case 2:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function updateProducts(_x, _x2, _x3) {
+        return _updateProducts.apply(this, arguments);
+      }
+      return updateProducts;
+    }()
+  }]);
+}();
+var productHandlerInstance = new DivaProductHandler();
+
 function ownKeys$8(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$8(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$8(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$8(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$8 = DivaUtils__default["default"].initLog('Planner', 'DIVA-SET-HANDLER');
@@ -31342,11 +30819,8 @@ var DivaSetHandler = /*#__PURE__*/function () {
               _context.next = 12;
               return set.plannerHandler.initSet(set, catalogData, undefined);
             case 12:
-              _context.next = 14;
-              return productHandlerInstance.updateProducts(set, 'onAdd');
-            case 14:
               return _context.abrupt("return", set);
-            case 15:
+            case 13:
             case "end":
               return _context.stop();
           }
@@ -31403,7 +30877,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                           PosNr: orderline.PosNr,
                           VariantValues: variantValues,
                           VariantItemData: orderline.VariantBasketDatas,
-                          ShelfPlanData: orderline.ShelfPlandata,
+                          ShelfPlandata: orderline.ShelfPlandata,
                           elementId: (_orderline$ElementID = orderline.ElementID) !== null && _orderline$ElementID !== void 0 ? _orderline$ElementID : elements === null || elements === void 0 || (_elements$find = elements.find(function (element) {
                             return element.basketID == orderline.BasketID;
                           })) === null || _elements$find === void 0 ? void 0 : _elements$find.elementID
@@ -32130,19 +31604,12 @@ var DivaSetHandler = /*#__PURE__*/function () {
               _context13.next = 16;
               return articleHandlerInstance.toDoAfterArticleLoaded(newArticle, defaultHeaderValues, {}, from, undefined, ignorePlanner);
             case 16:
-              if (!(from === 'initializing')) {
-                _context13.next = 19;
-                break;
-              }
-              _context13.next = 19;
-              return productHandlerInstance.updateProducts(set, 'onAdd');
-            case 19:
               LOG$8.successTransaction('ON_PLAN_ARTICLE', {
                 art: articleCodex,
                 artName: newArticle.name
               });
               return _context13.abrupt("return", newArticle);
-            case 21:
+            case 18:
             case "end":
               return _context13.stop();
           }
@@ -32275,7 +31742,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, _deletedArticle$curPr;
+        var _deletedArticle$doorP, _set$CatalogData;
         var setId, deletedArticle, articles, key, newSelectedElement, oldTransform, result, _set$getArticleByBask3, elementDeleted;
         return _regeneratorRuntime__default["default"].wrap(function _callee14$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
@@ -32335,20 +31802,13 @@ var DivaSetHandler = /*#__PURE__*/function () {
               _context16.next = 27;
               return this.updateArticlesOptionStatesOfActSet(set, {}, []);
             case 27:
-              if (dontReload) {
-                _context16.next = 30;
-                break;
-              }
-              _context16.next = 30;
-              return productHandlerInstance.updateProducts(set, 'onDelete', deletedArticle === null || deletedArticle === void 0 || (_deletedArticle$curPr = deletedArticle.curProduct) === null || _deletedArticle$curPr === void 0 ? void 0 : _deletedArticle$curPr.productId);
-            case 30:
               return _context16.abrupt("return", {
                 success: elementDeleted,
                 selectElementId: newSelectedElement,
                 setId: setId,
                 oldTransform: oldTransform
               });
-            case 31:
+            case 28:
             case "end":
               return _context16.stop();
           }
@@ -33130,8 +32590,8 @@ var DivaSetHandler = /*#__PURE__*/function () {
     key: "variantsEvaluator",
     value: (function () {
       var _variantsEvaluator = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee23(set, configItems, configStepKey, paletteType) {
-        var _set$WebConfig, _set$ViewConfig, _configItems$;
-        var opt, checkForProductsInStock, calcVariantsForPricePreview, previewType, _set$CatalogData$show, targetArticles, startTime, variants, endTime;
+        var _set$ViewConfig, _configItems$;
+        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:
@@ -33142,37 +32602,33 @@ var DivaSetHandler = /*#__PURE__*/function () {
               }
               return _context25.abrupt("return", configItems);
             case 3:
-              checkForProductsInStock = ((_set$WebConfig = set.WebConfig) === null || _set$WebConfig === void 0 ? void 0 : _set$WebConfig.checkForProductsInStock) && !(opt !== null && opt !== void 0 && opt.isDescribingState);
               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') {
                 calcVariantsForPricePreview = false;
               }
-              if (!(checkForProductsInStock || calcVariantsForPricePreview)) {
-                _context25.next = 19;
+              if (!calcVariantsForPricePreview) {
+                _context25.next = 17;
                 break;
               }
               targetArticles = set.configTree.getTargetArticles(configStepKey);
               startTime = new Date();
-              _context25.next = 14;
+              _context25.next = 13;
               return this.calcVariants(set, configItems, targetArticles);
-            case 14:
+            case 13:
               variants = _context25.sent;
               endTime = new Date();
               if (endTime.getTime() - startTime.getTime() > 1000) set.dontCalcPricePreviewDueToPerformanceIssues = true;
               if (previewType) {
                 this.calcPricePreview(set, configItems, variants);
               }
-              if (checkForProductsInStock) {
-                configItems = productHandlerInstance.checkProductInStock(configItems, variants, set.getDivaArticles(), targetArticles);
-              }
-            case 19:
+            case 17:
               return _context25.abrupt("return", configItems);
-            case 20:
+            case 18:
             case "end":
               return _context25.stop();
           }
@@ -33346,29 +32802,22 @@ var DivaSetHandler = /*#__PURE__*/function () {
               _context27.next = 19;
               return this.updateEdoArticles(set, retValues.newEDOExtraArticles);
             case 19:
-              if (!(from == 'FromViewClick')) {
-                _context27.next = 22;
-                break;
-              }
-              _context27.next = 22;
-              return productHandlerInstance.updateProducts(set, 'onConfig');
-            case 22:
               if (set.CatalogData.hasAlternateRenderings) set.CatalogData.updateAlternativeRenderings(set.getDivaArticles());
 
               //Update Planner - check if planner data changed
               if (!(!ignorePlanner && from != 'calcVariant')) {
-                _context27.next = 51;
+                _context27.next = 48;
                 break;
               }
               targetElementIds = this.getElementIdsOfArticles(set, targetArticlesWithNewValues);
-              _context27.next = 27;
+              _context27.next = 24;
               return set.plannerHandler.updatePlanner(set.getSetId(), myValues, targetElementIds);
-            case 27:
+            case 24:
               resultPlannerUpdate = _context27.sent;
               i = 0;
-            case 29:
+            case 26:
               if (!(i < resultPlannerUpdate.elemIdsToDelete.length)) {
-                _context27.next = 38;
+                _context27.next = 35;
                 break;
               }
               articleToDel = set.getArticleByElementId(resultPlannerUpdate.elemIdsToDelete[i]);
@@ -33376,43 +32825,43 @@ var DivaSetHandler = /*#__PURE__*/function () {
               if (index > -1) {
                 targetArticlesWithNewValues.splice(index, 1);
               }
-              _context27.next = 35;
+              _context27.next = 32;
               return this.deleteElementFromSetByElemId(set, resultPlannerUpdate.elemIdsToDelete[i], false, resultPlannerUpdate.deletionType);
-            case 35:
+            case 32:
               i++;
-              _context27.next = 29;
+              _context27.next = 26;
               break;
-            case 38:
+            case 35:
               if (!(resultPlannerUpdate.elementIdToCopy && resultPlannerUpdate.elementIdToCopy.length > 0)) {
-                _context27.next = 51;
+                _context27.next = 48;
                 break;
               }
               //Todo copy these elements
               articleCopyRelation = new Map();
               i = 0;
-            case 41:
+            case 38:
               if (!(i < resultPlannerUpdate.elementIdToCopy.length)) {
-                _context27.next = 49;
+                _context27.next = 46;
                 break;
               }
-              _context27.next = 44;
+              _context27.next = 41;
               return this.copyArticleByElementId(set, resultPlannerUpdate.elementIdToCopy[i], resultPlannerUpdate.ignoreOptionsToCopy);
-            case 44:
+            case 41:
               newArticle = _context27.sent;
               articleCopyRelation.set(resultPlannerUpdate.elementIdToCopy[i], newArticle.basketId);
-            case 46:
+            case 43:
               i++;
-              _context27.next = 41;
+              _context27.next = 38;
               break;
-            case 49:
-              _context27.next = 51;
+            case 46:
+              _context27.next = 48;
               return set.plannerHandler.copyPlannerElements(set.getSetId(), articleCopyRelation, {
                 dpType: resultPlannerUpdate.copyDPType ? resultPlannerUpdate.copyDPType : 'NO',
                 copyType: resultPlannerUpdate.copyType,
                 changedOPT: resultPlannerUpdate.changedOPT,
                 targetElements: resultPlannerUpdate.targetElements
               });
-            case 51:
+            case 48:
               this.updatePosNrOfAccessoiresOfTargetArticles(set, targetArticlesWithNewValues);
               if (from == 'FromViewClick' && (_Object$keys = Object.keys(myValues)) !== null && _Object$keys !== void 0 && _Object$keys.length) {
                 this.confirmOptionsInMetric(set, [Object.keys(myValues)[0]], 'onSelectConfig');
@@ -33422,7 +32871,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 elementIdsToUpdateSelection: (_resultPlannerUpdate = resultPlannerUpdate) === null || _resultPlannerUpdate === void 0 ? void 0 : _resultPlannerUpdate.elementIdsToUpdateSelection,
                 setId: set.getSetId()
               });
-            case 54:
+            case 51:
             case "end":
               return _context27.stop();
           }
@@ -33568,7 +33017,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           articleHandlerInstance.defineAllOptionsOfArticles(articles);
         } else if (key === set.getSetId()) {
           for (var _key in basketIdsOnOptions) {
-            articlesAndOptions[_key] = {
+            if (articles[_key]) articlesAndOptions[_key] = {
               article: articles[_key],
               options: basketIdsOnOptions[_key]
             };
@@ -33719,7 +33168,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
     value: function getTotalPrice(sets) {
       var _this$actSet;
       var price = 0;
-      if ((_this$actSet = this.actSet(sets)) !== null && _this$actSet !== void 0 && (_this$actSet = _this$actSet.WebConfig) !== null && _this$actSet !== void 0 && _this$actSet.checkForProductsInStock) {
+      if ((_this$actSet = this.actSet(sets)) !== null && _this$actSet !== void 0 && (_this$actSet = _this$actSet.WebConfig) !== null && _this$actSet !== void 0 && _this$actSet.checkForProductsPrice && productHandlerInstance.getPrice()) {
         return productHandlerInstance.getPrice();
       }
       for (var key in sets) {
@@ -33733,7 +33182,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
       var _this$actSet2;
       var price = 0;
       var bruttoActive = false;
-      if ((_this$actSet2 = this.actSet(sets)) !== null && _this$actSet2 !== void 0 && (_this$actSet2 = _this$actSet2.WebConfig) !== null && _this$actSet2 !== void 0 && _this$actSet2.checkForProductsInStock) {
+      if ((_this$actSet2 = this.actSet(sets)) !== null && _this$actSet2 !== void 0 && (_this$actSet2 = _this$actSet2.WebConfig) !== null && _this$actSet2 !== void 0 && _this$actSet2.checkForProductsPrice && productHandlerInstance.getPrice()) {
         return productHandlerInstance.getPrice();
       }
       for (var key in sets) {
@@ -33760,7 +33209,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
     key: "fillOrderLinesAndOrderSets",
     value: function () {
       var _fillOrderLinesAndOrderSets = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee28(sets, divaBasketHandler, repairOnly, setPlanner, returnTo) {
-        var _set$WebConfig2;
+        var _set$WebConfig;
         var orderSets, basketData, set, setPosNr, price, key, _set$basketConfigVari, _OrderLinesOfActSet$, _set, catalogData, articles, orderLineInitInfos, newOrderSet, OrderLinesOfActSet, ret, _key2, i, _basketData$OrderSets, _basketData$SetPlanne, oderSetsIsInActPlanning, setId, j;
         return _regeneratorRuntime__default["default"].wrap(function _callee28$(_context30) {
           while (1) switch (_context30.prev = _context30.next) {
@@ -33770,7 +33219,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               set = this.actSet(sets); //ACHTUNG: Wenn man das nicht zuerst löscht, gibt es beim wiederholten basket Speichern doppelte Einträge
               basketData.setSAPOrderLines([]);
               setPosNr = 0;
-              if (set !== null && set !== void 0 && (_set$WebConfig2 = set.WebConfig) !== null && _set$WebConfig2 !== void 0 && _set$WebConfig2.checkForProductsPrice) {
+              if (set !== null && set !== void 0 && (_set$WebConfig = set.WebConfig) !== null && _set$WebConfig !== void 0 && _set$WebConfig.checkForProductsPrice) {
                 price = set.priceForActHash();
                 if (!price) {
                   basketData.OrigProductId = undefined;
@@ -33807,7 +33256,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               if (newOrderSet.SetImage == '' && (_OrderLinesOfActSet$ = OrderLinesOfActSet[0]) !== null && _OrderLinesOfActSet$ !== void 0 && _OrderLinesOfActSet$.Image && _set.PlannerMode == 'No') {
                 newOrderSet.SetImage = OrderLinesOfActSet[0].Image.replace('_low', '');
               }
-              ret = divaBasketHandler.divaWWSHandler.getWWSData(basketData, _set, newOrderSet, OrderLinesOfActSet, productHandlerInstance.getCurrentProducts());
+              ret = divaBasketHandler.divaWWSHandler.getWWSData(basketData, _set, newOrderSet, OrderLinesOfActSet);
               for (_key2 in ret) {
                 if (_key2 == 'orderlines') {
                   OrderLinesOfActSet = ret[_key2];
@@ -33911,8 +33360,11 @@ var DivaSetHandler = /*#__PURE__*/function () {
         });
         if (origOrderSet) {
           origOrderSet.CatalogName = actOrderSet.CatalogName;
+          origOrderSet.AccountName = actOrderSet.AccountName;
+          origOrderSet.AccountLogo = actOrderSet.AccountLogo;
           origOrderSet.CatalogOfflineVersion = actOrderSet.CatalogOfflineVersion;
           origOrderSet.CatalogGUID = actOrderSet.CatalogGUID;
+          origOrderSet.CollectionGUID = actOrderSet.CollectionGUID;
           origOrderSet.OrderLines = actOrderSet.OrderLines;
           origOrderSet.OrderSetDesc = actOrderSet.OrderSetDesc;
           origOrderSet.OrigZKATNr = actOrderSet.OrigZKATNr;
@@ -33925,11 +33377,14 @@ var DivaSetHandler = /*#__PURE__*/function () {
           origOrderSet.BBox = actOrderSet.BBox;
           origOrderSet.VariantDescription = actOrderSet.VariantDescription;
           if (actOrderSet.ConfigVariants && origOrderSet.ConfigVariants) origOrderSet.ConfigVariants = actOrderSet.ConfigVariants.map(function (variant, index) {
+            var _origOrderSet$ConfigV;
+            var configVariant = (_origOrderSet$ConfigV = origOrderSet.ConfigVariants) === null || _origOrderSet$ConfigV === void 0 ? void 0 : _origOrderSet$ConfigV[index];
+            if (!configVariant) return variant;
             return _objectSpread$8(_objectSpread$8({}, variant), {}, {
-              SetImage: origOrderSet.ConfigVariants[index].SetImage,
-              HQRenderScript: origOrderSet.ConfigVariants[index].HQRenderScript,
-              Set2DImage: origOrderSet.ConfigVariants[index].Set2DImage,
-              Diva3DProject: origOrderSet.ConfigVariants[index].Diva3DProject
+              SetImage: configVariant.SetImage,
+              HQRenderScript: configVariant.HQRenderScript,
+              Set2DImage: configVariant.Set2DImage,
+              Diva3DProject: configVariant.Diva3DProject
             });
           });
         }
@@ -33938,7 +33393,6 @@ var DivaSetHandler = /*#__PURE__*/function () {
         _loop7();
       }
     }
-
     /**************************SpeicherRoutinen*************************************/
   }, {
     key: "isNoArticleToSave",
@@ -34022,7 +33476,6 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 CatalogOfflineFilesLastUpdate: catalogData.offlineFilesLastUpdate,
                 Description: catalogData.description,
                 GroupType: GroupType,
-                MainPosNr: posNr,
                 OfflineData: catalogData.offlineData,
                 SetArticleNr: set.SetArticleNr ? set.SetArticleNr : catalogData.retailArticleNr,
                 SetArticleNrPrefix: set.SetArticleNrPrefix,
@@ -34271,31 +33724,6 @@ var DivaSetHandler = /*#__PURE__*/function () {
         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",
-    value: function () {
-      var _loadProductsOfSets = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee34(orderSets, involvedSetIds) {
-        return _regeneratorRuntime__default["default"].wrap(function _callee34$(_context36) {
-          while (1) switch (_context36.prev = _context36.next) {
-            case 0:
-              _context36.next = 2;
-              return productHandlerInstance.loadProductsOfSets(orderSets, involvedSetIds);
-            case 2:
-            case "end":
-              return _context36.stop();
-          }
-        }, _callee34);
-      }));
-      function loadProductsOfSets(_x113, _x114) {
-        return _loadProductsOfSets.apply(this, arguments);
-      }
-      return loadProductsOfSets;
-    }()
-  }, {
-    key: "addProducts",
-    value: function addProducts(variants, families) {
-      productHandlerInstance.addProducts(variants, families);
-    }
   }, {
     key: "getAllProducts",
     value: function getAllProducts(sets) {
@@ -34323,28 +33751,25 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "addOrderSetArticlesToExistingSet",
     value: function () {
-      var _addOrderSetArticlesToExistingSet = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee35(set, orderSet, lastSetToInitialize) {
-        return _regeneratorRuntime__default["default"].wrap(function _callee35$(_context37) {
-          while (1) switch (_context37.prev = _context37.next) {
+      var _addOrderSetArticlesToExistingSet = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee34(set, orderSet, lastSetToInitialize) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee34$(_context36) {
+          while (1) switch (_context36.prev = _context36.next) {
             case 0:
               //TODO: GLOBAL STUFF
               //this.updateActSet(set);
               orderSet.changeBasketIds();
-              _context37.next = 3;
+              _context36.next = 3;
               return this.initOrderLineArticles(set, orderSet);
             case 3:
-              _context37.next = 5;
+              _context36.next = 5;
               return set.plannerHandler.extendSet(set, orderSet.SetPlanData, lastSetToInitialize);
             case 5:
-              _context37.next = 7;
-              return productHandlerInstance.updateProducts(set, 'onAdd');
-            case 7:
             case "end":
-              return _context37.stop();
+              return _context36.stop();
           }
-        }, _callee35, this);
+        }, _callee34, this);
       }));
-      function addOrderSetArticlesToExistingSet(_x115, _x116, _x117) {
+      function addOrderSetArticlesToExistingSet(_x113, _x114, _x115) {
         return _addOrderSetArticlesToExistingSet.apply(this, arguments);
       }
       return addOrderSetArticlesToExistingSet;
@@ -34669,21 +34094,29 @@ var DivaBasketHandler = /*#__PURE__*/function () {
   }, {
     key: "initProductId",
     value: function () {
-      var _initProductId = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(api, productId, keepOldDivaNr) {
+      var _initProductId = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(api, productId) {
+        var result;
         return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return this.loadProduct(api, productId, keepOldDivaNr);
+              return this.getProduct(api, productId);
             case 2:
+              result = _context2.sent;
+              this.assignNewDivaNr = true;
+              _context2.next = 6;
+              return this.initBasket(api, result.divaNr, {
+                basket: result.configuration
+              }, false);
+            case 6:
               return _context2.abrupt("return", _context2.sent);
-            case 3:
+            case 7:
             case "end":
               return _context2.stop();
           }
         }, _callee2, this);
       }));
-      function initProductId(_x2, _x3, _x4) {
+      function initProductId(_x2, _x3) {
         return _initProductId.apply(this, arguments);
       }
       return initProductId;
@@ -34729,7 +34162,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
           }
         }, _callee3, this);
       }));
-      function tryInitFirstCatalog(_x5) {
+      function tryInitFirstCatalog(_x4) {
         return _tryInitFirstCatalog.apply(this, arguments);
       }
       return tryInitFirstCatalog;
@@ -34764,7 +34197,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
           }
         }, _callee4, this);
       }));
-      function createNewDivaNr(_x6) {
+      function createNewDivaNr(_x5) {
         return _createNewDivaNr.apply(this, arguments);
       }
       return createNewDivaNr;
@@ -34794,7 +34227,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               } else {
                 this.origConfiguration.originDivaNr = divaNr;
               }
-              if (this.plannerConfig.returnTo != 'REPAIR_BASKET' && basket.StatusKey == 'BASE_CONFIGURATION') {
+              if (this.plannerConfig.returnTo != 'REPAIR_BASKET' && (basket.StatusKey == 'BASE_CONFIGURATION' || keepOldDivaNr === false)) {
                 this.assignNewDivaNr = true;
                 basket.CustomerJourneyId = DivaUtils.nanoid();
                 basket.StatusKey = 'USER_CONFIGURATION';
@@ -34812,7 +34245,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
                   basket.OrderSets[i].SetID = newSetId;
                 }
               }
-              if (!(this.assignNewDivaNr && !keepOldDivaNr)) {
+              if (!this.assignNewDivaNr) {
                 _context5.next = 29;
                 break;
               }
@@ -34892,7 +34325,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
           }
         }, _callee5, this);
       }));
-      function initBasket(_x7, _x8, _x9, _x10, _x11) {
+      function initBasket(_x6, _x7, _x8, _x9, _x10) {
         return _initBasket.apply(this, arguments);
       }
       return initBasket;
@@ -34971,7 +34404,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
           }
         }, _callee6, this);
       }));
-      function loadBasketByCatalogCodex(_x12) {
+      function loadBasketByCatalogCodex(_x11) {
         return _loadBasketByCatalogCodex.apply(this, arguments);
       }
       return loadBasketByCatalogCodex;
@@ -34979,7 +34412,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
   }, {
     key: "loadBasketByDivaNr",
     value: function () {
-      var _loadBasketByDivaNr = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7(api, divaNr, keepOldDivaNr, origProductId) {
+      var _loadBasketByDivaNr = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7(api, divaNr) {
         var variantData;
         return _regeneratorRuntime__default["default"].wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
@@ -34990,13 +34423,13 @@ var DivaBasketHandler = /*#__PURE__*/function () {
             case 3:
               variantData = _context7.sent;
               _context7.next = 6;
-              return this.initBasket(api, divaNr, variantData, keepOldDivaNr, origProductId);
+              return this.initBasket(api, divaNr, variantData);
             case 6:
               return _context7.abrupt("return", _context7.sent);
             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('DivaNr cannot be found in Database', {
                 code: 'WC_0004',
                 custom: {
                   divaNr: divaNr
@@ -35009,7 +34442,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
           }
         }, _callee7, this, [[0, 9]]);
       }));
-      function loadBasketByDivaNr(_x13, _x14, _x15, _x16) {
+      function loadBasketByDivaNr(_x12, _x13) {
         return _loadBasketByDivaNr.apply(this, arguments);
       }
       return loadBasketByDivaNr;
@@ -35022,98 +34455,65 @@ 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('CustomProductId cannot be found in Database', {
                 code: 'WC_0005',
                 custom: {
+                  key: key,
                   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) {
+      function loadBasketByCustomProductId(_x14, _x15, _x16, _x17) {
         return _loadBasketByCustomProductId.apply(this, arguments);
       }
       return loadBasketByCustomProductId;
     }()
   }, {
-    key: "loadProduct",
+    key: "getProduct",
     value: function () {
-      var _loadProduct = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee9(api, productId, keepOldDivaNr) {
-        var result, divaNr, id, successfully;
+      var _getProduct = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee9(api, productId) {
+        var result;
         return _regeneratorRuntime__default["default"].wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               _context9.next = 2;
-              return this.getProduct(api, productId);
-            case 2:
-              result = _context9.sent;
-              if (!(result === false)) {
-                _context9.next = 5;
-                break;
-              }
-              return _context9.abrupt("return", false);
-            case 5:
-              divaNr = result.divaNr;
-              if (result.originDivaNr) {
-                divaNr = result.originDivaNr;
-              } else if (result.variantId !== undefined) {
-                id = result.variantId;
-                divaNr = result.divaNr + '_' + id.toString().padStart(4, '0');
-              }
-              _context9.next = 9;
-              return this.loadBasketByDivaNr(api, divaNr, keepOldDivaNr, productId);
-            case 9:
-              successfully = _context9.sent;
-              result.type = 'ProductId';
-              if (!successfully) {
-                _context9.next = 15;
-                break;
-              }
-              return _context9.abrupt("return", result);
-            case 15:
-              return _context9.abrupt("return", false);
-            case 16:
-            case "end":
-              return _context9.stop();
-          }
-        }, _callee9, this);
-      }));
-      function loadProduct(_x21, _x22, _x23) {
-        return _loadProduct.apply(this, arguments);
-      }
-      return loadProduct;
-    }()
-  }, {
-    key: "getProduct",
-    value: function () {
-      var _getProduct = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee10(api, productId) {
-        var result;
-        return _regeneratorRuntime__default["default"].wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
-            case 0:
-              _context10.next = 2;
               return api.getDataCache(api.getProductUrl(productId), undefined, undefined, 'catalog');
             case 2:
-              result = _context10.sent;
+              result = _context9.sent;
               if (!(result.Error || !result)) {
-                _context10.next = 6;
+                _context9.next = 6;
                 break;
               }
               LOG$7.error(new DivaUtils.DivaError('ProductId konnte in der Datenbank nicht gefunden werden', {
@@ -35122,16 +34522,16 @@ var DivaBasketHandler = /*#__PURE__*/function () {
                   productId: productId
                 }
               }));
-              return _context10.abrupt("return", false);
+              return _context9.abrupt("return", false);
             case 6:
-              return _context10.abrupt("return", result[0]);
+              return _context9.abrupt("return", result[0]);
             case 7:
             case "end":
-              return _context10.stop();
+              return _context9.stop();
           }
-        }, _callee10);
+        }, _callee9);
       }));
-      function getProduct(_x24, _x25) {
+      function getProduct(_x18, _x19) {
         return _getProduct.apply(this, arguments);
       }
       return getProduct;
@@ -35139,15 +34539,14 @@ var DivaBasketHandler = /*#__PURE__*/function () {
   }, {
     key: "createNewBasket",
     value: function () {
-      var _createNewBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee11(api, initObject, divaNr, lang) {
+      var _createNewBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee10(api, initObject, divaNr, lang) {
         var setId, orderSet, basketInitObejct, basket;
-        return _regeneratorRuntime__default["default"].wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               setId = 'PLANNING_' + Math.random().toString(36).substring(6);
               orderSet = new basketModel.OrderSetData({
                 SetID: setId,
-                MainPosNr: 1,
                 AccountSessionGUID: initObject.accountSessionGuid,
                 CatalogCodex: initObject.catalogCodex,
                 CatalogGUID: initObject.catalogGuid,
@@ -35155,10 +34554,10 @@ var DivaBasketHandler = /*#__PURE__*/function () {
                 Favorites: new basketModel.Favorites()
               });
               if (!(initObject.accountGuid && !orderSet.AccountSessionGUID)) {
-                _context11.next = 5;
+                _context10.next = 5;
                 break;
               }
-              _context11.next = 5;
+              _context10.next = 5;
               return api.setAccountSessionGuid({
                 os: orderSet,
                 accountGuid: initObject.accountGuid,
@@ -35176,14 +34575,14 @@ var DivaBasketHandler = /*#__PURE__*/function () {
                 CustomerJourneyId: DivaUtils.nanoid()
               };
               basket = new basketModel.BasketData(basketInitObejct);
-              return _context11.abrupt("return", basket);
+              return _context10.abrupt("return", basket);
             case 8:
             case "end":
-              return _context11.stop();
+              return _context10.stop();
           }
-        }, _callee11);
+        }, _callee10);
       }));
-      function createNewBasket(_x26, _x27, _x28, _x29) {
+      function createNewBasket(_x20, _x21, _x22, _x23) {
         return _createNewBasket.apply(this, arguments);
       }
       return createNewBasket;
@@ -35202,11 +34601,11 @@ var DivaBasketHandler = /*#__PURE__*/function () {
   }, {
     key: "saveToBasket",
     value: function () {
-      var _saveToBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee12(api, actBasket, returnTo) {
+      var _saveToBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee11(api, actBasket, returnTo) {
         var _this$plannerConfig$c4, _this$_basketHandler, _api$getJwt;
         var response;
-        return _regeneratorRuntime__default["default"].wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               LOG$7.startTransaction({
                 event: 'SaveBasketOnAPI',
@@ -35218,12 +34617,12 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               actBasket.ReportConfigIdentifier = api.getReportConfigIdentifier();
               actBasket.PrintOptions = api.getPrintOptions(this.reportConfig);
               actBasket.ClientLanguage = api.getLanguage();
-              _context12.next = 8;
+              _context11.next = 8;
               return DivaUtils__default["default"].updateBasketOrgInfo(actBasket, this.plannerConfig.currentOrganization, this.plannerConfig.currentUser, this.plannerConfig.settings.keepSalesPersonDataInBasket);
             case 8:
               actBasket.UserLanguage = api.getLanguage();
               actBasket.PrintRetailLogo = (_this$plannerConfig$c4 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c4 === void 0 ? void 0 : _this$plannerConfig$c4.logoUrl;
-              _context12.next = 12;
+              _context11.next = 12;
               return (_this$_basketHandler = this._basketHandler) === null || _this$_basketHandler === void 0 ? void 0 : _this$_basketHandler.saveBasket({
                 jwt: (_api$getJwt = api.getJwt()) !== null && _api$getJwt !== void 0 ? _api$getJwt : undefined,
                 basket: actBasket,
@@ -35232,30 +34631,30 @@ var DivaBasketHandler = /*#__PURE__*/function () {
                 apiKey: api.getApiKey()
               });
             case 12:
-              response = _context12.sent;
+              response = _context11.sent;
               if (!(response != 'ERROR_NO_BASKET_SAVED')) {
-                _context12.next = 17;
+                _context11.next = 17;
                 break;
               }
               this.baskets[this.actDivaNr] = new basketModel.BasketData(response);
-              _context12.next = 19;
+              _context11.next = 19;
               break;
             case 17:
               if (!(response === 'ERROR_NO_BASKET_SAVED' || response === 'ERROR_BASKET_AFTER_SAVE')) {
-                _context12.next = 19;
+                _context11.next = 19;
                 break;
               }
-              return _context12.abrupt("return", response);
+              return _context11.abrupt("return", response);
             case 19:
               LOG$7.successTransaction('saveBasketOnAPI');
-              return _context12.abrupt("return", response === null || response === void 0 ? void 0 : response._id);
+              return _context11.abrupt("return", response === null || response === void 0 ? void 0 : response._id);
             case 21:
             case "end":
-              return _context12.stop();
+              return _context11.stop();
           }
-        }, _callee12, this);
+        }, _callee11, this);
       }));
-      function saveToBasket(_x30, _x31, _x32) {
+      function saveToBasket(_x24, _x25, _x26) {
         return _saveToBasket.apply(this, arguments);
       }
       return saveToBasket;
@@ -35368,61 +34767,53 @@ var DivaBasketHandler = /*#__PURE__*/function () {
   }, {
     key: "initWWSClient",
     value: function () {
-      var _initWWSClient = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee13(wwsClient) {
-        var _yield$import, PfisterWWSHandler, _yield$import2, LiviqueWWSHandler, _yield$import3, SeriousWWSHandler, _yield$import4, ProductWWSHandler, _yield$import5, StandardWWSHandler;
-        return _regeneratorRuntime__default["default"].wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+      var _initWWSClient = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee12(wwsClient) {
+        var _yield$import, PfisterWWSHandler, _yield$import2, LiviqueWWSHandler, _yield$import3, SeriousWWSHandler, _yield$import4, StandardWWSHandler;
+        return _regeneratorRuntime__default["default"].wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              _context13.t0 = wwsClient;
-              _context13.next = _context13.t0 === 'Pfister' ? 3 : _context13.t0 === 'Livique' ? 9 : _context13.t0 === 'Serious' ? 15 : _context13.t0 === 'Product' ? 21 : 27;
+              _context12.t0 = wwsClient;
+              _context12.next = _context12.t0 === 'Pfister' ? 3 : _context12.t0 === 'Livique' ? 9 : _context12.t0 === 'Serious' ? 15 : 21;
               break;
             case 3:
-              _context13.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-b47dba23.js'); });
+              _context12.next = 5;
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-ca73bf2c.js'); });
             case 5:
-              _yield$import = _context13.sent;
+              _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
               this._divaWWSHandler = new PfisterWWSHandler();
-              return _context13.abrupt("break", 33);
+              return _context12.abrupt("break", 27);
             case 9:
-              _context13.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-85a1dc89.js'); });
+              _context12.next = 11;
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-977c3952.js'); });
             case 11:
-              _yield$import2 = _context13.sent;
+              _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
               this._divaWWSHandler = new LiviqueWWSHandler();
-              return _context13.abrupt("break", 33);
+              return _context12.abrupt("break", 27);
             case 15:
-              _context13.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-28f031fa.js'); });
+              _context12.next = 17;
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-712a57c0.js'); });
             case 17:
-              _yield$import3 = _context13.sent;
+              _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
               this._divaWWSHandler = new SeriousWWSHandler();
-              return _context13.abrupt("break", 33);
+              return _context12.abrupt("break", 27);
             case 21:
-              _context13.next = 23;
-              return Promise.resolve().then(function () { return require('./ProductBasketHandler-22cb7ee4.js'); });
+              _context12.next = 23;
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-435c1ce1.js'); });
             case 23:
-              _yield$import4 = _context13.sent;
-              ProductWWSHandler = _yield$import4["default"];
-              this._divaWWSHandler = new ProductWWSHandler();
-              return _context13.abrupt("break", 33);
-            case 27:
-              _context13.next = 29;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-ab0c107b.js'); });
-            case 29:
-              _yield$import5 = _context13.sent;
-              StandardWWSHandler = _yield$import5["default"];
+              _yield$import4 = _context12.sent;
+              StandardWWSHandler = _yield$import4["default"];
               this._divaWWSHandler = new StandardWWSHandler();
-              return _context13.abrupt("break", 33);
-            case 33:
+              return _context12.abrupt("break", 27);
+            case 27:
             case "end":
-              return _context13.stop();
+              return _context12.stop();
           }
-        }, _callee13, this);
+        }, _callee12, this);
       }));
-      function initWWSClient(_x33) {
+      function initWWSClient(_x27) {
         return _initWWSClient.apply(this, arguments);
       }
       return initWWSClient;
@@ -36025,7 +35416,7 @@ var Rendering = /*#__PURE__*/function () {
     this.creationTime = new Date();
     this.layerMaskThreeTexture = undefined;
     this.hasStaticBackground = hasStaticBG;
-    this.mediaServiceSaveMode = mediaServiceSaveMode;
+    this.mediaServiceSaveMode = mediaServiceSaveMode !== null && mediaServiceSaveMode !== void 0 ? mediaServiceSaveMode : 'STREAM';
     this.urlToSavedRendering = '';
     this.catalogData = {
       catalogCodex: '',
@@ -36070,12 +35461,12 @@ var Rendering = /*#__PURE__*/function () {
   }, {
     key: "getHasStaticBackground",
     value: function getHasStaticBackground() {
-      return this.hasStaticBackground;
+      return !!this.hasStaticBackground;
     }
   }, {
     key: "getIsFullscreenRendering",
     value: function getIsFullscreenRendering() {
-      return this.isFullscreenRendering;
+      return !!this.isFullscreenRendering;
     }
   }, {
     key: "setIsFullscreenRendering",
@@ -36085,12 +35476,13 @@ var Rendering = /*#__PURE__*/function () {
   }, {
     key: "getHasDimensionLines",
     value: function getHasDimensionLines() {
-      return this.hasDimensionLines;
+      return !!this.hasDimensionLines;
     }
   }, {
     key: "getPlannerMeasureDigits",
     value: function getPlannerMeasureDigits() {
-      return this.plannerMeasureDigits;
+      var _this$plannerMeasureD;
+      return (_this$plannerMeasureD = this.plannerMeasureDigits) !== null && _this$plannerMeasureD !== void 0 ? _this$plannerMeasureD : 0;
     }
   }, {
     key: "getIsAlternateRendering",
@@ -36310,6 +35702,7 @@ var Rendering = /*#__PURE__*/function () {
       return this.catalogData.catalogCodex;
     },
     set: function set(val) {
+      if (!val) return;
       this.catalogData.catalogCodex = val;
     }
   }, {
@@ -36318,6 +35711,7 @@ var Rendering = /*#__PURE__*/function () {
       return this.catalogData.catalogGUID;
     },
     set: function set(val) {
+      if (!val) return;
       this.catalogData.catalogGUID = val;
     }
   }, {
@@ -36341,7 +35735,7 @@ var Rendering = /*#__PURE__*/function () {
   }, {
     key: "HasLayerMask",
     get: function get() {
-      return this.hasLayerMask;
+      return !!this.hasLayerMask;
     },
     set: function set(hasLayerMask) {
       this.hasLayerMask = hasLayerMask;
@@ -36349,17 +35743,19 @@ var Rendering = /*#__PURE__*/function () {
   }, {
     key: "RenderWidth",
     get: function get() {
-      return this.renderWidth;
+      var _this$renderWidth;
+      return (_this$renderWidth = this.renderWidth) !== null && _this$renderWidth !== void 0 ? _this$renderWidth : 0;
     }
   }, {
     key: "RenderHeight",
     get: function get() {
-      return this.renderHeight;
+      var _this$renderHeight;
+      return (_this$renderHeight = this.renderHeight) !== null && _this$renderHeight !== void 0 ? _this$renderHeight : 0;
     }
   }, {
     key: "getHasLayerMask",
     value: function getHasLayerMask() {
-      return this.hasLayerMask;
+      return !!this.hasLayerMask;
     }
   }, {
     key: "getLayerMaskForSrc",
@@ -36795,7 +36191,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-d3830717.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-6b8cace7.js'); });
             case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -38347,7 +37743,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context4.next = 10;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-c73e6e57.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-31757726.js'); });
             case 10:
               _yield$import = _context4.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -38358,7 +37754,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context4.abrupt("break", 21);
             case 15:
               _context4.next = 17;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-7b508f32.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-ed867881.js'); });
             case 17:
               _yield$import2 = _context4.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -38492,6 +37888,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) {
@@ -38504,9 +37901,9 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context6.abrupt("return", {
                 url: rendering === null || rendering === void 0 ? void 0 : rendering.UrlToSavedRendering,
                 dimensions: {
-                  w: rendering === null || rendering === void 0 ? void 0 : rendering.get3DDimInfo().w,
-                  h: rendering === null || rendering === void 0 ? void 0 : rendering.get3DDimInfo().h,
-                  d: rendering === null || rendering === void 0 ? void 0 : rendering.get3DDimInfo().d
+                  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:
@@ -39503,7 +38900,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
             //Do also pass the correct price format
             (_this$actions = _this.actions) === null || _this$actions === void 0 || (_this$actions$toggleL = _this$actions.toggleLoading) === null || _this$actions$toggleL === void 0 || _this$actions$toggleL.call(_this$actions, 'SUMMARY');
             _context2.next = 6;
-            return summaryHandlerInstance.getSummaryItems(_this.sets, _this.doConfigure.bind(_this), _this.doAllowSetPlanner());
+            return summaryHandlerInstance.getSummaryItems(_this.sets, _this.doConfigure.bind(_this));
           case 6:
             summaryItems = _context2.sent;
             (_this$updateSummaryIt = _this.updateSummaryItems) === null || _this$updateSummaryIt === void 0 || _this$updateSummaryIt.call(_this, summaryItems, setPriceFormat, summaryHandlerInstance.getSummaryStepWarning(_this.actSet(), summaryItems));
@@ -39588,11 +38985,12 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _this.updateViewButtonsDependigOnConfigStructure();
               baseArticle = setHandlerInstance.getBaseParentArticleOfAccessoire(set, newArticle.basketId);
               if (!dontUpdateView) (_this$updateElementSe = _this.updateElementSelectionPlanner) === null || _this$updateElementSe === void 0 || _this$updateElementSe.call(_this, [baseArticle.setId], [baseArticle.elementId], true);
-              _context3.next = 29;
+              productHandlerInstance.updateProducts(_this.setsAsArray, _this.api, 'onAdd');
+              _context3.next = 30;
               return _this.checkVariantData();
-            case 29:
-              return _context3.abrupt("return", 'ElementAdded');
             case 30:
+              return _context3.abrupt("return", 'ElementAdded');
+            case 31:
             case "end":
               return _context3.stop();
           }
@@ -39672,8 +39070,10 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 (_this$updateViewPlann3 = _this.updateViewPlannerElements) === null || _this$updateViewPlann3 === void 0 || _this$updateViewPlann3.call(_this, setHandlerInstance.getAllViewPlannerElements(set), setHandlerInstance.getAllVisualiedNotPlannedElements(set));
                 _this.updatePlannerView('ADD_ACC_ON_SHELF_PLANNER');
               }
+              productHandlerInstance.updateProducts(_this.setsAsArray, _this.api, 'onShelfAdd');
+              _this.checkVariantData();
               return _context5.abrupt("return", retVal);
-            case 8:
+            case 10:
             case "end":
               return _context5.stop();
           }
@@ -39717,7 +39117,9 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _this.updateViewButtonsDependigOnConfigStructure();
               (_this$updateViewPlann5 = _this.updateViewPlannerElements) === null || _this$updateViewPlann5 === void 0 || _this$updateViewPlann5.call(_this, setHandlerInstance.getAllViewPlannerElements(set), setHandlerInstance.getAllVisualiedNotPlannedElements(set));
               _this.updatePlannerView('DELETE_ACC_ON_SHELF_PLANNER');
-            case 9:
+              productHandlerInstance.updateProducts(_this.setsAsArray, _this.api, 'onShelfDelete');
+              _this.checkVariantData();
+            case 11:
             case "end":
               return _context6.stop();
           }
@@ -39775,22 +39177,24 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "updateAccessoireQuantity", /*#__PURE__*/function () {
       var _ref8 = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee8(accessoireItem, relatedToBasketId, newQuantity, forceConfigSingle) {
         var _this$actions11, _this$actions11$toggl, _this$actions12, _this$actions12$toggl;
-        var ret;
+        var set, ret;
         return _regeneratorRuntime__default["default"].wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
+              set = _this.actSet();
               (_this$actions11 = _this.actions) === null || _this$actions11 === void 0 || (_this$actions11$toggl = _this$actions11.toggleLoading) === null || _this$actions11$toggl === void 0 || _this$actions11$toggl.call(_this$actions11, 'LoadingArticles_' + accessoireItem.articleCodex, false, true);
-              _context8.next = 3;
-              return setHandlerInstance.updateAccessoireQuantity(_this.actSet(), accessoireItem, relatedToBasketId, newQuantity, forceConfigSingle);
-            case 3:
+              _context8.next = 4;
+              return setHandlerInstance.updateAccessoireQuantity(set, accessoireItem, relatedToBasketId, newQuantity, forceConfigSingle);
+            case 4:
               ret = _context8.sent;
               (_this$actions12 = _this.actions) === null || _this$actions12 === void 0 || (_this$actions12$toggl = _this$actions12.toggleLoading) === null || _this$actions12$toggl === void 0 || _this$actions12$toggl.call(_this$actions12, 'LoadingArticles_' + accessoireItem.articleCodex, false, false);
               if (ret.somethingChanged) _this.updateConfigStructure();
               _this.updatePlannerView('UPDATE_ACC_QUANTITY');
               _this.updatePriceInView();
               _this.updateViewButtonsDependigOnConfigStructure();
+              productHandlerInstance.updateProducts(_this.setsAsArray, _this.api, 'onAccessoireUpdate');
               _this.checkVariantData();
-            case 10:
+            case 12:
             case "end":
               return _context8.stop();
           }
@@ -39818,9 +39222,10 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 _this.updatePriceInView();
                 _this.updateViewButtonsDependigOnConfigStructure();
               }
+              productHandlerInstance.updateProducts(_this.setsAsArray, _this.api, 'onAccessoireDelete');
               _this.checkVariantData();
               return _context9.abrupt("return", wasDeleted);
-            case 7:
+            case 8:
             case "end":
               return _context9.stop();
           }
@@ -39902,9 +39307,10 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               returnValues = _context11.sent;
               (_this$actions14 = _this.actions) === null || _this$actions14 === void 0 || (_this$actions14$toggl = _this$actions14.toggleLoading) === null || _this$actions14$toggl === void 0 || _this$actions14$toggl.call(_this$actions14, 'doConfigure', false, false);
               structure = setHandlerInstance.loadConfigStructureOfActSet(set, _this.getCurPlannerType());
+              productHandlerInstance.updateProducts(_this.setsAsArray, _this.api, 'onConfig');
               _this.checkVariantData();
               if (dontUpdatePlannerView) {
-                _context11.next = 18;
+                _context11.next = 19;
                 break;
               }
               _this.updateConfiguratorStructure(structure);
@@ -39918,16 +39324,16 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _this.updateViewButtonsDependigOnConfigStructure();
               _this.updatePlannerView('DO_CONFIGURE', myValues);
               _this.updateWebConfiguratorTitle();
-              _context11.next = 18;
+              _context11.next = 19;
               return _this.getFreePlacesOnGrids(undefined, 'doConfigure');
-            case 18:
+            case 19:
               if (dontCallEvents) {
-                _context11.next = 21;
+                _context11.next = 22;
                 break;
               }
-              _context11.next = 21;
+              _context11.next = 22;
               return _this.fillBaksetforOnWebPlanerConfigChange(myValues);
-            case 21:
+            case 22:
             case "end":
               return _context11.stop();
           }
@@ -40053,11 +39459,11 @@ var DivaWebPlanner = /*#__PURE__*/function () {
             case 12:
               loadSuccessful = _context13.sent;
               if (!loadSuccessful) {
-                _context13.next = 55;
+                _context13.next = 58;
                 break;
               }
               if (!(typeof loadSuccessful != 'boolean')) {
-                _context13.next = 23;
+                _context13.next = 25;
                 break;
               }
               if (!(loadSuccessful.type == 'ProductList')) {
@@ -40074,53 +39480,49 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               (_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
-
-              //else if (DivaApiHandler.doCheckForProductsPrice()) {
-              //  await DivaSetHandler.loadProductsOfSets(
-              //    this.divaBasketHandler.getOrderSetsByDivaNr(this.divaNr),
-              //    this.divaBasketHandler.actBasket.SetPlannerInfos?.InvolvedSetIds,
-              //  );
-              //}
-
+              _context13.next = 26;
+              break;
+            case 25:
+              if (this.api.doCheckForProductsPrice()) ;
+            case 26:
               this.divaNr = this.divaBasketHandler.actDivaNr;
               initSetState = this.getInitStateForSet();
               this.plannerHandler.initPlanner(initSetState, this.getPlannerHandlerFunctions());
-              _context13.next = 28;
+              _context13.next = 31;
               return setHandlerInstance.initSetsByOrderSet(this.divaBasketHandler.getOrderSetsByDivaNr(this.divaNr), initSetState);
-            case 28:
+            case 31:
               set = this.actSet();
               if (!((_initSetState$api$web = initSetState.api.webConfig) !== null && _initSetState$api$web !== void 0 && _initSetState$api$web.checkForProductsPrice)) {
-                _context13.next = 40;
+                _context13.next = 43;
                 break;
               }
               if (!(typeof loadSuccessful != 'boolean' && loadSuccessful.type == 'ProductId')) {
-                _context13.next = 35;
+                _context13.next = 38;
                 break;
               }
               products = loadSuccessful;
               set === null || set === void 0 || set.remindPriceForHash(products);
-              _context13.next = 40;
+              _context13.next = 43;
               break;
-            case 35:
+            case 38:
               if (!this.divaBasketHandler.actBasket.OrigProductId) {
-                _context13.next = 40;
+                _context13.next = 43;
                 break;
               }
-              _context13.next = 38;
+              _context13.next = 41;
               return this.divaBasketHandler.getProduct(this.api, this.divaBasketHandler.actBasket.OrigProductId);
-            case 38:
+            case 41:
               result = _context13.sent;
               if (result) {
                 set === null || set === void 0 || set.remindPriceForHash(result);
               }
-            case 40:
-              _context13.next = 42;
+            case 43:
+              _context13.next = 45;
               return viewReadyPromise;
-            case 42:
-              _context13.next = 44;
+            case 45:
+              _context13.next = 47;
               return this.initView();
-            case 44:
+            case 47:
               (_this$actions16 = this.actions) === null || _this$actions16 === void 0 || _this$actions16.onEvent({
                 type: 'onConfiguratorReady'
               });
@@ -40144,11 +39546,11 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 divaNr: basket.DivaNr,
                 documentVersion: basket.DocumentVersion.toString()
               });
-              _context13.next = 52;
+              _context13.next = 55;
               return this.fillBaksetforOnWebPlanerConfigChange(undefined, true);
-            case 52:
-              return _context13.abrupt("return", true);
             case 55:
+              return _context13.abrupt("return", true);
+            case 58:
               this.onInitializationError();
               //fehler beim laden vom basket..
               LOG$1.errorTransaction('LOADING_BASKET', 'BASKET_0002', 'Fehler beim Laden des Baskets', {
@@ -40166,7 +39568,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 plannerMode: this.getCurImageMode(),*/
               });
               return _context13.abrupt("return", false);
-            case 58:
+            case 61:
             case "end":
               return _context13.stop();
           }
@@ -40328,7 +39730,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 break;
               }
               (_this$initConfigurato = this.initConfiguratorStructure) === null || _this$initConfigurato === void 0 || _this$initConfigurato.call(this, setHandlerInstance.loadConfigStructureForOnlyProductsList());
-              _context15.next = 17;
+              _context15.next = 18;
               break;
             case 7:
               _context15.next = 9;
@@ -40343,11 +39745,12 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               (_this$updateViewPlann9 = this.updateViewPlannerElements) === null || _this$updateViewPlann9 === void 0 || _this$updateViewPlann9.call(this, setHandlerInstance.getAllViewPlannerElements(set), setHandlerInstance.getAllVisualiedNotPlannedElements(set), set.getSetId(), set.firstElementId);
               this.updatePlannerView('INIT_VIEW');
               this.onBasketInitialized();
+              productHandlerInstance.updateProducts(this.setsAsArray, this.api, 'onInit');
               this.checkVariantData();
-            case 17:
-              _context15.next = 19;
+            case 18:
+              _context15.next = 20;
               return this.runInitMode(plannerMode);
-            case 19:
+            case 20:
             case "end":
               return _context15.stop();
           }
@@ -40446,31 +39849,32 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               i = 0;
             case 8:
               if (!(i < orderSets.length)) {
-                _context17.next = 23;
+                _context17.next = 24;
                 break;
               }
               orderset = orderSets[i];
               lastSetToInitialize = setHandlerInstance.getOrderSetShouldInitPlanner(orderSets, i);
               loadedSet = setHandlerInstance.findLoadedSet(this.sets, orderset.CatalogCodex, orderset.AccountGUID);
               if (!loadedSet) {
-                _context17.next = 17;
+                _context17.next = 18;
                 break;
               }
               _context17.next = 15;
               return setHandlerInstance.addOrderSetArticlesToExistingSet(loadedSet, orderset, lastSetToInitialize);
             case 15:
-              _context17.next = 19;
+              productHandlerInstance.updateProducts(this.setsAsArray, this.api, 'onAdd');
+              _context17.next = 20;
               break;
-            case 17:
-              _context17.next = 19;
+            case 18:
+              _context17.next = 20;
               return setHandlerInstance.initSet(orderset, this.getInitStateForSet(), lastSetToInitialize);
-            case 19:
-              this.cleanUpEmptySets(true);
             case 20:
+              this.cleanUpEmptySets(true);
+            case 21:
               i++;
               _context17.next = 8;
               break;
-            case 23:
+            case 24:
               this.divaBasketHandler.actBasket.OrderSets = [];
               this.updatePriceInView();
               this.updateWebConfiguratorTitle();
@@ -40478,7 +39882,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               (_this$updateViewPlann10 = this.updateViewPlannerElements) === null || _this$updateViewPlann10 === void 0 || _this$updateViewPlann10.call(this, setHandlerInstance.getAllViewPlannerElements(set), setHandlerInstance.getAllVisualiedNotPlannedElements(set));
               articlesKeys = Object.keys(this.actSet().getDivaArticles());
               this.loadPaletteInfos(undefined, [articlesKeys[0]], articlesKeys);
-            case 30:
+            case 31:
             case "end":
               return _context17.stop();
           }
@@ -40489,37 +39893,6 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       }
       return addSetToActPlanningByDivaNr;
     }()
-  }, {
-    key: "initProductId",
-    value: function () {
-      var _initProductId = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee18(productId) {
-        var loadSuccessful;
-        return _regeneratorRuntime__default["default"].wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
-            case 0:
-              _context18.next = 2;
-              return this.divaBasketHandler.initProductId(this.api, productId, true);
-            case 2:
-              loadSuccessful = _context18.sent;
-              if (!(typeof loadSuccessful != 'boolean')) {
-                _context18.next = 6;
-                break;
-              }
-              setHandlerInstance.addProducts([loadSuccessful], []);
-              return _context18.abrupt("return", loadSuccessful.divaNr);
-            case 6:
-              return _context18.abrupt("return", false);
-            case 7:
-            case "end":
-              return _context18.stop();
-          }
-        }, _callee18, this);
-      }));
-      function initProductId(_x49) {
-        return _initProductId.apply(this, arguments);
-      }
-      return initProductId;
-    }()
   }, {
     key: "cleanUpEmptySets",
     value: function cleanUpEmptySets(ignoreActSet) {
@@ -40548,28 +39921,28 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "setActSetCurConfigStepKey",
     value: function () {
-      var _setActSetCurConfigStepKey = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee19(curConfigStepKey) {
+      var _setActSetCurConfigStepKey = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee18(curConfigStepKey) {
         var set;
-        return _regeneratorRuntime__default["default"].wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               set = this.actSet();
               if (set) {
-                _context19.next = 3;
+                _context18.next = 3;
                 break;
               }
-              return _context19.abrupt("return");
+              return _context18.abrupt("return");
             case 3:
               set.ActConfigStepKey = curConfigStepKey;
-              _context19.next = 6;
+              _context18.next = 6;
               return setHandlerInstance.updateNavigation(set);
             case 6:
             case "end":
-              return _context19.stop();
+              return _context18.stop();
           }
-        }, _callee19, this);
+        }, _callee18, this);
       }));
-      function setActSetCurConfigStepKey(_x50) {
+      function setActSetCurConfigStepKey(_x49) {
         return _setActSetCurConfigStepKey.apply(this, arguments);
       }
       return setActSetCurConfigStepKey;
@@ -40708,17 +40081,17 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "deletePlannerElement",
     value: function () {
-      var _deletePlannerElement = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee20(setId, elementId, denyElementSelectionClear) {
+      var _deletePlannerElement = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee19(setId, elementId, denyElementSelectionClear) {
         var _this$updateViewPlann11;
         var set, result, _this$updateElementSe5, _this$updateElementSe6;
-        return _regeneratorRuntime__default["default"].wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               set = this.sets[setId];
-              _context20.next = 3;
+              _context19.next = 3;
               return setHandlerInstance.deleteElementFromSetByElemId(set, elementId, true);
             case 3:
-              result = _context20.sent;
+              result = _context19.sent;
               this.updateConfigStructure();
               (_this$updateViewPlann11 = this.updateViewPlannerElements) === null || _this$updateViewPlann11 === void 0 || _this$updateViewPlann11.call(this, setHandlerInstance.getAllViewPlannerElements(set), setHandlerInstance.getAllVisualiedNotPlannedElements(set));
               this.updatePlannerView('DELETE_PLANNER_ELEMENT');
@@ -40728,16 +40101,17 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 if (result.selectElementId) (_this$updateElementSe5 = this.updateElementSelectionPlanner) === null || _this$updateElementSe5 === void 0 || _this$updateElementSe5.call(this, [result.setId], [result.selectElementId], true);else (_this$updateElementSe6 = this.updateElementSelectionPlanner) === null || _this$updateElementSe6 === void 0 || _this$updateElementSe6.call(this, [], [], true);
               }
               this.updatePriceInView();
+              productHandlerInstance.updateProducts(this.setsAsArray, this.api, 'onDelete');
               this.checkVariantData();
-              _context20.next = 14;
+              _context19.next = 15;
               return this.getFreePlacesOnGrids(undefined, 'deleteElement');
-            case 14:
+            case 15:
             case "end":
-              return _context20.stop();
+              return _context19.stop();
           }
-        }, _callee20, this);
+        }, _callee19, this);
       }));
-      function deletePlannerElement(_x51, _x52, _x53) {
+      function deletePlannerElement(_x50, _x51, _x52) {
         return _deletePlannerElement.apply(this, arguments);
       }
       return deletePlannerElement;
@@ -40751,17 +40125,17 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "copyPlannerElement",
     value: (function () {
-      var _copyPlannerElement = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee21(setId, elementId, curConfigKey, copyInfo) {
+      var _copyPlannerElement = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee20(setId, elementId, curConfigKey, copyInfo) {
         var _this$updateViewPlann12;
         var set, newSelectedArticle, newConfigStepKey, _this$updateElementSe7, baseArticle;
-        return _regeneratorRuntime__default["default"].wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               set = this.sets[setId];
-              _context21.next = 3;
+              _context20.next = 3;
               return setHandlerInstance.copyPlannerElement(set, elementId, copyInfo);
             case 3:
-              newSelectedArticle = _context21.sent;
+              newSelectedArticle = _context20.sent;
               this.updateConfigStructure();
               (_this$updateViewPlann12 = this.updateViewPlannerElements) === null || _this$updateViewPlann12 === void 0 || _this$updateViewPlann12.call(this, setHandlerInstance.getAllViewPlannerElements(set), setHandlerInstance.getAllVisualiedNotPlannedElements(set));
               this.updatePlannerView('COPY_PLANNER_ELEMENT');
@@ -40774,17 +40148,18 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 baseArticle = setHandlerInstance.getBaseParentArticleOfAccessoire(set, newSelectedArticle.basketId);
                 (_this$updateElementSe7 = this.updateElementSelectionPlanner) === null || _this$updateElementSe7 === void 0 || _this$updateElementSe7.call(this, [baseArticle.setId], [baseArticle.elementId], true);
               }
-              _context21.next = 13;
+              productHandlerInstance.updateProducts(this.setsAsArray, this.api, 'onCopy');
+              _context20.next = 14;
               return this.checkVariantData();
-            case 13:
-              return _context21.abrupt("return", newConfigStepKey);
             case 14:
+              return _context20.abrupt("return", newConfigStepKey);
+            case 15:
             case "end":
-              return _context21.stop();
+              return _context20.stop();
           }
-        }, _callee21, this);
+        }, _callee20, this);
       }));
-      function copyPlannerElement(_x54, _x55, _x56, _x57) {
+      function copyPlannerElement(_x53, _x54, _x55, _x56) {
         return _copyPlannerElement.apply(this, arguments);
       }
       return copyPlannerElement;
@@ -40813,33 +40188,33 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getFreePlacesOnGrids",
     value: function () {
-      var _getFreePlacesOnGrids = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee22(gridGroup, from) {
+      var _getFreePlacesOnGrids = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee21(gridGroup, from) {
         var _this$updateFreePlace;
         var set, freeShelfGrids, plannedShelfGrids;
-        return _regeneratorRuntime__default["default"].wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
               set = this.actSet();
               if (set) {
-                _context22.next = 3;
+                _context21.next = 3;
                 break;
               }
               throw new Error('getFreePlacesOnGrids: act set is not defined!');
             case 3:
               if (!gridGroup) {
-                _context22.next = 9;
+                _context21.next = 9;
                 break;
               }
-              _context22.next = 6;
+              _context21.next = 6;
               return setHandlerInstance.getFreeShelfGrids(set, gridGroup);
             case 6:
-              _context22.t0 = _context22.sent;
-              _context22.next = 10;
+              _context21.t0 = _context21.sent;
+              _context21.next = 10;
               break;
             case 9:
-              _context22.t0 = undefined;
+              _context21.t0 = undefined;
             case 10:
-              freeShelfGrids = _context22.t0;
+              freeShelfGrids = _context21.t0;
               plannedShelfGrids = setHandlerInstance.getPlannedShelfGrids(set);
               LOG$1.debug('TOULA', 'freeShelfGrids', freeShelfGrids, 'plannedShelfGrids', plannedShelfGrids);
               LOG$1.debug('update free from: ' + from, 'freeShelfGrids', freeShelfGrids, 'plannedShelfGrids', plannedShelfGrids);
@@ -40847,17 +40222,17 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 freeShelfGrids: freeShelfGrids,
                 plannedShelfGrids: plannedShelfGrids
               });
-              return _context22.abrupt("return", {
+              return _context21.abrupt("return", {
                 freeShelfGrids: freeShelfGrids,
                 plannedShelfGrids: plannedShelfGrids
               });
             case 16:
             case "end":
-              return _context22.stop();
+              return _context21.stop();
           }
-        }, _callee22, this);
+        }, _callee21, this);
       }));
-      function getFreePlacesOnGrids(_x58, _x59) {
+      function getFreePlacesOnGrids(_x57, _x58) {
         return _getFreePlacesOnGrids.apply(this, arguments);
       }
       return getFreePlacesOnGrids;
@@ -40874,36 +40249,36 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "moveShelfItemToGrid",
     value: function () {
-      var _moveShelfItemToGrid = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee23(accessoireBasketId, parentBasketId, gridName, cellIndex) {
+      var _moveShelfItemToGrid = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee22(accessoireBasketId, parentBasketId, gridName, cellIndex) {
         var set, newGridId;
-        return _regeneratorRuntime__default["default"].wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
               set = this.actSet();
               if (set) {
-                _context23.next = 3;
+                _context22.next = 3;
                 break;
               }
-              return _context23.abrupt("return");
+              return _context22.abrupt("return");
             case 3:
-              _context23.next = 5;
+              _context22.next = 5;
               return setHandlerInstance.moveShelfItemToGrid(set, accessoireBasketId, parentBasketId, gridName, cellIndex);
             case 5:
-              newGridId = _context23.sent;
+              newGridId = _context22.sent;
               this.updatePlannerView('MOVE_SHELF_ITEM');
               if (!newGridId) {
-                _context23.next = 10;
+                _context22.next = 10;
                 break;
               }
-              _context23.next = 10;
+              _context22.next = 10;
               return this.getFreePlacesOnGrids(newGridId, 'move shelf');
             case 10:
             case "end":
-              return _context23.stop();
+              return _context22.stop();
           }
-        }, _callee23, this);
+        }, _callee22, this);
       }));
-      function moveShelfItemToGrid(_x60, _x61, _x62, _x63) {
+      function moveShelfItemToGrid(_x59, _x60, _x61, _x62) {
         return _moveShelfItemToGrid.apply(this, arguments);
       }
       return moveShelfItemToGrid;
@@ -40911,27 +40286,27 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "resetArticle",
     value: function () {
-      var _resetArticle = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee24(basketId) {
+      var _resetArticle = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee23(basketId) {
         var set;
-        return _regeneratorRuntime__default["default"].wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
               set = this.actSet();
               if (set) {
-                _context24.next = 3;
+                _context23.next = 3;
                 break;
               }
-              return _context24.abrupt("return");
+              return _context23.abrupt("return");
             case 3:
-              _context24.next = 5;
+              _context23.next = 5;
               return setHandlerInstance.resetArticle(set, basketId);
             case 5:
             case "end":
-              return _context24.stop();
+              return _context23.stop();
           }
-        }, _callee24, this);
+        }, _callee23, this);
       }));
-      function resetArticle(_x64) {
+      function resetArticle(_x63) {
         return _resetArticle.apply(this, arguments);
       }
       return resetArticle;
@@ -40939,27 +40314,27 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "checkVariantData",
     value: function () {
-      var _checkVariantData = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee25() {
+      var _checkVariantData = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee24() {
         var somethingChanged;
-        return _regeneratorRuntime__default["default"].wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
               if (!this.api.getDoCheckVariantData()) {
-                _context25.next = 5;
+                _context24.next = 5;
                 break;
               }
-              _context25.next = 3;
+              _context24.next = 3;
               return setHandlerInstance.checkVariantData(this.actSet());
             case 3:
-              somethingChanged = _context25.sent;
+              somethingChanged = _context24.sent;
               if (somethingChanged) {
                 this.updatePriceInView();
               }
             case 5:
             case "end":
-              return _context25.stop();
+              return _context24.stop();
           }
-        }, _callee25, this);
+        }, _callee24, this);
       }));
       function checkVariantData() {
         return _checkVariantData.apply(this, arguments);
@@ -41055,7 +40430,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "saveToBasketWrapper",
     value: function () {
-      var _saveToBasketWrapper = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee26(event, repairOnly, force) {
+      var _saveToBasketWrapper = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee25(event, repairOnly, force) {
         var _this$actions25,
           _this$actions25$toggl,
           _this$actions26,
@@ -41063,48 +40438,46 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           _this2 = this,
           _this$actions30,
           _this$i18n14;
-        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) {
+        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;
+        return _regeneratorRuntime__default["default"].wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
               returnTo = this.getReturnTo(event);
               finalEvent = event;
               if (!(returnTo == 'OPEN_LEAFLET_BARRIER')) {
-                _context26.next = 16;
+                _context25.next = 14;
                 break;
               }
               product = undefined;
               if (!((_this$api$getBarrierC = this.api.getBarrierConfig()) !== null && _this$api$getBarrierC !== void 0 && _this$api$getBarrierC.affiliate)) {
-                _context26.next = 10;
+                _context25.next = 8;
                 break;
               }
-              _context26.next = 7;
+              _context25.next = 7;
               return this.api.getDataCache(this.api.getCatalogProductUrl(this.actSet().getCatalogCodex()), undefined, undefined, 'catalog');
             case 7:
-              _result = _context26.sent;
-              productHandlerInstance.addProducts(_result, []);
-              product = productHandlerInstance.getBestMatch(this.getDivaArticles());
-            case 10:
-              _context26.next = 12;
+              _context25.sent;
+            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);
-            case 12:
-              finalEvent = _context26.sent;
+            case 10:
+              finalEvent = _context25.sent;
               if (finalEvent) {
-                _context26.next = 15;
+                _context25.next = 13;
                 break;
               }
-              return _context26.abrupt("return", 'canceled');
-            case 15:
+              return _context25.abrupt("return", 'canceled');
+            case 13:
               returnTo = finalEvent == 'onAddToBasket' ? 'OPEN_PDF' : returnTo;
-            case 16:
+            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);
-              _context26.next = 19;
+              _context25.next = 17;
               return this.saveToBasket(finalEvent, repairOnly, force);
-            case 19:
-              result = _context26.sent;
+            case 17:
+              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);
               if (!(result === 'canceled')) {
-                _context26.next = 25;
+                _context25.next = 23;
                 break;
               }
               LOG$1.error(new DivaUtils.DivaError('failed to save Basket'));
@@ -41112,12 +40485,12 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 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 _context26.abrupt("return", result);
-            case 25:
-              _context26.t0 = returnTo;
-              _context26.next = _context26.t0 === 'OPEN_PDF' ? 28 : _context26.t0 === 'SAVE_BASKET_WITH_MODAL' ? 30 : 31;
+              return _context25.abrupt("return", result);
+            case 23:
+              _context25.t0 = returnTo;
+              _context25.next = _context25.t0 === 'OPEN_PDF' ? 26 : _context25.t0 === 'SAVE_BASKET_WITH_MODAL' ? 28 : 29;
               break;
-            case 28:
+            case 26:
               if (!this.getBasket().PDFDocumentURL) {
                 LOG$1.error(new DivaUtils.DivaError('PDF url is missing in basket', {
                   code: 'WC_0010'
@@ -41135,39 +40508,28 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                   }
                 });
               }
-              return _context26.abrupt("break", 31);
-            case 30:
+              return _context25.abrupt("break", 29);
+            case 28:
               (_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
               });
-            case 31:
+            case 29:
               if (!(result == 'noArticleToSave')) {
-                _context26.next = 34;
+                _context25.next = 32;
                 break;
               }
               (_this$updatePlannerMs2 = this.updatePlannerMsgContainer) === null || _this$updatePlannerMs2 === void 0 || _this$updatePlannerMs2.call(this, 'NOTHING_TO_SAVE', true, 'INFO', 'NOTHING_TO_SAVE', true);
-              return _context26.abrupt("return", 'canceled');
-            case 34:
-              if (!(result == 'payloadToBig')) {
-                _context26.next = 37;
-                break;
-              }
-              (_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'
-              });
-              return _context26.abrupt("return", 'canceled');
-            case 37:
-              return _context26.abrupt("return", result);
-            case 38:
+              return _context25.abrupt("return", 'canceled');
+            case 32:
+              return _context25.abrupt("return", result);
+            case 33:
             case "end":
-              return _context26.stop();
+              return _context25.stop();
           }
-        }, _callee26, this);
+        }, _callee25, this);
       }));
-      function saveToBasketWrapper(_x65, _x66, _x67) {
+      function saveToBasketWrapper(_x64, _x65, _x66) {
         return _saveToBasketWrapper.apply(this, arguments);
       }
       return saveToBasketWrapper;
@@ -41175,51 +40537,36 @@ 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$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) {
+      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 set, actBasket, returnTo, oldReturnTo, result, newDivaNr, _result2, _event4, product;
+        return _regeneratorRuntime__default["default"].wrap(function _callee26$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
               set = this.actSet();
               if (!(setHandlerInstance.isNoArticleToSave(this.sets) && !force)) {
-                _context27.next = 3;
+                _context26.next = 3;
                 break;
               }
-              return _context27.abrupt("return", 'noArticleToSave');
+              return _context26.abrupt("return", 'noArticleToSave');
             case 3:
               actBasket = this.divaBasketHandler.actBasket;
               returnTo = this.getReturnTo(event);
               if (!((_returnTo = returnTo) !== null && _returnTo !== void 0 && _returnTo.startsWith('FAVORITS') && favoritesHandlerInstance.FavoritesDefined(set))) {
-                _context27.next = 22;
+                _context26.next = 13;
                 break;
               }
               oldReturnTo = returnTo;
               this.ReturnTo = returnTo.replace('FAVORITS_', '');
-              _context27.next = 10;
-              return this.getValidVariantsLength();
-            case 10:
-              count = _context27.sent;
-              _context27.next = 13;
-              return setHandlerInstance.fillOrderLinesAndOrderSets(this.sets, this.divaBasketHandler, !!repairOnly, this.doAllowSetPlanner(), this.ReturnTo);
-            case 13:
-              basketData = _context27.sent;
-              bytes = new TextEncoder().encode(JSON.stringify(basketData.getAsJson())).length;
-              if (!(bytes * count > 15000000)) {
-                _context27.next = 17;
-                break;
-              }
-              return _context27.abrupt("return", 'payloadToBig');
-            case 17:
-              _context27.next = 19;
+              _context26.next = 10;
               return this.handleFavorites('SAVE');
-            case 19:
-              result = _context27.sent;
+            case 10:
+              result = _context26.sent;
               if (result === 'canceled') {
                 this.ReturnTo = oldReturnTo;
               }
-              return _context27.abrupt("return", result);
-            case 22:
+              return _context26.abrupt("return", result);
+            case 13:
               LOG$1.startTransaction({
                 event: (_event = event) !== null && _event !== void 0 ? _event : 'onAddToBasket',
                 message: 'Perform case: ' + ((_event2 = event) !== null && _event2 !== void 0 ? _event2 : 'onAddToBasket'),
@@ -41234,13 +40581,13 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 warningTime: 2000,
                 errorTime: 4000
               });
-              _context27.t0 = this.divaBasketHandler;
-              _context27.t1 = this.divaBasketHandler.actDivaNr;
-              _context27.next = 27;
+              _context26.t0 = this.divaBasketHandler;
+              _context26.t1 = this.divaBasketHandler.actDivaNr;
+              _context26.next = 18;
               return setHandlerInstance.fillOrderLinesAndOrderSets(this.sets, this.divaBasketHandler, !!repairOnly, this.doAllowSetPlanner(), this.ReturnTo);
-            case 27:
-              _context27.t2 = _context27.sent;
-              _context27.t0.setBasketData.call(_context27.t0, _context27.t1, _context27.t2);
+            case 18:
+              _context26.t2 = _context26.sent;
+              _context26.t0.setBasketData.call(_context26.t0, _context26.t1, _context26.t2);
               if ((_returnTo2 = returnTo) !== null && _returnTo2 !== void 0 && _returnTo2.endsWith('OPEN_SELLER_BASKET')) {
                 this.ReturnTo = 'OPEN_SELLER_BASKET';
                 returnTo = this.ReturnTo;
@@ -41256,13 +40603,14 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               actBasket.Updated = Date.now();
               LOG$1.successTransaction('FILL_BASKET');
               if (!returnTo) {
-                _context27.next = 63;
+                _context26.next = 55;
                 break;
               }
-              _context27.t3 = returnTo;
-              _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;
+              _context26.t3 = returnTo;
+              _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 39:
+            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({
                 type: 'SELLER',
                 parameters: {
@@ -41270,12 +40618,11 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                   divaNr: actBasket.DivaNr
                 },
                 internal: {
-                  basketData: actBasket,
-                  edited: true
+                  basketData: actBasket
                 }
               });
-              return _context27.abrupt("break", 63);
-            case 41:
+              return _context26.abrupt("break", 55);
+            case 33:
               (_this$actions33 = this.actions) === null || _this$actions33 === void 0 || _this$actions33.openComponent({
                 type: 'SELLER',
                 parameters: {
@@ -41286,37 +40633,37 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                   basketData: actBasket
                 }
               });
-              return _context27.abrupt("break", 63);
-            case 43:
+              return _context26.abrupt("break", 55);
+            case 35:
               if (!(event == 'onSaveProduct')) {
-                _context27.next = 53;
+                _context26.next = 45;
                 break;
               }
               //copy basket, so we only save a copy as baseconfiguration and can continue working with the original basket
               actBasket = new basketModel.BasketData(JSON.parse(JSON.stringify(actBasket)));
-              _context27.next = 47;
+              _context26.next = 39;
               return DivaUtils__default["default"].updateBasketOrgInfo(actBasket, this.plannerConfig.currentOrganization, this.plannerConfig.currentUser);
-            case 47:
-              _context27.next = 49;
+            case 39:
+              _context26.next = 41;
               return this.api.getDataWithoutCache(this.api.getUniqueNewDivaNr(), undefined, 'basket');
-            case 49:
-              newDivaNr = _context27.sent;
+            case 41:
+              newDivaNr = _context26.sent;
               actBasket.convertToBaseConfiguration(newDivaNr.divaNr);
-              _context27.next = 62;
+              _context26.next = 54;
               break;
-            case 53:
+            case 45:
               if (this.divaBasketHandler.basketWasSavedWithCurrentDocVersion) {
                 this.divaBasketHandler.basketWasSavedWithCurrentDocVersion = undefined;
                 actBasket.setDocumentVersion(actBasket.getDocumentVersion() + 1);
               }
               this.divaBasketHandler.basketWasSavedWithCurrentDocVersion = true;
               actBasket.setDivaNr(this.divaBasketHandler.actDivaNr.split('-').length > 2 ? this.divaBasketHandler.actDivaNr.split('-')[0] + '-' + this.divaBasketHandler.actDivaNr.split('-')[1] : this.divaBasketHandler.actDivaNr);
-              _context27.next = 58;
+              _context26.next = 50;
               return this.divaBasketHandler.saveToBasket(this.api, actBasket, returnTo);
-            case 58:
-              _result2 = _context27.sent;
+            case 50:
+              _result2 = _context26.sent;
               if (!(_result2 === 'ERROR_NO_BASKET_SAVED' || _result2 === 'ERROR_BASKET_AFTER_SAVE')) {
-                _context27.next = 62;
+                _context26.next = 54;
                 break;
               }
               LOG$1.errorTransaction((_event4 = event) !== null && _event4 !== void 0 ? _event4 : 'onAddToBasket', 'WC_0019', 'Error saving basket', {
@@ -41325,23 +40672,23 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 status: this.getBasketData().Status,
                 bv: set.getSetPrice() / 1000
               });
-              return _context27.abrupt("return", 'canceled');
-            case 62:
-              return _context27.abrupt("break", 63);
-            case 63:
+              return _context26.abrupt("return", 'canceled');
+            case 54:
+              return _context26.abrupt("break", 55);
+            case 55:
               if (returnTo == 'DONT_SAVE_BASKET') event = 'dontSaveBasket';
-              _context27.next = 66;
+              _context26.next = 58;
               return this.addToBasket(actBasket, event);
-            case 66:
-              product = _context27.sent;
-              return _context27.abrupt("return", product !== null && product !== void 0 ? product : 'saved');
-            case 68:
+            case 58:
+              product = _context26.sent;
+              return _context26.abrupt("return", product !== null && product !== void 0 ? product : 'saved');
+            case 60:
             case "end":
-              return _context27.stop();
+              return _context26.stop();
           }
-        }, _callee27, this);
+        }, _callee26, this);
       }));
-      function saveToBasket(_x68, _x69, _x70) {
+      function saveToBasket(_x67, _x68, _x69) {
         return _saveToBasket.apply(this, arguments);
       }
       return saveToBasket;
@@ -41542,16 +40889,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",
@@ -41566,23 +40913,23 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getBasketDataWithEkText",
     value: function () {
-      var _getBasketDataWithEkText = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee28() {
-        return _regeneratorRuntime__default["default"].wrap(function _callee28$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+      var _getBasketDataWithEkText = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee27() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee27$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
-              _context28.t0 = this.divaBasketHandler;
-              _context28.t1 = this.divaBasketHandler.actDivaNr;
-              _context28.next = 4;
+              _context27.t0 = this.divaBasketHandler;
+              _context27.t1 = this.divaBasketHandler.actDivaNr;
+              _context27.next = 4;
               return setHandlerInstance.fillOrderLinesAndOrderSets(this.sets, this.divaBasketHandler, true, this.doAllowSetPlanner(), this.ReturnTo);
             case 4:
-              _context28.t2 = _context28.sent;
-              _context28.t0.setBasketData.call(_context28.t0, _context28.t1, _context28.t2);
-              return _context28.abrupt("return", this.divaBasketHandler.actBasket);
+              _context27.t2 = _context27.sent;
+              _context27.t0.setBasketData.call(_context27.t0, _context27.t1, _context27.t2);
+              return _context27.abrupt("return", this.divaBasketHandler.actBasket);
             case 7:
             case "end":
-              return _context28.stop();
+              return _context27.stop();
           }
-        }, _callee28, this);
+        }, _callee27, this);
       }));
       function getBasketDataWithEkText() {
         return _getBasketDataWithEkText.apply(this, arguments);
@@ -41592,8 +40939,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",
@@ -41608,7 +40955,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "addToBasket",
     value: function () {
-      var _addToBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee29(actBasket) {
+      var _addToBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee28(actBasket) {
         var _this$actions34,
           _this$actions35,
           _this$actions36,
@@ -41627,14 +40974,14 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           to,
           variants,
           products,
-          _args29 = arguments;
-        return _regeneratorRuntime__default["default"].wrap(function _callee29$(_context29) {
-          while (1) switch (_context29.prev = _context29.next) {
+          _args28 = arguments;
+        return _regeneratorRuntime__default["default"].wrap(function _callee28$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              event = _args29.length > 1 && _args29[1] !== undefined ? _args29[1] : 'onAddToBasket';
+              event = _args28.length > 1 && _args28[1] !== undefined ? _args28[1] : 'onAddToBasket';
               addToBasketLog = true;
-              _context29.t0 = event;
-              _context29.next = _context29.t0 === 'onWebPlanerPrint' ? 5 : _context29.t0 === 'onWebPlanerSave' ? 8 : _context29.t0 === 'onWebPlanerShare' ? 11 : _context29.t0 === 'onRequestConsulation' ? 14 : _context29.t0 === 'onSave' ? 17 : _context29.t0 === 'onSendEmail' ? 20 : _context29.t0 === 'onSaveProduct' ? 25 : _context29.t0 === 'dontSaveBasket' ? 33 : _context29.t0 === 'onAddToBasket' ? 35 : 35;
+              _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;
               break;
             case 5:
               this.handleSuccessTransaction('onPrintBasket', actBasket);
@@ -41642,35 +40989,35 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 type: 'onWebPlanerPrint',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 38);
+              return _context28.abrupt("break", 38);
             case 8:
               this.handleSuccessTransaction('onSaveBasket', actBasket);
               (_this$actions35 = this.actions) === null || _this$actions35 === void 0 || _this$actions35.onEvent({
                 type: 'onWebPlanerSave',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 38);
+              return _context28.abrupt("break", 38);
             case 11:
               this.handleSuccessTransaction('onShareBasket', actBasket);
               (_this$actions36 = this.actions) === null || _this$actions36 === void 0 || _this$actions36.onEvent({
                 type: 'onWebPlanerShare',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 38);
+              return _context28.abrupt("break", 38);
             case 14:
               this.handleSuccessTransaction('onRequestConsulation', actBasket);
               (_this$actions37 = this.actions) === null || _this$actions37 === void 0 || _this$actions37.onEvent({
                 type: 'onRequestConsulation',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 38);
+              return _context28.abrupt("break", 38);
             case 17:
               this.handleSuccessTransaction('onSave', actBasket);
               (_this$actions38 = this.actions) === null || _this$actions38 === void 0 || _this$actions38.onEvent({
                 type: 'onSave',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 38);
+              return _context28.abrupt("break", 38);
             case 20:
               emailConfig = (_this$divaBasketHandl3 = this.divaBasketHandler.emailConfig) !== null && _this$divaBasketHandl3 !== void 0 ? _this$divaBasketHandl3 : this.getEmailConfig(); //reset the emailConfig
               this.divaBasketHandler.emailConfig = undefined;
@@ -41706,23 +41053,23 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 38);
+              return _context28.abrupt("break", 38);
             case 25:
               this.actSet().CatalogData;
-              _context29.next = 28;
+              _context28.next = 28;
               return this.api.saveAsProduct(this.sets, actBasket);
             case 28:
-              products = _context29.sent;
+              products = _context28.sent;
               this.handleSuccessTransaction('onSaveProduct', actBasket);
               (_this$actions40 = this.actions) === null || _this$actions40 === void 0 || _this$actions40.onEvent({
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
               if (!products) {
-                _context29.next = 33;
+                _context28.next = 33;
                 break;
               }
-              return _context29.abrupt("return", products[0]);
+              return _context28.abrupt("return", products[0]);
             case 33:
               this.handleSuccessTransaction('onAddToBasketCallback', actBasket);
               addToBasketLog = false;
@@ -41732,16 +41079,16 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 38);
+              return _context28.abrupt("break", 38);
             case 38:
-              return _context29.abrupt("return");
+              return _context28.abrupt("return");
             case 39:
             case "end":
-              return _context29.stop();
+              return _context28.stop();
           }
-        }, _callee29, this);
+        }, _callee28, this);
       }));
-      function addToBasket(_x71) {
+      function addToBasket(_x70) {
         return _addToBasket.apply(this, arguments);
       }
       return addToBasket;
@@ -42022,9 +41369,9 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "initApiForLogicOnly",
     value: //just for testing purposes
     function () {
-      var _initApiForLogicOnly = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee30(organization, lang, getSessionGuid, handler, applicationEnvironment, apiKey, jwt) {
-        return _regeneratorRuntime__default["default"].wrap(function _callee30$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+      var _initApiForLogicOnly = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee29(organization, lang, getSessionGuid, handler, applicationEnvironment, apiKey, jwt) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee29$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
               //empty services
               this.api = new DivaApiHandler(_objectSpread$5(_objectSpread$5({}, this.plannerConfig), {}, {
@@ -42037,17 +41384,17 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 jwt: jwt,
                 apiKey: apiKey
               }), handler);
-              _context30.next = 3;
+              _context29.next = 3;
               return this.divaBasketHandler.initWWSClient(this.api.getWWSClient());
             case 3:
               this.plannerHandler = new DivaPlannerHandler(true);
             case 4:
             case "end":
-              return _context30.stop();
+              return _context29.stop();
           }
-        }, _callee30, this);
+        }, _callee29, this);
       }));
-      function initApiForLogicOnly(_x72, _x73, _x74, _x75, _x76, _x77, _x78) {
+      function initApiForLogicOnly(_x71, _x72, _x73, _x74, _x75, _x76, _x77) {
         return _initApiForLogicOnly.apply(this, arguments);
       }
       return initApiForLogicOnly;
@@ -42060,16 +41407,16 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "loadBasket",
     value: function () {
-      var _loadBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee31() {
-        return _regeneratorRuntime__default["default"].wrap(function _callee31$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+      var _loadBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee30() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee30$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
             case 0:
-              return _context31.abrupt("return", this.divaBasketHandler.initializeBasket(this.api));
+              return _context30.abrupt("return", this.divaBasketHandler.initializeBasket(this.api));
             case 1:
             case "end":
-              return _context31.stop();
+              return _context30.stop();
           }
-        }, _callee31, this);
+        }, _callee30, this);
       }));
       function loadBasket() {
         return _loadBasket.apply(this, arguments);
@@ -42084,31 +41431,31 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "initBasket",
     value: function () {
-      var _initBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee32(init3D, ignoreFavorites) {
+      var _initBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee31(init3D, ignoreFavorites) {
         var _initSetState$api$web2;
         var initSetState, sets, result, _sets$, set, basket;
-        return _regeneratorRuntime__default["default"].wrap(function _callee32$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee31$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
               this.divaNr = this.divaBasketHandler.actDivaNr;
               initSetState = this.getInitStateForSet(!init3D);
               this.plannerHandler.initPlanner(initSetState, this.getPlannerHandlerFunctions());
-              _context32.next = 5;
+              _context31.next = 5;
               return setHandlerInstance.initSetsByOrderSet(this.divaBasketHandler.getOrderSetsByDivaNr(this.divaNr), initSetState);
             case 5:
-              sets = _context32.sent;
+              sets = _context31.sent;
               if (!((_initSetState$api$web2 = initSetState.api.webConfig) !== null && _initSetState$api$web2 !== void 0 && _initSetState$api$web2.checkForProductsPrice)) {
-                _context32.next = 12;
+                _context31.next = 12;
                 break;
               }
               if (!this.divaBasketHandler.actBasket.OrigProductId) {
-                _context32.next = 12;
+                _context31.next = 12;
                 break;
               }
-              _context32.next = 10;
+              _context31.next = 10;
               return this.divaBasketHandler.getProduct(this.api, this.divaBasketHandler.actBasket.OrigProductId);
             case 10:
-              result = _context32.sent;
+              result = _context31.sent;
               if (result) {
                 (_sets$ = sets[0]) === null || _sets$ === void 0 || _sets$.remindPriceForHash(result);
               }
@@ -42117,24 +41464,24 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               set = this.actSet();
               setHandlerInstance.loadConfigStructureOfActSet(set, this.getCurPlannerType());
               if (!(favoritesHandlerInstance.FavoritesDefined(set) && !ignoreFavorites)) {
-                _context32.next = 17;
+                _context31.next = 17;
                 break;
               }
-              _context32.next = 17;
+              _context31.next = 17;
               return this.handleFavorites(init3D ? 'CALC' : 'REPAIR');
             case 17:
-              _context32.next = 19;
+              _context31.next = 19;
               return setHandlerInstance.fillOrderLinesAndOrderSets(this.sets, this.divaBasketHandler, !init3D, this.doAllowSetPlanner(), this.ReturnTo);
             case 19:
-              basket = _context32.sent;
-              return _context32.abrupt("return", basket);
+              basket = _context31.sent;
+              return _context31.abrupt("return", basket);
             case 21:
             case "end":
-              return _context32.stop();
+              return _context31.stop();
           }
-        }, _callee32, this);
+        }, _callee31, this);
       }));
-      function initBasket(_x79, _x80) {
+      function initBasket(_x78, _x79) {
         return _initBasket.apply(this, arguments);
       }
       return initBasket;
@@ -42148,21 +41495,21 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getValidVariantsLength",
     value: function () {
-      var _getValidVariantsLength = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee33() {
+      var _getValidVariantsLength = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee32() {
         var set;
-        return _regeneratorRuntime__default["default"].wrap(function _callee33$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee32$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
             case 0:
               set = this.actSet();
-              _context33.next = 3;
+              _context32.next = 3;
               return favoritesHandlerInstance.getValidVariants(set, true);
             case 3:
-              return _context33.abrupt("return", _context33.sent.length);
+              return _context32.abrupt("return", _context32.sent.length);
             case 4:
             case "end":
-              return _context33.stop();
+              return _context32.stop();
           }
-        }, _callee33, this);
+        }, _callee32, this);
       }));
       function getValidVariantsLength() {
         return _getValidVariantsLength.apply(this, arguments);
@@ -42172,46 +41519,46 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "handleFavorites",
     value: function () {
-      var _handleFavorites = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee34(mode) {
+      var _handleFavorites = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee33(mode) {
         var _this4 = this;
         var set, i;
-        return _regeneratorRuntime__default["default"].wrap(function _callee34$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee33$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
             case 0:
               set = this.actSet();
               i = 0;
             case 2:
               if (!favoritesHandlerInstance.IsCalcForSummary) {
-                _context34.next = 11;
+                _context33.next = 11;
                 break;
               }
-              _context34.next = 5;
+              _context33.next = 5;
               return DivaUtils__default["default"].Sleep(200);
             case 5:
               i++;
               if (!(i > 1000)) {
-                _context34.next = 9;
+                _context33.next = 9;
                 break;
               }
               LOG$1.error(new DivaUtils.DivaError('error on generating Variants of Summary'));
-              return _context34.abrupt("break", 11);
+              return _context33.abrupt("break", 11);
             case 9:
-              _context34.next = 2;
+              _context33.next = 2;
               break;
             case 11:
-              _context34.next = 13;
+              _context33.next = 13;
               return favoritesHandlerInstance.handleFavorites(set, mode, this.divaBasketHandler.actBasket, this.saveToBasketWrapper.bind(this), this.doConfigure.bind(this), function () {
                 return _this4.update2DGrid(set);
               }, this.actions);
             case 13:
-              return _context34.abrupt("return", _context34.sent);
+              return _context33.abrupt("return", _context33.sent);
             case 14:
             case "end":
-              return _context34.stop();
+              return _context33.stop();
           }
-        }, _callee34, this);
+        }, _callee33, this);
       }));
-      function handleFavorites(_x81) {
+      function handleFavorites(_x80) {
         return _handleFavorites.apply(this, arguments);
       }
       return handleFavorites;
@@ -42224,48 +41571,48 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "initSapOrderLinesFromBasket",
     value: function () {
-      var _initSapOrderLinesFromBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee35(divaNr, init3D, onlyLoadOldBakset) {
+      var _initSapOrderLinesFromBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee34(divaNr, init3D, onlyLoadOldBakset) {
         var result, oldBasket, basket;
-        return _regeneratorRuntime__default["default"].wrap(function _callee35$(_context35) {
-          while (1) switch (_context35.prev = _context35.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee34$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
               if (divaNr) this.divaBasketHandler.updateDivaNrInBasket(divaNr);
-              _context35.next = 3;
+              _context34.next = 3;
               return this.loadBasket();
             case 3:
-              result = _context35.sent;
+              result = _context34.sent;
               if (!onlyLoadOldBakset) {
-                _context35.next = 6;
+                _context34.next = 6;
                 break;
               }
-              return _context35.abrupt("return", {
+              return _context34.abrupt("return", {
                 oldBasket: new basketModel.BasketData(JSON.parse(JSON.stringify(this.divaBasketHandler.actBasket))),
                 cache: {}
               });
             case 6:
               if (!(result === false)) {
-                _context35.next = 8;
+                _context34.next = 8;
                 break;
               }
               throw new Error('Could not load basket! ' + divaNr);
             case 8:
               oldBasket = new basketModel.BasketData(JSON.parse(JSON.stringify(this.divaBasketHandler.actBasket)));
-              _context35.next = 11;
+              _context34.next = 11;
               return this.initBasket(init3D);
             case 11:
-              basket = _context35.sent;
-              return _context35.abrupt("return", {
+              basket = _context34.sent;
+              return _context34.abrupt("return", {
                 basket: basket,
                 oldBasket: oldBasket,
                 cache: this.api.getJsonDataCache()
               });
             case 13:
             case "end":
-              return _context35.stop();
+              return _context34.stop();
           }
-        }, _callee35, this);
+        }, _callee34, this);
       }));
-      function initSapOrderLinesFromBasket(_x82, _x83, _x84) {
+      function initSapOrderLinesFromBasket(_x81, _x82, _x83) {
         return _initSapOrderLinesFromBasket.apply(this, arguments);
       }
       return initSapOrderLinesFromBasket;
@@ -42290,6 +41637,11 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       }
       return undefined;
     }
+  }, {
+    key: "setsAsArray",
+    get: function get() {
+      return Object.values(this.sets);
+    }
 
     /**
      * This function returns the planner mode.
@@ -60223,7 +59575,7 @@ var ProductHandler = /*#__PURE__*/function () {
   }, {
     key: "isSameProduct",
     value: function isSameProduct(product, setHash, diva3dProject, orderLines, varinatData, catalogCodex) {
-      var _product$articles;
+      var _product$articles, _product$configuratio, _product$configuratio2;
       //For new products we store the setHash and hqRenderScript in order to determine if the product changed.
       if (product.uniqueHash !== undefined) {
         return product.uniqueHash === 'v1' + setHash + DivaUtils.md5(diva3dProject);
@@ -60234,22 +59586,22 @@ var ProductHandler = /*#__PURE__*/function () {
         return false;
       }
       //For older products without setHash we use the old comparison logic
+      var orderlines = (_product$configuratio = (_product$configuratio2 = product.configuration) === null || _product$configuratio2 === void 0 || (_product$configuratio2 = _product$configuratio2.OrderSets) === null || _product$configuratio2 === void 0 ? void 0 : _product$configuratio2[0].OrderLines) !== null && _product$configuratio !== void 0 ? _product$configuratio : [];
       var _loop = function _loop() {
-          var _article$variantValue;
-          var article = product.articles[i];
+          var article = orderlines[i];
           var orderLine = orderLines.find(function (ol) {
-            return ol.ArticleCodex == article.articleCodex && catalogCodex == article.catalogCodex;
+            return ol.ArticleCodex == article.ArticleCodex && catalogCodex == article.CatalogCodex;
           });
-          if (!orderLine || ((_article$variantValue = article.variantValues) === null || _article$variantValue === void 0 ? void 0 : _article$variantValue.length) != (varinatData === null || varinatData === void 0 ? void 0 : varinatData.length)) {
+          if (!orderLine) {
             return {
               v: false
             };
           }
           var _loop2 = function _loop2() {
-              var varinatValue = article.variantValues[j];
-              if (!(varinatData !== null && varinatData !== void 0 && varinatData.find(function (vb) {
+              var varinatValue = article.VariantBasketDatas[j];
+              if (!varinatData.find(function (vb) {
                 return vb.OPT == varinatValue['OPT'] && vb.OPV == varinatValue['OPV'];
-              }))) {
+              })) {
                 return {
                   v: {
                     v: false
@@ -60258,14 +59610,14 @@ var ProductHandler = /*#__PURE__*/function () {
               }
             },
             _ret2;
-          for (var j = 0; j < (((_article$variantValue2 = article.variantValues) === null || _article$variantValue2 === void 0 ? void 0 : _article$variantValue2.length) || 0); j++) {
-            var _article$variantValue2;
+          for (var j = 0; j < (((_article$VariantBaske = article.VariantBasketDatas) === null || _article$VariantBaske === void 0 ? void 0 : _article$VariantBaske.length) || 0); j++) {
+            var _article$VariantBaske;
             _ret2 = _loop2();
             if (_ret2) return _ret2.v;
           }
         },
         _ret;
-      for (var i = 0; i < product.articles.length; i++) {
+      for (var i = 0; i < orderlines.length; i++) {
         _ret = _loop();
         if (_ret) return _ret.v;
       }
@@ -60805,7 +60157,6 @@ exports.DockingPoint = DockingPoint;
 exports.Grid = Grid;
 exports.HQRenderScript = HQRenderScript;
 exports.OptionCatalogData = OptionCatalogData;
-exports.Product = Product;
 exports.Rendering = Rendering;
 exports.Vector2 = Vector2;
 exports.Vector3 = Vector3;
@@ -60814,6 +60165,5 @@ exports.articleHandlerInstance = articleHandlerInstance;
 exports.creatRenderOrders = creatRenderOrders;
 exports.getOrigProductId = getOrigProductId;
 exports.loadAndRepairBasket = loadAndRepairBasket;
-exports.productHandlerInstance = productHandlerInstance;
 exports.setHandlerInstance = setHandlerInstance;
 exports.summaryHandlerInstance = summaryHandlerInstance;