@crystaldesign/web-planner-logic 24.10.0-beta.1 → 24.10.0-beta.10

package/build/cjs/{index-0cf8efc1.js → index-0fbd8bd2.js}

@@ -863,7 +863,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "apiUrl",
     value: function apiUrl(queryString, useWebServiceApi) {
-      var _this$apiConfig19, _this$apiConfig20;
+      var _this$apiConfig21, _this$apiConfig22;
       if (useWebServiceApi == 'catalog') {
         var _this$apiConfig13, _this$apiConfig14;
         if (!((_this$apiConfig13 = this.apiConfig) !== null && _this$apiConfig13 !== void 0 && _this$apiConfig13.catalogService)) throw new Error('No catalog Service defined');
@@ -879,8 +879,13 @@ var DivaApiHandler = /*#__PURE__*/function () {
         if (!((_this$apiConfig17 = this.apiConfig) !== null && _this$apiConfig17 !== void 0 && _this$apiConfig17.reportService)) throw new Error('No report Service defined');
         return ((_this$apiConfig18 = this.apiConfig) === null || _this$apiConfig18 === void 0 ? void 0 : _this$apiConfig18.reportService) + queryString;
       }
-      var url = (_this$apiConfig19 = this.apiConfig) === null || _this$apiConfig19 === void 0 ? void 0 : _this$apiConfig19.api2["default"];
-      if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig20 = this.apiConfig) !== null && _this$apiConfig20 !== void 0 && _this$apiConfig20.api2.web) {
+      if (useWebServiceApi == 'enricher') {
+        var _this$apiConfig19, _this$apiConfig20;
+        if (!((_this$apiConfig19 = this.apiConfig) !== null && _this$apiConfig19 !== void 0 && _this$apiConfig19.enricherService)) throw new Error('No report Service defined');
+        return ((_this$apiConfig20 = this.apiConfig) === null || _this$apiConfig20 === void 0 ? void 0 : _this$apiConfig20.enricherService) + queryString;
+      }
+      var url = (_this$apiConfig21 = this.apiConfig) === null || _this$apiConfig21 === void 0 ? void 0 : _this$apiConfig21.api2["default"];
+      if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig22 = this.apiConfig) !== null && _this$apiConfig22 !== void 0 && _this$apiConfig22.api2.web) {
         url = this.apiConfig.api2.web;
       }
       if (!url) throw new Error('No API2 defined');
