@crystaldesign/web-planner-logic 26.13.0-beta.17 → 26.13.0-beta.19

package/build/cjs/{DivaBoxPlanner-593d689c.js → DivaBoxPlanner-cf785c8e.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-ecd4dc0b.js');
+var index = require('./index-dfe2c0e3.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-d266ccd0.js');
+var PlannerHandler2D = require('./PlannerHandler2D-cd71fcd3.js');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('axios');
 require('@babel/runtime/helpers/typeof');

package/build/cjs/{DivaStandardPlanner-f5ba6ead.js → DivaStandardPlanner-76758261.js}

@@ -6,10 +6,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-ecd4dc0b.js');
+var index = require('./index-dfe2c0e3.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var planner2dCore = require('@crystaldesign/planner-2d-core');
-var PlannerHandler2D = require('./PlannerHandler2D-d266ccd0.js');
+var PlannerHandler2D = require('./PlannerHandler2D-cd71fcd3.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('axios');

package/build/cjs/{DoorPlanner-35be7adf.js → DoorPlanner-322b433f.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-ecd4dc0b.js');
+require('./index-dfe2c0e3.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/cjs/{Host3DSignalR-b8beb958.js → Host3DSignalR-720088d4.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-ecd4dc0b.js');
+var index = require('./index-dfe2c0e3.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var signalr = require('@microsoft/signalr');
 var io = require('socket.io-client');

package/build/cjs/{LiviqueWWSHandler-13757823.js → LiviqueWWSHandler-ea49263b.js}

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

package/build/cjs/{PfisterWWSHandler-7404917e.js → PfisterWWSHandler-61d7dc26.js}

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

package/build/cjs/{PlannerHandler2D-d266ccd0.js → PlannerHandler2D-cd71fcd3.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-ecd4dc0b.js');
+var index = require('./index-dfe2c0e3.js');
 var _possibleConstructorReturn = require('@babel/runtime/helpers/possibleConstructorReturn');
 var _getPrototypeOf = require('@babel/runtime/helpers/getPrototypeOf');
 var _get = require('@babel/runtime/helpers/get');

package/build/cjs/{SeriousBasketHandler-2b3d0f22.js → SeriousBasketHandler-966ca145.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-ecd4dc0b.js');
+var index = require('./index-dfe2c0e3.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/cjs/{ShelfPlanner-4eb63a5c.js → ShelfPlanner-3a790d65.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-ecd4dc0b.js');
+var index = require('./index-dfe2c0e3.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');
@@ -128,6 +128,16 @@ var ShelfPlanner = /*#__PURE__*/function () {
         }
       }
     }
+
+    /**
+     * True when an accessoire with this codex can be planned for free on this shelf (an initAcc with noPrice, eg the first
+     * Kleiderstange of a Jutzler element).
+     */
+  }, {
+    key: "canBeFree",
+    value: function canBeFree(articleCodex) {
+      return this.freeArticlesPossible[articleCodex] !== undefined;
+    }
   }, {
     key: "IsVisible",
     get: function get() {

package/build/cjs/{StandardWWSHandler-9fce580d.js → StandardWWSHandler-b565c684.js}

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

package/build/cjs/{index-ecd4dc0b.js → index-dfe2c0e3.js}

@@ -21671,7 +21671,9 @@ function _loadReferencedSerieCatalogs() {
           _context9.next = 13;
           return catalogHandlerInstance.getCatalogData(set.getSetState, _serieNo2, {
             AccountGUID: catalogData.accountGuid,
-            AccountSessionGUID: catalogData.accountSessionGuid
+            AccountSessionGUID: catalogData.accountSessionGuid,
+            // a reopened basket starts without the isIDMData param - the other serie must not fall back to API2
+            IsIDMFormat: catalogData.isIDMFormat
           });
         case 13:
           serieCatalogs[_serieNo2] = _context9.sent;
@@ -30927,10 +30929,12 @@ var DivaArticle = /*#__PURE__*/function () {
     get: function get() {
       return this.articlePrices.PriceListCodex;
     }
+    /** A free article brings its partlist along for free - eg the Kleiderstange part of the free Jutzler Kleiderstange. */
   }, {
     key: "noPrice",
     get: function get() {
-      return this.article.noPrice;
+      var _this$partListParentA5;
+      return this.article.noPrice || !!((_this$partListParentA5 = this.partListParentArticle) !== null && _this$partListParentA5 !== void 0 && _this$partListParentA5.noPrice);
     },
     set: function set(noPrice) {
       this.article.noPrice = noPrice;
@@ -31313,8 +31317,8 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "getReqursiveArticleOptionStates",
     value: function getReqursiveArticleOptionStates() {
-      var _this$partListParentA5, _this$partListParentA6, _this$partListParentA7, _this$partListParentA8, _this$accessoireParen3, _this$accessoireParen4, _this$accessoireParen5, _this$accessoireParen6;
-      return [].concat(_toConsumableArray__default["default"]((_this$partListParentA5 = (_this$partListParentA6 = this.partListParentArticle) === null || _this$partListParentA6 === void 0 ? void 0 : _this$partListParentA6.articleOptionStates.values()) !== null && _this$partListParentA5 !== void 0 ? _this$partListParentA5 : []), _toConsumableArray__default["default"]((_this$partListParentA7 = (_this$partListParentA8 = this.partListParentArticle) === null || _this$partListParentA8 === void 0 ? void 0 : _this$partListParentA8.getReqursiveArticleOptionStates()) !== null && _this$partListParentA7 !== void 0 ? _this$partListParentA7 : []), _toConsumableArray__default["default"]((_this$accessoireParen3 = (_this$accessoireParen4 = this.accessoireParentArticle) === null || _this$accessoireParen4 === void 0 ? void 0 : _this$accessoireParen4.articleOptionStates.values()) !== null && _this$accessoireParen3 !== void 0 ? _this$accessoireParen3 : []), _toConsumableArray__default["default"]((_this$accessoireParen5 = (_this$accessoireParen6 = this.accessoireParentArticle) === null || _this$accessoireParen6 === void 0 ? void 0 : _this$accessoireParen6.getReqursiveArticleOptionStates()) !== null && _this$accessoireParen5 !== void 0 ? _this$accessoireParen5 : []));
+      var _this$partListParentA6, _this$partListParentA7, _this$partListParentA8, _this$partListParentA9, _this$accessoireParen3, _this$accessoireParen4, _this$accessoireParen5, _this$accessoireParen6;
+      return [].concat(_toConsumableArray__default["default"]((_this$partListParentA6 = (_this$partListParentA7 = this.partListParentArticle) === null || _this$partListParentA7 === void 0 ? void 0 : _this$partListParentA7.articleOptionStates.values()) !== null && _this$partListParentA6 !== void 0 ? _this$partListParentA6 : []), _toConsumableArray__default["default"]((_this$partListParentA8 = (_this$partListParentA9 = this.partListParentArticle) === null || _this$partListParentA9 === void 0 ? void 0 : _this$partListParentA9.getReqursiveArticleOptionStates()) !== null && _this$partListParentA8 !== void 0 ? _this$partListParentA8 : []), _toConsumableArray__default["default"]((_this$accessoireParen3 = (_this$accessoireParen4 = this.accessoireParentArticle) === null || _this$accessoireParen4 === void 0 ? void 0 : _this$accessoireParen4.articleOptionStates.values()) !== null && _this$accessoireParen3 !== void 0 ? _this$accessoireParen3 : []), _toConsumableArray__default["default"]((_this$accessoireParen5 = (_this$accessoireParen6 = this.accessoireParentArticle) === null || _this$accessoireParen6 === void 0 ? void 0 : _this$accessoireParen6.getReqursiveArticleOptionStates()) !== null && _this$accessoireParen5 !== void 0 ? _this$accessoireParen5 : []));
     }
   }, {
     key: "getAllArticleOptionsStates",
@@ -31909,8 +31913,8 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "getBaseParent",
     value: function getBaseParent() {
-      var _ref2, _this$partListParentA9, _this$partListParentA10, _this$accessoireParen8;
-      return (_ref2 = (_this$partListParentA9 = (_this$partListParentA10 = this.partListParentArticle) === null || _this$partListParentA10 === void 0 ? void 0 : _this$partListParentA10.getBaseParent()) !== null && _this$partListParentA9 !== void 0 ? _this$partListParentA9 : (_this$accessoireParen8 = this.accessoireParentArticle) === null || _this$accessoireParen8 === void 0 ? void 0 : _this$accessoireParen8.getBaseParent()) !== null && _ref2 !== void 0 ? _ref2 : this;
+      var _ref2, _this$partListParentA10, _this$partListParentA11, _this$accessoireParen8;
+      return (_ref2 = (_this$partListParentA10 = (_this$partListParentA11 = this.partListParentArticle) === null || _this$partListParentA11 === void 0 ? void 0 : _this$partListParentA11.getBaseParent()) !== null && _this$partListParentA10 !== void 0 ? _this$partListParentA10 : (_this$accessoireParen8 = this.accessoireParentArticle) === null || _this$accessoireParen8 === void 0 ? void 0 : _this$accessoireParen8.getBaseParent()) !== null && _ref2 !== void 0 ? _ref2 : this;
     }
   }, {
     key: "checkArtCodexIsAccessoire",
@@ -33270,7 +33274,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-4eb63a5c.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-3a790d65.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -33337,13 +33341,13 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "getRefLevelArticle",
     value: function getRefLevelArticle() {
-      var _this$partListParentA11;
+      var _this$partListParentA12;
       var refLevel = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 3;
       switch (refLevel) {
         case 1:
           return this.getBaseParent();
         case 2:
-          return (_this$partListParentA11 = this.partListParentArticle) !== null && _this$partListParentA11 !== void 0 ? _this$partListParentA11 : this;
+          return (_this$partListParentA12 = this.partListParentArticle) !== null && _this$partListParentA12 !== void 0 ? _this$partListParentA12 : this;
         case 3:
           return this;
       }
@@ -33519,8 +33523,8 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "isIDM3DSkipped",
     get: function get() {
-      var _this$partListParentA12;
-      return this.catalogArticle.isIDM3DSkipped || !!((_this$partListParentA12 = this.partListParentArticle) !== null && _this$partListParentA12 !== void 0 && _this$partListParentA12.isIDM3DSkipped);
+      var _this$partListParentA13;
+      return this.catalogArticle.isIDM3DSkipped || !!((_this$partListParentA13 = this.partListParentArticle) !== null && _this$partListParentA13 !== void 0 && _this$partListParentA13.isIDM3DSkipped);
     }
 
     /**
@@ -34216,7 +34220,9 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               _context3.next = 10;
               return catalogHandlerInstance.getCatalogData(set.getSetState, catalogCodex, {
                 AccountGUID: set.CatalogData.accountGuid,
-                AccountSessionGUID: set.CatalogData.accountSessionGuid
+                AccountSessionGUID: set.CatalogData.accountSessionGuid,
+                // a reopened basket starts without the isIDMData param - another serie of an IDM set must not fall back to API2
+                IsIDMFormat: set.CatalogData.isIDMFormat
               });
             case 10:
               catalog = _context3.sent;
@@ -35056,7 +35062,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     key: "evalAndLoadPartlistArticles",
     value: (function () {
       var _evalAndLoadPartlistArticles = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee13(article, dontLoadPartlist, newConfigValues) {
-        var partlistArticlesToLoad;
+        var partlistArticlesToLoad, _iterator4, _step4, position;
         return _regeneratorRuntime__default["default"].wrap(function _callee13$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
             case 0:
@@ -35083,9 +35089,20 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               if (article.bundleRules) {
                 partlistArticlesToLoad = this.bundlePartlistArticles(partlistArticlesToLoad, article.bundleRules, _defineProperty__default["default"]({}, article.basketId, article));
               }
+              _iterator4 = _createForOfIteratorHelper$d(partlistArticlesToLoad);
+              try {
+                for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                  position = _step4.value;
+                  position.SourceBasketID = article.basketId;
+                }
+              } catch (err) {
+                _iterator4.e(err);
+              } finally {
+                _iterator4.f();
+              }
               article.hasPartlistArticleInitialized = true;
               return _context14.abrupt("return", partlistArticlesToLoad);
-            case 12:
+            case 14:
             case "end":
               return _context14.stop();
           }
@@ -35313,7 +35330,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     value: (function () {
       var _evalOpvsOnOpvsConstructionRules = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee16(article) {
         var _article$CatalogData$;
-        var somethingChanged, previousRules, _key, actRules, item, _iterator4, _step4, ops, myOPVs, _iterator5, _step5, _step5$value, key2, opv, opvGroupName, _article$catalogArtic, _article$catalogArtic2, disable, onOpv, onOpvArr, invaliOPVs, invalidOPVArr, j, opvRule, ops2, i, invalidOpv, ops3, key, constructionRule, notifications, _i6, _item;
+        var somethingChanged, previousRules, _key, actRules, item, _iterator5, _step5, ops, myOPVs, _iterator6, _step6, _step6$value, key2, opv, opvGroupName, _article$catalogArtic, _article$catalogArtic2, disable, onOpv, onOpvArr, invaliOPVs, invalidOPVArr, j, opvRule, ops2, i, invalidOpv, ops3, key, constructionRule, notifications, _i6, _item;
         return _regeneratorRuntime__default["default"].wrap(function _callee16$(_context17) {
           while (1) switch (_context17.prev = _context17.next) {
             case 0:
@@ -35334,16 +35351,16 @@ var DivaArticleHandler = /*#__PURE__*/function () {
                   }
                 }
               }
-              _iterator4 = _createForOfIteratorHelper$d(article.articleOptionStates.values());
+              _iterator5 = _createForOfIteratorHelper$d(article.articleOptionStates.values());
               try {
-                for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                  ops = _step4.value;
+                for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                  ops = _step5.value;
                   if (ops.optionCodex.toUpperCase().endsWith('OPTCONSTRUCTIONRULES')) {
                     myOPVs = ops.option.articleOptionValues;
-                    _iterator5 = _createForOfIteratorHelper$d(myOPVs);
+                    _iterator6 = _createForOfIteratorHelper$d(myOPVs);
                     try {
-                      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-                        _step5$value = _slicedToArray__default["default"](_step5.value, 2), key2 = _step5$value[0], opv = _step5$value[1];
+                      for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+                        _step6$value = _slicedToArray__default["default"](_step6.value, 2), key2 = _step6$value[0], opv = _step6$value[1];
                         opvGroupName = opv.groupName;
                         if (opvGroupName && opvGroupName.startsWith('ON_OPV_SET_OPV')) {
                           disable = false;
@@ -35384,16 +35401,16 @@ var DivaArticleHandler = /*#__PURE__*/function () {
                         }
                       }
                     } catch (err) {
-                      _iterator5.e(err);
+                      _iterator6.e(err);
                     } finally {
-                      _iterator5.f();
+                      _iterator6.f();
                     }
                   }
                 }
               } catch (err) {
-                _iterator4.e(err);
+                _iterator5.e(err);
               } finally {
-                _iterator4.f();
+                _iterator5.f();
               }
               if (!((_article$CatalogData$ = article.CatalogData.warningRules) !== null && _article$CatalogData$ !== void 0 && _article$CatalogData$.length)) {
                 _context17.next = 20;
@@ -35797,11 +35814,11 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     value: function getOptiontreeAccessoiresArr(setId, article) {
       var s = 0;
       var accessoires = [];
-      var _iterator6 = _createForOfIteratorHelper$d(article.articleOptionStates.values()),
-        _step6;
+      var _iterator7 = _createForOfIteratorHelper$d(article.articleOptionStates.values()),
+        _step7;
       try {
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var ops = _step6.value;
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+          var ops = _step7.value;
           if (ops.option.articlePlaceholder) {
             //ArticlePlaceholder bestimmt, ob Optionswert als eigene SAPOrderline ausgegeben wird
             if (ops.isAccessoirArtNr && ops.isAccessoirArtNr != '') {
@@ -35817,9 +35834,9 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator6.e(err);
+        _iterator7.e(err);
       } finally {
-        _iterator6.f();
+        _iterator7.f();
       }
       return accessoires;
     }
@@ -35918,57 +35935,102 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     key: "correctPartlistArticlesByGlobalRules",
     value: (function () {
       var _correctPartlistArticlesByGlobalRules = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee18(set, partlistArticlesToLoad, bundleRules, doChangeRetailArticleNumbers) {
-        var _loop4, i, article;
+        var article, ownPositions, bundledCodices, _loop4, _i8, _arr, _iterator8, _step8, _step8$value, source, positions;
         return _regeneratorRuntime__default["default"].wrap(function _callee18$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
-              if (bundleRules) partlistArticlesToLoad = this.bundlePartlistArticles(partlistArticlesToLoad, bundleRules, set.getDivaArticles());
+              article = Object.values(set.getDivaArticles()).find(function (article) {
+                return article.hasPartlistArticle && !article.deleted;
+              }); //a shelf accessoire that can be planned for free keeps the positions no rule names: its noPrice has to waive the parts
+              //it brings along, and pooled onto the first article they would be charged there. Everything else is pooled.
+              ownPositions = new Map();
+              if (bundleRules) {
+                bundledCodices = new Set(bundleRules.flatMap(function (rule) {
+                  var _rule$result;
+                  return [].concat(_toConsumableArray__default["default"](rule.toBundle), _toConsumableArray__default["default"]((_rule$result = rule.result) !== null && _rule$result !== void 0 ? _rule$result : [])).map(function (entry) {
+                    return entry.articleCodex;
+                  });
+                }));
+                partlistArticlesToLoad = partlistArticlesToLoad.filter(function (position) {
+                  var _source$accessoirePar, _ownPositions$get;
+                  var source = position.SourceBasketID ? set.getArticleByBasketId(position.SourceBasketID) : undefined;
+                  if (!source || source.deleted || source === article || bundledCodices.has(position.ArticleCodex)) return true;
+                  if (!((_source$accessoirePar = source.accessoireParentArticle) !== null && _source$accessoirePar !== void 0 && (_source$accessoirePar = _source$accessoirePar.shelfPlanner) !== null && _source$accessoirePar !== void 0 && _source$accessoirePar.canBeFree(source.articleCodex))) return true;
+                  ownPositions.set(source, [].concat(_toConsumableArray__default["default"]((_ownPositions$get = ownPositions.get(source)) !== null && _ownPositions$get !== void 0 ? _ownPositions$get : []), [position]));
+                  return false;
+                });
+                partlistArticlesToLoad = this.bundlePartlistArticles(partlistArticlesToLoad, bundleRules, set.getDivaArticles());
+              }
               //Correct RetailArticleNumbers
               if (!(doChangeRetailArticleNumbers !== null && doChangeRetailArticleNumbers !== void 0 && doChangeRetailArticleNumbers.doChange && doChangeRetailArticleNumbers.retailArticleRules)) {
-                _context20.next = 9;
+                _context20.next = 11;
                 break;
               }
-              _loop4 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop4(i) {
-                var rule;
+              _loop4 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop4() {
+                var position, rule;
                 return _regeneratorRuntime__default["default"].wrap(function _loop4$(_context19) {
                   while (1) switch (_context19.prev = _context19.next) {
                     case 0:
+                      position = _arr[_i8];
                       //Run through articleCodexes to repair:
                       rule = doChangeRetailArticleNumbers.retailArticleRules.find(function (item) {
-                        return item.origRetailArticleNr == partlistArticlesToLoad[i].RetailArticleNr;
+                        return item.origRetailArticleNr == position.RetailArticleNr;
                       });
-                      if (rule && rule.origPrefix == partlistArticlesToLoad[i].RetailPrefix) {
-                        partlistArticlesToLoad[i].RetailPrefix = rule.newPrefix;
-                        partlistArticlesToLoad[i].RetailArticleNr = rule.newRetailArticleNr;
+                      if (rule && rule.origPrefix == position.RetailPrefix) {
+                        position.RetailPrefix = rule.newPrefix;
+                        position.RetailArticleNr = rule.newRetailArticleNr;
                       }
-                    case 2:
+                    case 3:
                     case "end":
                       return _context19.stop();
                   }
                 }, _loop4);
               });
-              i = 0;
-            case 4:
-              if (!(i < partlistArticlesToLoad.length)) {
-                _context20.next = 9;
+              _i8 = 0, _arr = [].concat(_toConsumableArray__default["default"](partlistArticlesToLoad), _toConsumableArray__default["default"](_toConsumableArray__default["default"](ownPositions.values()).flat()));
+            case 6:
+              if (!(_i8 < _arr.length)) {
+                _context20.next = 11;
                 break;
               }
-              return _context20.delegateYield(_loop4(i), "t0", 6);
-            case 6:
-              i++;
-              _context20.next = 4;
+              return _context20.delegateYield(_loop4(), "t0", 8);
+            case 8:
+              _i8++;
+              _context20.next = 6;
               break;
-            case 9:
-              article = Object.values(set.getDivaArticles()).find(function (article) {
-                return article.hasPartlistArticle && !article.deleted;
-              });
-              _context20.next = 12;
+            case 11:
+              _context20.next = 13;
               return this.loadPartlistArticles(partlistArticlesToLoad, article, {});
-            case 12:
+            case 13:
+              _iterator8 = _createForOfIteratorHelper$d(ownPositions);
+              _context20.prev = 14;
+              _iterator8.s();
+            case 16:
+              if ((_step8 = _iterator8.n()).done) {
+                _context20.next = 22;
+                break;
+              }
+              _step8$value = _slicedToArray__default["default"](_step8.value, 2), source = _step8$value[0], positions = _step8$value[1];
+              _context20.next = 20;
+              return this.loadPartlistArticles(positions, source, {});
+            case 20:
+              _context20.next = 16;
+              break;
+            case 22:
+              _context20.next = 27;
+              break;
+            case 24:
+              _context20.prev = 24;
+              _context20.t1 = _context20["catch"](14);
+              _iterator8.e(_context20.t1);
+            case 27:
+              _context20.prev = 27;
+              _iterator8.f();
+              return _context20.finish(27);
+            case 30:
             case "end":
               return _context20.stop();
           }
-        }, _callee18, this);
+        }, _callee18, this, [[14, 24, 27, 30]]);
       }));
       function correctPartlistArticlesByGlobalRules(_x53, _x54, _x55, _x56) {
         return _correctPartlistArticlesByGlobalRules.apply(this, arguments);
@@ -35996,8 +36058,8 @@ var DivaArticleHandler = /*#__PURE__*/function () {
         _loop5(i);
       }
       //bundle Partlistarticles
-      for (var _i8 = 0; _i8 < bundleRules.length; _i8++) {
-        var bundleRule = bundleRules[_i8];
+      for (var _i9 = 0; _i9 < bundleRules.length; _i9++) {
+        var bundleRule = bundleRules[_i9];
         var noBundleFound = false;
         var bundleUsedCounter = 0;
         while (!noBundleFound && (bundleRule.maximalUsage === undefined || bundleRule.maximalUsage > bundleUsedCounter)) {
@@ -37265,6 +37327,8 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
             for (_iterator36.s(); !(_step36 = _iterator36.n()).done;) {
               var _step36$value = _slicedToArray__default["default"](_step36.value, 2),
                 option = _step36$value[1];
+              // merged into its OPG step, which already shows these values — skipped like in the main config tree
+              if (option.mergesToOPG === true) continue;
               var _iterator37 = _createForOfIteratorHelper$c(option.configSteps),
                 _step37;
               try {
@@ -41992,7 +42056,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context5.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-35be7adf.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-322b433f.js'); });
             case 3:
               _yield$import = _context5.sent;
               DoorPlanner = _yield$import["default"];
@@ -49963,7 +50027,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context12.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-7404917e.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-61d7dc26.js'); });
             case 5:
               _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -49971,7 +50035,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 9:
               _context12.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-13757823.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-ea49263b.js'); });
             case 11:
               _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -49979,7 +50043,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 15:
               _context12.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-2b3d0f22.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-966ca145.js'); });
             case 17:
               _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -49987,7 +50051,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 21:
               _context12.next = 23;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-9fce580d.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-b565c684.js'); });
             case 23:
               _yield$import4 = _context12.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -51374,7 +51438,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
               //If we need real time rendering initialize the SignalR and 3D host connection Handler
               bootMark('signalr: chunk import start');
               _context3.next = 3;
-              return Promise.resolve().then(function () { return require('./Host3DSignalR-b8beb958.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-720088d4.js'); });
             case 3:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -53119,7 +53183,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context5.next = 10;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-f5ba6ead.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-76758261.js'); });
             case 10:
               _yield$import = _context5.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -53130,7 +53194,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context5.abrupt("break", 21);
             case 15:
               _context5.next = 17;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-593d689c.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-cf785c8e.js'); });
             case 17:
               _yield$import2 = _context5.sent;
               DivaBoxPlanner = _yield$import2["default"];

package/build/cjs/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-ecd4dc0b.js');
+var index = require('./index-dfe2c0e3.js');
 var planner2dCore = require('@crystaldesign/planner-2d-core');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/esm/{DivaBoxPlanner-7291fc69.js → DivaBoxPlanner-570bd517.js}

@@ -3,11 +3,11 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { c as Vector2, V as Vector3, P as PlannerElementData, B as BoundingBox } from './index-d4042c10.js';
+import { c as Vector2, V as Vector3, P as PlannerElementData, B as BoundingBox } from './index-0d6a39cb.js';
 import DivaUtils, { DivaError, md5 } from '@crystaldesign/diva-utils';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
-import { d as dockingPointHandlerInst, h as handler2D } from './PlannerHandler2D-eb466bb9.js';
+import { d as dockingPointHandlerInst, h as handler2D } from './PlannerHandler2D-487406e6.js';
 import '@babel/runtime/helpers/objectWithoutProperties';
 import 'axios';
 import '@babel/runtime/helpers/typeof';

package/build/esm/{DivaStandardPlanner-cde0a04a.js → DivaStandardPlanner-712385df.js}

@@ -4,10 +4,10 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { V as Vector3, P as PlannerElementData, B as BoundingBox } from './index-d4042c10.js';
+import { V as Vector3, P as PlannerElementData, B as BoundingBox } from './index-0d6a39cb.js';
 import DivaUtils, { DivaError, md5 } from '@crystaldesign/diva-utils';
 import { computeDockedTransform } from '@crystaldesign/planner-2d-core';
-import { d as dockingPointHandlerInst, h as handler2D } from './PlannerHandler2D-eb466bb9.js';
+import { d as dockingPointHandlerInst, h as handler2D } from './PlannerHandler2D-487406e6.js';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/objectWithoutProperties';
 import 'axios';

package/build/esm/{DoorPlanner-599bd2a0.js → DoorPlanner-3670fee0.js}

@@ -1,7 +1,7 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import './index-d4042c10.js';
+import './index-0d6a39cb.js';
 import DivaUtils from '@crystaldesign/diva-utils';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/asyncToGenerator';

package/build/esm/{Host3DSignalR-c12d1c95.js → Host3DSignalR-68938df9.js}

@@ -3,7 +3,7 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { d as bootMark, R as Rendering, H as HQRenderScript } from './index-d4042c10.js';
+import { d as bootMark, R as Rendering, H as HQRenderScript } from './index-0d6a39cb.js';
 import DivaUtils, { DivaError } from '@crystaldesign/diva-utils';
 import { HubConnectionBuilder, LogLevel } from '@microsoft/signalr';
 import io from 'socket.io-client';

package/build/esm/{LiviqueWWSHandler-443dd9fb.js → LiviqueWWSHandler-2cd9654b.js}

@@ -1,6 +1,6 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
-import './index-d4042c10.js';
+import './index-0d6a39cb.js';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/asyncToGenerator';
 import '@babel/runtime/helpers/defineProperty';