@crystaldesign/web-planner-logic 26.8.0-beta.2 → 26.8.0-beta.21

package/build/cjs/{DivaBoxPlanner-2e378a1a.js → DivaBoxPlanner-16d920f2.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-c1566d30.js');
+var index = require('./index-65181912.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-1b28c82a.js');
+var PlannerHandler2D = require('./PlannerHandler2D-62352f6b.js');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('axios');
 require('@crystaldesign/basket-model');
@@ -2843,6 +2843,7 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
         var seriesWidthToPlateOpv = coverPlateRule.seriesWidthToPlateOpv;
 
         // default => set all to ohne
+
         serie.forEach(function (element) {
           var _element$size$width;
           seriesWidth += (_element$size$width = element.size.width) !== null && _element$size$width !== void 0 ? _element$size$width : 0;
@@ -2852,37 +2853,30 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
           _this5.setOptionValue(element.elementId, coverPlateRule.optABD, 'OPVOHNE', optionHandler);
         });
         var firstUncoveredElement = serie[0];
-        var _loop = function _loop() {
-            var opv = seriesWidthToPlateOpv.findLast(function (stp) {
-              // is a clean element ending
-              var helperWidth = 0;
-              var isClean = false;
-              serie.forEach(function (element) {
-                var _element$size$width2;
-                helperWidth += (_element$size$width2 = element.size.width) !== null && _element$size$width2 !== void 0 ? _element$size$width2 : 0;
-                if (Math.abs(helperWidth - stp.limit) < 1) isClean = true;
-              });
-              if (stp.limit <= seriesWidth && isClean) return true;
-              return false;
-            });
-            if (!opv) return {
-              v: void 0
-            };
-            _this5.setOptionValue(firstUncoveredElement.elementId, coverPlateRule.optABD, opv.plateOpv, optionHandler);
+        var elementCoverage = firstUncoveredElement.area.fromX;
+        while (seriesWidth != 0) {
+          var _boxPlannerGrid$GridS;
+          var opv = seriesWidthToPlateOpv.findLast(function (stp) {
+            // is a clean element ending
             var helperWidth = 0;
-            firstUncoveredElement = serie.find(function (e) {
-              var _e$size$width;
-              helperWidth += (_e$size$width = e.size.width) !== null && _e$size$width !== void 0 ? _e$size$width : 0;
-              if (helperWidth > opv.limit) return true;
-              return false;
+            var isClean = false;
+            serie.forEach(function (element) {
+              var _element$size$width2;
+              helperWidth += (_element$size$width2 = element.size.width) !== null && _element$size$width2 !== void 0 ? _element$size$width2 : 0;
+              if (Math.abs(helperWidth - stp.limit) < 1) isClean = true;
             });
-            seriesWidth = seriesWidth - opv.limit;
-            if (seriesWidthToPlateOpv[1].limit > seriesWidth) seriesWidth = 0;
-          },
-          _ret;
-        while (seriesWidth != 0) {
-          _ret = _loop();
-          if (_ret) return _ret.v;
+            if (stp.limit <= seriesWidth && isClean) return true;
+            return false;
+          });
+          if (!opv) return;
+          _this5.setOptionValue(firstUncoveredElement.elementId, coverPlateRule.optABD, opv.plateOpv, optionHandler);
+          elementCoverage += Math.round(opv.limit / ((_boxPlannerGrid$GridS = boxPlannerGrid.GridSetupParams.fixCellRasterWidth) !== null && _boxPlannerGrid$GridS !== void 0 ? _boxPlannerGrid$GridS : 1));
+          firstUncoveredElement = serie.find(function (e) {
+            if (e.area.fromX >= elementCoverage) return true;
+            return false;
+          });
+          seriesWidth = seriesWidth - opv.limit;
+          if (seriesWidthToPlateOpv[1].limit > seriesWidth) seriesWidth = 0;
         }
       });
     }
@@ -3767,6 +3761,9 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
     }
   }, {
     key: "GridSetupParams",
+    get: function get() {
+      return this.gridSetupParams;
+    },
     set: function set(gridSetupParams) {
       this.gridSetupParams = gridSetupParams;
     }
@@ -4501,29 +4498,42 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
       // Neighbor column left/right of the copy (where support width is checked). At the grid edge that column does not exist
       // (LEFT: startColIndex === 0 → index.x === -1; RIGHT: endColIndex === curGrid.length → past last column).
       // Then scan along an in-grid column of this element so we still collect the full vertical stack to copy.
-      var supportColX = index.x;
+      var supportColX = dir === 'LEFT' ? curPos.startColIndex - 1 : curPos.endColIndex;
+      var belowColX = dir === 'LEFT' ? curPos.startColIndex : curPos.endColIndex - 1;
+
+      // Copying into new grid space (e.g. LEFT from column 0) — no adjacent column exists to check
+      // support width against, so include the entire vertical stack below unconditionally.
       if (!curGrid[supportColX]) {
-        supportColX = dir === 'LEFT' ? curPos.startColIndex : curPos.endColIndex - 1;
+        for (var y = index.y - 1; y >= 0;) {
+          var _curGrid$belowColX;
+          var belowElement = (_curGrid$belowColX = curGrid[belowColX]) === null || _curGrid$belowColX === void 0 || (_curGrid$belowColX = _curGrid$belowColX[y]) === null || _curGrid$belowColX === void 0 ? void 0 : _curGrid$belowColX.plannedElement;
+          if (!belowElement) break;
+          plannerIdsToFill.push(belowElement.elementId);
+          y = belowElement.area.fromY - 1;
+        }
+        return {
+          elements: plannerIdsToFill.reverse(),
+          backside: curPos.backside
+        };
       }
-      var belowColX = dir === 'LEFT' ? curPos.startColIndex : curPos.endColIndex - 1;
-      var _loop = function _loop(_y3) {
-          var _curGrid$belowColX, _curGrid$supportColX$, _Width, _Width2, _Width3;
+      var _loop = function _loop(_y4) {
+          var _curGrid$belowColX2, _curGrid$supportColX$, _Width, _Width2, _Width3;
           if (!curGrid[supportColX]) {
-            y = _y3;
+            _y3 = _y4;
             return 0;
           } // break
 
           // Always resolve the element in our own column — that is what we copy, not the neighbour.
-          var belowElement = (_curGrid$belowColX = curGrid[belowColX]) === null || _curGrid$belowColX === void 0 || (_curGrid$belowColX = _curGrid$belowColX[_y3]) === null || _curGrid$belowColX === void 0 ? void 0 : _curGrid$belowColX.plannedElement;
+          var belowElement = (_curGrid$belowColX2 = curGrid[belowColX]) === null || _curGrid$belowColX2 === void 0 || (_curGrid$belowColX2 = _curGrid$belowColX2[_y4]) === null || _curGrid$belowColX2 === void 0 ? void 0 : _curGrid$belowColX2.plannedElement;
           if (!belowElement) {
-            y = _y3;
+            _y3 = _y4;
             return 0;
           } // break
-          var supportElement = (_curGrid$supportColX$ = curGrid[supportColX][_y3]) === null || _curGrid$supportColX$ === void 0 ? void 0 : _curGrid$supportColX$.plannedElement;
+          var supportElement = (_curGrid$supportColX$ = curGrid[supportColX][_y4]) === null || _curGrid$supportColX$ === void 0 ? void 0 : _curGrid$supportColX$.plannedElement;
           if (!supportElement) {
             plannerIdsToFill.push(belowElement.elementId);
-            _y3 = belowElement.area.fromY - 1;
-            y = _y3;
+            _y4 = belowElement.area.fromY - 1;
+            _y3 = _y4;
             return 1; // continue
           }
 
@@ -4543,7 +4553,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
             freeSpace += n.Width;
           });
           if (freeSpace >= elementWidth) {
-            y = _y3;
+            _y3 = _y4;
             return 0;
           } // break
           var belowWidth = (_Width3 = _this2.getElementById(belowElement.elementId).Width) !== null && _Width3 !== void 0 ? _Width3 : belowElement.size.width;
@@ -4552,12 +4562,12 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
             plannerIdsToFill.push(belowElement.elementId);
             missingWidth = Math.round(missingWidth - belowWidth);
           }
