@crystaldesign/web-planner-logic 26.6.0-beta.8 → 26.6.0-rc.0

package/build/cjs/{DivaBoxPlanner-e0cea98e.js → DivaBoxPlanner-58888ff2.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-8def7364.js');
+var index = require('./index-2844897f.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-6af64e9e.js');
+var PlannerHandler2D = require('./PlannerHandler2D-7dc308bd.js');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('axios');
 require('@crystaldesign/basket-model');

package/build/cjs/{DivaStandardPlanner-6695be1e.js → DivaStandardPlanner-adf08998.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-8def7364.js');
+var index = require('./index-2844897f.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
-var PlannerHandler2D = require('./PlannerHandler2D-6af64e9e.js');
+var PlannerHandler2D = require('./PlannerHandler2D-7dc308bd.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/toConsumableArray');
@@ -927,14 +927,14 @@ var DivaStandardPlanner = /*#__PURE__*/function () {
     key: "initPlanner",
     value: function () {
       var _initPlanner = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(setPlanData) {
-        var planDataString, planData, jsonElements, elementsSortedbyPosNr, accElements, i, _jsonElement$Accessoi2, jsonElement, catalogArticle, elementID, plannerElement, data, onlyOneBaseElement, element, DPsInfo, j, dpInfo, sourceElement, sourceDP, targetElement, targetDP, _jsonElements, _elementsSortedbyPosNr, _accElements, _jsonElement$Accessoi3, _jsonElement, _catalogArticle, basketID, elementId, _plannerElement, _data, centerWorldPos, parentPosNr, accPosNr, _DPsInfo, _dpInfo, _this$plannerElements, targetElementId, dpType, curElement, _targetElement;
+        var planDataString, planData, jsonElements, elementsSortedbyPosNr, accElements, i, _jsonElement$Accessoi2, jsonElement, catalogArticle, elementID, plannerElement, data, onlyOneBaseElement, _jsonElement, hasSavedPos, element, DPsInfo, j, dpInfo, sourceElement, sourceDP, targetElement, targetDP, _jsonElements, _elementsSortedbyPosNr, _accElements, _jsonElement2$Accesso, _jsonElement2, _catalogArticle, basketID, elementId, _plannerElement, _data, centerWorldPos, parentPosNr, accPosNr, _DPsInfo, _dpInfo, _this$plannerElements, targetElementId, dpType, curElement, _targetElement;
         return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               planDataString = DivaUtils__default["default"].decodeBase64(setPlanData);
               planData = JSON.parse(planDataString);
               if (!(planData.v != null && planData.v == 2)) {
-                _context5.next = 61;
+                _context5.next = 62;
                 break;
               }
               LOG.debug('Initialize set Plan Data - V2\n' + planData, 'DivaStandardPlanner initPlanner');
@@ -1011,25 +1011,30 @@ var DivaStandardPlanner = /*#__PURE__*/function () {
               i = 0;
             case 41:
               if (!(i < elementsSortedbyPosNr.length)) {
-                _context5.next = 59;
+                _context5.next = 60;
                 break;
               }
               _context5.prev = 42;
               if (!(i == 0 && onlyOneBaseElement && this.plannerHasStaticBackground)) {
-                _context5.next = 47;
+                _context5.next = 48;
                 break;
               }
-              //if the planner has a static background room and there is only one base element (ignore docked ACCs) then it should be forced positioned in the center of the room
-              element = this.plannerElements.get(elementsSortedbyPosNr[i].elementID);
-              if (element) element.WorldPosCenter = new index.Vector3(0, element.Height / 2, element.Depth / 2);
-              return _context5.abrupt("continue", 56);
-            case 47:
+              //if the planner has a static background room and there is only one base element (ignore docked ACCs) then it should be forced positioned in the center of the room.
+              //Only do this for fresh plannings - if the saved planData already contains a position, keep it.
+              _jsonElement = elementsSortedbyPosNr[i];
+              hasSavedPos = _jsonElement.x != null || _jsonElement.y != null || _jsonElement.z != null;
+              if (!hasSavedPos) {
+                element = this.plannerElements.get(_jsonElement.elementID);
+                if (element) element.WorldPosCenter = new index.Vector3(0, element.Height / 2, element.Depth / 2);
+              }
+              return _context5.abrupt("continue", 57);
+            case 48:
               if (!(elementsSortedbyPosNr[i].DP == null || elementsSortedbyPosNr[i].DP.length == 0)) {
-                _context5.next = 49;
+                _context5.next = 50;
                 break;
               }
-              return _context5.abrupt("continue", 56);
-            case 49:
+              return _context5.abrupt("continue", 57);
+            case 50:
               DPsInfo = elementsSortedbyPosNr[i].DP;
               for (j = 0; j < DPsInfo.length; j++) {
                 dpInfo = DPsInfo[j];
@@ -1045,122 +1050,122 @@ var DivaStandardPlanner = /*#__PURE__*/function () {
                   }
                 }
               }
-              _context5.next = 56;
+              _context5.next = 57;
               break;
-            case 53:
-              _context5.prev = 53;
+            case 54:
+              _context5.prev = 54;
               _context5.t1 = _context5["catch"](42);
               LOG.error(new DivaUtils.DivaError('Error initializing dockingPoints of element with elementID ' + elementsSortedbyPosNr[i].elementID, {
                 cause: _context5.t1,
                 code: 'WC_0012'
               }));
-            case 56:
+            case 57:
               i++;
               _context5.next = 41;
               break;
-            case 59:
-              _context5.next = 112;
+            case 60:
+              _context5.next = 113;
               break;
-            case 61:
+            case 62:
               LOG.debug('Initialize set Plan Data - old V1\n' + planData, 'DivaStandardPlanner initPlanner');
               if (!(!planData.Sets || planData.Sets.length == 0 || !planData.Sets[0].Elements || planData.Sets[0].Elements.length == 0)) {
-                _context5.next = 64;
+                _context5.next = 65;
                 break;
               }
               return _context5.abrupt("return");
-            case 64:
+            case 65:
               //Init old Plannings - saved with the old planner
               _jsonElements = planData.Sets[0].Elements;
               _elementsSortedbyPosNr = [];
               _accElements = []; //Zuerst initialisiere alle Elemente
               //Dann positioniere sie richtig
               i = 0;
-            case 68:
+            case 69:
               if (!(i < _jsonElements.length)) {
-                _context5.next = 102;
+                _context5.next = 103;
                 break;
               }
-              _context5.prev = 69;
-              _jsonElement = _jsonElements[i];
-              _catalogArticle = this.set.CatalogData.getCatalogArticleByArticleCodex(_jsonElement.articleCodex || _jsonElement.Codex);
-              if (!(!_catalogArticle && (_jsonElement$Accessoi3 = _jsonElement.AccessoireInitParams) !== null && _jsonElement$Accessoi3 !== void 0 && _jsonElement$Accessoi3.RelatedToBasketID && !this.set.getSetState.onlyRunLogic)) {
-                _context5.next = 75;
+              _context5.prev = 70;
+              _jsonElement2 = _jsonElements[i];
+              _catalogArticle = this.set.CatalogData.getCatalogArticleByArticleCodex(_jsonElement2.articleCodex || _jsonElement2.Codex);
+              if (!(!_catalogArticle && (_jsonElement2$Accesso = _jsonElement2.AccessoireInitParams) !== null && _jsonElement2$Accesso !== void 0 && _jsonElement2$Accesso.RelatedToBasketID && !this.set.getSetState.onlyRunLogic)) {
+                _context5.next = 76;
                 break;
               }
               LOG.error(new DivaUtils.DivaError('Error initializing element nr ' + i + ' in the Standard Web Planner. PlanData V2', {
                 code: 'WC_0012'
               }));
-              return _context5.abrupt("continue", 99);
-            case 75:
-              basketID = _jsonElement.BasketID;
-              if (this.set.getElementId(basketID) == -1) this.set.setElementId(basketID, Number(_jsonElement.ID));
+              return _context5.abrupt("continue", 100);
+            case 76:
+              basketID = _jsonElement2.BasketID;
+              if (this.set.getElementId(basketID) == -1) this.set.setElementId(basketID, Number(_jsonElement2.ID));
               elementId = this.set.getElementId(basketID);
-              _jsonElement.elementId = elementId;
+              _jsonElement2.elementId = elementId;
               if (!(elementId == -1)) {
-                _context5.next = 82;
+                _context5.next = 83;
                 break;
               }
               LOG.error(new DivaUtils.DivaError('Error when initializing planner. The elementID Was not saved in the article. ', {
                 code: 'WC_0012'
               }));
-              return _context5.abrupt("continue", 99);
-            case 82:
+              return _context5.abrupt("continue", 100);
+            case 83:
               _plannerElement = new index.PlannerElementData(this.set.getSetId(), basketID, elementId, DivaStandardPlanner.plannerType);
               this.nextElementId = elementId + 1;
               this.plannerElements.set(_plannerElement.ElementId, _plannerElement);
               _data = this.set.getPlannerData(_plannerElement.ElementId);
               _plannerElement.updatePlannerData(_data);
               if (this.doDisablePlanner2D) {
-                _context5.next = 90;
+                _context5.next = 91;
                 break;
               }
-              _context5.next = 90;
+              _context5.next = 91;
               return PlannerHandler2D.handler2D.loadSVG(_plannerElement, this.set);
-            case 90:
+            case 91:
               //Achtung die Pos Infos im alten Planer waren Zentrumskoordinaten!!! Nicht hinten oben.
-              centerWorldPos = new index.Vector3(_jsonElement.PosX, _jsonElement.PosZ, _jsonElement.PosY);
+              centerWorldPos = new index.Vector3(_jsonElement2.PosX, _jsonElement2.PosZ, _jsonElement2.PosY);
               _plannerElement.WorldPosCenter = new index.Vector3(this.plannerBoundingBox.WorldPos.x + centerWorldPos.x, this.plannerBoundingBox.WorldPos.y + centerWorldPos.y, this.plannerBoundingBox.WorldPos.z + centerWorldPos.z);
-              _plannerElement.RotDeg = _jsonElement.Rot;
+              _plannerElement.RotDeg = _jsonElement2.Rot;
               if (_plannerElement.IsDockedAccessoire) {
-                _accElements.push(_jsonElement);
-                if (_jsonElement.PosNum.toString().indexOf('.') > 0) {
-                  parentPosNr = _jsonElement.PosNum.toString().split('.')[0];
-                  accPosNr = _jsonElement.PosNum.toString().split('.')[1];
+                _accElements.push(_jsonElement2);
+                if (_jsonElement2.PosNum.toString().indexOf('.') > 0) {
+                  parentPosNr = _jsonElement2.PosNum.toString().split('.')[0];
+                  accPosNr = _jsonElement2.PosNum.toString().split('.')[1];
                   _plannerElement.PosNr = parentPosNr;
                   _plannerElement.AccessoirePosNr = accPosNr;
                 }
               } else {
-                _elementsSortedbyPosNr[_jsonElement.PosNum - 1] = _jsonElement;
-                _plannerElement.PosNr = _jsonElement.PosNum;
+                _elementsSortedbyPosNr[_jsonElement2.PosNum - 1] = _jsonElement2;
+                _plannerElement.PosNr = _jsonElement2.PosNum;
               }
-              _context5.next = 99;
+              _context5.next = 100;
               break;
-            case 96:
-              _context5.prev = 96;
-              _context5.t2 = _context5["catch"](69);
+            case 97:
+              _context5.prev = 97;
+              _context5.t2 = _context5["catch"](70);
               LOG.error(new DivaUtils.DivaError('Error initializing element nr ' + i + ' in the Standard Web Planner - Plan Data old Planner', {
                 cause: _context5.t2,
                 code: 'WC_0012'
               }));
-            case 99:
+            case 100:
               i++;
-              _context5.next = 68;
+              _context5.next = 69;
               break;
-            case 102:
+            case 103:
               _elementsSortedbyPosNr = _elementsSortedbyPosNr.concat(_accElements);
               //Dann werden die DockingPoints durchgegangen und die jeweils richtigen müssen gesucht werden.
               i = 0;
-            case 104:
+            case 105:
               if (!(i < _elementsSortedbyPosNr.length)) {
-                _context5.next = 112;
+                _context5.next = 113;
                 break;
               }
               if (!(_elementsSortedbyPosNr[i].DP == null || _elementsSortedbyPosNr[i].DP.length == 0)) {
-                _context5.next = 107;
+                _context5.next = 108;
                 break;
               }
-              return _context5.abrupt("continue", 109);
-            case 107:
+              return _context5.abrupt("continue", 110);
+            case 108:
               _DPsInfo = _elementsSortedbyPosNr[i].DP;
               for (j = 0; j < _DPsInfo.length; j++) {
                 _dpInfo = _DPsInfo[j];
@@ -1178,18 +1183,18 @@ var DivaStandardPlanner = /*#__PURE__*/function () {
                   }
                 }
               }
-            case 109:
+            case 110:
               i++;
-              _context5.next = 104;
+              _context5.next = 105;
               break;
-            case 112:
+            case 113:
               this.updateAllElementsWorldPos();
               this.updatePlannerPosNr();
-            case 114:
+            case 115:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[11, 32], [42, 53], [69, 96]]);
+        }, _callee5, this, [[11, 32], [42, 54], [70, 97]]);
       }));
       function initPlanner(_x9) {
         return _initPlanner.apply(this, arguments);

package/build/cjs/{DoorPlanner-d1db433c.js → DoorPlanner-ab476f81.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-8def7364.js');
+require('./index-2844897f.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/cjs/{Host3DSignalR-6ca32b05.js → Host3DSignalR-b032e03c.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-8def7364.js');
+var index = require('./index-2844897f.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var signalr = require('@microsoft/signalr');
 var io = require('socket.io-client');

package/build/cjs/{LiviqueWWSHandler-a74d9e68.js → LiviqueWWSHandler-1e5c6f30.js}

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

package/build/cjs/{PfisterWWSHandler-0cbc1cd7.js → PfisterWWSHandler-ec587d2a.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-var index = require('./index-8def7364.js');
+var index = require('./index-2844897f.js');
 var basketModel = require('@crystaldesign/basket-model');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
@@ -210,7 +210,8 @@ var PfisterWWSHandler = /*#__PURE__*/function () {
               }
             }
           } else {
-            var articleNrPrefix = 'ZKAT';
+            var _article$retailPrefix;
+            var articleNrPrefix = (_article$retailPrefix = article === null || article === void 0 ? void 0 : article.retailPrefix) !== null && _article$retailPrefix !== void 0 ? _article$retailPrefix : 'ZKAT';
             var useSAPArticleNumberInEKText = true;
             //wenn keine Orderlines des Sets als SapOrderline gelistet wurden,
             //dann jetzt für die unterschiedlichen ZKAT Artikelnummer innerhalb eines SETS eigene SAPOrderline listen

package/build/cjs/{PlannerHandler2D-6af64e9e.js → PlannerHandler2D-7dc308bd.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-8def7364.js');
+var index = require('./index-2844897f.js');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var fabric = require('fabric');

package/build/cjs/{SeriousBasketHandler-1098e5a5.js → SeriousBasketHandler-b795e6c3.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-8def7364.js');
+var index = require('./index-2844897f.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/cjs/{ShelfPlanner-ae77add5.js → ShelfPlanner-9e65c7b8.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-8def7364.js');
+var index = require('./index-2844897f.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');

package/build/cjs/{StandardWWSHandler-6c320c6e.js → StandardWWSHandler-5b3b12d1.js}

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