@crystaldesign/basket-model 25.13.2-rc.8 → 25.13.2-rc.9

package/build/esm/index.js

@@ -67,93 +67,95 @@ var GroupsData = /*#__PURE__*/_createClass(function GroupsData(json) {
   this.Group = new GroupData(json);
 });
 
-var VariantItemData = /*#__PURE__*/function () {
-  function VariantItemData(json) {
-    _classCallCheck(this, VariantItemData);
-    _defineProperty(this, "BasketID", void 0);
-    _defineProperty(this, "OPT", void 0);
-    //                      OptionCodex
-    _defineProperty(this, "OPTName", void 0);
-    //                 Name der Option
-    _defineProperty(this, "OPTName_locales", void 0);
-    _defineProperty(this, "TabGroup", void 0);
-    //                TabGroup in welches sich die Option befindet
-    _defineProperty(this, "TabGroup_locales", void 0);
-    _defineProperty(this, "OPV", void 0);
-    //                      OptionValue Codex
-    _defineProperty(this, "vOPV", void 0);
-    //                    Benutzerfreudliche OptionValue Codex (IDM) welcher im Frontend angezeigt werden soll
-    _defineProperty(this, "OPVName", void 0);
-    _defineProperty(this, "OPVName_locales", void 0);
-    _defineProperty(this, "OPVImage", void 0);
-    _defineProperty(this, "OPVHexVal", void 0);
-    _defineProperty(this, "SinglePrice", void 0);
-    //  Aufpreis / Basepreis der option
-    _defineProperty(this, "AddPercentage", void 0);
-    //           Prozentueller Aufpreis der Option
-    _defineProperty(this, "ShowOPVAsArticleNr", void 0);
-    _defineProperty(this, "SendToSAP", void 0);
-    _defineProperty(this, "ArticlePlaceholder", void 0);
-    _defineProperty(this, "HideInOrderText", void 0);
-    _defineProperty(this, "Hidden", void 0);
-    _defineProperty(this, "IsDescribingState", void 0);
-    //          If true it means this option does not change the Product but just the state like if an Ombrella is opened or closed
-    _defineProperty(this, "FreeText", void 0);
-    _defineProperty(this, "FreeTextLang", void 0);
-    _defineProperty(this, "MeasureValue", void 0);
-    _defineProperty(this, "MeasureUnit", void 0);
-    _defineProperty(this, "isFreeText", void 0);
-    _defineProperty(this, "isMeasureValue", void 0);
-    //public OPTEAN?: string = ""; //           BARCode der Artikel / deprected
-    //public OPVEAN?: string = "";
-    //public FirstTime?: string = "";
-    _defineProperty(this, "AddPrice", void 0);
-    _defineProperty(this, "AddPriceFormatted", void 0);
-    _defineProperty(this, "PriceUnit", void 0);
-    _defineProperty(this, "PriceID", void 0);
-    _defineProperty(this, "OCD", void 0);
-    _defineProperty(this, "OptionOCD", void 0);
-    this.BasketID = json.BasketID;
-    this.OPT = json.OPT;
-    this.OPV = json.OPV;
-    this.OPTName = json.OPTName;
-    this.OPTName_locales = json.OPTName_locales;
-    this.TabGroup = json.TabGroup;
-    this.TabGroup_locales = json.TabGroup_locales;
-    this.vOPV = json.vOPV;
-    this.OPVName = json.OPVName;
-    this.OPVName_locales = json.OPVName_locales;
-    this.OPVImage = json.OPVImage;
-    this.OPVHexVal = json.OPVHexVal;
-    this.FreeText = json.FreeText;
-    this.SinglePrice = json.SinglePrice;
-    this.AddPercentage = json.AddPercentage;
-    this.IsDescribingState = json.IsDescribingState;
-    this.SendToSAP = json.SendToSAP;
-    this.ArticlePlaceholder = json.ArticlePlaceholder;
-    this.HideInOrderText = json.HideInOrderText;
-    this.Hidden = json.Hidden;
-    this.ShowOPVAsArticleNr = json.ShowOPVAsArticleNr;
-    this.AddPrice = json.AddPrice;
-    if (this.AddPrice) this.AddPriceFormatted = json.AddPriceFormatted;
-    this.PriceUnit = json.PriceUnit;
-    this.PriceID = json.PriceID;
-    this.FreeText = json.FreeText;
-    this.MeasureValue = json.MeasureValue;
-    this.MeasureUnit = json.MeasureUnit;
-    this.isFreeText = json.isFreeText;
-    this.isMeasureValue = json.isMeasureValue;
-    this.OCD = json.OCD;
-    this.OptionOCD = json.OptionOCD;
-    this.FreeTextLang = json.FreeTextLang;
-  }
-  return _createClass(VariantItemData, [{
-    key: "getStringForHash",
-    value: function getStringForHash() {
-      return this.OPT + '_' + this.OPV + (this.MeasureValue !== undefined ? '_' + this.MeasureValue : '') + (this.FreeText !== undefined ? '_' + this.FreeText : '');
-    }
-  }]);
-}();
+var VariantItemData = /*#__PURE__*/_createClass(function VariantItemData(json) {
+  _classCallCheck(this, VariantItemData);
+  _defineProperty(this, "BasketID", void 0);
+  _defineProperty(this, "OPT", void 0);
+  //                      OptionCodex
+  _defineProperty(this, "OPTName", void 0);
+  //                 Name der Option
+  _defineProperty(this, "MaskOPTName", void 0);
+  //              overwritten name by mask
+  _defineProperty(this, "OPTName_locales", void 0);
+  _defineProperty(this, "TabGroup", void 0);
+  //                TabGroup in welches sich die Option befindet
+  _defineProperty(this, "MaskTabGroup", void 0);
+  _defineProperty(this, "TabGroup_locales", void 0);
+  _defineProperty(this, "OPV", void 0);
+  //                      OptionValue Codex
+  _defineProperty(this, "vOPV", void 0);
+  //                    Benutzerfreudliche OptionValue Codex (IDM) welcher im Frontend angezeigt werden soll
+  _defineProperty(this, "OPVName", void 0);
+  _defineProperty(this, "MaskOPVName", void 0);
+  _defineProperty(this, "OPVName_locales", void 0);
+  _defineProperty(this, "OPVImage", void 0);
+  _defineProperty(this, "OPVHexVal", void 0);
+  _defineProperty(this, "SinglePrice", void 0);
+  //  Aufpreis / Basepreis der option
+  _defineProperty(this, "AddPercentage", void 0);
+  //           Prozentueller Aufpreis der Option
+  _defineProperty(this, "ShowOPVAsArticleNr", void 0);
+  _defineProperty(this, "SendToSAP", void 0);
+  _defineProperty(this, "ArticlePlaceholder", void 0);
+  _defineProperty(this, "HideInOrderText", void 0);
+  _defineProperty(this, "Hidden", void 0);
+  _defineProperty(this, "IsDescribingState", void 0);
+  //          If true it means this option does not change the Product but just the state like if an Ombrella is opened or closed
+  _defineProperty(this, "FreeText", void 0);
+  _defineProperty(this, "FreeTextLang", void 0);
+  _defineProperty(this, "MeasureValue", void 0);
+  _defineProperty(this, "MeasureUnit", void 0);
+  _defineProperty(this, "isFreeText", void 0);
+  _defineProperty(this, "isMeasureValue", void 0);
+  //public OPTEAN?: string = ""; //           BARCode der Artikel / deprected
+  //public OPVEAN?: string = "";
+  //public FirstTime?: string = "";
+  _defineProperty(this, "AddPrice", void 0);
+  _defineProperty(this, "AddPriceFormatted", void 0);
+  _defineProperty(this, "PriceUnit", void 0);
+  _defineProperty(this, "PriceID", void 0);
+  _defineProperty(this, "OCD", void 0);
+  _defineProperty(this, "OptionOCD", void 0);
+  this.BasketID = json.BasketID;
+  this.OPT = json.OPT;
+  this.OPV = json.OPV;
+  this.OPTName = json.OPTName;
+  this.MaskOPTName = json.MaskOPTName;
+  this.OPTName_locales = json.OPTName_locales;
+  this.TabGroup = json.TabGroup;
+  this.MaskTabGroup = json.MaskTabGroup;
+  this.TabGroup_locales = json.TabGroup_locales;
+  this.vOPV = json.vOPV;
+  this.OPVName = json.OPVName;
+  this.MaskOPVName = json.MaskOPVName;
+  this.OPVName_locales = json.OPVName_locales;
+  this.OPVImage = json.OPVImage;
+  this.OPVHexVal = json.OPVHexVal;
+  this.FreeText = json.FreeText;
+  this.SinglePrice = json.SinglePrice;
+  this.AddPercentage = json.AddPercentage;
+  this.IsDescribingState = json.IsDescribingState;
+  this.SendToSAP = json.SendToSAP;
+  this.ArticlePlaceholder = json.ArticlePlaceholder;
+  this.HideInOrderText = json.HideInOrderText;
+  this.Hidden = json.Hidden;
+  this.ShowOPVAsArticleNr = json.ShowOPVAsArticleNr;
+  this.AddPrice = json.AddPrice;
+  if (this.AddPrice) this.AddPriceFormatted = json.AddPriceFormatted;
+  this.PriceUnit = json.PriceUnit;
+  this.PriceID = json.PriceID;
+  this.FreeText = json.FreeText;
+  this.MeasureValue = json.MeasureValue;
+  this.MeasureUnit = json.MeasureUnit;
+  this.isFreeText = json.isFreeText;
+  this.isMeasureValue = json.isMeasureValue;
+  this.OCD = json.OCD;
+  this.OptionOCD = json.OptionOCD;
+  this.FreeTextLang = json.FreeTextLang;
+});
+var getStringForHash = function getStringForHash(vd) {
+  return vd.OPT + '_' + vd.OPV + (vd.MeasureValue !== undefined ? '_' + vd.MeasureValue : '') + (vd.FreeText !== undefined ? '_' + vd.FreeText : '');
+};
 
 function ownKeys$1(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -191,6 +193,7 @@ var OrderLineData = /*#__PURE__*/function () {
     //                 bei Flache Artikel wird dies manchmal verwendet
     _defineProperty(this, "ArticleGUID", void 0);
     _defineProperty(this, "Name", void 0);
+    _defineProperty(this, "MaskName", void 0);
     _defineProperty(this, "Name_locales", void 0);
     _defineProperty(this, "MetaData_locales", void 0);
     _defineProperty(this, "Size", void 0);
@@ -214,6 +217,7 @@ var OrderLineData = /*#__PURE__*/function () {
     //                       Liste der Tabgroups
     _defineProperty(this, "SendToSAP", void 0);
     _defineProperty(this, "ArticlePlaceholder", void 0);
+    _defineProperty(this, "CustomDimensions", void 0);
     //wird bei Pfister verwendet um später wieder zu erkennen ob man zufällig wieder die selbe SAP Art Nummer (Basiskonfigurat) geplant hat
     //ist ein eindeutiger Schlüssel zweier gleichen Planung unabhängig der Accounts
     _defineProperty(this, "ArticleVariantID", void 0);
@@ -278,6 +282,7 @@ var OrderLineData = /*#__PURE__*/function () {
     this.ArticleEAN = json.ArticleEAN;
     this.ArticleGUID = json.ArticleGUID;
     this.Name = json.Name;
+    this.MaskName = json.MaskName;
     this.Size = json.Size;
     this.Width = json.Width;
     this.Depth = json.Depth;
@@ -288,6 +293,7 @@ var OrderLineData = /*#__PURE__*/function () {
     this.MetaData_locales = json.MetaData_locales;
     this.Name_locales = json.Name_locales;
     this.VariantDesc_locales = json.VariantDesc_locales;
+    this.CustomDimensions = json.CustomDimensions;
     this.RuleDesc_locales = json.RuleDesc_locales;
     this.Quantity = json.Quantity;
     var vkPrice = json.VKPrice || json.VkPrice;
@@ -402,7 +408,11 @@ var OrderLineData = /*#__PURE__*/function () {
       if (!this.VariantBasketDatas) this.VariantBasketDatas = [];
       for (var i = 0; i < this.VariantBasketDatas.length; i++) {
         var v = this.VariantBasketDatas[i];
-        ret['OPT' + v.OPT] = 'OPV' + v.OPV;
+        if (!v.OPT.endsWith('_val')) {
+          ret['OPT' + v.OPT] = 'OPV' + v.OPV;
+        } else {
+          ret['OPT' + v.OPT] = v.OPV;
+        }
         if (v.MeasureValue || v.FreeText) {
           var _ref;
           ret['OPT' + v.OPT + '_val'] = (_ref = v.MeasureValue || v.FreeText) === null || _ref === void 0 ? void 0 : _ref.toString();
@@ -422,10 +432,10 @@ var OrderLineData = /*#__PURE__*/function () {
       return false;
     }
 
-    /**
-     *
-     * @param t i18n translation instance
-     * @returns general Article description
+    /**
+     *
+     * @param t i18n translation instance
+     * @returns general Article description
      */
   }, {
     key: "getArticleInfoText",
@@ -473,40 +483,34 @@ var OrderLineData = /*#__PURE__*/function () {
         !config.hideTotalPrices && this.CalcPrice ? t('basket.priceOverview.table.sum') + ': ' + DivaUtils.formatPrice(this.CalcPrice, priceFormat) + ' \n' : '')
       );
     }
-  }, {
-    key: "getHash",
-    value: function getHash() {
-      var _this$VariantBasketDa2, _this$VariantBasketDa3;
-      return md5(this.CatalogCodex + '_' + this.ArticleCodex + '_' + this.Quantity + '_' + ((_this$VariantBasketDa2 = (_this$VariantBasketDa3 = this.VariantBasketDatas) === null || _this$VariantBasketDa3 === void 0 || (_this$VariantBasketDa3 = _this$VariantBasketDa3.filter(function (v) {
-        return !v.IsDescribingState;
-      })) === null || _this$VariantBasketDa3 === void 0 ? void 0 : _this$VariantBasketDa3.map(function (v) {
-        return v.getStringForHash();
-      })) !== null && _this$VariantBasketDa2 !== void 0 ? _this$VariantBasketDa2 : []).join());
-    }
   }, {
     key: "getTinyVariantConfigurationDatas",
     value: function getTinyVariantConfigurationDatas() {
-      var _this$VariantBasketDa4, _this$VariantBasketDa5, _this$VariantBasketDa6, _this$VariantBasketDa7;
-      return [].concat(_toConsumableArray((_this$VariantBasketDa4 = (_this$VariantBasketDa5 = this.VariantBasketDatas) === null || _this$VariantBasketDa5 === void 0 ? void 0 : _this$VariantBasketDa5.map(function (v) {
+      var _this$VariantBasketDa2, _this$VariantBasketDa3, _this$VariantBasketDa4, _this$VariantBasketDa5;
+      return [].concat(_toConsumableArray((_this$VariantBasketDa2 = (_this$VariantBasketDa3 = this.VariantBasketDatas) === null || _this$VariantBasketDa3 === void 0 ? void 0 : _this$VariantBasketDa3.map(function (v) {
         return {
           OPT: v.OPT,
           OPV: v.OPV,
+          OPTName: v.OPTName,
+          OPVName: v.OPVName,
           OCD: v.OCD,
           OptionOCD: v.OptionOCD,
           IsDescribingState: v.IsDescribingState
         };
-      })) !== null && _this$VariantBasketDa4 !== void 0 ? _this$VariantBasketDa4 : []), _toConsumableArray((_this$VariantBasketDa6 = (_this$VariantBasketDa7 = this.VariantBasketDatas) === null || _this$VariantBasketDa7 === void 0 || (_this$VariantBasketDa7 = _this$VariantBasketDa7.filter(function (v) {
+      })) !== null && _this$VariantBasketDa2 !== void 0 ? _this$VariantBasketDa2 : []), _toConsumableArray((_this$VariantBasketDa4 = (_this$VariantBasketDa5 = this.VariantBasketDatas) === null || _this$VariantBasketDa5 === void 0 || (_this$VariantBasketDa5 = _this$VariantBasketDa5.filter(function (v) {
         return v.MeasureValue || v.FreeText;
-      })) === null || _this$VariantBasketDa7 === void 0 ? void 0 : _this$VariantBasketDa7.map(function (v) {
+      })) === null || _this$VariantBasketDa5 === void 0 ? void 0 : _this$VariantBasketDa5.map(function (v) {
         var _ref2;
         return {
           OPT: v.OPT + '_val',
           OPV: (_ref2 = v.MeasureValue || v.FreeText) === null || _ref2 === void 0 ? void 0 : _ref2.toString(),
+          OPTName: v.OPTName,
+          OPVName: v.OPVName,
           OCD: v.OCD,
           OptionOCD: v.OptionOCD,
           IsDescribingState: v.IsDescribingState
         };
-      })) !== null && _this$VariantBasketDa6 !== void 0 ? _this$VariantBasketDa6 : []));
+      })) !== null && _this$VariantBasketDa4 !== void 0 ? _this$VariantBasketDa4 : []));
     }
   }, {
     key: "getAsJson",
@@ -521,6 +525,14 @@ var OrderLineData = /*#__PURE__*/function () {
     }
   }]);
 }();
+var getHash = function getHash(ol) {
+  var _ol$VariantBasketData, _ol$VariantBasketData2;
+  return md5(ol.CatalogCodex + '_' + ol.ArticleCodex + '_' + ol.Quantity + '_' + ((_ol$VariantBasketData = (_ol$VariantBasketData2 = ol.VariantBasketDatas) === null || _ol$VariantBasketData2 === void 0 || (_ol$VariantBasketData2 = _ol$VariantBasketData2.filter(function (v) {
+    return !v.IsDescribingState;
+  })) === null || _ol$VariantBasketData2 === void 0 ? void 0 : _ol$VariantBasketData2.map(function (v) {
+    return getStringForHash(v);
+  })) !== null && _ol$VariantBasketData !== void 0 ? _ol$VariantBasketData : []).join());
+};
 
 var OrderSetData = /*#__PURE__*/function () {
   function OrderSetData(json, ZKATNr, SetArticleNr, SetArticleNrPrefix, priceFormat) {
@@ -547,6 +559,7 @@ var OrderSetData = /*#__PURE__*/function () {
     //= new SetImageData();
     _defineProperty(this, "Set2DImage", void 0);
     // 2D bild der Planung
+    _defineProperty(this, "SerieId", void 0);
     _defineProperty(this, "SetPrice", void 0);
     _defineProperty(this, "SetPriceFormatted", void 0);
     _defineProperty(this, "BruttoSetPrice", void 0);
@@ -592,6 +605,8 @@ var OrderSetData = /*#__PURE__*/function () {
     //                  Letzte Versionierung -> kann überprüft werden ob in zwischenzeit das Modell versioniert wurde (neue Version gibt) / wird beim Speichern Clientseitig nicht gefüllt
     _defineProperty(this, "CatalogValidTo", void 0);
     //                     VerfallsDatum / wird beim Speichern Clientseitig nicht gefüllt
+    _defineProperty(this, "RetailCatalogNr", void 0);
+    //                    Programm Nr im CM
     _defineProperty(this, "ModelCodex", void 0);
     //                         Modellvorauswahl ModellCodex
     _defineProperty(this, "ModelCatalogCodex", void 0);
@@ -630,18 +645,22 @@ var OrderSetData = /*#__PURE__*/function () {
     _defineProperty(this, "MetaData", void 0);
     _defineProperty(this, "MetaData_locales", void 0);
     _defineProperty(this, "AdditionalCatalogPrice", void 0);
+    _defineProperty(this, "FavoriteAiRoomKeys", void 0);
+    // New field for multiple favorites
     //war vohrer auskommentiert, Grund weiß ich nicht mehr. Kann ev. zu Problemen führen
     //inzukunft sollen diese Inhalte über ein Webservice gezogen werden und per Hash abrufbar sein
     _defineProperty(this, "SetPlanData", void 0);
     //                              2D Planung
     _defineProperty(this, "SummaryInfo", []);
     _defineProperty(this, "BBox", void 0);
+    _defineProperty(this, "IsIDMFormat", void 0);
     this.SetID = json.SetID;
     this.SetName = json.SetName;
     this.SetName_locales = json.SetName_locales;
     this.ProductSetName = json.ProductSetName;
     this.SetImage = json.SetImage;
     this.HQRenderScript = json.HQRenderScript;
+    this.IsIDMFormat = json.IsIDMFormat;
     this.SetImages = json.SetImages; //: SetImageData[] = []; //= new SetImageData();
     this.SetPrice = json.SetPrice;
     this.SetPriceFormatted = DivaUtils.formatPrice(this.SetPrice, priceFormat);
@@ -678,6 +697,7 @@ var OrderSetData = /*#__PURE__*/function () {
     this.CatalogOfflineVersion = json.CatalogOfflineVersion;
     this.CatalogOfflineFilesLastUpdate = json.CatalogOfflineFilesLastUpdate;
     this.CatalogGUID = json.CatalogGUID;
+    this.RetailCatalogNr = json.RetailCatalogNr;
     this.EkSetPrice = json.EkSetPrice;
     this.EkCurrency = json.EkCurrency;
     this.BruttoSetPrice = json.BruttoSetPrice;
@@ -699,6 +719,7 @@ var OrderSetData = /*#__PURE__*/function () {
     this.SupplierGUID = json.SupplierGUID;
     this.SupplierILN = json.SupplierILN;
     this.SupplierCatalogName = json.SupplierCatalogName;
+    this.SerieId = json.SerieId;
     this.SetPlanData = json.SetPlanData;
     this.PlannerWarnings = json.PlannerWarnings;
     this.Weight = json.Weight;
@@ -706,6 +727,7 @@ var OrderSetData = /*#__PURE__*/function () {
     this.Volume = json.Volume;
     this.VolumeUnit = json.VolumeUnit;
     this.AdditionalCatalogPrice = json.AdditionalCatalogPrice;
+    this.FavoriteAiRoomKeys = json.FavoriteAiRoomKeys;
     if (json.OrderLines) {
       for (var i = 0; i < json.OrderLines.length; i++) {
         this.OrderLines[i] = new OrderLineData(json.OrderLines[i], priceFormat);
@@ -754,8 +776,8 @@ var OrderSetData = /*#__PURE__*/function () {
       this.SetPlanData = DivaUtils.encodeBase64(setPlanData);
     }
 
-    /**
-     * get the docking point infos of all orderlines of the set
+    /**
+     * get the docking point infos of all orderlines of the set
      */
   }, {
     key: "getDockingPointInfo",
@@ -798,10 +820,14 @@ var mCaption = 'M';
 var artikelCaption = 'Artikel';
 var preisCaption = 'Preis';
 var newLine = '\r\n';
-var _generateEKTextOfBasket = (function (basket, withoutPrices) {
+var _generateEKTextOfBasket = (function (basket, withoutPrices, customDivaNr) {
   var _basket$OrderSets;
   var ekTextHead = '';
-  ekTextHead = writeText(ekTextHead, basket.DivaNr + '-' + basket.DocumentVersion);
+  var divaNrtext = basket.DocumentVersion > 0 ? "".concat(basket.DivaNr, "-").concat(basket.DocumentVersion) : basket.DivaNr;
+  if (customDivaNr) {
+    divaNrtext = customDivaNr;
+  }
+  ekTextHead = writeText(ekTextHead, divaNrtext);
   var sbSetOrderText = ekTextHead;
   var preisLength = 9;
   if (withoutPrices) {
@@ -815,13 +841,13 @@ var _generateEKTextOfBasket = (function (basket, withoutPrices) {
     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
 
@@ -897,9 +923,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;
     });
@@ -932,15 +958,17 @@ var processPartListOrderLines = function processPartListOrderLines(basket, ols,
       return sol.ArticleNrPrefix === 'ZKAT' && orderLine.RetailArticleNr == sol.ArticleNr;
     })) && orderLine.IsPartlistArticle;
   }).reduce(function (group, ol) {
-    var _group$category;
-    var category = ol.Name + '|' + ol.TypeNr + '|' + ol.SetID + '|' + ol.ArticleCodex;
+    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 : [];
     group[category].push(ol);
     return group;
   }, {});
   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) {
@@ -953,7 +981,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
@@ -1006,8 +1034,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
@@ -1040,11 +1068,11 @@ var processNonPartlistOrderlines = function processNonPartlistOrderlines(basket,
     }
 
     /* Activate when base prices and additional prices should be displayed. */
-    /*if (orderLine.ConfigPriceDatas?.BasePrice && !withoutPrices) {
-      sapOrderLineText += appendToTheRight(mLength + 1, ' ');
-      sapOrderLineText += appendToTheRight(artikelLength, 'Basispreis');
-      sapOrderLineText += appendToTheLeft(preisLength - 6, formatPrice(orderLine.ConfigPriceDatas?.BasePrice.toString() ?? '0'));
-      sapOrderLineText += newLine + newLine;
+    /*if (orderLine.ConfigPriceDatas?.BasePrice && !withoutPrices) {
+      sapOrderLineText += appendToTheRight(mLength + 1, ' ');
+      sapOrderLineText += appendToTheRight(artikelLength, 'Basispreis');
+      sapOrderLineText += appendToTheLeft(preisLength - 6, formatPrice(orderLine.ConfigPriceDatas?.BasePrice.toString() ?? '0'));
+      sapOrderLineText += newLine + newLine;
     }*/
     /* -------------------------------------------------------------------- */
 
@@ -1167,16 +1195,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. */
@@ -1192,12 +1220,12 @@ var addVariants = function addVariants(articleLength, orderLine, articleLength2R
     variantDataText += writeOtherLines(vbLines, startPositionArticle2Row /*additionalPrice ? true : false*/);
 
     /* Activate when base prices and additional prices should be displayed. */
-    /*if (additionalPrice && false) {
-      variantDataText += appendToTheLeft(
-        preisLength + (artikelLength - vbLines[vbLines.length - 1].length) - 5,
-        formatPrice(additionalPrice?.Price.toString() ?? '0'),
-      );
-      variantDataText += newLine;
+    /*if (additionalPrice && false) {
+      variantDataText += appendToTheLeft(
+        preisLength + (artikelLength - vbLines[vbLines.length - 1].length) - 5,
+        formatPrice(additionalPrice?.Price.toString() ?? '0'),
+      );
+      variantDataText += newLine;
     }*/
   }
   return variantDataText;
@@ -1239,6 +1267,9 @@ var BasketData = /*#__PURE__*/function () {
     _defineProperty(this, "Servername", void 0);
     _defineProperty(this, "CreationDate", void 0);
     _defineProperty(this, "SendIWOBasket", false);
+    _defineProperty(this, "MatchingProductId", void 0);
+    _defineProperty(this, "MatchingProductRetailerArticleNr", void 0);
+    _defineProperty(this, "RetailArticleNr", void 0);
     _defineProperty(this, "ProductSetName", void 0);
     _defineProperty(this, "ReportConfigIdentifier", void 0);
     _defineProperty(this, "OrganizationId", void 0);
@@ -1320,6 +1351,7 @@ var BasketData = /*#__PURE__*/function () {
     _defineProperty(this, "_discounts", []);
     _defineProperty(this, "AdditionalPrices", []);
     _defineProperty(this, "OrderStatus", void 0);
+    _defineProperty(this, "OriginBaseUrl", void 0);
     //Readonly finished
     _defineProperty(this, "UseFavoritesAsVariants", false);
     //              Wird benötigt beim Laden einer Mutter DivaNr mit Varianten
@@ -1330,6 +1362,7 @@ var BasketData = /*#__PURE__*/function () {
     //                                 Enthält URL zum gerenderten Bild.
     _defineProperty(this, "PDFDocumentURL", void 0);
     //                          Link zu PDF für IWOFurn. Wird ServerSeitig beim BasketToIwoFurnConverter gesetzt
+    _defineProperty(this, "ReturnTo", void 0);
     _defineProperty(this, "pdfs", void 0);
     _defineProperty(this, "PDFContent", void 0);
     //                                   HTML für das Serverseitige PDF erstellen
@@ -1375,6 +1408,9 @@ var BasketData = /*#__PURE__*/function () {
     this.ApplicationEnvironment = json.ApplicationEnvironment;
     this.catalogStatus = json.catalogStatus;
     this.SendIWOBasket = json.SendIWOBasket;
+    this.RetailArticleNr = json.RetailArticleNr;
+    this.MatchingProductId = json.MatchingProductId;
+    this.MatchingProductRetailerArticleNr = json.MatchingProductRetailerArticleNr;
     this.ConverterStatus3D = json.ConverterStatus3D;
     this.ConverterFormat3D = json.ConverterFormat3D;
     this.ProductSetName = json.ProductSetName;
@@ -1402,6 +1438,7 @@ var BasketData = /*#__PURE__*/function () {
     this.ReportConfigIdentifier = json.ReportConfigIdentifier;
     this.ClientLanguage = json.ClientLanguage;
     this.ClientRemark = json.ClientRemark;
+    this.ReturnTo = json.ReturnTo;
     this.DocumentVersion = Number(json.DocumentVersion);
     this.UniqueID = json.UniqueID;
     this.Status = json.Status;
@@ -1474,6 +1511,7 @@ var BasketData = /*#__PURE__*/function () {
     //this.PriceInfo = priceInfo;
     this.PrintOptions = json.PrintOptions;
     this.OrderStatus = json.OrderStatus;
+    this.OriginBaseUrl = json.OriginBaseUrl;
   }
   return _createClass(BasketData, [{
     key: "OrigZKATNr",
@@ -1555,6 +1593,15 @@ var BasketData = /*#__PURE__*/function () {
         return price + addPrice.Price;
       }, 0)) !== null && _this$AdditionalCatal3 !== void 0 ? _this$AdditionalCatal3 : 0);
     }
+
+    // calculated from all the Sets
+  }, {
+    key: "EkPrice",
+    get: function get() {
+      return this.OrderSets.reduce(function (price, set) {
+        return price + set.EkSetPrice;
+      }, 0);
+    }
   }, {
     key: "AdditionalCatalogPrice",
     get: function get() {
@@ -1660,6 +1707,7 @@ var BasketData = /*#__PURE__*/function () {
       this.UniqueID = date.getTime().toString();
       this.PDFDocumentURL = undefined;
       this.PriceFormat = DivaUtils.defaultPriceFormat;
+      this.OriginBaseUrl = window.location.origin + window.location.pathname;
     }
   }, {
     key: "clearBasketClientData",
@@ -1918,21 +1966,23 @@ var BasketData = /*#__PURE__*/function () {
   }, {
     key: "getReportConfig",
     value: function getReportConfig() {
-      var _this$PrintOptions, _this$PrintOptions2, _this$PrintOptions3, _this$PrintOptions4, _this$PrintOptions5, _this$PrintOptions6, _this$PrintOptions7, _this$PrintOptions8, _this$PrintOptions9, _this$PrintOptions10, _this$PrintOptions11, _this$PrintOptions12, _this$PrintOptions13;
+      var _this$PrintOptions, _this$PrintOptions2, _this$PrintOptions3, _this$PrintOptions4, _this$PrintOptions5, _this$PrintOptions6, _this$PrintOptions7, _this$PrintOptions8, _this$PrintOptions9, _this$PrintOptions10, _this$PrintOptions11, _this$PrintOptions12, _this$PrintOptions13, _this$PrintOptions14, _this$PrintOptions15;
       return {
         printWithGDPR: !!((_this$PrintOptions = this.PrintOptions) !== null && _this$PrintOptions !== void 0 && _this$PrintOptions.Gdpr),
         printWithPlanningSketch: !!((_this$PrintOptions2 = this.PrintOptions) !== null && _this$PrintOptions2 !== void 0 && _this$PrintOptions2.PlanningSketch),
         printWithRemark: !!((_this$PrintOptions3 = this.PrintOptions) !== null && _this$PrintOptions3 !== void 0 && _this$PrintOptions3.Remark),
         printWithPrices: !!((_this$PrintOptions4 = this.PrintOptions) !== null && _this$PrintOptions4 !== void 0 && _this$PrintOptions4.Prices),
-        printWithAllPrices: !!((_this$PrintOptions5 = this.PrintOptions) !== null && _this$PrintOptions5 !== void 0 && _this$PrintOptions5.AllPrices),
-        printWithModelName: !!((_this$PrintOptions6 = this.PrintOptions) !== null && _this$PrintOptions6 !== void 0 && _this$PrintOptions6.ModelName),
-        printWithCollectionLogo: !!((_this$PrintOptions7 = this.PrintOptions) !== null && _this$PrintOptions7 !== void 0 && _this$PrintOptions7.CollectionLogo),
-        printWithDivaLogo: !!((_this$PrintOptions8 = this.PrintOptions) !== null && _this$PrintOptions8 !== void 0 && _this$PrintOptions8.DivaLogo),
-        printWithSignature: !!((_this$PrintOptions9 = this.PrintOptions) !== null && _this$PrintOptions9 !== void 0 && _this$PrintOptions9.Signature),
-        printWithClientpersonData: !!((_this$PrintOptions10 = this.PrintOptions) !== null && _this$PrintOptions10 !== void 0 && _this$PrintOptions10.ClientpersonData),
-        printWithSalespersonData: !!((_this$PrintOptions11 = this.PrintOptions) !== null && _this$PrintOptions11 !== void 0 && _this$PrintOptions11.SalespersonData),
-        printWithPartlist: !!((_this$PrintOptions12 = this.PrintOptions) !== null && _this$PrintOptions12 !== void 0 && _this$PrintOptions12.Partlist),
-        printWithDate: !!((_this$PrintOptions13 = this.PrintOptions) !== null && _this$PrintOptions13 !== void 0 && _this$PrintOptions13.PrintDate)
+        printWithArQrCode: !!((_this$PrintOptions5 = this.PrintOptions) !== null && _this$PrintOptions5 !== void 0 && _this$PrintOptions5.arQrCode),
+        printWithAllPrices: !!((_this$PrintOptions6 = this.PrintOptions) !== null && _this$PrintOptions6 !== void 0 && _this$PrintOptions6.AllPrices),
+        printWithOpvCodices: !!((_this$PrintOptions7 = this.PrintOptions) !== null && _this$PrintOptions7 !== void 0 && _this$PrintOptions7.OpvCodices),
+        printWithModelName: !!((_this$PrintOptions8 = this.PrintOptions) !== null && _this$PrintOptions8 !== void 0 && _this$PrintOptions8.ModelName),
+        printWithCollectionLogo: !!((_this$PrintOptions9 = this.PrintOptions) !== null && _this$PrintOptions9 !== void 0 && _this$PrintOptions9.CollectionLogo),
+        printWithDivaLogo: !!((_this$PrintOptions10 = this.PrintOptions) !== null && _this$PrintOptions10 !== void 0 && _this$PrintOptions10.DivaLogo),
+        printWithSignature: !!((_this$PrintOptions11 = this.PrintOptions) !== null && _this$PrintOptions11 !== void 0 && _this$PrintOptions11.Signature),
+        printWithClientpersonData: !!((_this$PrintOptions12 = this.PrintOptions) !== null && _this$PrintOptions12 !== void 0 && _this$PrintOptions12.ClientpersonData),
+        printWithSalespersonData: !!((_this$PrintOptions13 = this.PrintOptions) !== null && _this$PrintOptions13 !== void 0 && _this$PrintOptions13.SalespersonData),
+        printWithPartlist: !!((_this$PrintOptions14 = this.PrintOptions) !== null && _this$PrintOptions14 !== void 0 && _this$PrintOptions14.Partlist),
+        printWithDate: !!((_this$PrintOptions15 = this.PrintOptions) !== null && _this$PrintOptions15 !== void 0 && _this$PrintOptions15.PrintDate)
       };
     }
   }, {
@@ -1952,13 +2002,13 @@ var BasketData = /*#__PURE__*/function () {
     }
   }, {
     key: "generateEKTextOfBasket",
-    value: function generateEKTextOfBasket(withoutPrices) {
+    value: function generateEKTextOfBasket(withoutPrices, customDivaNr) {
       return _generateEKTextOfBasket(this, withoutPrices);
     }
   }, {
     key: "getEKText",
-    value: function getEKText(withoutPrices) {
-      return _generateEKTextOfBasket(this, withoutPrices).OrderSets[0].SetOrderText;
+    value: function getEKText(withoutPrices, customDivaNr) {
+      return _generateEKTextOfBasket(this, withoutPrices, customDivaNr).OrderSets[0].SetOrderText;
     }
   }, {
     key: "getProductConfiguration",
@@ -1969,6 +2019,7 @@ var BasketData = /*#__PURE__*/function () {
         DivaNr: this.DivaNr,
         VariantID: variantId,
         OrderSets: this.OrderSets.map(function (set) {
+          var _set$Favorites$Varian, _set$Favorites;
           return {
             AccountGUID: set.AccountGUID,
             CatalogCodex: set.CatalogCodex,
@@ -1980,7 +2031,7 @@ var BasketData = /*#__PURE__*/function () {
             SetPlanData: set.SetPlanData,
             SupplierGUID: set.SupplierGUID,
             Favorites: {
-              VariantValues: set.Favorites.VariantValues
+              VariantValues: (_set$Favorites$Varian = (_set$Favorites = set.Favorites) === null || _set$Favorites === void 0 ? void 0 : _set$Favorites.VariantValues) !== null && _set$Favorites$Varian !== void 0 ? _set$Favorites$Varian : undefined
             },
             HQRenderScript: set.HQRenderScript,
             Diva3DProject: _this2.Diva3DProject,
@@ -1999,7 +2050,7 @@ var BasketData = /*#__PURE__*/function () {
                 NoPrice: ol.NoPrice ? true : undefined,
                 RelatedToBasketID: ol.RelatedToBasketID,
                 ShelfPlandata: ol.ShelfPlandata,
-                ArticleHash: ol.getHash(),
+                ArticleHash: getHash(ol),
                 VariantBasketDatas: ol.getTinyVariantConfigurationDatas()
               };
             })
@@ -2045,6 +2096,7 @@ var BasketData = /*#__PURE__*/function () {
               olVariant.OPV = variant.OPV;
             }
           });
+          variantOrderline.ArticleHash = getHash(variantOrderline);
         });
       }
       return productConfiguration;
@@ -2189,7 +2241,7 @@ function PriceObjectData(Price, FormatedPrice, CalcPrice, PriceType, Currency, P
 });
 
 var SAPOrderLineData = /*#__PURE__*/function () {
-  function SAPOrderLineData(SetID, ArticleNr, ArticleNrPrefix, Name, PosNr, Price, Quantity, UseSAPArticleNumberInEKText) {
+  function SAPOrderLineData(SetID, ArticleNr, ArticleNrPrefix, Name, PosNr, Price, Quantity, UseSAPArticleNumberInEKText, basketIds) {
     _classCallCheck(this, SAPOrderLineData);
     _defineProperty(this, "SetID", '');
     _defineProperty(this, "ArticleNr", void 0);
@@ -2202,6 +2254,7 @@ var SAPOrderLineData = /*#__PURE__*/function () {
     _defineProperty(this, "OrderText", void 0);
     _defineProperty(this, "Quantity", void 0);
     _defineProperty(this, "UseSAPArticleNumberInEKText", void 0);
+    _defineProperty(this, "basketIds", void 0);
     this.SetID = SetID;
     this.ArticleNr = ArticleNr;
     this.ArticleNrPrefix = ArticleNrPrefix;
@@ -2210,6 +2263,7 @@ var SAPOrderLineData = /*#__PURE__*/function () {
     this.Price = Price;
     this.Quantity = Quantity;
     this.UseSAPArticleNumberInEKText = UseSAPArticleNumberInEKText;
+    this.basketIds = basketIds;
   }
   return _createClass(SAPOrderLineData, [{
     key: "addQuantity",