-          _y3 = belowElement.area.fromY - 1;
-          y = _y3;
+          _y4 = belowElement.area.fromY - 1;
+          _y3 = _y4;
         },
         _ret;
-      for (var y = index.y - 1; y >= 0;) {
-        _ret = _loop(y);
+      for (var _y3 = index.y - 1; _y3 >= 0;) {
+        _ret = _loop(_y3);
         if (_ret === 0) break;
         if (_ret === 1) continue;
       }
@@ -4908,9 +4918,9 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
         for (var _x5 = cell.plannedElement.area.fromX; _x5 < cell.plannedElement.area.toX; _x5++) {
           var row = grid[_x5];
           if (!row) continue;
-          for (var _y4 = origin.y; _y4 < row.length; _y4++) {
-            var _cell = row[_y4];
-            if (_cell.index.y != _y4 || _cell.plannedElement.elementId == cell.plannedElement.elementId) continue; //already corrected
+          for (var _y5 = origin.y; _y5 < row.length; _y5++) {
+            var _cell = row[_y5];
+            if (_cell.index.y != _y5 || _cell.plannedElement.elementId == cell.plannedElement.elementId) continue; //already corrected
             _cell.index.y += diff.y;
             _cell.plannedElement.area.fromY += diff.y;
             _cell.plannedElement.area.toY += diff.y;
@@ -4919,8 +4929,8 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
       } else if (diff.x != 0 && (diff.x > free || diff.x < 0)) {
         // if there is enough free space on the right no need to move
         for (var _x6 = cell.plannedElement.area.fromX; _x6 < grid.length; _x6++) {
-          for (var _y5 = cell.plannedElement.area.fromY; _y5 < cell.plannedElement.area.toY; _y5++) {
-            var _cell10 = grid[_x6][_y5];
+          for (var _y6 = cell.plannedElement.area.fromY; _y6 < cell.plannedElement.area.toY; _y6++) {
+            var _cell10 = grid[_x6][_y6];
             if (!_cell10 || _cell10.plannedElement.elementId == elementId) continue; //already corrected
             _cell10.index.x += diff.x;
             _cell10.plannedElement.area.fromX += diff.x;
@@ -4944,7 +4954,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
             });
           })) return 0; // continue
           for (var _x7 = area.fromX; _x7 < area.toX; _x7++) {
-            for (var _y6 = area.fromY; _y6 < area.toY; _y6++) {
+            for (var _y7 = area.fromY; _y7 < area.toY; _y7++) {
               if (!newGrid[_x7] && area.fromY == 0) newGrid[_x7] = [];
 
               // we have a so called overhanging element not so nice, let's correct:
@@ -4968,10 +4978,10 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
               // when the element above starts early and goes over multiple ones
 
               // regular case
-              newGrid[_x7][_y6] = _objectSpread(_objectSpread({}, cell), {}, {
+              newGrid[_x7][_y7] = _objectSpread(_objectSpread({}, cell), {}, {
                 index: {
                   x: _x7,
-                  y: _y6
+                  y: _y7
                 },
                 plannedElement: _objectSpread(_objectSpread({}, cell.plannedElement), {}, {
                   area: {
@@ -5449,9 +5459,9 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
             var _targetColIndex = endColIndex;
             var _copyPossible2 = false;
             // Iterate through rows within the element's height
-            for (var _y7 = startRowIndex; _y7 <= endRowIndex; _y7++) {
-              if (isValidCell(_targetColIndex, _y7)) {
-                copyStartRowIndex = _y7;
+            for (var _y8 = startRowIndex; _y8 <= endRowIndex; _y8++) {
+              if (isValidCell(_targetColIndex, _y8)) {
+                copyStartRowIndex = _y8;
                 _copyPossible2 = true;
                 break;
               }

package/build/cjs/{DivaStandardPlanner-0a6e8f4a.js → DivaStandardPlanner-b4e89cab.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-c1566d30.js');
+var index = require('./index-65181912.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
-var PlannerHandler2D = require('./PlannerHandler2D-1b28c82a.js');
+var PlannerHandler2D = require('./PlannerHandler2D-62352f6b.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/toConsumableArray');

package/build/cjs/{DoorPlanner-0ebcb060.js → DoorPlanner-1438da9c.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-c1566d30.js');
+require('./index-65181912.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/cjs/{Host3DSignalR-653cebc1.js → Host3DSignalR-530ac879.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-c1566d30.js');
+var index = require('./index-65181912.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var signalr = require('@microsoft/signalr');
 var io = require('socket.io-client');

package/build/cjs/{LiviqueWWSHandler-9259293e.js → LiviqueWWSHandler-e865b385.js}

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

package/build/cjs/{PfisterWWSHandler-26c807f9.js → PfisterWWSHandler-d85f9680.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-var index = require('./index-c1566d30.js');
+var index = require('./index-65181912.js');
 var basketModel = require('@crystaldesign/basket-model');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
@@ -284,6 +284,15 @@ var PfisterWWSHandler = /*#__PURE__*/function () {
         } else {
           sapOrderlines = sapOrderlines.concat(blindSAPOrderLines);
         }
+      } else if (blindSAPOrderLines.length > 0) {
+        //ZKAT/blind Artikel zusätzlich zu expliziten SAP Orderlines nur listen, wenn per ADD_AS_ZKAT markiert
+        var zkatLinesToAdd = blindSAPOrderLines.filter(function (line) {
+          return line.basketIds.some(function (id) {
+            var _articles$id;
+            return (_articles$id = articles[id]) === null || _articles$id === void 0 ? void 0 : _articles$id.addAsZKAT;
+          });
+        });
+        sapOrderlines = sapOrderlines.concat(zkatLinesToAdd);
       }
       if (orderSet.BruttoSetPrice) orderSet.SetPrice = orderSet.BruttoSetPrice;
       return {

package/build/cjs/{PlannerHandler2D-1b28c82a.js → PlannerHandler2D-62352f6b.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-c1566d30.js');
+var index = require('./index-65181912.js');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var fabric = require('fabric');
@@ -1670,8 +1670,9 @@ var DockingPointHandler = /*#__PURE__*/function () {
     value: function checkDPAVLFilterDoMatch(plannerElement1, plannerElement2) {
       var avrFilter1 = plannerElement1.FilterAVR;
       var avlFilter2 = plannerElement2.FilterAVL;
-      if (avlFilter2.length == 0 && avrFilter1.length == 0) return true; //Diese überprüfung bin ich mir nicht sicher, dass es so passt.
 
+      // An empty filter on either side means "no connector restriction" -> always dockable.
+      if (avlFilter2.length == 0 || avrFilter1.length == 0) return true;
       for (var i = 0; i < avrFilter1.length; i++) {
         for (var j = 0; j < avlFilter2.length; j++) {
           if (avrFilter1[i] == avlFilter2[j]) {
@@ -1686,7 +1687,9 @@ var DockingPointHandler = /*#__PURE__*/function () {
     value: function checkDPAVRFilterDoMatch(plannerElement1, plannerElement2) {
       var avlFilter1 = plannerElement1.FilterAVL;
       var avrFilter2 = plannerElement2.FilterAVR;
-      if (avlFilter1.length == 0 && avrFilter2.length == 0) return true; //Diese überprüfung bin ich mir nicht sicher, dass es so passt.
+
+      // An empty filter on either side means "no connector restriction" -> always dockable.
+      if (avlFilter1.length == 0 || avrFilter2.length == 0) return true;
       for (var i = 0; i < avlFilter1.length; i++) {
         for (var j = 0; j < avrFilter2.length; j++) {
           if (avlFilter1[i] == avrFilter2[j]) {
@@ -1706,10 +1709,18 @@ var DockingPointHandler = /*#__PURE__*/function () {
       var avrDockable = this.checkDPAVRFilterDoMatch(sourcePlannerElement, targetElement);
       var avlDockable = this.checkDPAVLFilterDoMatch(sourcePlannerElement, targetElement);
       var refDPType = this.getReferenceDPType(dp1.Type);
-      if (refDPType == 'AVL' && !avlDockable) return false;
-      if (refDPType == 'AVR' && !avrDockable) return false;
-      if (dp2.Type != refDPType) return false;
-      if (dp1.IsDocking || dp2.IsDocking) return false;
+      if (refDPType == 'AVL' && !avlDockable) {
+        return false;
+      }
+      if (refDPType == 'AVR' && !avrDockable) {
+        return false;
+      }
+      if (dp2.Type != refDPType) {
+        return false;
+      }
+      if (dp1.IsDocking || dp2.IsDocking) {
+        return false;
+      }
       if (!dp1.IgnoreLayer || !dp2.IgnoreLayer) {
         var doCheckLayer = true;
         if (dp1.PlannerConfig.ignoreLayerAVC && (dp1.Type == 'AVC' || dp2.Type == 'AVC')) {
@@ -1722,9 +1733,13 @@ var DockingPointHandler = /*#__PURE__*/function () {
           doCheckLayer = false;
         }
         //Check layer
-        if (doCheckLayer && dp2.Layer == dp1.Layer) return false;
+        if (doCheckLayer && dp2.Layer == dp1.Layer) {
+          return false;
+        }
+      }
+      if (!dp1.PlannerConfig.ignoreDockingNumber && dp1.HasNumber && dp2.HasNumber && dp1.Number != dp2.Number) {
+        return false;
       }
-      if (dp1.HasNumber && dp2.HasNumber && dp1.Number != dp2.Number) return false;
       return true;
     }
 

package/build/cjs/{SeriousBasketHandler-e3f8040a.js → SeriousBasketHandler-1dc4eb5a.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-c1566d30.js');
+var index = require('./index-65181912.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/cjs/{ShelfPlanner-58edfc01.js → ShelfPlanner-9df60123.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-c1566d30.js');
+var index = require('./index-65181912.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');

package/build/cjs/{StandardWWSHandler-6faba9e9.js → StandardWWSHandler-77bbb1fb.js}

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