@crystaldesign/web-planner-logic 26.4.3-rc.2 → 26.4.3-rc.21

package/build/cjs/{DivaBoxPlanner-c6dd2e23.js → DivaBoxPlanner-7b7df440.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-36427acd.js');
+var index = require('./index-528b346a.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
-var PlannerHandler2D = require('./PlannerHandler2D-2c3c3671.js');
+var PlannerHandler2D = require('./PlannerHandler2D-94232ad3.js');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('axios');
 require('@crystaldesign/basket-model');
@@ -4789,6 +4789,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
       var grid = this.generalPlanningState.grids[0].matrix;
       var backup = structuredClone(this.generalPlanningState);
       var res = this.getCellsInGridByElementId(elementId);
+      if (res.cells.length == 0) return true;
       var cell = res.cells[0];
       var scpe = this.gridSetupParams.forceSingleCellPerElement;
       var origin = {
@@ -6088,7 +6089,7 @@ var DivaBoxPlanner = /*#__PURE__*/function () {
         allElementsToCopy.push(elementId);
         if (copyInfo) {
           if (copyInfo.copyIndex.x != 0) {
-            if (this.constructionRulesHandler.getForceWholePlanningSameHeight()) {
+            if (this.boxPlannerGrid.getForceSingleCellPerElement() || this.constructionRulesHandler.getForceWholePlanningSameHeight()) {
               var result = this.boxPlannerGrid.getAllElementsInSameCol(elementId);
               allElementsToCopy = result.elements;
               result.backside;
@@ -6099,7 +6100,7 @@ var DivaBoxPlanner = /*#__PURE__*/function () {
             }
           }
           if (copyInfo.copyIndex.y != 0) {
-            if (this.constructionRulesHandler.getForceWholePlanningSameHeight()) {
+            if (this.boxPlannerGrid.getForceSingleCellPerElement() || this.constructionRulesHandler.getForceWholePlanningSameHeight()) {
               var resultCopyUp = this.boxPlannerGrid.getAllElementsInSameRowByElementId(elementId);
               allElementsToCopy = resultCopyUp.elementIds;
               resultCopyUp.backside;

package/build/cjs/{DivaStandardPlanner-a39991d8.js → DivaStandardPlanner-0ecbf621.js}

@@ -5,9 +5,9 @@ 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-36427acd.js');
+var index = require('./index-528b346a.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
-var PlannerHandler2D = require('./PlannerHandler2D-2c3c3671.js');
+var PlannerHandler2D = require('./PlannerHandler2D-94232ad3.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/toConsumableArray');

package/build/cjs/{DoorPlanner-8ca88521.js → DoorPlanner-c7649bfb.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-36427acd.js');
+require('./index-528b346a.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/cjs/{Host3DSignalR-42820b73.js → Host3DSignalR-65a20f74.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-36427acd.js');
+var index = require('./index-528b346a.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var signalr = require('@microsoft/signalr');
 var io = require('socket.io-client');

package/build/cjs/{LiviqueWWSHandler-b40b2274.js → LiviqueWWSHandler-2e03f234.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-require('./index-36427acd.js');
+require('./index-528b346a.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/defineProperty');

package/build/cjs/{PfisterWWSHandler-0b179395.js → PfisterWWSHandler-db0a295c.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-var index = require('./index-36427acd.js');
+var index = require('./index-528b346a.js');
 var basketModel = require('@crystaldesign/basket-model');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');

package/build/cjs/{PlannerHandler2D-2c3c3671.js → PlannerHandler2D-94232ad3.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-36427acd.js');
+var index = require('./index-528b346a.js');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var fabric = require('fabric');

package/build/cjs/{SeriousBasketHandler-ed972b51.js → SeriousBasketHandler-0289ebe6.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-36427acd.js');
+var index = require('./index-528b346a.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/cjs/{ShelfPlanner-aa7431d5.js → ShelfPlanner-2e95b0b6.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-36427acd.js');
+var index = require('./index-528b346a.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');

package/build/cjs/{StandardWWSHandler-c7f96af4.js → StandardWWSHandler-fbb14d7d.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-require('./index-36427acd.js');
+require('./index-528b346a.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/defineProperty');

package/build/cjs/{index-36427acd.js → index-528b346a.js}

@@ -23217,6 +23217,7 @@ var DivaEngine = /*#__PURE__*/function () {
     _classCallCheck__default["default"](this, DivaEngine);
     _defineProperty__default["default"](this, "article", void 0);
     _defineProperty__default["default"](this, "decisionDebugStack", []);
+    _defineProperty__default["default"](this, "catalogDecisionsByNumber", void 0);
     this.article = article;
   }
   return _createClass__default["default"](DivaEngine, [{
@@ -23700,11 +23701,13 @@ var DivaEngine = /*#__PURE__*/function () {
     key: "evalAllDecisions",
     value: function evalAllDecisions() {
       var myDecisions = this.article.catalogArticle.articleReferencedDecisions;
-      for (var i = myDecisions.length - 1; i >= 0; i--) {
-        if (myDecisions[i].addedViaDisableEnableRef) {
-          myDecisions.splice(i, 1);
+      var writeIdx = 0;
+      for (var i = 0; i < myDecisions.length; i++) {
+        if (!myDecisions[i].addedViaDisableEnableRef) {
+          myDecisions[writeIdx++] = myDecisions[i];
         }
       }
+      myDecisions.length = writeIdx;
       //add the partlist spesific decisions to the normal decisions
       if (this.article.initDecisions) myDecisions = myDecisions.concat(this.article.initDecisions);
       for (var _i = 0; _i < myDecisions.length; _i++) {
@@ -23727,6 +23730,9 @@ var DivaEngine = /*#__PURE__*/function () {
       } finally {
         _iterator7.f();
       }
+      this.catalogDecisionsByNumber = new Map(this.article.catalogArticle.articleDecisions.map(function (d) {
+        return [d.Number, d];
+      }));
       this.decisionDebugStack = [];
       var beforeSnapshot = this.article.set.logDecisions ? this.article.snapshot : undefined;
       for (var m = 0; m < myDecisions.length; m++) {
@@ -23939,10 +23945,10 @@ var DivaEngine = /*#__PURE__*/function () {
                 case 'SET_FEATURE_DEFAULT_NULL':
                   break;
                 case 'DISABLE_DECISION':
-                  this.disableDecision(myDecision, myDoc, myDecisions);
+                  this.disableDecision(myDecision, myDA.DecisionNr, myDecisions);
                   break;
                 case 'ENABLE_DECISION':
-                  this.enableDecision(myDecision, myDoc, myDecisions);
+                  this.enableDecision(myDecision, myDA.DecisionNr, myDecisions);
                   break;
                 default:
                   LOG$g.error(new DivaUtils.DivaError('Action type not supported in DecisionOptionCombination', {
@@ -24002,114 +24008,63 @@ var DivaEngine = /*#__PURE__*/function () {
     }
   }, {
     key: "disableDecision",
-    value: function disableDecision(myDecision, myDoc, myDecisions) {
-      var _this2 = this;
-      if (myDecision.activeCombination == -1) return;
-      var SearchDecNumber = [];
-      if (myDoc.DA) for (var m = 0; m < myDoc.DA.length; m++) {
-        var decisionAction = myDoc.DA[m];
-        if (decisionAction.Type == 'DISABLE_DECISION') {
-          SearchDecNumber.push(Number(decisionAction.DecisionNr));
-        }
-      }
-      SearchDecNumber.map(function (d) {
-        return myDecisions.find(function (de) {
-          return de.Number == d.toString();
-        });
-      }).map(function (d, index) {
-        var _d$disableHistory;
-        var decisionNumber = SearchDecNumber[index];
-        if (!d) {
-          var decision = _this2.article.catalogArticle.articleDecisions.find(function (d) {
-            return d.Number == decisionNumber.toString();
-          });
-          if (!decision) {
-            LOG$g.warn('Decision ' + decisionNumber + ' that is referenced in disable decision ' + myDecision.Number + ' not found.');
-            return;
-          }
-          var insertIndex = 0;
-          var prios = myDecisions.map(function (d) {
-            return d.Prio;
-          });
-          if (decision.Prio <= myDecision.Prio) LOG$g.warn('Decision ' + decisionNumber + ' that is referenced in enable decision ' + myDecision.Number + ' has a lower prio than the enable decision.');
-          for (var i = 0; i < prios.length; i++) {
-            if (Number(prios[i]) >= Number(decision.Prio)) {
-              insertIndex = i;
-              break;
-            }
-          }
-          myDecisions.splice(insertIndex, 0, _objectSpread$h(_objectSpread$h({}, decision), {}, {
-            enabled: false,
-            disableHistory: ['referenced and disabled By ' + myDecision.Number],
-            addedViaDisableEnableRef: true
-          }));
-          return;
-        }
-        d.enabled = false;
-        (_d$disableHistory = d.disableHistory) === null || _d$disableHistory === void 0 || _d$disableHistory.push('disabled By ' + myDecision.Number);
-      });
+    value: function disableDecision(myDecision, targetDecisionNr, myDecisions) {
+      this.toggleDecisionEnabled(myDecision, targetDecisionNr, myDecisions, false);
     }
   }, {
     key: "enableDecision",
-    value: function enableDecision(myDecision, myDoc, myDecisions) {
-      var _this3 = this;
+    value: function enableDecision(myDecision, targetDecisionNr, myDecisions) {
+      this.toggleDecisionEnabled(myDecision, targetDecisionNr, myDecisions, true);
+    }
+  }, {
+    key: "toggleDecisionEnabled",
+    value: function toggleDecisionEnabled(myDecision, targetDecisionNr, myDecisions, enabled) {
+      var _this$catalogDecision, _this$catalogDecision2;
       if (myDecision.activeCombination == -1) return;
-      var SearchDecNumber = [];
-      if (myDoc.DA) {
-        for (var m = 0; m < myDoc.DA.length; m++) {
-          var decisionAction = myDoc.DA[m];
-          if (decisionAction.Type == 'ENABLE_DECISION') {
-            SearchDecNumber.push(Number(decisionAction.DecisionNr));
-          }
-        }
+      var verb = enabled ? 'enabled' : 'disabled';
+      var existing = myDecisions.find(function (d) {
+        return d.Number == targetDecisionNr;
+      });
+      if (existing) {
+        var _existing$disableHist;
+        existing.enabled = enabled;
+        (_existing$disableHist = existing.disableHistory) === null || _existing$disableHist === void 0 || _existing$disableHist.push("".concat(verb, " By ").concat(myDecision.Number));
+        return;
       }
-      SearchDecNumber.map(function (d) {
-        return myDecisions.find(function (de) {
-          return de.Number == d.toString();
-        });
-      }).map(function (d, index) {
-        var _d$disableHistory2;
-        var decisionNumber = SearchDecNumber[index];
-        if (!d) {
-          var decision = _this3.article.catalogArticle.articleDecisions.find(function (d) {
-            return d.Number == decisionNumber.toString();
-          });
-          if (!decision) {
-            LOG$g.warn('Decision ' + decisionNumber + ' that is referenced in enable decision ' + myDecision.Number + ' not found.');
-            return;
-          }
-          var insertIndex = 0;
-          var prios = myDecisions.map(function (d) {
-            return d.Prio;
-          });
-          if (decision.Prio <= myDecision.Prio) LOG$g.warn('Decision ' + decisionNumber + ' that is referenced in enable decision ' + myDecision.Number + ' has a lower prio than the enable decision.');
-          for (var i = 0; i < prios.length; i++) {
-            if (Number(prios[i]) >= Number(decision.Prio)) {
-              insertIndex = i;
-              break;
-            }
-          }
-          myDecisions.splice(insertIndex, 0, _objectSpread$h(_objectSpread$h({}, decision), {}, {
-            enabled: true,
-            disableHistory: ['referenced and enabled By ' + myDecision.Number],
-            addedViaDisableEnableRef: true
-          }));
-          return;
-        }
-        d.enabled = true;
-        (_d$disableHistory2 = d.disableHistory) === null || _d$disableHistory2 === void 0 || _d$disableHistory2.push('enabled By ' + myDecision.Number);
+      var decision = (_this$catalogDecision = (_this$catalogDecision2 = this.catalogDecisionsByNumber) === null || _this$catalogDecision2 === void 0 ? void 0 : _this$catalogDecision2.get(targetDecisionNr)) !== null && _this$catalogDecision !== void 0 ? _this$catalogDecision : this.article.catalogArticle.articleDecisions.find(function (d) {
+        return d.Number == targetDecisionNr;
       });
+      if (!decision) {
+        LOG$g.warn("Decision ".concat(targetDecisionNr, " that is referenced in ").concat(verb.replace('d', ''), " decision ").concat(myDecision.Number, " not found."));
+        return;
+      }
+      var decisionPrio = Number(decision.Prio);
+      if (decisionPrio <= Number(myDecision.Prio)) {
+        LOG$g.warn("Decision ".concat(targetDecisionNr, " that is referenced in enable decision ").concat(myDecision.Number, " has a lower prio than the enable decision."));
+      }
+      var insertIndex = 0;
+      for (var i = 0; i < myDecisions.length; i++) {
+        if (Number(myDecisions[i].Prio) >= decisionPrio) {
+          insertIndex = i;
+          break;
+        }
+      }
+      myDecisions.splice(insertIndex, 0, _objectSpread$h(_objectSpread$h({}, decision), {}, {
+        enabled: enabled,
+        disableHistory: ["referenced and ".concat(verb, " By ").concat(myDecision.Number)],
+        addedViaDisableEnableRef: true
+      }));
     }
   }, {
     key: "evalType1Decision",
     value: function evalType1Decision(myDecision) {
-      var _this4 = this;
+      var _this2 = this;
       var validOPVs = {};
       var doAlsoCheckOPTs = [];
       if (myDecision.Options && myDecision.DOC) {
         var _loop2 = function _loop2() {
           var OPT = myDecision.Options[p];
-          var ops = _this4.article.getArticleOptionStateFlat(OPT);
+          var ops = _this2.article.getArticleOptionStateFlat(OPT);
           if (!ops) return 1; // break
           if (!validOPVs[OPT]) validOPVs[OPT] = new Map();
           var possibleOPVs = new Map(ops.visibleOptionValues);
@@ -24120,7 +24075,7 @@ var DivaEngine = /*#__PURE__*/function () {
             //wenn diese Row mehrere Optionen hat, dann müssen die bisher gesetzten schon übereinstimmen
 
             var myDoc = myDecision.DOC[j];
-            var doUseDoc = _this4.checkIfDocIsValid(myDoc, doAlsoCheckOPTs);
+            var doUseDoc = _this2.checkIfDocIsValid(myDoc, doAlsoCheckOPTs);
             if (doUseDoc) {
               var _myDoc$Row;
               myDecision.activeCombination = j;
@@ -24198,10 +24153,10 @@ var DivaEngine = /*#__PURE__*/function () {
           ops.updateVisibleOptionValues(new Map(schnittmenge));
           var valCodex = ops.valCodex;
           if ((!valCodex || !schnittmenge.get(valCodex)) && ops.visibleOPVKeys.length > 0) {
-            if (_this4.article.CatalogData.useDiomexConfigLogic) {
-              _this4.clearOP(OPT, true);
+            if (_this2.article.CatalogData.useDiomexConfigLogic) {
+              _this2.clearOP(OPT, true);
             } else {
-              _this4.updateArtOPV(_this4.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
+              _this2.updateArtOPV(_this2.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
             }
           }
           doAlsoCheckOPTs.push(OPT);
@@ -24238,13 +24193,13 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "evalType0Decision",
     value: function evalType0Decision(myDecision) {
-      var _this5 = this;
+      var _this3 = this;
       var invalidOPVs = {},
         doAlsoCheckOPTs = [];
       if (myDecision.Options && myDecision.Options.length > 1 && myDecision.DOC) {
         var _loop3 = function _loop3() {
           var OPT = myDecision.Options[p];
-          var ops = _this5.article.getArticleOptionStateFlat(OPT);
+          var ops = _this3.article.getArticleOptionStateFlat(OPT);
           if (!ops) return 1; // break
           if (!invalidOPVs[OPT]) invalidOPVs[OPT] = new Map();
           var possibleOPVs = ops.visibleOptionValues;
@@ -24261,7 +24216,7 @@ var DivaEngine = /*#__PURE__*/function () {
                 for (var f = 0; f < doAlsoCheckOPTs.length; f++) {
                   var _myDoc$Row3;
                   var checkOptX = doAlsoCheckOPTs[f];
-                  var _ops3 = _this5.article.getArticleOptionState(checkOptX);
+                  var _ops3 = _this3.article.getArticleOptionState(checkOptX);
                   if (_ops3 && (_myDoc$Row3 = myDoc.Row) !== null && _myDoc$Row3 !== void 0 && _myDoc$Row3[checkOptX] && _ops3.valCodex && !myDoc.Row[checkOptX].includes(_ops3.valCodex)) {
                     doUseDoc = false;
                     break;
@@ -24289,10 +24244,10 @@ var DivaEngine = /*#__PURE__*/function () {
             ops.updateVisibleOptionValues(schnittmenge);
             var valCodex = ops.valCodex;
             if ((!valCodex || !schnittmenge.get(valCodex)) && ops.visibleOPVKeys.length > 0) {
-              if (_this5.article.CatalogData.useDiomexConfigLogic) {
-                _this5.clearOP(OPT, true);
+              if (_this3.article.CatalogData.useDiomexConfigLogic) {
+                _this3.clearOP(OPT, true);
               } else {
-                _this5.updateArtOPV(_this5.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
+                _this3.updateArtOPV(_this3.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
               }
             }
           } else if (p < myDecision.Options.length - 1) {
@@ -24620,7 +24575,7 @@ var DivaEngine = /*#__PURE__*/function () {
     key: "addPartilstToPartlistArticlesToLoad",
     value: function addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, partlistGroup, newConfigValues, myDecisionVal, groupDecisionVal, decisionNumber, partlistGroupPrefix, loadReason) {
       var _myPartListPos$Option,
-        _this6 = this;
+        _this4 = this;
       var allDecisions = this.article.catalogArticle.articleDecisions;
       var decisions = myPartListPos.PartListPosDecisionsAndPosCounts;
       var optionsForPrint = (_myPartListPos$Option = myPartListPos.OptionsForPrint) === null || _myPartListPos$Option === void 0 ? void 0 : _myPartListPos$Option.split(';');
@@ -24631,9 +24586,9 @@ var DivaEngine = /*#__PURE__*/function () {
         var articleCodex = myPartListPos.ItemRefArticles[d].ArticleCodex;
         var catalogCodex = myPartListPos.ItemRefArticles[d].CatalogCodex;
         var retailArticleNr = myPartListPos.RetailArticleNr && myPartListPos.RetailArticleNr != '' ? myPartListPos.RetailArticleNr : undefined;
-        if (myDecisionVal && (myDecisionVal.Rule && myDecisionVal.Rule != '' && _this6.article.CatalogData.doUseRuleDescForPartListArticles() || myPartListPos.RetailArticleNr == 'CUST')) {
-          myRuleDesc = DivaUtils__default["default"].getRuleDescription(myDecisionVal.Rule, _this6.article.articleOptionStates, _this6.article.set.api.ruleDescSeperator());
-          myRuleDesc_locales = DivaUtils__default["default"].getRuleDescription_locales(myDecisionVal.Rule, _this6.article.articleOptionStates, _this6.article.set.api.ruleDescSeperator());
+        if (myDecisionVal && (myDecisionVal.Rule && myDecisionVal.Rule != '' && _this4.article.CatalogData.doUseRuleDescForPartListArticles() || myPartListPos.RetailArticleNr == 'CUST')) {
+          myRuleDesc = DivaUtils__default["default"].getRuleDescription(myDecisionVal.Rule, _this4.article.articleOptionStates, _this4.article.set.api.ruleDescSeperator());
+          myRuleDesc_locales = DivaUtils__default["default"].getRuleDescription_locales(myDecisionVal.Rule, _this4.article.articleOptionStates, _this4.article.set.api.ruleDescSeperator());
         }
         var initDecisions = decisions.filter(function (decision) {
           return decision.RelationType !== 'PosCount';
@@ -24643,7 +24598,7 @@ var DivaEngine = /*#__PURE__*/function () {
           });
         });
         var quanitity = 1;
-        if (_this6.article.CatalogData.useDecisionPosCountValue) {
+        if (_this4.article.CatalogData.useDecisionPosCountValue) {
           var _decision$DOC;
           // get SetPosCountValue from decsion action if defined and else use myPartListPos.PosCountValue;
           var decision = decisionNumber ? allDecisions.find(function (d) {
@@ -24658,12 +24613,12 @@ var DivaEngine = /*#__PURE__*/function () {
             return a.SetPosCountValue !== undefined;
           })) === null || _decision$DOC === void 0 ? void 0 : _decision$DOC.SetPosCountValue;
           quanitity = setPosCountValue !== undefined ? setPosCountValue : myPartListPos.PosCountValue;
-        } else if (_this6.article.CatalogData.usePosCountValue) {
+        } else if (_this4.article.CatalogData.usePosCountValue) {
           quanitity = myPartListPos.PosCountValue;
         }
-        quanitity = quanitity * _this6.article.quantity;
-        var previousPartlistArticle = _this6.article.getPreviousPartlistArticle(articleCodex);
-        if (_this6.article.set.logDecisions) {
+        quanitity = quanitity * _this4.article.quantity;
+        var previousPartlistArticle = _this4.article.getPreviousPartlistArticle(articleCodex);
+        if (_this4.article.set.logDecisions) {
           var base = {
             articleCodex: articleCodex,
             catalogCodex: catalogCodex,
@@ -24671,7 +24626,7 @@ var DivaEngine = /*#__PURE__*/function () {
             sequenceNo: myPartListPos.SequenceNo
           };
           if (quanitity < 1) {
-            _this6.pushPartlistDebugEntry(base, {
+            _this4.pushPartlistDebugEntry(base, {
               loaded: false,
               reason: 'Quantity < 1',
               quantity: quanitity,
@@ -24679,7 +24634,7 @@ var DivaEngine = /*#__PURE__*/function () {
             });
             return 1; // continue
           }
-          _this6.pushPartlistDebugEntry(base, {
+          _this4.pushPartlistDebugEntry(base, {
             loaded: true,
             reason: loadReason !== null && loadReason !== void 0 ? loadReason : 'Loaded',
             decisionNo: decisionNumber,
@@ -24702,13 +24657,13 @@ var DivaEngine = /*#__PURE__*/function () {
         if (quanitity >= 1) {
           var _myDecisionVal$Rule;
           partlistArticlesToLoad.push({
-            CatalogCodex: catalogCodex !== null && catalogCodex !== void 0 ? catalogCodex : _this6.article.catalogCodex,
+            CatalogCodex: catalogCodex !== null && catalogCodex !== void 0 ? catalogCodex : _this4.article.catalogCodex,
             BasketID: previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.basketId,
             ArticleCodex: articleCodex,
             RetailArticleNr: retailArticleNr,
             RetailPrefix: myPartListPos.RetailPrefix,
             Quantity: quanitity,
-            PartlistRule: (groupDecisionVal ? groupDecisionVal.Rule + ' && ' : '') + myDecisionVal ? DivaUtils__default["default"].getOptionValuePairsByRule((_myDecisionVal$Rule = myDecisionVal === null || myDecisionVal === void 0 ? void 0 : myDecisionVal.Rule) !== null && _myDecisionVal$Rule !== void 0 ? _myDecisionVal$Rule : '', _this6.article.VariantValues) : undefined,
+            PartlistRule: (groupDecisionVal ? groupDecisionVal.Rule + ' && ' : '') + myDecisionVal ? DivaUtils__default["default"].getOptionValuePairsByRule((_myDecisionVal$Rule = myDecisionVal === null || myDecisionVal === void 0 ? void 0 : myDecisionVal.Rule) !== null && _myDecisionVal$Rule !== void 0 ? _myDecisionVal$Rule : '', _this4.article.VariantValues) : undefined,
             partlistDecisionNo: decisionNumber,
             SupplierOrderCodex: myPartListPos.SupplierOrderCodex,
             initDecisions: initDecisionsFiltered,
@@ -24717,7 +24672,7 @@ var DivaEngine = /*#__PURE__*/function () {
             RuleDesc_locales: myRuleDesc_locales,
             PosInvisibility: myPartListPos.PosInvisibility,
             ConfigurationMode: myPartListPos.ConfigurationMode,
-            VariantValues: _this6.article.variantValuesForPla(myPartListPos.ConfigurationMode, previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantValues, newConfigValues),
+            VariantValues: _this4.article.variantValuesForPla(myPartListPos.ConfigurationMode, previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantValues, newConfigValues),
             VariantItemData: previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantItemData,
             optionImgForPrint: optionImgForPrint,
             optionsForPrint: optionsForPrint,
@@ -24766,7 +24721,7 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "calcConfigPrice",
     value: function calcConfigPrice(maxPriceOfGroupCodex, digits) {
-      var _this7 = this,
+      var _this5 = this,
         _this$article$catalog5;
       //Wenn im Planer für dieses Shape mehere Rules gibt, müssen wir diese jetzt prüfen, ob jetzt ein anderes shape gültig ist.
       //wenn ja, hier neues shape übergeben
@@ -24900,7 +24855,7 @@ var DivaEngine = /*#__PURE__*/function () {
           if (!targetPPGPrefixes) continue;
           var _loop7 = function _loop7() {
             var targetPrefix = targetPPGPrefixes[_i8];
-            var priceRef = _this7.article.priceRefs.find(function (item) {
+            var priceRef = _this5.article.priceRefs.find(function (item) {
               var _item$PPG;
               return ((_item$PPG = item.PPG) === null || _item$PPG === void 0 ? void 0 : _item$PPG.split('_')[0]) == targetPrefix;
             });
@@ -24925,11 +24880,11 @@ var DivaEngine = /*#__PURE__*/function () {
         var _loop6 = function _loop6() {
           var targetPrefix = basePriceRef.TargetPPGPrefixes[_j];
           var myArtOpv;
-          var priceRef = _this7.article.priceRefs.find(function (item) {
+          var priceRef = _this5.article.priceRefs.find(function (item) {
             return item.PPG && item.PPG.split('_')[0] == targetPrefix;
           });
           if (!priceRef) {
-            var _iterator13 = _createForOfIteratorHelper$a(_this7.article.articleOptionStates.values()),
+            var _iterator13 = _createForOfIteratorHelper$a(_this5.article.articleOptionStates.values()),
               _step13;
             try {
               for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
@@ -25173,7 +25128,7 @@ var DivaEngine = /*#__PURE__*/function () {
     value: function updateConfigDependentMedia() {
       var _this$article$catalog6,
         _this$article$catalog7,
-        _this8 = this;
+        _this6 = this;
       var catalogData = this.article.CatalogData;
       //articlebild berechnung
 
@@ -25300,7 +25255,7 @@ var DivaEngine = /*#__PURE__*/function () {
           var _plannerCatArt$topSvg;
           var custom = {
             formulas: (_plannerCatArt$topSvg = plannerCatArt.topSvgsWithFormula) === null || _plannerCatArt$topSvg === void 0 ? void 0 : _plannerCatArt$topSvg.map(function (item) {
-              return DivaUtils__default["default"].getRuleByFormula(item.JsFormula, _this8.article.catalogCodex, catalogData.multiselectOptions);
+              return DivaUtils__default["default"].getRuleByFormula(item.JsFormula, _this6.article.catalogCodex, catalogData.multiselectOptions);
             }),
             catalogName: catalogData.catalogName,
             catalogCodex: this.article.catalogCodex,
@@ -29486,7 +29441,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-aa7431d5.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-2e95b0b6.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -37423,7 +37378,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context5.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-8ca88521.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-c7649bfb.js'); });
             case 3:
               _yield$import = _context5.sent;
               DoorPlanner = _yield$import["default"];
@@ -42187,7 +42142,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context12.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-0b179395.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-db0a295c.js'); });
             case 5:
               _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -42195,7 +42150,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 9:
               _context12.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-b40b2274.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-2e03f234.js'); });
             case 11:
               _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -42203,7 +42158,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 15:
               _context12.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-ed972b51.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-0289ebe6.js'); });
             case 17:
               _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -42211,7 +42166,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 21:
               _context12.next = 23;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-c7f96af4.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-fbb14d7d.js'); });
             case 23:
               _yield$import4 = _context12.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -43635,7 +43590,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _context3.next = 2;
-              return Promise.resolve().then(function () { return require('./Host3DSignalR-42820b73.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-65a20f74.js'); });
             case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -45388,7 +45343,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context4.next = 10;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-a39991d8.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-0ecbf621.js'); });
             case 10:
               _yield$import = _context4.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -45399,7 +45354,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context4.abrupt("break", 21);
             case 15:
               _context4.next = 17;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-c6dd2e23.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-7b7df440.js'); });
             case 17:
               _yield$import2 = _context4.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -47249,7 +47204,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               this.api.setState(this.state);
               this.ReturnTo = this.plannerConfig.returnTo;
               LOG$1.startTransaction({
-                event: this.plannerConfig.configuratorSessionId ? 'onReinitializeConfigurator' : 'onInitializeConfigurator',
+                event: 'onInitializeConfigurator',
                 message: 'Loading Basket',
                 eventId: 'LOADING_BASKET',
                 warningTime: 2000,
@@ -47264,13 +47219,11 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               return this.divaBasketHandler.initializeBasket(this.api);
             case 12:
               loadSuccessful = _context14.sent;
-              if (this.plannerConfig.configuratorSessionId) {
+              if (this.plannerConfig.configuratorSessionId === undefined && (!this.divaBasketHandler.hasConfiguratorSessionIdGetter || DivaUtils__default["default"].businessMetrics.getConfiguratorSessionId() === undefined)) {
+                DivaUtils__default["default"].businessMetrics.setConfiguratorSessionId();
+              } else if (this.plannerConfig.configuratorSessionId) {
                 //force new configurator session id - Landingpage case
                 DivaUtils__default["default"].businessMetrics.setConfiguratorSessionId(this.plannerConfig.configuratorSessionId);
-              } else {
-                // Only create a new configurator session if we don't already have one. This keeps the analytics
-                // session stable across re-inits (e.g. switching products inside the same catalog).
-                DivaUtils__default["default"].businessMetrics.setConfiguratorSessionId(undefined, true);
               }
               if (!loadSuccessful) {
                 _context14.next = 31;