@crystaldesign/basket-model 25.11.0-beta.21 → 25.11.0-beta.22

package/build/cjs/index.js

@@ -850,13 +850,13 @@ var _generateEKTextOfBasket = (function (basket, withoutPrices, customDivaNr) {
     return sol.OrderText = '';
   });
   var _loop = function _loop() {
-      var _os$BBox, _basket$getSAPOrderLi;
+      var _os$BBox, _os$CatalogName, _basket$getSAPOrderLi;
       var setText = '';
       var os = basket.OrderSets[i];
       if ((_os$BBox = os.BBox) !== null && _os$BBox !== void 0 && _os$BBox.Info) {
         setText = writeText(setText, os.BBox.Info);
       }
-      setText = writeText(setText, 'Modell: ' + os.CatalogName);
+      setText = writeText(setText, 'Modell: ' + DivaUtils__default["default"].stripTags((_os$CatalogName = os.CatalogName) !== null && _os$CatalogName !== void 0 ? _os$CatalogName : ''));
       ols = os.OrderLines;
       if (!ols || ols.length == 0) return 1; // continue
 
@@ -932,9 +932,9 @@ var addingSapOrderLinesToEkText = function addingSapOrderLinesToEkText(saporderL
   //https://app.asana.com/0/686949732692179/692909200657046
   var setText = '';
   var _loop3 = function _loop3() {
-    var _sapOrderline$UseSAPA, _orderLine$ConfigArti;
+    var _sapOrderline$Name, _sapOrderline$UseSAPA, _orderLine$ConfigArti;
     var sapOrderline = saporderLines[i];
-    var lines = getLines(artikelLength, artikelLength2Row, sapOrderline.Name);
+    var lines = getLines(artikelLength, artikelLength2Row, DivaUtils__default["default"].stripTags((_sapOrderline$Name = sapOrderline.Name) !== null && _sapOrderline$Name !== void 0 ? _sapOrderline$Name : ''));
     var orderLine = ols.find(function (ol) {
       return ol.RetailArticleNr === sapOrderline.ArticleNr;
     });
@@ -967,8 +967,8 @@ var processPartListOrderLines = function processPartListOrderLines(basket, ols,
       return sol.ArticleNrPrefix === 'ZKAT' && orderLine.RetailArticleNr == sol.ArticleNr;
     })) && orderLine.IsPartlistArticle;
   }).reduce(function (group, ol) {
-    var _ol$VariantBasketData, _group$category;
-    var category = ol.Name + '|' + ol.TypeNr + '|' + ol.SetID + '|' + ol.ArticleCodex + '|' + ((_ol$VariantBasketData = ol.VariantBasketDatas) === null || _ol$VariantBasketData === void 0 ? void 0 : _ol$VariantBasketData.map(function (v) {
+    var _ol$Name, _ol$VariantBasketData, _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$VariantBasketData = ol.VariantBasketDatas) === null || _ol$VariantBasketData === void 0 ? void 0 : _ol$VariantBasketData.map(function (v) {
       return v.OPT + v.OPV;
     }).join(';'));
     group[category] = (_group$category = group[category]) !== null && _group$category !== void 0 ? _group$category : [];
@@ -977,7 +977,7 @@ var processPartListOrderLines = function processPartListOrderLines(basket, ols,
   }, {});
   var retval = '';
   var _loop4 = function _loop4() {
-      var _basket$getSAPOrderLi3, _basket$getSAPOrderLi4, _basket$getSAPOrderLi5, _orderLine$ConfigArti2;
+      var _basket$getSAPOrderLi3, _basket$getSAPOrderLi4, _basket$getSAPOrderLi5, _orderLine$Name, _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) {
@@ -990,7 +990,7 @@ var processPartListOrderLines = function processPartListOrderLines(basket, ols,
         }, 0).toString();
         setOrderText += appendToTheRight(mLength, quantity);
       }
-      var lines = getLines(artikelLength, newArtikelLength2Row, orderLine.Name);
+      var lines = getLines(artikelLength, newArtikelLength2Row, DivaUtils__default["default"].stripTags((_orderLine$Name = orderLine.Name) !== null && _orderLine$Name !== void 0 ? _orderLine$Name : ''));
       var articleNumber = (_orderLine$ConfigArti2 = orderLine.ConfigArticleCodex) !== null && _orderLine$ConfigArti2 !== void 0 ? _orderLine$ConfigArti2 : orderLine.ArticleCodex;
 
       //Anforderung von Polypol auch die Typennummer anzugeben
@@ -1043,8 +1043,8 @@ var processNonPartlistOrderlines = function processNonPartlistOrderlines(basket,
     return sol.ArticleNrPrefix === 'ZKAT' && orderLine.RetailArticleNr === sol.ArticleNr;
   });
   if (sol) {
-    var _orderLine$ConfigArti3, _orderLine$VariantBas, _orderLine$VariantBas2, _orderLine$ConfigPric;
-    var lines = getLines(artikelLength, artikelLength2Row, orderLine.Name);
+    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 articleNumber = (_orderLine$ConfigArti3 = orderLine.ConfigArticleCodex) !== null && _orderLine$ConfigArti3 !== void 0 ? _orderLine$ConfigArti3 : orderLine.ArticleCodex;
 
     //Anforderung von Polypol auch die Typennummer anzugeben
@@ -1204,16 +1204,16 @@ var getLines = function getLines(maxLengthColumn1Row, maxLengthColumn2Row, value
   lines.push(line);
   return lines;
 };
-var addVariants = function addVariants(articleLength, orderLine, articleLength2Row, startPositionArticle2Row, preisLength) {
-  var _orderLine$ConfigPric2, _orderLine$VariantBas3, _orderLine$VariantBas4;
-  (_orderLine$ConfigPric2 = orderLine.ConfigPriceDatas) === null || _orderLine$ConfigPric2 === void 0 ? void 0 : _orderLine$ConfigPric2.AdditionalPrices;
+var addVariants = function addVariants(articleLength, orderLine, articleLength2Row, startPositionArticle2Row) {
+  var _orderLine$VariantBas3, _orderLine$VariantBas4;
   var variantDatas = (_orderLine$VariantBas3 = (_orderLine$VariantBas4 = orderLine.VariantBasketDatas) === null || _orderLine$VariantBas4 === void 0 ? void 0 : _orderLine$VariantBas4.filter(function (vd) {
     return !vd.Hidden && (!vd.SendToSAP || !vd.ArticlePlaceholder) && vd.BasketID == orderLine.BasketID;
   })) !== null && _orderLine$VariantBas3 !== void 0 ? _orderLine$VariantBas3 : [];
   var variantDataText = '';
   for (var i = 0; i < variantDatas.length; i++) {
+    var _vb$OPTName, _vb$OPVName;
     var vb = variantDatas[i];
-    var remark = vb.OPTName + ': ' + vb.OPVName;
+    var remark = DivaUtils__default["default"].stripTags((_vb$OPTName = vb.OPTName) !== null && _vb$OPTName !== void 0 ? _vb$OPTName : '') + ': ' + DivaUtils__default["default"].stripTags((_vb$OPVName = vb.OPVName) !== null && _vb$OPVName !== void 0 ? _vb$OPVName : '');
     if (vb.vOPV) remark += ' (' + vb.vOPV + ')';
 
     /* Activate when base prices and additional prices should be displayed. */

package/build/esm/index.js

@@ -838,13 +838,13 @@ var _generateEKTextOfBasket = (function (basket, withoutPrices, customDivaNr) {
     return sol.OrderText = '';
   });
   var _loop = function _loop() {
-      var _os$BBox, _basket$getSAPOrderLi;
+      var _os$BBox, _os$CatalogName, _basket$getSAPOrderLi;
       var setText = '';
       var os = basket.OrderSets[i];
       if ((_os$BBox = os.BBox) !== null && _os$BBox !== void 0 && _os$BBox.Info) {
         setText = writeText(setText, os.BBox.Info);
       }
-      setText = writeText(setText, 'Modell: ' + os.CatalogName);
+      setText = writeText(setText, 'Modell: ' + DivaUtils.stripTags((_os$CatalogName = os.CatalogName) !== null && _os$CatalogName !== void 0 ? _os$CatalogName : ''));
       ols = os.OrderLines;
       if (!ols || ols.length == 0) return 1; // continue
 
@@ -920,9 +920,9 @@ var addingSapOrderLinesToEkText = function addingSapOrderLinesToEkText(saporderL
   //https://app.asana.com/0/686949732692179/692909200657046
   var setText = '';
   var _loop3 = function _loop3() {
-    var _sapOrderline$UseSAPA, _orderLine$ConfigArti;
+    var _sapOrderline$Name, _sapOrderline$UseSAPA, _orderLine$ConfigArti;
     var sapOrderline = saporderLines[i];
-    var lines = getLines(artikelLength, artikelLength2Row, sapOrderline.Name);
+    var lines = getLines(artikelLength, artikelLength2Row, DivaUtils.stripTags((_sapOrderline$Name = sapOrderline.Name) !== null && _sapOrderline$Name !== void 0 ? _sapOrderline$Name : ''));
     var orderLine = ols.find(function (ol) {
       return ol.RetailArticleNr === sapOrderline.ArticleNr;
     });
@@ -955,8 +955,8 @@ var processPartListOrderLines = function processPartListOrderLines(basket, ols,
       return sol.ArticleNrPrefix === 'ZKAT' && orderLine.RetailArticleNr == sol.ArticleNr;
     })) && orderLine.IsPartlistArticle;
   }).reduce(function (group, ol) {
-    var _ol$VariantBasketData, _group$category;
-    var category = ol.Name + '|' + ol.TypeNr + '|' + ol.SetID + '|' + ol.ArticleCodex + '|' + ((_ol$VariantBasketData = ol.VariantBasketDatas) === null || _ol$VariantBasketData === void 0 ? void 0 : _ol$VariantBasketData.map(function (v) {
+    var _ol$Name, _ol$VariantBasketData, _group$category;
+    var category = DivaUtils.stripTags((_ol$Name = ol.Name) !== null && _ol$Name !== void 0 ? _ol$Name : '') + '|' + ol.TypeNr + '|' + ol.SetID + '|' + ol.ArticleCodex + '|' + ((_ol$VariantBasketData = ol.VariantBasketDatas) === null || _ol$VariantBasketData === void 0 ? void 0 : _ol$VariantBasketData.map(function (v) {
       return v.OPT + v.OPV;
     }).join(';'));
     group[category] = (_group$category = group[category]) !== null && _group$category !== void 0 ? _group$category : [];
@@ -965,7 +965,7 @@ var processPartListOrderLines = function processPartListOrderLines(basket, ols,
   }, {});
   var retval = '';
   var _loop4 = function _loop4() {
-      var _basket$getSAPOrderLi3, _basket$getSAPOrderLi4, _basket$getSAPOrderLi5, _orderLine$ConfigArti2;
+      var _basket$getSAPOrderLi3, _basket$getSAPOrderLi4, _basket$getSAPOrderLi5, _orderLine$Name, _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) {
@@ -978,7 +978,7 @@ var processPartListOrderLines = function processPartListOrderLines(basket, ols,
         }, 0).toString();
         setOrderText += appendToTheRight(mLength, quantity);
       }
-      var lines = getLines(artikelLength, newArtikelLength2Row, orderLine.Name);
+      var lines = getLines(artikelLength, newArtikelLength2Row, DivaUtils.stripTags((_orderLine$Name = orderLine.Name) !== null && _orderLine$Name !== void 0 ? _orderLine$Name : ''));
       var articleNumber = (_orderLine$ConfigArti2 = orderLine.ConfigArticleCodex) !== null && _orderLine$ConfigArti2 !== void 0 ? _orderLine$ConfigArti2 : orderLine.ArticleCodex;
 
       //Anforderung von Polypol auch die Typennummer anzugeben
@@ -1031,8 +1031,8 @@ var processNonPartlistOrderlines = function processNonPartlistOrderlines(basket,
     return sol.ArticleNrPrefix === 'ZKAT' && orderLine.RetailArticleNr === sol.ArticleNr;
   });
   if (sol) {
-    var _orderLine$ConfigArti3, _orderLine$VariantBas, _orderLine$VariantBas2, _orderLine$ConfigPric;
-    var lines = getLines(artikelLength, artikelLength2Row, orderLine.Name);
+    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 articleNumber = (_orderLine$ConfigArti3 = orderLine.ConfigArticleCodex) !== null && _orderLine$ConfigArti3 !== void 0 ? _orderLine$ConfigArti3 : orderLine.ArticleCodex;
 
     //Anforderung von Polypol auch die Typennummer anzugeben
@@ -1192,16 +1192,16 @@ var getLines = function getLines(maxLengthColumn1Row, maxLengthColumn2Row, value
   lines.push(line);
   return lines;
 };
-var addVariants = function addVariants(articleLength, orderLine, articleLength2Row, startPositionArticle2Row, preisLength) {
-  var _orderLine$ConfigPric2, _orderLine$VariantBas3, _orderLine$VariantBas4;
-  (_orderLine$ConfigPric2 = orderLine.ConfigPriceDatas) === null || _orderLine$ConfigPric2 === void 0 ? void 0 : _orderLine$ConfigPric2.AdditionalPrices;
+var addVariants = function addVariants(articleLength, orderLine, articleLength2Row, startPositionArticle2Row) {
+  var _orderLine$VariantBas3, _orderLine$VariantBas4;
   var variantDatas = (_orderLine$VariantBas3 = (_orderLine$VariantBas4 = orderLine.VariantBasketDatas) === null || _orderLine$VariantBas4 === void 0 ? void 0 : _orderLine$VariantBas4.filter(function (vd) {
     return !vd.Hidden && (!vd.SendToSAP || !vd.ArticlePlaceholder) && vd.BasketID == orderLine.BasketID;
   })) !== null && _orderLine$VariantBas3 !== void 0 ? _orderLine$VariantBas3 : [];
   var variantDataText = '';
   for (var i = 0; i < variantDatas.length; i++) {
+    var _vb$OPTName, _vb$OPVName;
     var vb = variantDatas[i];
-    var remark = vb.OPTName + ': ' + vb.OPVName;
+    var remark = DivaUtils.stripTags((_vb$OPTName = vb.OPTName) !== null && _vb$OPTName !== void 0 ? _vb$OPTName : '') + ': ' + DivaUtils.stripTags((_vb$OPVName = vb.OPVName) !== null && _vb$OPVName !== void 0 ? _vb$OPVName : '');
     if (vb.vOPV) remark += ' (' + vb.vOPV + ')';
 
     /* Activate when base prices and additional prices should be displayed. */

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;iCAcd,UAAU,kBAAkB,OAAO,iBAAiB,MAAM;AAAlF,wBA0FE"}
+{"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;AAAlF,wBA0FE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/basket-model",
-  "version": "25.11.0-beta.21",
+  "version": "25.11.0-beta.22",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -17,5 +17,5 @@
     "lodash": "^4.17.21"
   },
   "main": "build/cjs/index.js",
-  "gitHead": "b4aab484b15dcc59e64012e2360756d971b153bd"
+  "gitHead": "9fb1bd251f8c2ae9b1b771c8f1b1fe04370e6074"
 }