@crystaldesign/basket-model 26.12.0-beta.9 → 26.12.0-rc.0

package/build/cjs/index.js

@@ -943,26 +943,56 @@ var _generateEKTextOfBasket = (function (basket, withoutPrices, customDivaNr, va
         return !ol.IsPartlistArticle;
       });
       var usedOrderLines = [];
-      var _loop2 = function _loop2(_i) {
-        var retval = processNonPartlistOrderlines(basket, orderlines[_i], setTextHeader, preisLength, withoutPrices);
-        usedOrderLines.push(orderlines[_i]);
-        if (retval) {
-          setText += retval;
+      var _loop2 = function _loop2() {
+          var orderLine = orderlines[_i];
           //check if partlistarticles exists for this orderline
           var partlistArticleOrderLines = ols.filter(function (ol) {
-            return ol.RelatedToBasketID === orderlines[_i].BasketID && ol.IsPartlistArticle;
+            return ol.RelatedToBasketID === orderLine.BasketID && ol.IsPartlistArticle;
           });
-          if ((partlistArticleOrderLines === null || partlistArticleOrderLines === void 0 ? void 0 : partlistArticleOrderLines.length) > 0) {
-            usedOrderLines.push.apply(usedOrderLines, _toConsumableArray__default["default"](partlistArticleOrderLines));
-            var value = processPartListOrderLines(basket, partlistArticleOrderLines, setTextHeader, preisLength, withoutPrices, true);
-            if (value) {
-              setText += value;
+          var retval = isHull(basket, ols, orderLine) ? undefined : processNonPartlistOrderlines(basket, orderLine, setTextHeader, preisLength, withoutPrices);
+          usedOrderLines.push(orderLine);
+          if (retval) {
+            setText += retval;
+            if (partlistArticleOrderLines.length > 0) {
+              usedOrderLines.push.apply(usedOrderLines, _toConsumableArray__default["default"](partlistArticleOrderLines));
+              var _value = processPartListOrderLines(basket, partlistArticleOrderLines, setTextHeader, preisLength, withoutPrices, true);
+              if (_value) {
+                setText += _value;
+              }
             }
+            return 0; // continue
           }
-        }
-      };
+
+          // An article without a price of its own is only represented by its components. They are written here instead of after
+          // every other position, so that a main article keeps its place in front of the accessories that belong to it.
+          if (!isHull(basket, ols, orderLine)) return 0; // continue
+          var components = _getPartlistComponents(ols, orderLine).filter(function (component) {
+            return !usedOrderLines.includes(component);
+          });
+          if (components.length === 0) return 0; // continue
+
+          // Identical components of the hulls further down are merged into this position (e.g. "2 Drehtür ... 538.00" in Twist),
+          // as they were when the components of all hulls were written together at the end. An accessory stays below the main
+          // article it belongs to, so that it is clear where it is mounted (e.g. the cushions of each sofa in Brühl alba).
+          var groupKeys = components.map(getGroupKey);
+          var sameComponentsOfLaterHulls = orderlines.slice(_i + 1).filter(function (ol) {
+            return isHull(basket, ols, ol) && ol.RelatedToBasketID === orderLine.RelatedToBasketID;
+          }).flatMap(function (hull) {
+            return _getPartlistComponents(ols, hull);
+          }).filter(function (component) {
+            return groupKeys.includes(getGroupKey(component));
+          });
+          var positions = [].concat(_toConsumableArray__default["default"](components), _toConsumableArray__default["default"](sameComponentsOfLaterHulls));
+          usedOrderLines.push.apply(usedOrderLines, _toConsumableArray__default["default"](positions));
+          var value = processPartListOrderLines(basket, positions, setTextHeader, preisLength, withoutPrices);
+          if (value) {
+            setText += value;
+          }
+        },
+        _ret;
       for (var _i = 0; _i < orderlines.length; _i++) {
-        _loop2(_i);
+        _ret = _loop2();
+        if (_ret === 0) continue;
       }
       var notUsedOls = ols.filter(function (ol) {
         return ol.IsPartlistArticle && !usedOrderLines.includes(ol);
@@ -989,6 +1019,54 @@ var _generateEKTextOfBasket = (function (basket, withoutPrices, customDivaNr, va
   basket.OrderSets[0].SetOrderText = sbSetOrderText;
   return basket;
 });
+
+/**
+ * A component that carries the name and the price of the article it belongs to is that article written a second time.
+ * Listing both prints the same position and the same price twice, so the listed prices no longer add up to the total.
+ */
+var repeatsOrderLine = function repeatsOrderLine(orderLine, component) {
+  var _component$Name, _orderLine$Name, _component$VKPrice, _orderLine$VKPrice;
+  return DivaUtils__default["default"].stripTags((_component$Name = component.Name) !== null && _component$Name !== void 0 ? _component$Name : '') === DivaUtils__default["default"].stripTags((_orderLine$Name = orderLine.Name) !== null && _orderLine$Name !== void 0 ? _orderLine$Name : '') && ((_component$VKPrice = component.VKPrice) === null || _component$VKPrice === void 0 ? void 0 : _component$VKPrice.CalcPrice) === ((_orderLine$VKPrice = orderLine.VKPrice) === null || _orderLine$VKPrice === void 0 ? void 0 : _orderLine$VKPrice.CalcPrice);
+};
+var hasZkatOrderLine = function hasZkatOrderLine(basket, orderLine) {
+  var _basket$getSAPOrderLi2;
+  return !!((_basket$getSAPOrderLi2 = basket.getSAPOrderLines()) !== null && _basket$getSAPOrderLi2 !== void 0 && _basket$getSAPOrderLi2.some(function (sol) {
+    return sol.ArticleNrPrefix === 'ZKAT' && orderLine.RetailArticleNr === sol.ArticleNr;
+  }));
+};
+
+/**
+ * An article without a price of its own that is only represented by its components: it has no ZKAT order line of its own, or
+ * a component repeats it (e.g. the Brühl accessories), so writing the article as well would list the same position twice.
+ * The repeating component needs a ZKAT order line of its own, as it is not written without one and the article would get lost.
+ */
+var isHull = function isHull(basket, ols, orderLine) {
+  var _orderLine$VKPrice2;
+  return !!orderLine.HasPartlistArticle && !((_orderLine$VKPrice2 = orderLine.VKPrice) !== null && _orderLine$VKPrice2 !== void 0 && _orderLine$VKPrice2.Price) && (!hasZkatOrderLine(basket, orderLine) || _getPartlistComponents(ols, orderLine).some(function (component) {
+    return hasZkatOrderLine(basket, component) && repeatsOrderLine(orderLine, component);
+  }));
+};
+
+/** Partlist order lines with the same key are written as one position with the summed quantity and price. */
+var getGroupKey = function getGroupKey(ol) {
+  var _ol$Name, _ol$VariantBasketData2;
+  return DivaUtils__default["default"].stripTags((_ol$Name = ol.Name) !== null && _ol$Name !== void 0 ? _ol$Name : '') + '|' + ol.TypeNr + '|' + ol.SetID + '|' + ol.ArticleCodex + '|' + ((_ol$VariantBasketData2 = ol.VariantBasketDatas) === null || _ol$VariantBasketData2 === void 0 ? void 0 : _ol$VariantBasketData2.map(function (v) {
+    return v.OPT + v.OPV;
+  }).join(';'));
+};
+
+/** Partlist order lines below an order line at any depth, in the order of the set. */
+var _getPartlistComponents = function getPartlistComponents(ols, orderLine) {
+  var children = ols.filter(function (ol) {
+    return ol.IsPartlistArticle && ol.RelatedToBasketID === orderLine.BasketID;
+  });
+  var components = children.flatMap(function (child) {
+    return [child].concat(_toConsumableArray__default["default"](_getPartlistComponents(ols, child)));
+  });
+  return ols.filter(function (ol) {
+    return components.includes(ol);
+  });
+};
 var addingSapOrderLinesToEkText = function addingSapOrderLinesToEkText(saporderLines, ols) {
   //https://app.asana.com/0/686949732692179/692909200657046
   var setText = '';
@@ -1023,27 +1101,25 @@ var processPartListOrderLines = function processPartListOrderLines(basket, ols,
     newArtikelLength2Row += lengthSubPostion;
   }
   var groupedOls = ols.filter(function (orderLine) {
-    var _basket$getSAPOrderLi2;
-    return ((_basket$getSAPOrderLi2 = basket.getSAPOrderLines()) === null || _basket$getSAPOrderLi2 === void 0 ? void 0 : _basket$getSAPOrderLi2.find(function (sol) {
+    var _basket$getSAPOrderLi3;
+    return ((_basket$getSAPOrderLi3 = basket.getSAPOrderLines()) === null || _basket$getSAPOrderLi3 === void 0 ? void 0 : _basket$getSAPOrderLi3.find(function (sol) {
       return sol.ArticleNrPrefix === 'ZKAT' && orderLine.RetailArticleNr == sol.ArticleNr;
     })) && orderLine.IsPartlistArticle;
   }).reduce(function (group, ol) {
-    var _ol$Name, _ol$VariantBasketData2, _group$category;
-    var category = DivaUtils__default["default"].stripTags((_ol$Name = ol.Name) !== null && _ol$Name !== void 0 ? _ol$Name : '') + '|' + ol.TypeNr + '|' + ol.SetID + '|' + ol.ArticleCodex + '|' + ((_ol$VariantBasketData2 = ol.VariantBasketDatas) === null || _ol$VariantBasketData2 === void 0 ? void 0 : _ol$VariantBasketData2.map(function (v) {
-      return v.OPT + v.OPV;
-    }).join(';'));
+    var _group$category;
+    var category = getGroupKey(ol);
     group[category] = (_group$category = group[category]) !== null && _group$category !== void 0 ? _group$category : [];
     group[category].push(ol);
     return group;
   }, {});
   var retval = '';
   var _loop4 = function _loop4() {
-      var _basket$getSAPOrderLi3, _basket$getSAPOrderLi4, _basket$getSAPOrderLi5, _orderLine$Name, _orderLine$ConfigArti2;
+      var _basket$getSAPOrderLi4, _basket$getSAPOrderLi5, _basket$getSAPOrderLi6, _orderLine$Name2, _orderLine$ConfigArti2;
       var groupedOl = groupedOls[key];
       var orderLine = groupedOl[0];
-      var sol = (_basket$getSAPOrderLi3 = (_basket$getSAPOrderLi4 = basket.getSAPOrderLines()) === null || _basket$getSAPOrderLi4 === void 0 ? void 0 : _basket$getSAPOrderLi4.find(function (sol) {
+      var sol = (_basket$getSAPOrderLi4 = (_basket$getSAPOrderLi5 = basket.getSAPOrderLines()) === null || _basket$getSAPOrderLi5 === void 0 ? void 0 : _basket$getSAPOrderLi5.find(function (sol) {
         return sol.ArticleNrPrefix === 'ZKAT' && orderLine.RetailArticleNr === sol.ArticleNr;
-      })) !== null && _basket$getSAPOrderLi3 !== void 0 ? _basket$getSAPOrderLi3 : (_basket$getSAPOrderLi5 = basket.getSAPOrderLines()) === null || _basket$getSAPOrderLi5 === void 0 ? void 0 : _basket$getSAPOrderLi5[0];
+      })) !== null && _basket$getSAPOrderLi4 !== void 0 ? _basket$getSAPOrderLi4 : (_basket$getSAPOrderLi6 = basket.getSAPOrderLines()) === null || _basket$getSAPOrderLi6 === void 0 ? void 0 : _basket$getSAPOrderLi6[0];
       var setOrderText = '';
       if (!isSubPosition) {
         var quantity = groupedOl.reduce(function (sum, ol) {
@@ -1051,7 +1127,7 @@ var processPartListOrderLines = function processPartListOrderLines(basket, ols,
         }, 0).toString();
         setOrderText += appendToTheRight(mLength, quantity);
       }
-      var lines = getLines(artikelLength, newArtikelLength2Row, DivaUtils__default["default"].stripTags((_orderLine$Name = orderLine.Name) !== null && _orderLine$Name !== void 0 ? _orderLine$Name : ''));
+      var lines = getLines(artikelLength, newArtikelLength2Row, DivaUtils__default["default"].stripTags((_orderLine$Name2 = orderLine.Name) !== null && _orderLine$Name2 !== void 0 ? _orderLine$Name2 : ''));
       var articleNumber = (_orderLine$ConfigArti2 = orderLine.ConfigArticleCodex) !== null && _orderLine$ConfigArti2 !== void 0 ? _orderLine$ConfigArti2 : orderLine.ArticleCodex;
 
       //Anforderung von Polypol auch die Typennummer anzugeben
@@ -1107,8 +1183,8 @@ var processNonPartlistOrderlines = function processNonPartlistOrderlines(basket,
     return sol.ArticleNrPrefix === 'ZKAT' && orderLine.RetailArticleNr === sol.ArticleNr;
   });
   if (sol) {
-    var _orderLine$Name2, _orderLine$ConfigArti3, _orderLine$VariantBas, _orderLine$VariantBas2, _orderLine$ConfigPric;
-    var lines = getLines(artikelLength, artikelLength2Row, DivaUtils__default["default"].stripTags((_orderLine$Name2 = orderLine.Name) !== null && _orderLine$Name2 !== void 0 ? _orderLine$Name2 : ''));
+    var _orderLine$Name3, _orderLine$ConfigArti3, _orderLine$VariantBas, _orderLine$VariantBas2, _orderLine$ConfigPric;
+    var lines = getLines(artikelLength, artikelLength2Row, DivaUtils__default["default"].stripTags((_orderLine$Name3 = orderLine.Name) !== null && _orderLine$Name3 !== void 0 ? _orderLine$Name3 : ''));
     var articleNumber = (_orderLine$ConfigArti3 = orderLine.ConfigArticleCodex) !== null && _orderLine$ConfigArti3 !== void 0 ? _orderLine$ConfigArti3 : orderLine.ArticleCodex;
 
     //Anforderung von Polypol auch die Typennummer anzugeben
@@ -1128,8 +1204,8 @@ var processNonPartlistOrderlines = function processNonPartlistOrderlines(basket,
     sapOrderLineText += appendToTheRight(mLength, orderLine.Quantity.toString());
     sapOrderLineText += appendToTheRight(artikelLength, lines[0]);
     if (!withoutPrices) {
-      var _orderLine$VKPrice$Ca, _orderLine$VKPrice;
-      sapOrderLineText += appendToTheLeft(preisLength, formatPrice((_orderLine$VKPrice$Ca = (_orderLine$VKPrice = orderLine.VKPrice) === null || _orderLine$VKPrice === void 0 || (_orderLine$VKPrice = _orderLine$VKPrice.CalcPrice) === null || _orderLine$VKPrice === void 0 ? void 0 : _orderLine$VKPrice.toString()) !== null && _orderLine$VKPrice$Ca !== void 0 ? _orderLine$VKPrice$Ca : '0'));
+      var _orderLine$VKPrice$Ca, _orderLine$VKPrice3;
+      sapOrderLineText += appendToTheLeft(preisLength, formatPrice((_orderLine$VKPrice$Ca = (_orderLine$VKPrice3 = orderLine.VKPrice) === null || _orderLine$VKPrice3 === void 0 || (_orderLine$VKPrice3 = _orderLine$VKPrice3.CalcPrice) === null || _orderLine$VKPrice3 === void 0 ? void 0 : _orderLine$VKPrice3.toString()) !== null && _orderLine$VKPrice$Ca !== void 0 ? _orderLine$VKPrice$Ca : '0'));
     }
     sapOrderLineText += newLine;
     sapOrderLineText += writeOtherLines(lines, startPositionArtikel2Row);

package/build/esm/index.js

@@ -931,26 +931,56 @@ var _generateEKTextOfBasket = (function (basket, withoutPrices, customDivaNr, va
         return !ol.IsPartlistArticle;
       });
       var usedOrderLines = [];
-      var _loop2 = function _loop2(_i) {
-        var retval = processNonPartlistOrderlines(basket, orderlines[_i], setTextHeader, preisLength, withoutPrices);
-        usedOrderLines.push(orderlines[_i]);
-        if (retval) {
-          setText += retval;
+      var _loop2 = function _loop2() {
+          var orderLine = orderlines[_i];
           //check if partlistarticles exists for this orderline
           var partlistArticleOrderLines = ols.filter(function (ol) {
-            return ol.RelatedToBasketID === orderlines[_i].BasketID && ol.IsPartlistArticle;
+            return ol.RelatedToBasketID === orderLine.BasketID && ol.IsPartlistArticle;
           });
-          if ((partlistArticleOrderLines === null || partlistArticleOrderLines === void 0 ? void 0 : partlistArticleOrderLines.length) > 0) {
-            usedOrderLines.push.apply(usedOrderLines, _toConsumableArray(partlistArticleOrderLines));
-            var value = processPartListOrderLines(basket, partlistArticleOrderLines, setTextHeader, preisLength, withoutPrices, true);
-            if (value) {
-              setText += value;
+          var retval = isHull(basket, ols, orderLine) ? undefined : processNonPartlistOrderlines(basket, orderLine, setTextHeader, preisLength, withoutPrices);
+          usedOrderLines.push(orderLine);
+          if (retval) {
+            setText += retval;
+            if (partlistArticleOrderLines.length > 0) {
+              usedOrderLines.push.apply(usedOrderLines, _toConsumableArray(partlistArticleOrderLines));
+              var _value = processPartListOrderLines(basket, partlistArticleOrderLines, setTextHeader, preisLength, withoutPrices, true);
+              if (_value) {
+                setText += _value;
+              }
             }
+            return 0; // continue
           }
-        }
-      };
+
+          // An article without a price of its own is only represented by its components. They are written here instead of after
+          // every other position, so that a main article keeps its place in front of the accessories that belong to it.
+          if (!isHull(basket, ols, orderLine)) return 0; // continue
+          var components = _getPartlistComponents(ols, orderLine).filter(function (component) {
+            return !usedOrderLines.includes(component);
+          });
+          if (components.length === 0) return 0; // continue
+
+          // Identical components of the hulls further down are merged into this position (e.g. "2 Drehtür ... 538.00" in Twist),
+          // as they were when the components of all hulls were written together at the end. An accessory stays below the main
+          // article it belongs to, so that it is clear where it is mounted (e.g. the cushions of each sofa in Brühl alba).
+          var groupKeys = components.map(getGroupKey);
+          var sameComponentsOfLaterHulls = orderlines.slice(_i + 1).filter(function (ol) {
+            return isHull(basket, ols, ol) && ol.RelatedToBasketID === orderLine.RelatedToBasketID;
+          }).flatMap(function (hull) {
+            return _getPartlistComponents(ols, hull);
+          }).filter(function (component) {
+            return groupKeys.includes(getGroupKey(component));
+          });
+          var positions = [].concat(_toConsumableArray(components), _toConsumableArray(sameComponentsOfLaterHulls));
+          usedOrderLines.push.apply(usedOrderLines, _toConsumableArray(positions));
+          var value = processPartListOrderLines(basket, positions, setTextHeader, preisLength, withoutPrices);
+          if (value) {
+            setText += value;
+          }
+        },
+        _ret;
       for (var _i = 0; _i < orderlines.length; _i++) {
-        _loop2(_i);
+        _ret = _loop2();
+        if (_ret === 0) continue;
       }
       var notUsedOls = ols.filter(function (ol) {
         return ol.IsPartlistArticle && !usedOrderLines.includes(ol);
@@ -977,6 +1007,54 @@ var _generateEKTextOfBasket = (function (basket, withoutPrices, customDivaNr, va
   basket.OrderSets[0].SetOrderText = sbSetOrderText;
   return basket;
 });
+
+/**
+ * A component that carries the name and the price of the article it belongs to is that article written a second time.
+ * Listing both prints the same position and the same price twice, so the listed prices no longer add up to the total.
+ */
+var repeatsOrderLine = function repeatsOrderLine(orderLine, component) {
+  var _component$Name, _orderLine$Name, _component$VKPrice, _orderLine$VKPrice;
+  return DivaUtils.stripTags((_component$Name = component.Name) !== null && _component$Name !== void 0 ? _component$Name : '') === DivaUtils.stripTags((_orderLine$Name = orderLine.Name) !== null && _orderLine$Name !== void 0 ? _orderLine$Name : '') && ((_component$VKPrice = component.VKPrice) === null || _component$VKPrice === void 0 ? void 0 : _component$VKPrice.CalcPrice) === ((_orderLine$VKPrice = orderLine.VKPrice) === null || _orderLine$VKPrice === void 0 ? void 0 : _orderLine$VKPrice.CalcPrice);
+};
+var hasZkatOrderLine = function hasZkatOrderLine(basket, orderLine) {
+  var _basket$getSAPOrderLi2;
+  return !!((_basket$getSAPOrderLi2 = basket.getSAPOrderLines()) !== null && _basket$getSAPOrderLi2 !== void 0 && _basket$getSAPOrderLi2.some(function (sol) {
+    return sol.ArticleNrPrefix === 'ZKAT' && orderLine.RetailArticleNr === sol.ArticleNr;
+  }));
+};
+
+/**
+ * An article without a price of its own that is only represented by its components: it has no ZKAT order line of its own, or
+ * a component repeats it (e.g. the Brühl accessories), so writing the article as well would list the same position twice.
+ * The repeating component needs a ZKAT order line of its own, as it is not written without one and the article would get lost.
+ */
+var isHull = function isHull(basket, ols, orderLine) {
+  var _orderLine$VKPrice2;
+  return !!orderLine.HasPartlistArticle && !((_orderLine$VKPrice2 = orderLine.VKPrice) !== null && _orderLine$VKPrice2 !== void 0 && _orderLine$VKPrice2.Price) && (!hasZkatOrderLine(basket, orderLine) || _getPartlistComponents(ols, orderLine).some(function (component) {
+    return hasZkatOrderLine(basket, component) && repeatsOrderLine(orderLine, component);
+  }));
+};
+
+/** Partlist order lines with the same key are written as one position with the summed quantity and price. */
+var getGroupKey = function getGroupKey(ol) {
+  var _ol$Name, _ol$VariantBasketData2;
+  return DivaUtils.stripTags((_ol$Name = ol.Name) !== null && _ol$Name !== void 0 ? _ol$Name : '') + '|' + ol.TypeNr + '|' + ol.SetID + '|' + ol.ArticleCodex + '|' + ((_ol$VariantBasketData2 = ol.VariantBasketDatas) === null || _ol$VariantBasketData2 === void 0 ? void 0 : _ol$VariantBasketData2.map(function (v) {
+    return v.OPT + v.OPV;
+  }).join(';'));
+};
+
+/** Partlist order lines below an order line at any depth, in the order of the set. */
+var _getPartlistComponents = function getPartlistComponents(ols, orderLine) {
+  var children = ols.filter(function (ol) {
+    return ol.IsPartlistArticle && ol.RelatedToBasketID === orderLine.BasketID;
+  });
+  var components = children.flatMap(function (child) {
+    return [child].concat(_toConsumableArray(_getPartlistComponents(ols, child)));
+  });
+  return ols.filter(function (ol) {
+    return components.includes(ol);
+  });
+};
 var addingSapOrderLinesToEkText = function addingSapOrderLinesToEkText(saporderLines, ols) {
   //https://app.asana.com/0/686949732692179/692909200657046
   var setText = '';
@@ -1011,27 +1089,25 @@ var processPartListOrderLines = function processPartListOrderLines(basket, ols,
     newArtikelLength2Row += lengthSubPostion;
   }
   var groupedOls = ols.filter(function (orderLine) {
-    var _basket$getSAPOrderLi2;
-    return ((_basket$getSAPOrderLi2 = basket.getSAPOrderLines()) === null || _basket$getSAPOrderLi2 === void 0 ? void 0 : _basket$getSAPOrderLi2.find(function (sol) {
+    var _basket$getSAPOrderLi3;
+    return ((_basket$getSAPOrderLi3 = basket.getSAPOrderLines()) === null || _basket$getSAPOrderLi3 === void 0 ? void 0 : _basket$getSAPOrderLi3.find(function (sol) {
       return sol.ArticleNrPrefix === 'ZKAT' && orderLine.RetailArticleNr == sol.ArticleNr;
     })) && orderLine.IsPartlistArticle;
   }).reduce(function (group, ol) {
-    var _ol$Name, _ol$VariantBasketData2, _group$category;
-    var category = DivaUtils.stripTags((_ol$Name = ol.Name) !== null && _ol$Name !== void 0 ? _ol$Name : '') + '|' + ol.TypeNr + '|' + ol.SetID + '|' + ol.ArticleCodex + '|' + ((_ol$VariantBasketData2 = ol.VariantBasketDatas) === null || _ol$VariantBasketData2 === void 0 ? void 0 : _ol$VariantBasketData2.map(function (v) {
-      return v.OPT + v.OPV;
-    }).join(';'));
+    var _group$category;
+    var category = getGroupKey(ol);
     group[category] = (_group$category = group[category]) !== null && _group$category !== void 0 ? _group$category : [];
     group[category].push(ol);
     return group;
   }, {});
   var retval = '';
   var _loop4 = function _loop4() {
-      var _basket$getSAPOrderLi3, _basket$getSAPOrderLi4, _basket$getSAPOrderLi5, _orderLine$Name, _orderLine$ConfigArti2;
+      var _basket$getSAPOrderLi4, _basket$getSAPOrderLi5, _basket$getSAPOrderLi6, _orderLine$Name2, _orderLine$ConfigArti2;
       var groupedOl = groupedOls[key];
       var orderLine = groupedOl[0];
-      var sol = (_basket$getSAPOrderLi3 = (_basket$getSAPOrderLi4 = basket.getSAPOrderLines()) === null || _basket$getSAPOrderLi4 === void 0 ? void 0 : _basket$getSAPOrderLi4.find(function (sol) {
+      var sol = (_basket$getSAPOrderLi4 = (_basket$getSAPOrderLi5 = basket.getSAPOrderLines()) === null || _basket$getSAPOrderLi5 === void 0 ? void 0 : _basket$getSAPOrderLi5.find(function (sol) {
         return sol.ArticleNrPrefix === 'ZKAT' && orderLine.RetailArticleNr === sol.ArticleNr;
-      })) !== null && _basket$getSAPOrderLi3 !== void 0 ? _basket$getSAPOrderLi3 : (_basket$getSAPOrderLi5 = basket.getSAPOrderLines()) === null || _basket$getSAPOrderLi5 === void 0 ? void 0 : _basket$getSAPOrderLi5[0];
+      })) !== null && _basket$getSAPOrderLi4 !== void 0 ? _basket$getSAPOrderLi4 : (_basket$getSAPOrderLi6 = basket.getSAPOrderLines()) === null || _basket$getSAPOrderLi6 === void 0 ? void 0 : _basket$getSAPOrderLi6[0];
       var setOrderText = '';
       if (!isSubPosition) {
         var quantity = groupedOl.reduce(function (sum, ol) {
@@ -1039,7 +1115,7 @@ var processPartListOrderLines = function processPartListOrderLines(basket, ols,
         }, 0).toString();
         setOrderText += appendToTheRight(mLength, quantity);
       }
-      var lines = getLines(artikelLength, newArtikelLength2Row, DivaUtils.stripTags((_orderLine$Name = orderLine.Name) !== null && _orderLine$Name !== void 0 ? _orderLine$Name : ''));
+      var lines = getLines(artikelLength, newArtikelLength2Row, DivaUtils.stripTags((_orderLine$Name2 = orderLine.Name) !== null && _orderLine$Name2 !== void 0 ? _orderLine$Name2 : ''));
       var articleNumber = (_orderLine$ConfigArti2 = orderLine.ConfigArticleCodex) !== null && _orderLine$ConfigArti2 !== void 0 ? _orderLine$ConfigArti2 : orderLine.ArticleCodex;
 
       //Anforderung von Polypol auch die Typennummer anzugeben
@@ -1095,8 +1171,8 @@ var processNonPartlistOrderlines = function processNonPartlistOrderlines(basket,
     return sol.ArticleNrPrefix === 'ZKAT' && orderLine.RetailArticleNr === sol.ArticleNr;
   });
   if (sol) {
-    var _orderLine$Name2, _orderLine$ConfigArti3, _orderLine$VariantBas, _orderLine$VariantBas2, _orderLine$ConfigPric;
-    var lines = getLines(artikelLength, artikelLength2Row, DivaUtils.stripTags((_orderLine$Name2 = orderLine.Name) !== null && _orderLine$Name2 !== void 0 ? _orderLine$Name2 : ''));
+    var _orderLine$Name3, _orderLine$ConfigArti3, _orderLine$VariantBas, _orderLine$VariantBas2, _orderLine$ConfigPric;
+    var lines = getLines(artikelLength, artikelLength2Row, DivaUtils.stripTags((_orderLine$Name3 = orderLine.Name) !== null && _orderLine$Name3 !== void 0 ? _orderLine$Name3 : ''));
     var articleNumber = (_orderLine$ConfigArti3 = orderLine.ConfigArticleCodex) !== null && _orderLine$ConfigArti3 !== void 0 ? _orderLine$ConfigArti3 : orderLine.ArticleCodex;
 
     //Anforderung von Polypol auch die Typennummer anzugeben
@@ -1116,8 +1192,8 @@ var processNonPartlistOrderlines = function processNonPartlistOrderlines(basket,
     sapOrderLineText += appendToTheRight(mLength, orderLine.Quantity.toString());
     sapOrderLineText += appendToTheRight(artikelLength, lines[0]);
     if (!withoutPrices) {
-      var _orderLine$VKPrice$Ca, _orderLine$VKPrice;
-      sapOrderLineText += appendToTheLeft(preisLength, formatPrice((_orderLine$VKPrice$Ca = (_orderLine$VKPrice = orderLine.VKPrice) === null || _orderLine$VKPrice === void 0 || (_orderLine$VKPrice = _orderLine$VKPrice.CalcPrice) === null || _orderLine$VKPrice === void 0 ? void 0 : _orderLine$VKPrice.toString()) !== null && _orderLine$VKPrice$Ca !== void 0 ? _orderLine$VKPrice$Ca : '0'));
+      var _orderLine$VKPrice$Ca, _orderLine$VKPrice3;
+      sapOrderLineText += appendToTheLeft(preisLength, formatPrice((_orderLine$VKPrice$Ca = (_orderLine$VKPrice3 = orderLine.VKPrice) === null || _orderLine$VKPrice3 === void 0 || (_orderLine$VKPrice3 = _orderLine$VKPrice3.CalcPrice) === null || _orderLine$VKPrice3 === void 0 ? void 0 : _orderLine$VKPrice3.toString()) !== null && _orderLine$VKPrice$Ca !== void 0 ? _orderLine$VKPrice$Ca : '0'));
     }
     sapOrderLineText += newLine;
     sapOrderLineText += writeOtherLines(lines, startPositionArtikel2Row);

package/build/types/basket-model/src/EKTextGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EKTextGenerator.d.ts","sourceRoot":"","sources":["../../../../src/EKTextGenerator.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,cAAc,CAAC;iCAed,UAAU,kBAAkB,OAAO,iBAAiB,MAAM,cAAc,MAAM;AAAtG,wBAoHE"}
+{"version":3,"file":"EKTextGenerator.d.ts","sourceRoot":"","sources":["../../../../src/EKTextGenerator.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,cAAc,CAAC;iCAed,UAAU,kBAAkB,OAAO,iBAAiB,MAAM,cAAc,MAAM;AAAtG,wBAkJE"}

package/build/types/basket-model/src/tests/unit/EKTextGenerator.hullArticles.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=EKTextGenerator.hullArticles.test.d.ts.map

package/build/types/basket-model/src/tests/unit/EKTextGenerator.hullArticles.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EKTextGenerator.hullArticles.test.d.ts","sourceRoot":"","sources":["../../../../../../src/tests/unit/EKTextGenerator.hullArticles.test.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/basket-model",
-  "version": "26.12.0-beta.9",
+  "version": "26.12.0-rc.0",
   "description": "Shared data model for baskets, order lines, clients and configuration prices.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -17,5 +17,5 @@
     "lodash": "^4.17.21"
   },
   "main": "build/cjs/index.js",
-  "gitHead": "62f51ceee2ea71c54b990c666eb7ae864f13d374"
+  "gitHead": "12ba245952d1dfdef154b037eb66dbdbc09650eb"
 }