@crystaldesign/web-planner-logic 24.10.0-beta.2 → 24.10.0-beta.4

package/build/cjs/{DivaBoxPlanner-6a883291.js → DivaBoxPlanner-df3a7b94.js}

@@ -5,11 +5,11 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-0cf8efc1.js');
+var index = require('./index-6c4b6fc1.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
-var DockingPointHandler = require('./DockingPointHandler-5c6b6024.js');
-var PlannerHandler2D = require('./PlannerHandler2D-a941c306.js');
+var DockingPointHandler = require('./DockingPointHandler-32c1267a.js');
+var PlannerHandler2D = require('./PlannerHandler2D-03db7092.js');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/slicedToArray');
 require('axios');

package/build/cjs/{DivaSingleProductPlanner-fcf3e4be.js → DivaSingleProductPlanner-825f9f2a.js}

@@ -5,8 +5,8 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-0cf8efc1.js');
-var DockingPointHandler = require('./DockingPointHandler-5c6b6024.js');
+var index = require('./index-6c4b6fc1.js');
+var DockingPointHandler = require('./DockingPointHandler-32c1267a.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/slicedToArray');

package/build/cjs/{DivaStandardPlanner-a18f752d.js → DivaStandardPlanner-fa3dc4b8.js}

@@ -5,10 +5,10 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-0cf8efc1.js');
-var DockingPointHandler = require('./DockingPointHandler-5c6b6024.js');
+var index = require('./index-6c4b6fc1.js');
+var DockingPointHandler = require('./DockingPointHandler-32c1267a.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
-var PlannerHandler2D = require('./PlannerHandler2D-a941c306.js');
+var PlannerHandler2D = require('./PlannerHandler2D-03db7092.js');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/toConsumableArray');

package/build/cjs/{DockingPointHandler-5c6b6024.js → DockingPointHandler-32c1267a.js}

@@ -3,7 +3,7 @@
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-var index = require('./index-0cf8efc1.js');
+var index = require('./index-6c4b6fc1.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

package/build/cjs/{DoorPlanner-5164c50d.js → DoorPlanner-87781159.js}

@@ -3,7 +3,7 @@
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-require('./index-0cf8efc1.js');
+require('./index-6c4b6fc1.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/regenerator');

package/build/cjs/{Host3DSignalR-f13134cb.js → Host3DSignalR-b474bb65.js}

@@ -5,7 +5,7 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-0cf8efc1.js');
+var index = require('./index-6c4b6fc1.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var signalR = require('@microsoft/signalr');
 var io = require('socket.io-client');

package/build/cjs/{LiviqueWWSHandler-32bb295f.js → LiviqueWWSHandler-d0164c3f.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-require('./index-0cf8efc1.js');
+require('./index-6c4b6fc1.js');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/defineProperty');
 require('@babel/runtime/regenerator');

package/build/cjs/{PfisterWWSHandler-0447de84.js → PfisterWWSHandler-decd7c4f.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-require('./index-0cf8efc1.js');
+require('./index-6c4b6fc1.js');
 var basketModel = require('@crystaldesign/basket-model');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/cjs/{PlannerHandler2D-a941c306.js → PlannerHandler2D-03db7092.js}

@@ -5,12 +5,12 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-0cf8efc1.js');
+var index = require('./index-6c4b6fc1.js');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var fabric = require('fabric');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var serialize = require('w3c-xmlserializer');
-var DockingPointHandler = require('./DockingPointHandler-5c6b6024.js');
+var DockingPointHandler = require('./DockingPointHandler-32c1267a.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 

package/build/cjs/{ProductBasketHandler-144386d9.js → ProductBasketHandler-1387d823.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-var index = require('./index-0cf8efc1.js');
+var index = require('./index-6c4b6fc1.js');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/defineProperty');
 require('@babel/runtime/regenerator');

package/build/cjs/{SeriousBasketHandler-e7f5bfb9.js → SeriousBasketHandler-9c37933c.js}

@@ -3,7 +3,7 @@
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-var index = require('./index-0cf8efc1.js');
+var index = require('./index-6c4b6fc1.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/regenerator');

package/build/cjs/{ShelfPlanner-63df1fef.js → ShelfPlanner-9c52b6e2.js}

@@ -6,7 +6,7 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-0cf8efc1.js');
+var index = require('./index-6c4b6fc1.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/slicedToArray');

package/build/cjs/{StandardWWSHandler-96b3ab81.js → StandardWWSHandler-053af296.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-require('./index-0cf8efc1.js');
+require('./index-6c4b6fc1.js');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/defineProperty');
 require('@babel/runtime/regenerator');

package/build/cjs/{index-0cf8efc1.js → index-6c4b6fc1.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');
@@ -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
@@ -19614,7 +19624,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 +19636,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 +19657,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 +19716,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 +23520,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-9c52b6e2.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -23568,6 +23584,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 +23615,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 {
-                  var secondUnit2Param = freeTextMeasure;
-                  if (mUnit == 'm') secondUnit2Param = secondUnit2Param * 100;
-                  myArtOPS.usedCalcPrice = calcUnit2Price * firstUnit2Param * secondUnit2Param;
+                  quantity = freeTextMeasure;
+                }
+                if (mUnit == 'cm') myArtOPS.usedCalcPrice = calcUnitPrice * quantity;else if (mUnit == 'm') myArtOPS.usedCalcPrice = calcUnitPrice * quantity * 100;
+              } else if (calcUnit2Price != 0) {
+                //for diamter option
+                if (myArtOPS.option.diameter) {
+                  myArtOPS.usedCalcPrice = calcUnit2Price * this.calcWidth * this.calcDepth;
+                } else {
+                  if (firstUnit2Param == 0) {
+                    firstUnit2Param = freeTextMeasure;
+                    if (mUnit == 'm') firstUnit2Param = firstUnit2Param * 100;
+                  } else {
+                    secondUnit2Param = freeTextMeasure;
+                    if (mUnit == 'm') secondUnit2Param = secondUnit2Param * 100;
+                    myArtOPS.usedCalcPrice = calcUnit2Price * firstUnit2Param * secondUnit2Param;
+                  }
                 }
               }
             }
           }
-        }
-        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 +23786,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) {
@@ -27970,7 +28008,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-87781159.js'); });
             case 3:
               _yield$import = _context4.sent;
               DoorPlanner = _yield$import["default"];
@@ -35763,7 +35801,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-decd7c4f.js'); });
             case 5:
               _yield$import = _context13.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -35771,7 +35809,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-d0164c3f.js'); });
             case 11:
               _yield$import2 = _context13.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -35779,7 +35817,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-9c37933c.js'); });
             case 17:
               _yield$import3 = _context13.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -35787,7 +35825,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-1387d823.js'); });
             case 23:
               _yield$import4 = _context13.sent;
               ProductWWSHandler = _yield$import4["default"];
@@ -35795,7 +35833,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-053af296.js'); });
             case 29:
               _yield$import5 = _context13.sent;
               StandardWWSHandler = _yield$import5["default"];
@@ -37000,7 +37038,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-b474bb65.js'); });
             case 3:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -38560,7 +38598,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-825f9f2a.js'); });
             case 11:
               _yield$import = _context4.sent;
               DivaSingleProductPlanner = _yield$import["default"];
@@ -38569,7 +38607,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-fa3dc4b8.js'); });
             case 18:
               _yield$import2 = _context4.sent;
               DivaStandardPlanner = _yield$import2["default"];
@@ -38581,7 +38619,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-df3a7b94.js'); });
             case 25:
               _yield$import3 = _context4.sent;
               DivaBoxPlanner = _yield$import3["default"];
@@ -43001,8 +43039,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;
         }
@@ -43881,19 +43920,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)) {

package/build/cjs/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-0cf8efc1.js');
+var index = require('./index-6c4b6fc1.js');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/classCallCheck');
 require('@babel/runtime/helpers/createClass');