@@ -944,7 +949,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getCatalogProductUrl",
     value: function getCatalogProductUrl(catalogCodex) {
-      var search = '{catCodex,contains,' + catalogCodex + '},{available,eq,true}';
+      var search = '{catCodex,contains,' + catalogCodex + "},{availableForOrganizations,eq,".concat(this.organization._id, "}");
       return '/v1/products?' + 'search=' + encodeURIComponent('[' + search + ']') + '&organizationIds=' + this.organization._id + '&fields=' + encodeURIComponent('{divaNr,addedPrice,discountedPrice,shortDescription,image,dockingPoints,articles,originDivaNr,variantId,affiliate,retailerArticleNr,minQuantity,increments,calculatedPrice}');
     }
   }, {
@@ -983,6 +988,11 @@ var DivaApiHandler = /*#__PURE__*/function () {
     value: function getAdditionalModelInfosQS(accountGuid, catalogGuid) {
       return '/additionalModelInfos/one?' + '&accountGuid=' + accountGuid + '&catalogGuid=' + catalogGuid;
     }
+  }, {
+    key: "getCatalogMaskQS",
+    value: function getCatalogMaskQS(catalogGuid, organizationId) {
+      return '/live/mask/' + catalogGuid + '/mask?organizationId=' + organizationId;
+    }
   }, {
     key: "getAdditionalModelInfosPostMaskQS",
     value: function getAdditionalModelInfosPostMaskQS(id) {
@@ -1252,12 +1262,12 @@ var DivaApiHandler = /*#__PURE__*/function () {
     key: "getDimensionbyId",
     value: function () {
       var _getDimensionbyId = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee11(id, iln, catalogCodex, plannedOptions) {
-        var _this$apiConfig21;
+        var _this$apiConfig23;
         var fullUrl, res, headers;
         return _regeneratorRuntime__default["default"].wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              fullUrl = this.getConstructorServiceUrl() + '/dimension/' + id + '?iln=' + iln + '&catalogCodex=' + catalogCodex + '&debug=' + ((_this$apiConfig21 = this.apiConfig) === null || _this$apiConfig21 === void 0 ? void 0 : _this$apiConfig21.useDebugUrl);
+              fullUrl = this.getConstructorServiceUrl() + '/dimension/' + id + '?iln=' + iln + '&catalogCodex=' + catalogCodex + '&debug=' + ((_this$apiConfig23 = this.apiConfig) === null || _this$apiConfig23 === void 0 ? void 0 : _this$apiConfig23.useDebugUrl);
               headers = {};
               if (this.jwt) headers = {
                 Authorization: 'Bearer ' + this.jwt
@@ -16043,7 +16053,7 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
       showOnlyWhenHasPrice: jsonOPV.ShowOnlyWhenHasPrice && jsonOPV.ShowOnlyWhenHasPrice == 'True' ? true : false,
       priceUnit: jsonOPV.PriceUnit,
       value: jsonOPV.Value,
-      property: [].concat(_toConsumableArray__default["default"]((_jsonOPV$Metadatas = jsonOPV.Metadatas) !== null && _jsonOPV$Metadatas !== void 0 ? _jsonOPV$Metadatas : []), _toConsumableArray__default["default"]((_mask$properties = mask === null || mask === void 0 ? void 0 : mask.properties) !== null && _mask$properties !== void 0 ? _mask$properties : [])),
+      property: [].concat(_toConsumableArray__default["default"]((_jsonOPV$Metadatas = jsonOPV.Metadatas) !== null && _jsonOPV$Metadatas !== void 0 ? _jsonOPV$Metadatas : []), _toConsumableArray__default["default"](Object.values((_mask$properties = mask === null || mask === void 0 ? void 0 : mask.properties) !== null && _mask$properties !== void 0 ? _mask$properties : {}))),
       textbausteine: jsonOPV.Textbausteine
     };
     this.opv.colorGroups = this.mapRALColorToGroup();
@@ -16425,7 +16435,7 @@ var CatalogArticleData = /*#__PURE__*/function () {
       arePricesLoaded: false,
       articleOptions: {},
       decisions: [],
-      properties: [].concat(_toConsumableArray__default["default"]((_jsonArticle$Metadata = jsonArticle.Metadatas) !== null && _jsonArticle$Metadata !== void 0 ? _jsonArticle$Metadata : []), _toConsumableArray__default["default"]((_articleMask$properti = articleMask === null || articleMask === void 0 ? void 0 : articleMask.properties) !== null && _articleMask$properti !== void 0 ? _articleMask$properti : [])),
+      properties: [].concat(_toConsumableArray__default["default"]((_jsonArticle$Metadata = jsonArticle.Metadatas) !== null && _jsonArticle$Metadata !== void 0 ? _jsonArticle$Metadata : []), _toConsumableArray__default["default"](Object.values((_articleMask$properti = articleMask === null || articleMask === void 0 ? void 0 : articleMask.properties) !== null && _articleMask$properti !== void 0 ? _articleMask$properti : {}))),
       image: jsonArticle.Image && jsonArticle.Image != '' ? jsonArticle.Image : undefined,
       imageWidth: jsonArticle.ImageWidth ? jsonArticle.ImageWidth : undefined,
       imageHeight: jsonArticle.ImageHeight ? jsonArticle.ImageHeight : undefined,
@@ -17829,10 +17839,11 @@ var CatalogPlannerArticleData = /*#__PURE__*/function () {
 
 var OptionCatalogData = /*#__PURE__*/function () {
   function OptionCatalogData(codex, jsonOPT, catalogData) {
-    var _catalogData$catalogM, _catalogData$catalogM2, _catalogData$catalogM3, _optionMask$name$cata, _optionMask$name, _catalogData$api$getL, _optionMask$name2, _optionMask$hidden, _optionMask$tabGroup, _catalogData$api$getL2, _ref, _optionMask$layout, _optionMask$propertie, _jsonOPT$showOPVAsArt, _jsonOPT$Properties, _optionMask$propertie2;
+    var _catalogData$catalogM, _catalogData$catalogM2, _catalogData$catalogM3, _jsonOPT$Properties, _optionMask$propertie, _optionMask$name$cata, _optionMask$name, _catalogData$api$getL, _optionMask$name2, _optionMask$hidden, _optionMask$tabGroup, _catalogData$api$getL2, _ref, _optionMask$layout, _properties$find, _jsonOPT$showOPVAsArt;
     _classCallCheck__default["default"](this, OptionCatalogData);
     _defineProperty__default["default"](this, "opt", void 0);
     var optionMask = (_catalogData$catalogM = (_catalogData$catalogM2 = catalogData.catalogMask) === null || _catalogData$catalogM2 === void 0 || (_catalogData$catalogM2 = _catalogData$catalogM2.options) === null || _catalogData$catalogM2 === void 0 ? void 0 : _catalogData$catalogM2[codex]) !== null && _catalogData$catalogM !== void 0 ? _catalogData$catalogM : codex.startsWith('OPT') ? (_catalogData$catalogM3 = catalogData.catalogMask) === null || _catalogData$catalogM3 === void 0 || (_catalogData$catalogM3 = _catalogData$catalogM3.options) === null || _catalogData$catalogM3 === void 0 ? void 0 : _catalogData$catalogM3[codex.substring(3)] : undefined;
+    var properties = [].concat(_toConsumableArray__default["default"]((_jsonOPT$Properties = jsonOPT.Properties) !== null && _jsonOPT$Properties !== void 0 ? _jsonOPT$Properties : []), _toConsumableArray__default["default"](Object.values((_optionMask$propertie = optionMask === null || optionMask === void 0 ? void 0 : optionMask.properties) !== null && _optionMask$propertie !== void 0 ? _optionMask$propertie : {})));
     this.opt = {
       codex: codex,
       name: (_optionMask$name$cata = optionMask === null || optionMask === void 0 || (_optionMask$name = optionMask.name) === null || _optionMask$name === void 0 ? void 0 : _optionMask$name[(_catalogData$api$getL = catalogData.api.getLanguage()) === null || _catalogData$api$getL === void 0 ? void 0 : _catalogData$api$getL.toLowerCase()]) !== null && _optionMask$name$cata !== void 0 ? _optionMask$name$cata : jsonOPT.Name,
@@ -17843,9 +17854,9 @@ var OptionCatalogData = /*#__PURE__*/function () {
       image: jsonOPT.Image ? jsonOPT.Image : undefined,
       invisible: (_optionMask$hidden = optionMask === null || optionMask === void 0 ? void 0 : optionMask.hidden) !== null && _optionMask$hidden !== void 0 ? _optionMask$hidden : jsonOPT.Invisible != undefined ? jsonOPT.Invisible : false,
       maskTabgroup: optionMask === null || optionMask === void 0 || (_optionMask$tabGroup = optionMask.tabGroup) === null || _optionMask$tabGroup === void 0 ? void 0 : _optionMask$tabGroup[(_catalogData$api$getL2 = catalogData.api.getLanguage()) === null || _catalogData$api$getL2 === void 0 ? void 0 : _catalogData$api$getL2.toLowerCase()],
-      layout: (_ref = (_optionMask$layout = optionMask === null || optionMask === void 0 ? void 0 : optionMask.layout) !== null && _optionMask$layout !== void 0 ? _optionMask$layout : optionMask === null || optionMask === void 0 || (_optionMask$propertie = optionMask.properties) === null || _optionMask$propertie === void 0 || (_optionMask$propertie = _optionMask$propertie.find(function (p) {
+      layout: (_ref = (_optionMask$layout = optionMask === null || optionMask === void 0 ? void 0 : optionMask.layout) !== null && _optionMask$layout !== void 0 ? _optionMask$layout : properties === null || properties === void 0 || (_properties$find = properties.find(function (p) {
         return p.Codex == 'LAYOUT';
-      })) === null || _optionMask$propertie === void 0 ? void 0 : _optionMask$propertie.Value) !== null && _ref !== void 0 ? _ref : jsonOPT.Layout != undefined ? jsonOPT.Layout : 'IMAGE',
+      })) === null || _properties$find === void 0 ? void 0 : _properties$find.Value) !== null && _ref !== void 0 ? _ref : jsonOPT.Layout != undefined ? jsonOPT.Layout : 'IMAGE',
       multiselect: jsonOPT.Multiselect != undefined ? jsonOPT.Multiselect == 'True' : false,
       sendToPIM: !!jsonOPT.SendToPIM,
       useMaxPriceOfGroup: jsonOPT.UseMaxPriceOfGroup != undefined ? Number(jsonOPT.UseMaxPriceOfGroup) : undefined,
@@ -17854,7 +17865,7 @@ var OptionCatalogData = /*#__PURE__*/function () {
       hideInOrderText: jsonOPT.hideInOrderText != undefined ? jsonOPT.hideInOrderText == 'True' : false,
       showOPVCodex: jsonOPT.showOPVCodex != undefined ? jsonOPT.showOPVCodex == 'True' : false,
       showOPVAsArticleNr: typeof jsonOPT.showOPVAsArticleNr == 'boolean' ? jsonOPT.showOPVAsArticleNr : ((_jsonOPT$showOPVAsArt = jsonOPT.showOPVAsArticleNr) === null || _jsonOPT$showOPVAsArt === void 0 ? void 0 : _jsonOPT$showOPVAsArt.toLowerCase()) == 'true',
-      property: [].concat(_toConsumableArray__default["default"]((_jsonOPT$Properties = jsonOPT.Properties) !== null && _jsonOPT$Properties !== void 0 ? _jsonOPT$Properties : []), _toConsumableArray__default["default"]((_optionMask$propertie2 = optionMask === null || optionMask === void 0 ? void 0 : optionMask.properties) !== null && _optionMask$propertie2 !== void 0 ? _optionMask$propertie2 : [])),
+      property: properties,
       parentOptionCodex: jsonOPT.ParentOptionCodex,
       articlePlaceholder: jsonOPT.ArticlePlaceholder && jsonOPT.ArticlePlaceholder == 'True' ? true : false,
       isMultiselect: jsonOPT.Multiselect != undefined ? jsonOPT.Multiselect == 'True' : false
@@ -18289,7 +18300,28 @@ var DivaCatalogData = /*#__PURE__*/function () {
       // old tag
       useDecisionPosCountValue: false,
       useShelfPlannerRTV: false,
-      notificationsRules: [],
+      notificationsRules: [{
+        rules: [{
+          visitedOptions: ['SHELFARTICLE_1'],
+          articles: [''],
+          jsFormula: '',
+          variantValues: {}
+        }],
+        checkOnEvents: {
+          option: 'GR',
+          articleCodex: '',
+          optionValue: ''
+        },
+        type: 'notification',
+        showInModal: true,
+        onlyShowOnce: true,
+        messageTitle: {
+          DE: 'ospele'
+        },
+        message: {
+          DE: 'Achtung alle änderungen gehen verlohren... Bist du sicher?'
+        }
+      }],
       warningRule: [],
       summaryTabGroupPosition: undefined,
       onConfigSingleDontGeneralize: false,
@@ -18335,7 +18367,7 @@ var DivaCatalogData = /*#__PURE__*/function () {
         var _this$catalogMask$cat;
         if ((_this$catalogMask$cat = this.catalogMask.catalog.name) !== null && _this$catalogMask$cat !== void 0 && _this$catalogMask$cat[this.api.getLanguage()]) this.catalogData.catalogName = this.catalogMask.catalog.name[this.api.getLanguage()];
         if (this.catalogMask.catalog.name) this.catalogData.name_locales = this.catalogMask.catalog.name;
-        if (this.catalogMask.catalog.properties) this.initProperties([].concat(_toConsumableArray__default["default"](this.origProperties), _toConsumableArray__default["default"](this.catalogMask.catalog.properties)));
+        if (this.catalogMask.catalog.properties) this.initProperties([].concat(_toConsumableArray__default["default"](this.origProperties), _toConsumableArray__default["default"](Object.values(this.catalogMask.catalog.properties))));
       }
     }
   }, {
@@ -18593,6 +18625,8 @@ var DivaCatalogData = /*#__PURE__*/function () {
           _this.catalogData.bundleRules = JSON.parse(item.Value);
         } else if (item.Codex == 'NOTIFICATIONS') {
           _this.catalogData.notificationsRules = JSON.parse(item.Value);
+        } else if (item.Codex == 'WARNINGS') {
+          _this.catalogData.warningRule = JSON.parse(item.Value);
         } else if (item.Codex == 'IGNORE_MAX_PRICE_AS_BASEPRICE') {
           _this.catalogData.ignoreMaxPriceAsBP = item.Value == '1';
         } else if (item.Codex == 'DONT_USE_VCODEX_FOR_BASKET') {
@@ -19614,7 +19648,7 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
     key: "getCatalogData",
     value: function () {
       var _getCatalogData = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(state, catalogCodex, orderSet) {
-        var catalogKey, promises, _yield$Promise$all, _yield$Promise$all2, catalogApiData, catalogArticleListData, catalogArticlePlannerListData, additionalModelInfos, catalogData, _state$actions;
+        var catalogKey, promises, _yield$Promise$all, _yield$Promise$all2, catalogApiData, catalogArticleListData, catalogArticlePlannerListData, additionalModelInfos, mask, _state$catalogMask, catalogData, _state$actions;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -19626,7 +19660,7 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
               return _context.abrupt("return", state.divaCatalogs[catalogKey]);
             case 5:
               if (!orderSet) {
-                _context.next = 42;
+                _context.next = 46;
                 break;
               }
               // ab hier parallell laden
@@ -19647,43 +19681,49 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
               throw new Error(catalogApiData.Error);
             case 17:
               additionalModelInfos = undefined;
+              mask = undefined;
+              _context.prev = 19;
+              _context.next = 22;
+              return state.api.getDataCache(state.api.getCatalogMaskQS(catalogApiData.GUID, state.api.OrganizationId), undefined, undefined, 'enricher');
+            case 22:
+              mask = _context.sent;
               if (!(!state.api.dontLoadAdditionalModelInfos && catalogApiData.AccountGuid)) {
-                _context.next = 28;
+                _context.next = 27;
                 break;
               }
-              _context.prev = 19;
-              _context.next = 22;
+              _context.next = 26;
               return state.api.getDataCache(state.api.getAdditionalModelInfosQS(catalogApiData.AccountGuid, catalogApiData.GUID), undefined, undefined, 'catalog');
-            case 22:
+            case 26:
               additionalModelInfos = _context.sent;
-              _context.next = 28;
+            case 27:
+              _context.next = 32;
               break;
-            case 25:
-              _context.prev = 25;
+            case 29:
+              _context.prev = 29;
               _context.t0 = _context["catch"](19);
               LOG$d.debug('no additionalModelInfos found: ' + _context.t0);
-            case 28:
-              if (state.catalogMask) {
+            case 32:
+              if (state.catalogMask || mask) {
                 if (!additionalModelInfos) additionalModelInfos = {
                   _id: ''
                 };
-                additionalModelInfos.catalogMask = state.catalogMask;
+                additionalModelInfos.catalogMask = (_state$catalogMask = state.catalogMask) !== null && _state$catalogMask !== void 0 ? _state$catalogMask : mask;
               }
               catalogData = new DivaCatalogData(catalogApiData, orderSet, state.api, additionalModelInfos);
               if (!(catalogArticleListData.Articles && catalogArticleListData.Articles.length > 0)) {
-                _context.next = 34;
+                _context.next = 38;
                 break;
               }
               catalogData.initCatalogArticles(catalogArticleListData.Articles);
-              _context.next = 37;
+              _context.next = 41;
               break;
-            case 34:
+            case 38:
               DivaUtils__default["default"].endSpanOfApm('Catalog initialize');
               LOG$d.error(new DivaUtils.DivaError('Catalog ' + catalogData.catalogName + ' not listed', {
                 code: 'WC_0002'
               }));
               throw new Error('Articles of Catalog: ' + catalogData.catalogCodex + ' are empty');
-            case 37:
+            case 41:
               if (catalogArticlePlannerListData.PlannerElements && catalogArticlePlannerListData.PlannerElements.length > 0) {
                 catalogData.initCatalogPlannerArticles(catalogArticlePlannerListData.PlannerElements);
               }
@@ -19700,16 +19740,16 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
 
               DivaUtils__default["default"].endSpanOfApm('Catalog initialize');
               return _context.abrupt("return", state.divaCatalogs[catalogKey]);
-            case 42:
+            case 46:
               LOG$d.error(new DivaUtils.DivaError('Catalog: ' + catalogCodex + ' not initialized! and orderSet not set', {
                 code: 'WC_0007'
               }));
               return _context.abrupt("return", state.divaCatalogs[catalogKey]);
-            case 44:
+            case 48:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[19, 25]]);
+        }, _callee, null, [[19, 29]]);
       }));
       function getCatalogData(_x, _x2, _x3) {
         return _getCatalogData.apply(this, arguments);
@@ -23504,7 +23544,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-63df1fef.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-402344f9.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -23568,6 +23608,7 @@ var DivaArticle = /*#__PURE__*/function () {
         calcUnitPrice = 0,
         calcUnit2Price = 0,
         firstUnit2Param = 0,
+        secondUnit2Param = 0,
         idmPriceMeasureFactor = 1;
       //CalcPreise berechnen
       for (var i = 0; i < maxPriceOfGroupCodex.length; i++) {
@@ -23598,76 +23639,82 @@ var DivaArticle = /*#__PURE__*/function () {
         if (myArtOPS.replaceMainArtNr) {
           this.configArticleCodex = myArtOPS.replaceMainArtNr;
         }
+        var name = myArtOPS.name;
+        console.log('name', name);
         if (!tmpOPT.useMaxPriceOfGroup) {
           myArtOPS.calcPrice = myArtOPS.price * myArtOPS.quantity;
         }
-        switch (pUnit) {
-          case 'm':
-            calcUnitPrice += myArtOPS.calcPrice / 100;
-            break;
-          case 'cm':
-            calcUnitPrice += myArtOPS.calcPrice;
-            break;
-          case 'm2':
-            calcUnit2Price += myArtOPS.calcPrice / 10000;
-            break;
-          case 'cm2':
-            calcUnit2Price += myArtOPS.calcPrice;
-            break;
-          default:
-            if (myArtOPS.isPercentage) {
-              //hier myArtOPS.TargetOption auswerten
-              if (myArtOPS.targetOption && myArtOPS.targetOption != '') ; else {
-                myArtOPS.usedCalcPrice = myArtOPS.calcPrice;
-              }
-            } else {
-              myArtOPS.usedCalcPrice = DivaUtils__default["default"].decimalAdjust('round', myArtOPS.calcPrice, digits);
-            }
-            break;
-        }
-        if (mUnit || OP == 'OPTUMFANG' || OP == 'OPTUMFANG_KREIS') {
-          var freeTextMeasure = parseFloat(myArtOPS.freeText ? myArtOPS.freeText : '');
-          if (freeTextMeasure || OP == 'OPTUMFANG' || OP == 'OPTUMFANG_KREIS') {
-            if (calcUnitPrice != 0) {
-              var quantity = 0;
-              if (OP == 'OPTUMFANG') {
-                mUnit = 'cm';
-                quantity = this.calcWidth * 2 + this.calcDepth * 2;
-              } else if (OP == 'OPTUMFANG_KREIS') {
-                mUnit = 'cm';
-                quantity = this.calcWidth * Math.PI;
+        if (pUnit !== null && pUnit !== void 0 && pUnit.includes('2') && calcUnit2Price && firstUnit2Param && secondUnit2Param) {
+          var unit2Price = this.getCalcPerUnit(pUnit, myArtOPS.calcPrice);
+          myArtOPS.usedCalcPrice = unit2Price * firstUnit2Param * secondUnit2Param;
+        } else {
+          switch (pUnit) {
+            case 'm':
+              calcUnitPrice += myArtOPS.calcPrice / 100;
+              break;
+            case 'cm':
+              calcUnitPrice += myArtOPS.calcPrice;
+              break;
+            case 'm2':
+              calcUnit2Price += myArtOPS.calcPrice / 10000;
+              break;
+            case 'cm2':
+              calcUnit2Price += myArtOPS.calcPrice;
+              break;
+            default:
+              if (myArtOPS.isPercentage) {
+                //hier myArtOPS.TargetOption auswerten
+                if (myArtOPS.targetOption && myArtOPS.targetOption != '') ; else {
+                  myArtOPS.usedCalcPrice = myArtOPS.calcPrice;
+                }
               } else {
-                quantity = freeTextMeasure;
+                myArtOPS.usedCalcPrice = DivaUtils__default["default"].decimalAdjust('round', myArtOPS.calcPrice, digits);
               }
-              if (mUnit == 'cm') myArtOPS.usedCalcPrice = calcUnitPrice * quantity;else if (mUnit == 'm') myArtOPS.usedCalcPrice = calcUnitPrice * quantity * 100;
-            } else if (calcUnit2Price != 0) {
-              //for diamter option
-              if (myArtOPS.option.diameter) {
-                myArtOPS.usedCalcPrice = calcUnit2Price * this.calcWidth * this.calcDepth;
-              } else {
-                if (firstUnit2Param == 0) {
-                  firstUnit2Param = freeTextMeasure;
-                  if (mUnit == 'm') firstUnit2Param = firstUnit2Param * 100;
+              break;
+          }
+          if (mUnit || OP == 'OPTUMFANG' || OP == 'OPTUMFANG_KREIS') {
+            var freeTextMeasure = parseFloat(myArtOPS.freeText ? myArtOPS.freeText : '');
+            if (freeTextMeasure || (OP == 'OPTUMFANG' || OP == 'OPTUMFANG_KREIS') && calcUnitPrice != 0) {
+              if (calcUnitPrice != 0) {
+                var quantity = 0;
+                if (OP == 'OPTUMFANG') {
+                  mUnit = 'cm';
+                  quantity = this.calcWidth * 2 + this.calcDepth * 2;
+                } else if (OP == 'OPTUMFANG_KREIS') {
+                  mUnit = 'cm';
+                  quantity = this.calcWidth * Math.PI;
+                } else {
+                  quantity = freeTextMeasure;
+                }
+                if (mUnit == 'cm') myArtOPS.usedCalcPrice = calcUnitPrice * quantity;else if (mUnit == 'm') myArtOPS.usedCalcPrice = calcUnitPrice * quantity * 100;
+              } else if (calcUnit2Price != 0) {
+                //for diamter option
+                if (myArtOPS.option.diameter) {
+                  myArtOPS.usedCalcPrice = calcUnit2Price * this.calcWidth * this.calcDepth;
                 } else {
-                  var secondUnit2Param = freeTextMeasure;
-                  if (mUnit == 'm') secondUnit2Param = secondUnit2Param * 100;
-                  myArtOPS.usedCalcPrice = calcUnit2Price * firstUnit2Param * secondUnit2Param;
+                  if (firstUnit2Param == 0) {
+                    firstUnit2Param = freeTextMeasure;
+                    if (mUnit == 'm') firstUnit2Param = firstUnit2Param * 100;
+                  } else {
+                    secondUnit2Param = freeTextMeasure;
+                    if (mUnit == 'm') secondUnit2Param = secondUnit2Param * 100;
+                    myArtOPS.usedCalcPrice = calcUnit2Price * firstUnit2Param * secondUnit2Param;
+                  }
                 }
               }
             }
           }
-        }
-        if (OP == 'OPT95' && !!this.catalogArticle.widthHasPrice) {
-          idmPriceMeasureFactor = idmPriceMeasureFactor * this.calcWidth;
-        }
-        if (OP == 'OPT96' && !!this.catalogArticle.depthHasPrice) {
-          idmPriceMeasureFactor = idmPriceMeasureFactor * this.calcDepth;
-        }
-        if (OP == 'OPT97' && !!this.catalogArticle.heightHasPrice) {
-          idmPriceMeasureFactor = idmPriceMeasureFactor * this.calcHeight;
+          if (OP == 'OPT95' && !!this.catalogArticle.widthHasPrice) {
+            idmPriceMeasureFactor = idmPriceMeasureFactor * this.calcWidth;
+          }
+          if (OP == 'OPT96' && !!this.catalogArticle.depthHasPrice) {
+            idmPriceMeasureFactor = idmPriceMeasureFactor * this.calcDepth;
+          }
+          if (OP == 'OPT97' && !!this.catalogArticle.heightHasPrice) {
+            idmPriceMeasureFactor = idmPriceMeasureFactor * this.calcHeight;
+          }
         }
       }
-
       //jetzt nochmal prozentuelle Preise mit TargetOption berechnen
       for (var _iKey3 in myArtOPSs) {
         var _myArtOPS = myArtOPSs[_iKey3];
@@ -23763,6 +23810,21 @@ var DivaArticle = /*#__PURE__*/function () {
       }
       this.article.price = articleUsedCalcPrice;
     }
+  }, {
+    key: "getCalcPerUnit",
+    value: function getCalcPerUnit(unit, calcPrice) {
+      switch (unit) {
+        case 'm':
+          return calcPrice / 100;
+        case 'cm':
+          return calcPrice;
+        case 'm2':
+          return calcPrice / 10000;
+        case 'cm2':
+          return calcPrice;
+      }
+      return 0;
+    }
   }, {
     key: "getOptionPrice",
     value: function getOptionPrice(calculatedPrice, optItem, digits) {
@@ -27943,8 +28005,8 @@ var DivaSet = /*#__PURE__*/function () {
   }, {
     key: "remindPriceForHash",
     value: function remindPriceForHash(product) {
-      var _product$discountedPr, _product$discountedPr2;
-      if (!product.available) return;
+      var _product$availableFor, _product$discountedPr, _product$discountedPr2;
+      if (!((_product$availableFor = product.availableForOrganizations) !== null && _product$availableFor !== void 0 && _product$availableFor.includes(this.getSetState.organizationId))) return;
       var claculatedPrice = this.getSetPrice(true);
       if (!product.discountedPrice && product.addedPrice === product.calculatedPrice && claculatedPrice == product.calculatedPrice) {
         return;
@@ -27970,7 +28032,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context4.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-5164c50d.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-96be0550.js'); });
             case 3:
               _yield$import = _context4.sent;
               DoorPlanner = _yield$import["default"];
@@ -29395,7 +29457,7 @@ var SummaryHandler = /*#__PURE__*/function () {
       if (article.getArticleOptionState('OPT' + optionCodexes[0])) {
         for (var i = 0; i < optionCodexes.length; i++) {
           var optionState = article.getArticleOptionState('OPT' + optionCodexes[i]);
-          if (!optionState.isInvisible && optionState.isDoShow && optionState.visibleCount > 0 && optionState.valCodex != 'OPVNR') {
+          if (optionState && !optionState.isInvisible && optionState.isDoShow && optionState.visibleCount > 0 && optionState.valCodex != 'OPVNR') {
             opss.push(optionState);
           }
         }
@@ -29687,10 +29749,10 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
               setHashes = {};
               variantId = this.getVariantIdToStart(set);
               origConfig = articles[Object.keys(articles)[0]].VariantValues;
-              i = variants.length - 1;
+              i = 0;
             case 6:
-              if (!(i >= 0)) {
-                _context3.next = 50;
+              if (!(i < variants.length)) {
+                _context3.next = 53;
                 break;
               }
               variantForTargetArticles = variants[i];
@@ -29793,9 +29855,14 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
               variantForTargetArticles.configVariantValues = configVariantValues;
               variantForTargetArticles.price = set === null || set === void 0 ? void 0 : set.getSetPrice();
               variantForTargetArticles.title = set === null || set === void 0 ? void 0 : set.CatalogData.catalogName;
-              if (!variantIsValid) {
-                variants.splice(i, 1);
+              if (variantIsValid) {
+                _context3.next = 48;
+                break;
               }
+              variants.splice(i, 1);
+              i--;
+              return _context3.abrupt("continue", 50);
+            case 48:
               reservedId = this.tryGetOldVariantIdForVariant(set, variants[i]);
               if (reservedId !== undefined) {
                 variants[i].id = reservedId;
@@ -29803,21 +29870,21 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
                 variants[i].id = variantId;
                 variantId++;
               }
-            case 47:
-              i--;
+            case 50:
+              i++;
               _context3.next = 6;
               break;
-            case 50:
+            case 53:
               if (!set.favoritesChanged) this.evalOldConfigVariants(set, variants);
-              _context3.next = 53;
+              _context3.next = 56;
               return setHandlerInstance.updateArticlesOptionStatesOfActSet(set, origConfig, Object.keys(articles), true);
-            case 53:
+            case 56:
               set.allVariantsCache = variants;
               variants.sort(function (a, b) {
                 return a.id - b.id;
               });
               return _context3.abrupt("return", variants);
-            case 56:
+            case 59:
             case "end":
               return _context3.stop();
           }
@@ -30104,7 +30171,7 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
               allvariants = _context4.t0;
               validVariants = [];
               for (i = 0; i < allvariants.length; i++) {
-                if (!set.disabledVariants.includes(i)) {
+                if (!set.disabledVariants.includes(allvariants[i].id)) {
                   validVariants.push(allvariants[i]);
                 }
               }
@@ -30299,8 +30366,8 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
       if (!((_set$oldConfigVariant3 = set.oldConfigVariants) !== null && _set$oldConfigVariant3 !== void 0 && _set$oldConfigVariant3.length)) return;
       //set all invalid
       set.disabledVariants = [];
-      variants.map(function (v, index) {
-        return set.disabledVariants.push(index);
+      variants.map(function (v) {
+        return set.disabledVariants.push(v.id);
       });
       var oldConfigVariants = _toConsumableArray__default["default"](set.oldConfigVariants);
       for (var i = 0; i < variants.length; i++) {
@@ -30323,7 +30390,7 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
             if (tryNext) break;
           }
           if (!tryNext) {
-            var index = set.disabledVariants.indexOf(i);
+            var index = set.disabledVariants.indexOf(variant.id);
             if (index != -1) set.disabledVariants.splice(index, 1);
             oldConfigVariants.splice(j, 1);
           }
@@ -34819,7 +34886,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     value: function () {
       var _initializeBasket = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(api) {
         var _this$plannerConfig$s3, _this$plannerConfig$s5, _api$getPlannerType, _this$plannerConfig$r;
-        var returnSuccessfully, divaNr, i, os, _params$customFieldsT, params, _this$plannerConfig$h, _this$plannerConfig$c, _this$plannerConfig$c2, _result$data$, result, _result$data$2, _this$plannerConfig$s4, _this$plannerConfig$a4, _api$getI18n, _api$getI18n2, successfully;
+        var returnSuccessfully, divaNr, i, os, _params$customFieldsT, params, _this$plannerConfig$h, _this$plannerConfig$c, _this$plannerConfig$c2, _this$plannerConfig$c3, _result$data$, result, _result$data$2, _this$plannerConfig$s4, _this$plannerConfig$a4, _api$getI18n, _api$getI18n2, successfully;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -34952,9 +35019,9 @@ var DivaBasketHandler = /*#__PURE__*/function () {
                 op: 'eq',
                 value: (_this$plannerConfig$c2 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c2 === void 0 ? void 0 : _this$plannerConfig$c2._id
               }, {
-                id: 'available',
+                id: 'availableForOrganizations',
                 op: 'eq',
-                value: true
+                value: (_this$plannerConfig$c3 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c3 === void 0 ? void 0 : _this$plannerConfig$c3._id
               }]);
             case 60:
               result = _context.sent;
@@ -35588,7 +35655,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     key: "saveToBasket",
     value: function () {
       var _saveToBasket = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee12(api, actBasket, returnTo) {
-        var _this$plannerConfig$c3, _this$_basketHandler, _api$getJwt;
+        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) {
@@ -35607,7 +35674,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               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$c3 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c3 === void 0 ? void 0 : _this$plannerConfig$c3.logoUrl;
+              actBasket.PrintRetailLogo = (_this$plannerConfig$c4 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c4 === void 0 ? void 0 : _this$plannerConfig$c4.logoUrl;
               _context12.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,
@@ -35763,7 +35830,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context13.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-0447de84.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-224c584c.js'); });
             case 5:
               _yield$import = _context13.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -35771,7 +35838,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context13.abrupt("break", 33);
             case 9:
               _context13.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-32bb295f.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-735014f7.js'); });
             case 11:
               _yield$import2 = _context13.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -35779,7 +35846,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context13.abrupt("break", 33);
             case 15:
               _context13.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-e7f5bfb9.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-3f4b1594.js'); });
             case 17:
               _yield$import3 = _context13.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -35787,7 +35854,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context13.abrupt("break", 33);
             case 21:
               _context13.next = 23;
-              return Promise.resolve().then(function () { return require('./ProductBasketHandler-144386d9.js'); });
+              return Promise.resolve().then(function () { return require('./ProductBasketHandler-034a3339.js'); });
             case 23:
               _yield$import4 = _context13.sent;
               ProductWWSHandler = _yield$import4["default"];
@@ -35795,7 +35862,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context13.abrupt("break", 33);
             case 27:
               _context13.next = 29;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-96b3ab81.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-b61cae22.js'); });
             case 29:
               _yield$import5 = _context13.sent;
               StandardWWSHandler = _yield$import5["default"];
@@ -35826,43 +35893,43 @@ var DivaBasketHandler = /*#__PURE__*/function () {
         //if no shopType is set in parent organization, no ropo effekt
         if (!organization.shopType) return;
         if (organization.shopType == 'store' && sourceOrganizationId.shopType == 'store') {
-          var _this$plannerConfig$c4;
+          var _this$plannerConfig$c5;
           LOG$6.businessEvent('ropoEffectStoreToStore', 'Seller', 'Evaluating the ROPO Effect Store To Store', {
             sourceDivaNr: sourceBasket.DivaNr,
             sourceOrgId: sourceOrganizationId.id,
-            targetOrgId: (_this$plannerConfig$c4 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c4 === void 0 ? void 0 : _this$plannerConfig$c4._id
+            targetOrgId: (_this$plannerConfig$c5 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c5 === void 0 ? void 0 : _this$plannerConfig$c5._id
           });
         } else if (organization.shopType == 'webshop' && sourceOrganizationId.shopType == 'webshop') {
-          var _this$plannerConfig$c5;
+          var _this$plannerConfig$c6;
           LOG$6.businessEvent('ropoEffectWebToWeb', 'Seller', 'Evaluating the ROPO Effect Web To Web', {
             sourceDivaNr: sourceBasket.DivaNr,
             sourceOrgId: sourceOrganizationId.id,
-            targetOrgId: (_this$plannerConfig$c5 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c5 === void 0 ? void 0 : _this$plannerConfig$c5._id
+            targetOrgId: (_this$plannerConfig$c6 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c6 === void 0 ? void 0 : _this$plannerConfig$c6._id
           });
         } else if (organization.shopType == 'store' && sourceOrganizationId.shopType == 'webshop') {
-          var _this$plannerConfig$c6;
+          var _this$plannerConfig$c7;
           LOG$6.businessEvent('ropoEffectStoreToWeb', 'Seller', 'Evaluating the ROPO Effect Web To Store', {
             sourceDivaNr: sourceBasket.DivaNr,
             sourceOrgId: sourceOrganizationId.id,
-            targetOrgId: (_this$plannerConfig$c6 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c6 === void 0 ? void 0 : _this$plannerConfig$c6._id
+            targetOrgId: (_this$plannerConfig$c7 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c7 === void 0 ? void 0 : _this$plannerConfig$c7._id
           });
         } else if (organization.shopType == 'webshop' && sourceOrganizationId.shopType == 'store') {
-          var _this$plannerConfig$c7;
+          var _this$plannerConfig$c8;
           LOG$6.businessEvent('ropoEffectWebToStore', 'Seller', 'Evaluating the ROPO Effect Store To Web', {
             sourceDivaNr: sourceBasket.DivaNr,
             sourceOrgId: sourceOrganizationId.id,
-            targetOrgId: (_this$plannerConfig$c7 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c7 === void 0 ? void 0 : _this$plannerConfig$c7._id
+            targetOrgId: (_this$plannerConfig$c8 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c8 === void 0 ? void 0 : _this$plannerConfig$c8._id
           });
         }
       } catch (e) {
-        var _this$plannerConfig$c8;
+        var _this$plannerConfig$c9;
         LOG$6.error(new DivaUtils.DivaError('Error on Evaluating ROPO Effect', {
           code: 'SELLER_0006',
           cause: e,
           custom: {
             sourceDivaNr: sourceBasket.DivaNr,
             sourceOrgId: sourceOrganizationId,
-            targetOrgId: (_this$plannerConfig$c8 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c8 === void 0 ? void 0 : _this$plannerConfig$c8._id
+            targetOrgId: (_this$plannerConfig$c9 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c9 === void 0 ? void 0 : _this$plannerConfig$c9._id
           }
         }));
       }
@@ -37000,7 +37067,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
                 break;
               }
               _context3.next = 3;
-              return Promise.resolve().then(function () { return require('./Host3DSignalR-f13134cb.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-e4ca360e.js'); });
             case 3:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -38560,7 +38627,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
                 break;
               }
               _context4.next = 11;
-              return Promise.resolve().then(function () { return require('./DivaSingleProductPlanner-fcf3e4be.js'); });
+              return Promise.resolve().then(function () { return require('./DivaSingleProductPlanner-a308bc4c.js'); });
             case 11:
               _yield$import = _context4.sent;
               DivaSingleProductPlanner = _yield$import["default"];
@@ -38569,7 +38636,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 16:
               _context4.next = 18;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-a18f752d.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-3ead2b7c.js'); });
             case 18:
               _yield$import2 = _context4.sent;
               DivaStandardPlanner = _yield$import2["default"];
@@ -38581,7 +38648,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context4.abrupt("break", 29);
             case 23:
               _context4.next = 25;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-6a883291.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-d100fdb8.js'); });
             case 25:
               _yield$import3 = _context4.sent;
               DivaBoxPlanner = _yield$import3["default"];
@@ -42974,6 +43041,8 @@ var Grid = /*#__PURE__*/function () {
     // E.g: "Grid Left" or "Grid Middle" or "Grid Right"
     _defineProperty__default["default"](this, "gridName", void 0);
     _defineProperty__default["default"](this, "maxAccessoireInGridCounter", void 0);
+    //only one array of accessoires is plannable together in one grid. the accessoires of the mid array exclude each other. The outer array is for te usage of this rule in different usecases.
+    _defineProperty__default["default"](this, "excludeAccessoiresByAccessoiresInGrid", void 0);
     _defineProperty__default["default"](this, "influencedByNeighborGrids", void 0);
     _defineProperty__default["default"](this, "influencedByOverlappingGrids", void 0);
     var grid = data.ShelfPlanner[index];
@@ -42989,6 +43058,7 @@ var Grid = /*#__PURE__*/function () {
     this.requiredWarning = grid.RequiredWarning;
     this.gridName = grid.GridName;
     this.maxAccessoireInGridCounter = grid.MaxAccessoireInGridCounter;
+    this.excludeAccessoiresByAccessoiresInGrid = grid.ExcludeAccessoiresByAccessoiresInGrid;
     this.influencedByNeighborGrids = grid.InfluencedByNeighborGrids;
     this.influencedByOverlappingGrids = grid.InfluencedByOverlappingGrids;
     this._group = grid.Group;
@@ -43001,8 +43071,9 @@ var Grid = /*#__PURE__*/function () {
       for (var i = 0; i < this.heightGridCellCountOnRule.length; i++) {
         var gridOnRule = this.heightGridCellCountOnRule[i];
         if (this.article.evalRule(DivaUtils__default["default"].getRuleByFormula(gridOnRule.Rule))) {
-          cellCount = gridOnRule.HeightGridCellCount;
-          this.articleRelations = gridOnRule.ArticleRelations;
+          var _gridOnRule$HeightGri, _gridOnRule$ArticleRe;
+          cellCount = (_gridOnRule$HeightGri = gridOnRule.HeightGridCellCount) !== null && _gridOnRule$HeightGri !== void 0 ? _gridOnRule$HeightGri : grid.HeightGridCellCount;
+          this.articleRelations = (_gridOnRule$ArticleRe = gridOnRule.ArticleRelations) !== null && _gridOnRule$ArticleRe !== void 0 ? _gridOnRule$ArticleRe : grid.ArticleRelations;
           if (gridOnRule.initAccArr) this.initAccArr = gridOnRule.initAccArr;
           this.currentLoadedRuleIndex = i;
         }
@@ -43674,7 +43745,7 @@ var Grid = /*#__PURE__*/function () {
     key: "getFreeSpacesOfAccessoire",
     value: function getFreeSpacesOfAccessoire(accessoire) {
       var size = accessoire.shelfHeight;
-      if (!size || this.disabledByRule || this.maxAccessoireCountReached(accessoire)) return [];
+      if (!size || this.disabledByRule || this.checkAccessoireInGridRules(accessoire)) return [];
       var freeCells = [];
       for (var i = 0; i < this.Cells.length; i++) {
         var _cell$Article4;
@@ -43709,22 +43780,51 @@ var Grid = /*#__PURE__*/function () {
       return _toConsumableArray__default["default"](new Set(freeCells));
     }
   }, {
-    key: "maxAccessoireCountReached",
-    value: function maxAccessoireCountReached(accessoire) {
-      var _this$maxAccessoireIn;
-      if (!((_this$maxAccessoireIn = this.maxAccessoireInGridCounter) !== null && _this$maxAccessoireIn !== void 0 && _this$maxAccessoireIn.length)) return false;
-      for (var i = 0; i < this.maxAccessoireInGridCounter.length; i++) {
-        var rule = this.maxAccessoireInGridCounter[i];
-        var counter = 0;
-        if (rule.accessoires.includes(accessoire.articleCodex)) {
-          var currentAccessoires = Object.values(this.Accessoires);
-          for (var j = 0; j < currentAccessoires.length; j++) {
-            var curAcc = currentAccessoires[j];
-            if (rule.accessoires.includes(curAcc.articleCodex)) {
-              counter = counter + curAcc.quantity;
+    key: "checkAccessoireInGridRules",
+    value: function checkAccessoireInGridRules(accessoire) {
+      var _this$maxAccessoireIn, _this$excludeAccessoi;
+      //max count in grid logic
+      if ((_this$maxAccessoireIn = this.maxAccessoireInGridCounter) !== null && _this$maxAccessoireIn !== void 0 && _this$maxAccessoireIn.length) {
+        for (var i = 0; i < this.maxAccessoireInGridCounter.length; i++) {
+          var rule = this.maxAccessoireInGridCounter[i];
+          var counter = 0;
+          if (rule.accessoires.includes(accessoire.articleCodex)) {
+            var currentAccessoires = Object.values(this.Accessoires);
+            for (var j = 0; j < currentAccessoires.length; j++) {
+              var curAcc = currentAccessoires[j];
+              if (rule.accessoires.includes(curAcc.articleCodex)) {
+                counter = counter + curAcc.quantity;
+              }
+            }
+            if (counter >= rule.maxCount) return true;
+          }
+        }
+      }
+
+      //accessories excluded eachother
+      if ((_this$excludeAccessoi = this.excludeAccessoiresByAccessoiresInGrid) !== null && _this$excludeAccessoi !== void 0 && _this$excludeAccessoi.length) {
+        var excludeAccessoiresGroup = this.excludeAccessoiresByAccessoiresInGrid;
+        for (var _j2 = 0; _j2 < excludeAccessoiresGroup.length; _j2++) {
+          var plannedAccessoireIndex = -1;
+          var excludeAccessoires = excludeAccessoiresGroup[_j2];
+          for (var _i16 = 0; _i16 < excludeAccessoires.length; _i16++) {
+            var accessoireArray = excludeAccessoires[_i16];
+            for (var basketId in this.Accessoires) {
+              var palnnedAccessoire = this.Accessoires[basketId];
+              if (accessoireArray.includes(palnnedAccessoire.articleCodex)) {
+                plannedAccessoireIndex = _i16;
+                break;
+              }
+            }
+            if (plannedAccessoireIndex >= 0) break;
+          }
+          if (plannedAccessoireIndex >= 0) {
+            for (var _i17 = 0; _i17 < excludeAccessoires.length; _i17++) {
+              var _accessoireArray = excludeAccessoires[_i17];
+              if (plannedAccessoireIndex == _i17) continue;
+              if (_accessoireArray.includes(accessoire.articleCodex)) return true;
             }
           }
-          if (counter >= rule.maxCount) return true;
         }
       }
       return false;
@@ -43769,16 +43869,16 @@ var Grid = /*#__PURE__*/function () {
         }
       }
       if ((_this$influencedByNei = this.influencedByNeighborGrids) !== null && _this$influencedByNei !== void 0 && _this$influencedByNei.length) {
-        for (var _i16 = 0; _i16 < this.influencedByNeighborGrids.length; _i16++) {
+        for (var _i18 = 0; _i18 < this.influencedByNeighborGrids.length; _i18++) {
           var _this$article$shelfPl2;
-          var _influenced = this.influencedByNeighborGrids[_i16];
+          var _influenced = this.influencedByNeighborGrids[_i18];
           var neighborGrid = (_this$article$shelfPl2 = this.article.shelfPlanner) === null || _this$article$shelfPl2 === void 0 ? void 0 : _this$article$shelfPl2.getGridByGridName(_influenced.GridName);
           var _ret = false;
           if (!neighborGrid) continue;
           if (neighborGrid.Direction === this.Direction) {
-            for (var _j2 = 0; _j2 < size; _j2++) {
+            for (var _j3 = 0; _j3 < size; _j3++) {
               var _cell$Article5;
-              var cell = neighborGrid.cells[_j2 + index];
+              var cell = neighborGrid.cells[_j3 + index];
               if ((cell === null || cell === void 0 ? void 0 : cell.InUse) !== -1 && ((_cell$Article5 = cell.Article) === null || _cell$Article5 === void 0 ? void 0 : _cell$Article5.basketId) !== accessoire.basketId) {
                 _ret = true;
               }
@@ -43881,19 +43981,20 @@ var Grid = /*#__PURE__*/function () {
       });
       if (alternative) return alternative.ArticleRelations;
       if (this.heightGridCellCountOnRule && this.currentLoadedRuleIndex !== false) {
-        return this.heightGridCellCountOnRule[this.currentLoadedRuleIndex].ArticleRelations;
+        var curGrid = this.heightGridCellCountOnRule[this.currentLoadedRuleIndex];
+        if (curGrid.ArticleRelations) return curGrid.ArticleRelations;
       }
       return this.articleRelations;
     }
   }, {
     key: "getGridIdByArticleCodex",
     value: function getGridIdByArticleCodex(articleCodex) {
-      var _this$ArticleRelation3;
+      var _this$ArticleRelation3, _this$heightGridCellC;
       var alternative = (_this$ArticleRelation3 = this.ArticleRelationsForOtherGroups) === null || _this$ArticleRelation3 === void 0 ? void 0 : _this$ArticleRelation3.find(function (g) {
         return g.ArticleRelations.includes(articleCodex);
       });
       if (alternative) return alternative.Group;
-      if (this.heightGridCellCountOnRule && this.currentLoadedRuleIndex !== false && this.heightGridCellCountOnRule[this.currentLoadedRuleIndex].ArticleRelations.includes(articleCodex)) {
+      if (this.heightGridCellCountOnRule && this.currentLoadedRuleIndex !== false && (_this$heightGridCellC = this.heightGridCellCountOnRule[this.currentLoadedRuleIndex].ArticleRelations) !== null && _this$heightGridCellC !== void 0 && _this$heightGridCellC.includes(articleCodex)) {
         return this.gridGroup;
       }
       if (this.articleRelations.includes(articleCodex)) {
@@ -59884,7 +59985,7 @@ var ProductHandler = /*#__PURE__*/function () {
      */
     _defineProperty__default["default"](this, "loadProducts", /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(_ref3) {
-        var _productData$length, _basket$OrderSets, _baseProduct, _baseProduct2, _baseProduct3, _baseProduct4, _baseProduct5, _baseProduct6, _baseProduct7, _baseProduct8, _baseProduct9, _baseProduct10, _baseProduct11, _baseProduct$width, _baseProduct12, _basket$SetPlannerInf, _basket$OrderSets$0$B, _baseProduct$height, _baseProduct13, _basket$SetPlannerInf2, _basket$OrderSets$0$B2, _baseProduct$depth, _baseProduct14, _basket$SetPlannerInf3, _basket$OrderSets$0$B3, _basket$SetPlannerInf4, _basket$SetPlannerInf5, _baseProduct15, _baseProduct16, _baseProduct17, _baseProduct18;
+        var _productData$length, _basket$OrderSets, _baseProduct, _baseProduct2, _baseProduct3, _baseProduct4, _baseProduct5, _baseProduct6, _baseProduct7, _baseProduct8, _baseProduct9, _baseProduct10, _baseProduct11, _baseProduct$width, _baseProduct12, _basket$SetPlannerInf, _basket$OrderSets$0$B, _baseProduct$height, _baseProduct13, _basket$SetPlannerInf2, _basket$OrderSets$0$B2, _baseProduct$depth, _baseProduct14, _basket$SetPlannerInf3, _basket$OrderSets$0$B3, _basket$SetPlannerInf4, _basket$SetPlannerInf5, _baseProduct15, _baseProduct16, _baseProduct17;
         var basket, catalogData, productData, classificationFields, products, baseProduct, variantProducts, isSet, dockingPoints, orderDescription, catalogDataName, catalogDataDescription, setName, _ProductHandler$calcu, shortDescription, shortDescriptionModified, _ProductHandler$calcu2, addedPrice, addedPriceModified, articles, baseData, classificationData, variantData, variantDataModified, addedProducts, removedProducts, optFields, initialSelectedFields, _basket$OrderSets$0$C2, usedConfigVariants, differingOPTs, _basket$OrderSets$0$C3, opts, i;
         return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -59996,10 +60097,9 @@ var ProductHandler = /*#__PURE__*/function () {
                 mainCategory: _this.mainCategory,
                 subCategory: _this.subCategory,
                 retailerArticleNr: (_baseProduct15 = baseProduct) === null || _baseProduct15 === void 0 ? void 0 : _baseProduct15.retailerArticleNr,
-                available: ((_baseProduct16 = baseProduct) === null || _baseProduct16 === void 0 ? void 0 : _baseProduct16.available) != undefined ? baseProduct.available : false,
                 dockingPoints: dockingPoints,
-                media: (_baseProduct17 = baseProduct) === null || _baseProduct17 === void 0 ? void 0 : _baseProduct17.media,
-                affiliate: (_baseProduct18 = baseProduct) === null || _baseProduct18 === void 0 ? void 0 : _baseProduct18.affiliate
+                media: (_baseProduct16 = baseProduct) === null || _baseProduct16 === void 0 ? void 0 : _baseProduct16.media,
+                affiliate: (_baseProduct17 = baseProduct) === null || _baseProduct17 === void 0 ? void 0 : _baseProduct17.affiliate
               }; //get classification data and remove field prefix
               classificationData = _this.parseClassificationFields(baseProduct, true); // init Variants
               variantData = [];
@@ -60481,11 +60581,6 @@ _defineProperty__default["default"](ProductHandler, "baseDataFields", [{
   type: 'text',
   title: 'productcreator.fields.technicalDescription',
   fieldType: 'BASE'
-}, {
-  field: 'available',
-  type: 'boolean',
-  title: 'productcreator.fields.available',
-  fieldType: 'BASE'
 }, {
   field: 'calculatedPrice',
   type: 'price',