@crystaldesign/product-handler 24.12.0-beta.24 → 24.12.0-beta.25

package/build/esm/index.js

@@ -26,9 +26,6 @@ var _excluded = ["value"];
 var _ProductHandlerAbstract;
 function ownKeys(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(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-
-//const LOG = initLog('CORE');
-
 var TRANSLATED_FILEDS = ['info', 'modelName', 'technicalDescription', 'shortDescription', 'shortTechnicalDescription'];
 var ProductHandlerAbstract = /*#__PURE__*/function () {
   function ProductHandlerAbstract(LOG, t, openModal, closeModal) {
@@ -43,6 +40,8 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
     _defineProperty(this, "_apiKey", void 0);
     _defineProperty(this, "_catalogService", '');
     _defineProperty(this, "_mediaService", '');
+    _defineProperty(this, "_api2", '');
+    _defineProperty(this, "_sessionGuid", '');
     _defineProperty(this, "_organization", {});
   }
   return _createClass(ProductHandlerAbstract, [{
@@ -69,6 +68,19 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
     set: function set(val) {
       this._mediaService = val;
     }
+  }, {
+    key: "api2",
+    get: function get() {
+      return this._api2;
+    },
+    set: function set(val) {
+      this._api2 = val;
+    }
+  }, {
+    key: "sessionGuid",
+    get: function get() {
+      return this._sessionGuid;
+    }
   }, {
     key: "organization",
     get: function get() {
@@ -115,7 +127,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
     value: (function () {
       var _createAndSave = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
         var _basket$ProductSetNam;
-        var basket, catalogData, availableLanguages, currentLang, createdState, baseData, data;
+        var basket, catalogData, availableLanguages, currentLang, createdState, data;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -123,6 +135,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
               _context.next = 3;
               return this.loadProducts({
                 basket: basket,
+                divaNr: basket.DivaNr,
                 catalogData: catalogData,
                 productData: [],
                 availableLanguages: availableLanguages,
@@ -132,10 +145,11 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
               createdState = _context.sent;
               createdState.baseData.shortDescription = (_basket$ProductSetNam = basket.ProductSetName) !== null && _basket$ProductSetNam !== void 0 ? _basket$ProductSetNam : basket.SetName;
               createdState.baseData.shortDescription_locales = basket.SetName_locales;
-              baseData = _objectSpread({}, createdState.baseData);
+              _objectSpread({}, createdState.baseData);
               _context.next = 9;
               return this.prepareData({
-                baseData: baseData,
+                basket: basket,
+                baseData: createdState.baseData,
                 classificationData: createdState.classificationData,
                 variantData: createdState.variantData,
                 oldClassificationData: createdState.oldClassificationData
@@ -143,9 +157,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
             case 9:
               data = _context.sent;
               _context.next = 12;
-              return this.saveBasketAndProducts(_objectSpread(_objectSpread({}, data), {}, {
-                basket: basket
-              }));
+              return this.saveProducts(_objectSpread({}, data));
             case 12:
               return _context.abrupt("return", _context.sent);
             case 13:
@@ -171,82 +183,53 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
     key: "loadProducts",
     value: (function () {
       var _loadProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref2) {
-        var _baseProduct9,
-          _baseProduct10,
-          _baseProduct11,
-          _baseProduct12,
-          _baseProduct13,
-          _baseProduct14,
-          _baseProduct15,
-          _baseProduct16,
-          _baseProduct17,
-          _baseProduct18,
-          _baseProduct19,
-          _baseProduct20,
-          _baseProduct21,
-          _baseProduct22,
-          _baseProduct23,
-          _baseProduct24,
-          _baseProduct25,
-          _baseProduct26,
-          _baseProduct$width,
-          _baseProduct27,
-          _basket$SetPlannerInf,
-          _basket$OrderSets$0$B,
-          _baseProduct$height,
-          _baseProduct28,
-          _basket$SetPlannerInf2,
-          _basket$OrderSets$0$B2,
-          _baseProduct$depth,
-          _baseProduct29,
-          _basket$SetPlannerInf3,
-          _basket$OrderSets$0$B3,
-          _baseProduct$weight,
-          _baseProduct30,
-          _price$addedPrice,
-          _baseProduct31,
-          _baseProduct32,
-          _baseProduct33,
-          _basket$SetPlannerInf4,
-          _basket$SetPlannerInf5,
-          _baseProduct34,
-          _baseProduct35,
-          _baseProduct36,
-          _baseProduct37,
-          _baseProduct38,
-          _baseProduct39,
-          _baseProduct$brand,
-          _baseProduct40,
+        var _baseProduct$configur,
+          _baseProduct,
+          _this = this,
+          _baseProduct2,
+          _baseProduct3,
+          _baseProduct$divaNr,
+          _baseProduct4,
+          _dataByBasket$price$a,
+          _dataByBasket$price,
+          _baseProduct5,
+          _basket$getProductCon,
+          _baseProduct6,
+          _dataByBasket$docking,
+          _baseProduct7,
           _baseProduct$organiza,
-          _baseProduct41,
+          _baseProduct8,
           _this$organization$pa,
           _this$organization$pa2,
-          _baseProduct42,
           _baseProduct$createdB,
-          _baseProduct43,
+          _baseProduct9,
           _this$user,
-          _baseProduct44,
-          _baseProduct45,
-          _baseProduct46,
-          _baseProduct47,
-          _baseProduct48,
-          _baseProduct49,
-          _baseProduct50,
-          _this = this;
-        var basket, catalogData, productData, classificationFields, fieldConfiguration, customBaseFields, classificationConfig, _ref2$availableLangua, availableLanguages, _ref2$currentLang, currentLang, editedBasket, products, baseProduct, variantProducts, isSet, dockingPoints, orderDescription, orderDescription_locales, catalogDataName, catalogDataBrand, catalogDataDescription, catalogDataName_locales, catalogDataDescription_locales, i, c, key, _key, articles, delivery, _baseProduct$delivery, _baseProduct, _baseProduct$delivery2, _baseProduct2, _baseProduct$delivery3, _baseProduct3, _baseProduct$delivery4, _baseProduct4, _baseProduct$delivery5, _baseProduct5, _ref3, _baseProduct$delivery6, _baseProduct6, _fieldConfiguration$d, _ref4, _baseProduct$delivery7, _baseProduct7, _fieldConfiguration$d2, _ref5, _baseProduct$delivery8, _baseProduct8, _fieldConfiguration$d3, config, packages, ismanual, price, oldClassificationData, _i, variant, _key2, oldUniqueHash, baseData, metaData, metaData_locales, _this$parseMetaDataAn, classificationData, customData, optMap, _ProductHandlerAbstra, shortDescription, shortDescriptionModified, variantData, variantDataModified, addedProducts, removedProducts, optFields, initialSelectedFields, _this$LOG, _basket$OrderSets$0$C3, _basket$OrderSets$0$F, usedConfigVariants, newVariantPosition, variantPositions, currentVariantPos, differingOPTs, _basket$OrderSets$0$C4, opts, _i2, initializedOptMap;
+          _baseProduct10,
+          _baseProduct11,
+          _baseProduct12,
+          _baseProduct13,
+          _baseProduct14,
+          _baseProduct15;
+        var basket, divaNr, catalogData, productData, classificationFields, fieldConfiguration, customBaseFields, classificationConfig, _ref2$availableLangua, availableLanguages, _ref2$currentLang, currentLang, products, baseProduct, variantProducts, dataByBasket, oldClassificationData, i, variant, key, oldUniqueHash, baseData, metaData, metaData_locales, _this$parseMetaDataAn, classificationData, customData, optMap, _ProductHandlerAbstra, shortDescription, shortDescriptionModified, variantData, variantDataModified, addedProducts, removedProducts, optFields, initialSelectedFields, usedVariantIds, newVariantPosition, variantPositions, currentVariantPos, _basket$OrderSets$0$C2, differingOPTs, _variantData$, opts, _i, initializedOptMap;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              basket = _ref2.basket, catalogData = _ref2.catalogData, productData = _ref2.productData, classificationFields = _ref2.classificationFields, fieldConfiguration = _ref2.fieldConfiguration, customBaseFields = _ref2.customBaseFields, classificationConfig = _ref2.classificationConfig, _ref2$availableLangua = _ref2.availableLanguages, availableLanguages = _ref2$availableLangua === void 0 ? ['de', 'fr', 'it', 'en'] : _ref2$availableLangua, _ref2$currentLang = _ref2.currentLang, currentLang = _ref2$currentLang === void 0 ? 'de' : _ref2$currentLang, editedBasket = _ref2.editedBasket;
+              basket = _ref2.basket, divaNr = _ref2.divaNr, catalogData = _ref2.catalogData, productData = _ref2.productData, classificationFields = _ref2.classificationFields, fieldConfiguration = _ref2.fieldConfiguration, customBaseFields = _ref2.customBaseFields, classificationConfig = _ref2.classificationConfig, _ref2$availableLangua = _ref2.availableLanguages, availableLanguages = _ref2$availableLangua === void 0 ? ['de', 'fr', 'it', 'en'] : _ref2$availableLangua, _ref2$currentLang = _ref2.currentLang, currentLang = _ref2$currentLang === void 0 ? 'de' : _ref2$currentLang;
+              if (!(!productData && !divaNr)) {
+                _context2.next = 3;
+                break;
+              }
+              throw new Error('this should not happen');
+            case 3:
               if (productData) {
-                _context2.next = 5;
+                _context2.next = 7;
                 break;
               }
-              _context2.next = 4;
-              return this.apiGetProducts(basket.DivaNr);
-            case 4:
+              _context2.next = 6;
+              return this.apiGetProducts(divaNr);
+            case 6:
               productData = _context2.sent;
-            case 5:
+            case 7:
               products = {
                 data: productData,
                 total: productData.length
@@ -263,263 +246,59 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                   return !p.baseProduct;
                 });
               }
+              if (catalogData) {
+                _context2.next = 15;
+                break;
+              }
+              _context2.next = 14;
+              return Promise.all((_baseProduct$configur = (_baseProduct = baseProduct) === null || _baseProduct === void 0 || (_baseProduct = _baseProduct.configuration) === null || _baseProduct === void 0 ? void 0 : _baseProduct.OrderSets.map(function (os) {
+                return _this.apiGetCatalogData(os.CatalogCodex, currentLang, os.AccountGUID);
+              })) !== null && _baseProduct$configur !== void 0 ? _baseProduct$configur : []);
+            case 14:
+              catalogData = _context2.sent;
+            case 15:
               if (!(products.total && !baseProduct)) {
-                _context2.next = 11;
+                _context2.next = 17;
                 break;
               }
               throw new Error('If existing products are fetched, there has to be atleast a base product.');
-            case 11:
-              isSet = !!basket.SetPlannerInfos;
-              dockingPoints = isSet ? undefined : basket.OrderSets[0].getDockingPointInfo();
-              orderDescription = isSet ? basket.OrderSets.reduce(function (total, os) {
-                return total + os.SetName + '\n' + os.VariantDescription + '\n\n';
-              }, '') : basket.OrderSets[0].VariantDescription;
-              orderDescription_locales = basket.OrderSets[0].VariantDescription_locales;
-              catalogDataName = catalogData === null || catalogData === void 0 ? void 0 : catalogData.map(function (c) {
-                return c.name;
-              }).filter(function (name) {
-                return name;
-              }).join(' - ');
-              catalogDataBrand = catalogData === null || catalogData === void 0 ? void 0 : catalogData.map(function (c) {
-                return c.brand;
-              }).filter(function (brand) {
-                return brand;
-              }).join(' - ');
-              catalogDataDescription = catalogData === null || catalogData === void 0 ? void 0 : catalogData.map(function (c) {
-                return c.description;
-              }).filter(function (description) {
-                return description;
-              }).join('<br/>');
-              catalogDataName_locales = {};
-              catalogDataDescription_locales = {};
-              for (i = 0; i < (catalogData !== null && catalogData !== void 0 ? catalogData : []).length; i++) {
-                c = catalogData[i];
-                for (key in c.name_locales) {
-                  if (!catalogDataName_locales[key]) {
-                    catalogDataName_locales[key] = c.name_locales[key];
-                  } else {
-                    catalogDataName_locales[key] = catalogDataName_locales[key] + ' - ' + c.name_locales[key];
-                  }
-                }
-                for (_key in c.description_locales) {
-                  if (!catalogDataDescription_locales[_key]) {
-                    catalogDataDescription_locales[_key] = c.description_locales[_key];
-                  } else {
-                    catalogDataDescription_locales[_key] = catalogDataDescription_locales[_key] + ' - ' + c.description_locales[_key];
-                  }
-                }
-              }
-              articles = [];
-              if (isSet) {
-                articles = basket.OrderSets.flatMap(function (os) {
-                  return os.OrderLines.map(function (ol) {
-                    var _ol$VariantBasketData;
-                    return {
-                      articleCodex: ol.ArticleCodex,
-                      catalogCodex: os.CatalogCodex,
-                      variantValues: (_ol$VariantBasketData = ol.VariantBasketDatas) === null || _ol$VariantBasketData === void 0 ? void 0 : _ol$VariantBasketData.map(function (vb) {
-                        return {
-                          OPT: vb.OptionOCD ? vb.OptionOCD.substring(3) : vb.OPT,
-                          OPV: vb.OCD ? vb.OCD.substring(3) : vb.OPV
-                        };
-                      })
-                    };
-                  });
-                });
-              } else {
-                articles = basket.OrderSets[0].OrderLines.map(function (ol) {
-                  var _ol$VariantBasketData2;
-                  return {
-                    articleCodex: ol.ArticleCodex,
-                    catalogCodex: basket.OrderSets[0].CatalogCodex,
-                    variantValues: (_ol$VariantBasketData2 = ol.VariantBasketDatas) === null || _ol$VariantBasketData2 === void 0 ? void 0 : _ol$VariantBasketData2.map(function (vb) {
-                      return {
-                        OPT: vb.OptionOCD ? vb.OptionOCD.substring(3) : vb.OPT,
-                        OPV: vb.OCD ? vb.OCD.substring(3) : vb.OPV
-                      };
-                    })
-                  };
-                });
-              }
-              if (fieldConfiguration !== null && fieldConfiguration !== void 0 && fieldConfiguration.delivery) {
-                config = {
-                  addedPackageWeight: 0,
-                  addedPackageHeight: 0,
-                  addedPackageWidth: 0,
-                  addedPackageDepth: 0,
-                  defaultDeliveryTime: 0,
-                  defaultDeliveryPrice: 0,
-                  defaultInstallationPrice: 0
-                };
-                if (typeof fieldConfiguration.delivery != 'boolean') {
-                  config = _objectSpread(_objectSpread({}, config), fieldConfiguration.delivery);
-                }
-                packages = [];
-                basket.OrderSets.flatMap(function (os) {
-                  return os.OrderLines;
-                }).forEach(function (ol) {
-                  packages.push({
-                    height: ol.Height ? ol.Height + config.addedPackageHeight : 0,
-                    width: ol.Width ? ol.Width + config.addedPackageWidth : 0,
-                    depth: ol.Depth ? ol.Depth + config.addedPackageDepth : 0,
-                    weight: ol.Weight ? ol.Weight + config.addedPackageWeight : 0
-                  });
-                });
-                delivery = {
-                  estPackages: packages,
-                  estMaxPackages: (_baseProduct$delivery = (_baseProduct = baseProduct) === null || _baseProduct === void 0 || (_baseProduct = _baseProduct.delivery) === null || _baseProduct === void 0 ? void 0 : _baseProduct.estMaxPackages) !== null && _baseProduct$delivery !== void 0 ? _baseProduct$delivery : packages.length,
-                  estMaxPackageWeight: (_baseProduct$delivery2 = (_baseProduct2 = baseProduct) === null || _baseProduct2 === void 0 || (_baseProduct2 = _baseProduct2.delivery) === null || _baseProduct2 === void 0 ? void 0 : _baseProduct2.estMaxPackageWeight) !== null && _baseProduct$delivery2 !== void 0 ? _baseProduct$delivery2 : Math.max.apply(Math, [0].concat(_toConsumableArray(packages.map(function (p) {
-                    return p.weight;
-                  }).filter(function (f) {
-                    return f;
-                  })))),
-                  estMaxPackageHeight: (_baseProduct$delivery3 = (_baseProduct3 = baseProduct) === null || _baseProduct3 === void 0 || (_baseProduct3 = _baseProduct3.delivery) === null || _baseProduct3 === void 0 ? void 0 : _baseProduct3.estMaxPackageHeight) !== null && _baseProduct$delivery3 !== void 0 ? _baseProduct$delivery3 : Math.max.apply(Math, [0].concat(_toConsumableArray(packages.map(function (p) {
-                    return p.height;
-                  }).filter(function (f) {
-                    return f;
-                  })))),
-                  estMaxPackageWidth: (_baseProduct$delivery4 = (_baseProduct4 = baseProduct) === null || _baseProduct4 === void 0 || (_baseProduct4 = _baseProduct4.delivery) === null || _baseProduct4 === void 0 ? void 0 : _baseProduct4.estMaxPackageWidth) !== null && _baseProduct$delivery4 !== void 0 ? _baseProduct$delivery4 : Math.max.apply(Math, [0].concat(_toConsumableArray(packages.map(function (p) {
-                    return p.width;
-                  }).filter(function (f) {
-                    return f;
-                  })))),
-                  estMaxPackageDepth: (_baseProduct$delivery5 = (_baseProduct5 = baseProduct) === null || _baseProduct5 === void 0 || (_baseProduct5 = _baseProduct5.delivery) === null || _baseProduct5 === void 0 ? void 0 : _baseProduct5.estMaxPackageDepth) !== null && _baseProduct$delivery5 !== void 0 ? _baseProduct$delivery5 : Math.max.apply(Math, [0].concat(_toConsumableArray(packages.map(function (p) {
-                    return p.depth;
-                  }).filter(function (f) {
-                    return f;
-                  })))),
-                  deliveryTime: (_ref3 = (_baseProduct$delivery6 = (_baseProduct6 = baseProduct) === null || _baseProduct6 === void 0 || (_baseProduct6 = _baseProduct6.delivery) === null || _baseProduct6 === void 0 ? void 0 : _baseProduct6.deliveryTime) !== null && _baseProduct$delivery6 !== void 0 ? _baseProduct$delivery6 : (_fieldConfiguration$d = fieldConfiguration.delivery) === null || _fieldConfiguration$d === void 0 ? void 0 : _fieldConfiguration$d.defaultDeliveryTime) !== null && _ref3 !== void 0 ? _ref3 : 0,
-                  deliveryPrice: (_ref4 = (_baseProduct$delivery7 = (_baseProduct7 = baseProduct) === null || _baseProduct7 === void 0 || (_baseProduct7 = _baseProduct7.delivery) === null || _baseProduct7 === void 0 ? void 0 : _baseProduct7.deliveryPrice) !== null && _baseProduct$delivery7 !== void 0 ? _baseProduct$delivery7 : (_fieldConfiguration$d2 = fieldConfiguration.delivery) === null || _fieldConfiguration$d2 === void 0 ? void 0 : _fieldConfiguration$d2.defaultDeliveryPrice) !== null && _ref4 !== void 0 ? _ref4 : 0,
-                  installationPrice: (_ref5 = (_baseProduct$delivery8 = (_baseProduct8 = baseProduct) === null || _baseProduct8 === void 0 || (_baseProduct8 = _baseProduct8.delivery) === null || _baseProduct8 === void 0 ? void 0 : _baseProduct8.installationPrice) !== null && _baseProduct$delivery8 !== void 0 ? _baseProduct$delivery8 : (_fieldConfiguration$d3 = fieldConfiguration.delivery) === null || _fieldConfiguration$d3 === void 0 ? void 0 : _fieldConfiguration$d3.defaultInstallationPrice) !== null && _ref5 !== void 0 ? _ref5 : 0
-                };
-              }
-              ismanual = ((_baseProduct9 = baseProduct) === null || _baseProduct9 === void 0 ? void 0 : _baseProduct9.calculatedPrice) !== ((_baseProduct10 = baseProduct) === null || _baseProduct10 === void 0 ? void 0 : _baseProduct10.addedPrice);
-              price = {
-                calculatedPrice: basket === null || basket === void 0 ? void 0 : basket.SummaryPrice,
-                addedPrice: (_baseProduct11 = baseProduct) === null || _baseProduct11 === void 0 ? void 0 : _baseProduct11.addedPrice,
-                discountPrice: (_baseProduct12 = baseProduct) === null || _baseProduct12 === void 0 ? void 0 : _baseProduct12.discountedPrice
-              };
-              if (!((_baseProduct13 = baseProduct) !== null && _baseProduct13 !== void 0 && _baseProduct13.calculatedPrice)) price = ProductHandlerAbstract.calcPrice(basket === null || basket === void 0 ? void 0 : basket.SummaryPrice, basket === null || basket === void 0 ? void 0 : basket.Discounts, (_baseProduct14 = baseProduct) === null || _baseProduct14 === void 0 ? void 0 : _baseProduct14.calculatedPrice, ismanual);
-
-              //to remember what for position was previously set for the classification
+            case 17:
+              dataByBasket = this.getProductDataByBasket(basket, catalogData, fieldConfiguration, baseProduct); //to remember what for position was previously set for the classification
               oldClassificationData = {};
-              for (_i = 0; _i < products.data.length; _i++) {
-                variant = products.data[_i];
+              for (i = 0; i < products.data.length; i++) {
+                variant = products.data[i];
                 oldClassificationData[variant._id] = {};
-                for (_key2 in variant) {
-                  if (_key2.startsWith('dc_') && variant[_key2].optionPosition !== undefined) {
-                    oldClassificationData[variant._id][_key2] = variant[_key2];
+                for (key in variant) {
+                  if (key.startsWith('dc_') && variant[key].optionPosition !== undefined) {
+                    oldClassificationData[variant._id][key] = variant[key];
                   }
                 }
               }
-              oldUniqueHash = (_baseProduct15 = baseProduct) === null || _baseProduct15 === void 0 ? void 0 : _baseProduct15.uniqueHash;
-              baseData = {
-                _id: ((_baseProduct16 = baseProduct) === null || _baseProduct16 === void 0 ? void 0 : _baseProduct16._id) || nanoid(),
-                divaNr: basket === null || basket === void 0 ? void 0 : basket.DivaNr,
-                modelName: ((_baseProduct17 = baseProduct) === null || _baseProduct17 === void 0 ? void 0 : _baseProduct17.modelName) || catalogDataName,
-                info: ((_baseProduct18 = baseProduct) === null || _baseProduct18 === void 0 ? void 0 : _baseProduct18.info) || catalogDataDescription,
-                technicalDescription: ((_baseProduct19 = baseProduct) === null || _baseProduct19 === void 0 ? void 0 : _baseProduct19.technicalDescription) || orderDescription,
-                shortTechnicalDescription: (_baseProduct20 = baseProduct) === null || _baseProduct20 === void 0 ? void 0 : _baseProduct20.shortTechnicalDescription,
-                modelName_locales: ((_baseProduct21 = baseProduct) === null || _baseProduct21 === void 0 ? void 0 : _baseProduct21.modelName_locales) || catalogDataName_locales,
-                info_locales: ((_baseProduct22 = baseProduct) === null || _baseProduct22 === void 0 ? void 0 : _baseProduct22.info_locales) || catalogDataDescription_locales,
-                technicalDescription_locales: ((_baseProduct23 = baseProduct) === null || _baseProduct23 === void 0 ? void 0 : _baseProduct23.technicalDescription_locales) || orderDescription_locales,
-                shortTechnicalDescription_locales: (_baseProduct24 = baseProduct) === null || _baseProduct24 === void 0 ? void 0 : _baseProduct24.shortTechnicalDescription_locales,
-                orderDescription: orderDescription,
-                shortDescription: (_baseProduct25 = baseProduct) === null || _baseProduct25 === void 0 ? void 0 : _baseProduct25.shortDescription,
-                shortDescription_locales: (_baseProduct26 = baseProduct) === null || _baseProduct26 === void 0 ? void 0 : _baseProduct26.shortDescription_locales,
-                width: (_baseProduct$width = (_baseProduct27 = baseProduct) === null || _baseProduct27 === void 0 ? void 0 : _baseProduct27.width) !== null && _baseProduct$width !== void 0 ? _baseProduct$width : isSet ? (_basket$SetPlannerInf = basket.SetPlannerInfos) === null || _basket$SetPlannerInf === void 0 || (_basket$SetPlannerInf = _basket$SetPlannerInf.BBox) === null || _basket$SetPlannerInf === void 0 ? void 0 : _basket$SetPlannerInf.X : (_basket$OrderSets$0$B = basket.OrderSets[0].BBox) === null || _basket$OrderSets$0$B === void 0 ? void 0 : _basket$OrderSets$0$B.X,
-                height: (_baseProduct$height = (_baseProduct28 = baseProduct) === null || _baseProduct28 === void 0 ? void 0 : _baseProduct28.height) !== null && _baseProduct$height !== void 0 ? _baseProduct$height : isSet ? (_basket$SetPlannerInf2 = basket.SetPlannerInfos) === null || _basket$SetPlannerInf2 === void 0 || (_basket$SetPlannerInf2 = _basket$SetPlannerInf2.BBox) === null || _basket$SetPlannerInf2 === void 0 ? void 0 : _basket$SetPlannerInf2.Z : (_basket$OrderSets$0$B2 = basket.OrderSets[0].BBox) === null || _basket$OrderSets$0$B2 === void 0 ? void 0 : _basket$OrderSets$0$B2.Z,
-                depth: (_baseProduct$depth = (_baseProduct29 = baseProduct) === null || _baseProduct29 === void 0 ? void 0 : _baseProduct29.depth) !== null && _baseProduct$depth !== void 0 ? _baseProduct$depth : isSet ? (_basket$SetPlannerInf3 = basket.SetPlannerInfos) === null || _basket$SetPlannerInf3 === void 0 || (_basket$SetPlannerInf3 = _basket$SetPlannerInf3.BBox) === null || _basket$SetPlannerInf3 === void 0 ? void 0 : _basket$SetPlannerInf3.Y : (_basket$OrderSets$0$B3 = basket.OrderSets[0].BBox) === null || _basket$OrderSets$0$B3 === void 0 ? void 0 : _basket$OrderSets$0$B3.Y,
-                weight: (_baseProduct$weight = (_baseProduct30 = baseProduct) === null || _baseProduct30 === void 0 ? void 0 : _baseProduct30.weight) !== null && _baseProduct$weight !== void 0 ? _baseProduct$weight : basket.OrderSets.flatMap(function (os) {
-                  return os.OrderLines.map(function (ol) {
-                    return ol.Weight;
-                  }).filter(function (f) {
-                    return f;
-                  });
-                }).reduce(function (sum, v) {
-                  return sum + v;
-                }, 0),
-                calculatedPrice: price.calculatedPrice,
-                delivery: delivery,
-                addedPrice: (_price$addedPrice = price.addedPrice) !== null && _price$addedPrice !== void 0 ? _price$addedPrice : (_baseProduct31 = baseProduct) === null || _baseProduct31 === void 0 ? void 0 : _baseProduct31.addedPrice,
-                discountedPrice: (_baseProduct32 = baseProduct) === null || _baseProduct32 === void 0 ? void 0 : _baseProduct32.discountedPrice,
-                percentageDiscount: (_baseProduct33 = baseProduct) === null || _baseProduct33 === void 0 ? void 0 : _baseProduct33.percentageDiscount,
-                articles: articles,
-                image: isSet ? (_basket$SetPlannerInf4 = basket.SetPlannerInfos) === null || _basket$SetPlannerInf4 === void 0 ? void 0 : _basket$SetPlannerInf4.SetPlannerImg3D : basket.OrderSets[0].SetImage,
-                image2D: isSet ? (_basket$SetPlannerInf5 = basket.SetPlannerInfos) === null || _basket$SetPlannerInf5 === void 0 ? void 0 : _basket$SetPlannerInf5.SetPlannerImg2D : basket.OrderSets[0].Set2DImage,
-                catalogId: isSet ? basket.OrderSets.map(function (os) {
-                  return os.CatalogGUID;
-                }) : [basket.OrderSets[0].CatalogGUID],
-                collection: isSet ? basket.OrderSets.map(function (os) {
-                  return os.AccountName;
-                }) : [basket.OrderSets[0].AccountName],
-                collectionId: isSet ? basket.OrderSets.map(function (os) {
-                  return os.CollectionGUID;
-                }) : [basket.OrderSets[0].CollectionGUID],
-                catCodex: isSet ? basket.OrderSets.map(function (os) {
-                  return os.CatalogCodex;
-                }) : [basket.OrderSets[0].CatalogCodex],
-                supplierId: catalogData === null || catalogData === void 0 ? void 0 : catalogData.map(function (c) {
-                  return c.supplierGuid;
-                }).filter(function (c) {
-                  return c;
-                }),
-                retailCatalogNr: catalogData === null || catalogData === void 0 ? void 0 : catalogData.map(function (c) {
-                  return c.retailCatalogNr;
-                }).filter(function (c) {
-                  return c;
-                }),
-                supplierArticleNr: basket.OrderSets.flatMap(function (os) {
-                  return os.OrderLines.map(function (ol) {
-                    return ol.ConfigArticleCodex;
-                  }).filter(function (f) {
-                    return f;
-                  });
-                }).filter(function (f) {
-                  return f;
-                }),
-                retailCatalogArticleNr: basket.OrderSets.flatMap(function (os) {
-                  return os.OrderLines.map(function (ol) {
-                    return ol.RetailArticleNr;
-                  }).filter(function (f) {
-                    return f;
-                  });
-                }).filter(function (f) {
-                  return f;
-                }),
-                livingArea: (_baseProduct34 = baseProduct) === null || _baseProduct34 === void 0 ? void 0 : _baseProduct34.livingArea,
-                mainCategory: (_baseProduct35 = baseProduct) === null || _baseProduct35 === void 0 ? void 0 : _baseProduct35.mainCategory,
-                subCategory: (_baseProduct36 = baseProduct) === null || _baseProduct36 === void 0 ? void 0 : _baseProduct36.subCategory,
-                retailerArticleNr: (_baseProduct37 = baseProduct) === null || _baseProduct37 === void 0 ? void 0 : _baseProduct37.retailerArticleNr,
-                dockingPoints: dockingPoints,
-                media: (_baseProduct38 = baseProduct) === null || _baseProduct38 === void 0 ? void 0 : _baseProduct38.media,
-                affiliate: (_baseProduct39 = baseProduct) === null || _baseProduct39 === void 0 ? void 0 : _baseProduct39.affiliate,
-                brand: (_baseProduct$brand = (_baseProduct40 = baseProduct) === null || _baseProduct40 === void 0 ? void 0 : _baseProduct40.brand) !== null && _baseProduct$brand !== void 0 ? _baseProduct$brand : catalogDataBrand,
+              oldUniqueHash = (_baseProduct2 = baseProduct) === null || _baseProduct2 === void 0 ? void 0 : _baseProduct2.uniqueHash;
+              baseData = _objectSpread(_objectSpread(_objectSpread({}, dataByBasket), baseProduct), {}, {
+                _id: ((_baseProduct3 = baseProduct) === null || _baseProduct3 === void 0 ? void 0 : _baseProduct3._id) || nanoid(),
+                divaNr: (_baseProduct$divaNr = (_baseProduct4 = baseProduct) === null || _baseProduct4 === void 0 ? void 0 : _baseProduct4.divaNr) !== null && _baseProduct$divaNr !== void 0 ? _baseProduct$divaNr : basket === null || basket === void 0 ? void 0 : basket.DivaNr,
+                addedPrice: (_dataByBasket$price$a = dataByBasket === null || dataByBasket === void 0 || (_dataByBasket$price = dataByBasket.price) === null || _dataByBasket$price === void 0 ? void 0 : _dataByBasket$price.addedPrice) !== null && _dataByBasket$price$a !== void 0 ? _dataByBasket$price$a : (_baseProduct5 = baseProduct) === null || _baseProduct5 === void 0 ? void 0 : _baseProduct5.addedPrice,
+                configuration: (_basket$getProductCon = basket === null || basket === void 0 ? void 0 : basket.getProductConfiguration()) !== null && _basket$getProductCon !== void 0 ? _basket$getProductCon : (_baseProduct6 = baseProduct) === null || _baseProduct6 === void 0 ? void 0 : _baseProduct6.configuration,
+                dockingPoints: (_dataByBasket$docking = dataByBasket.dockingPoints) !== null && _dataByBasket$docking !== void 0 ? _dataByBasket$docking : (_baseProduct7 = baseProduct) === null || _baseProduct7 === void 0 ? void 0 : _baseProduct7.dockingPoints,
                 currency: DivaUtils.defaultPriceFormat.currency,
-                organizationId: (_baseProduct$organiza = (_baseProduct41 = baseProduct) === null || _baseProduct41 === void 0 ? void 0 : _baseProduct41.organizationId) !== null && _baseProduct$organiza !== void 0 ? _baseProduct$organiza : this.organization._id,
+                organizationId: (_baseProduct$organiza = (_baseProduct8 = baseProduct) === null || _baseProduct8 === void 0 ? void 0 : _baseProduct8.organizationId) !== null && _baseProduct$organiza !== void 0 ? _baseProduct$organiza : this.organization._id,
                 inheritedOrganizations: [].concat(_toConsumableArray((_this$organization$pa = (_this$organization$pa2 = this.organization.parentOrganizations) === null || _this$organization$pa2 === void 0 ? void 0 : _this$organization$pa2.map(function (o) {
                   return o._id;
                 })) !== null && _this$organization$pa !== void 0 ? _this$organization$pa : []), [this.organization._id]),
-                created: (_baseProduct42 = baseProduct) === null || _baseProduct42 === void 0 ? void 0 : _baseProduct42.created,
-                createdBy: (_baseProduct$createdB = (_baseProduct43 = baseProduct) === null || _baseProduct43 === void 0 ? void 0 : _baseProduct43.createdBy) !== null && _baseProduct$createdB !== void 0 ? _baseProduct$createdB : (_this$user = this.user) === null || _this$user === void 0 ? void 0 : _this$user._id,
-                createdBy_displayText: (_baseProduct44 = baseProduct) === null || _baseProduct44 === void 0 ? void 0 : _baseProduct44.createdBy_displayText,
-                archived: (_baseProduct45 = baseProduct) !== null && _baseProduct45 !== void 0 && _baseProduct45.archived ? (_baseProduct46 = baseProduct) === null || _baseProduct46 === void 0 ? void 0 : _baseProduct46.archived : false,
-                isTopseller: !!((_baseProduct47 = baseProduct) !== null && _baseProduct47 !== void 0 && _baseProduct47.isTopseller),
-                orderText: basket.getEKText(true),
-                classificationInfo: (_baseProduct48 = baseProduct) === null || _baseProduct48 === void 0 ? void 0 : _baseProduct48.classificationInfo,
-                modelInfoPageWeight: (_baseProduct49 = baseProduct) === null || _baseProduct49 === void 0 ? void 0 : _baseProduct49.modelInfoPageWeight,
-                uniqueHash: isSet ? ProductHandlerAbstract.getHashValue(basket.OrderSets.map(function (os) {
-                  return os.SetHash;
-                }).join(''), basket.Diva3DProject) : ProductHandlerAbstract.getHashValue(basket.SetHash, basket.Diva3DProject)
-              };
-              metaData = basket.OrderSets.reduce(function (prev, curr) {
+                createdBy: (_baseProduct$createdB = (_baseProduct9 = baseProduct) === null || _baseProduct9 === void 0 ? void 0 : _baseProduct9.createdBy) !== null && _baseProduct$createdB !== void 0 ? _baseProduct$createdB : (_this$user = this.user) === null || _this$user === void 0 ? void 0 : _this$user._id,
+                createdBy_displayText: (_baseProduct10 = baseProduct) === null || _baseProduct10 === void 0 ? void 0 : _baseProduct10.createdBy_displayText,
+                archived: (_baseProduct11 = baseProduct) !== null && _baseProduct11 !== void 0 && _baseProduct11.archived ? (_baseProduct12 = baseProduct) === null || _baseProduct12 === void 0 ? void 0 : _baseProduct12.archived : false,
+                isTopseller: !!((_baseProduct13 = baseProduct) !== null && _baseProduct13 !== void 0 && _baseProduct13.isTopseller)
+              });
+              metaData = basket === null || basket === void 0 ? void 0 : basket.OrderSets.reduce(function (prev, curr) {
                 return _objectSpread(_objectSpread({}, prev), curr.MetaData || {});
               }, {});
-              metaData_locales = basket.OrderSets.reduce(function (prev, curr) {
+              metaData_locales = basket === null || basket === void 0 ? void 0 : basket.OrderSets.reduce(function (prev, curr) {
                 return _objectSpread(_objectSpread({}, prev), curr.MetaData_locales || {});
               }, {});
               _this$parseMetaDataAn = this.parseMetaDataAndClassificationInformation(metaData, metaData_locales, baseProduct, classificationConfig, customBaseFields), classificationData = _this$parseMetaDataAn.classificationData, customData = _this$parseMetaDataAn.customData, optMap = _this$parseMetaDataAn.optMap;
-              baseData.customData = _objectSpread(_objectSpread({}, (_baseProduct50 = baseProduct) === null || _baseProduct50 === void 0 ? void 0 : _baseProduct50.customData), customData);
+              baseData.customData = _objectSpread(_objectSpread({}, (_baseProduct14 = baseProduct) === null || _baseProduct14 === void 0 ? void 0 : _baseProduct14.customData), customData);
 
               //add livingarea,maincategorie,subcategorie of loaded product if not exists
               classificationConfig = this.checkAndAddClassificationConfigCategories(baseProduct, classificationConfig);
@@ -535,55 +314,56 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
               removedProducts = [];
               optFields = [];
               initialSelectedFields = [];
-              if (isSet) {
-                (_this$LOG = this.LOG) === null || _this$LOG === void 0 || _this$LOG.warn('Variants are currently not supported for set products');
-              } else {
-                //iterate all existing variant products and add them to the variants
-                usedConfigVariants = [];
-                variantProducts.forEach(function (product) {
-                  var cv;
-                  if (editedBasket) {
-                    var _basket$OrderSets$0$C;
-                    cv = (_basket$OrderSets$0$C = basket.OrderSets[0].ConfigVariants) === null || _basket$OrderSets$0$C === void 0 ? void 0 : _basket$OrderSets$0$C.find(function (cv) {
-                      return ProductHandlerAbstract.isSameProduct(product, cv.SetHash, cv.Diva3DProject, basket.OrderSets[0].OrderLines, cv.VariantBasketDatas, basket.OrderSets[0].CatalogCodex);
-                    });
-                  } else {
-                    var _basket$OrderSets$0$C2;
-                    cv = (_basket$OrderSets$0$C2 = basket.OrderSets[0].ConfigVariants) === null || _basket$OrderSets$0$C2 === void 0 ? void 0 : _basket$OrderSets$0$C2.find(function (cv) {
-                      return cv.VariantID == product.variantId;
-                    });
-                  }
+              if (!dataByBasket.isSet) {
+                _context2.next = 37;
+                break;
+              }
+              throw new Error('Variants are currently not supported for set products');
+            case 37:
+              //iterate all existing variant products and add them to the variants
+              usedVariantIds = [];
+              variantProducts.forEach(function (product) {
+                var cv;
+                if (basket) {
+                  var _basket$OrderSets$0$C;
+                  cv = (_basket$OrderSets$0$C = basket.OrderSets[0].ConfigVariants) === null || _basket$OrderSets$0$C === void 0 || (_basket$OrderSets$0$C = _basket$OrderSets$0$C.find(function (cv) {
+                    return ProductHandlerAbstract.isSameProduct(product, cv.SetHash, cv.Diva3DProject, basket.OrderSets[0].OrderLines, cv.VariantBasketDatas, basket.OrderSets[0].CatalogCodex);
+                  })) === null || _basket$OrderSets$0$C === void 0 ? void 0 : _basket$OrderSets$0$C.VariantID;
+                } else {
+                  cv = product.variantId;
+                }
 
-                  //if the product is originating from a different divaNr it is not included in the configVariant of this divaNr
-                  if (product.originDivaNr || cv) {
-                    usedConfigVariants.push(cv);
-                    var _this$initVariant = _this.initVariant(baseData, classificationData, availableLanguages, cv, product, classificationFields, fieldConfiguration, customBaseFields, classificationConfig),
-                      _variant = _this$initVariant.variant,
-                      modified = _this$initVariant.modified;
-                    variantData.push(_variant);
-                    variantDataModified.push(modified);
-                  } else {
-                    var _this$initVariant2 = _this.initVariant(baseData, classificationData, availableLanguages, cv, product, classificationFields, fieldConfiguration, customBaseFields, classificationConfig),
-                      _variant2 = _this$initVariant2.variant,
-                      _modified = _this$initVariant2.modified;
-                    variantData.push(_variant2);
-                    variantDataModified.push(_modified);
-                    removedProducts.push(_variant2._id);
-                  }
-                });
+                //if the product is originating from a different divaNr it is not included in the configVariant of this divaNr
+                if (product.originDivaNr || cv !== undefined) {
+                  if (cv !== undefined) usedVariantIds.push(cv);
+                  var _this$initVariant = _this.initVariant(baseData, classificationData, availableLanguages, catalogData, basket, cv, product, classificationFields, fieldConfiguration, customBaseFields, classificationConfig),
+                    _variant = _this$initVariant.variant,
+                    modified = _this$initVariant.modified;
+                  variantData.push(_variant);
+                  variantDataModified.push(modified);
+                } else {
+                  var _this$initVariant2 = _this.initVariant(baseData, classificationData, availableLanguages, catalogData, basket, cv, product, classificationFields, fieldConfiguration, customBaseFields, classificationConfig),
+                    _variant2 = _this$initVariant2.variant,
+                    _modified = _this$initVariant2.modified;
+                  variantData.push(_variant2);
+                  variantDataModified.push(_modified);
+                  removedProducts.push(_variant2._id);
+                }
+              });
 
-                //now iterate all configVariants that are left and add them to the variants  (new Products)
-                newVariantPosition = variantData.filter(function (vd) {
-                  return !removedProducts.includes(vd._id);
-                });
-                variantPositions = newVariantPosition.map(function (element) {
-                  return element.variantPosition || element.variantPosition === 0 ? element.variantPosition : -1;
-                });
-                currentVariantPos = Math.max.apply(Math, _toConsumableArray(variantPositions));
-                (_basket$OrderSets$0$C3 = basket.OrderSets[0].ConfigVariants) === null || _basket$OrderSets$0$C3 === void 0 || _basket$OrderSets$0$C3.filter(function (cv) {
-                  return !usedConfigVariants.includes(cv);
+              //now iterate all configVariants that are left and add them to the variants  (new Products)
+              newVariantPosition = variantData.filter(function (vd) {
+                return !removedProducts.includes(vd._id);
+              });
+              variantPositions = newVariantPosition.map(function (element) {
+                return element.variantPosition || element.variantPosition === 0 ? element.variantPosition : -1;
+              });
+              currentVariantPos = Math.max.apply(Math, _toConsumableArray(variantPositions));
+              if (basket) {
+                (_basket$OrderSets$0$C2 = basket.OrderSets[0].ConfigVariants) === null || _basket$OrderSets$0$C2 === void 0 || _basket$OrderSets$0$C2.filter(function (cv) {
+                  return !usedVariantIds.includes(cv.VariantID);
                 }).forEach(function (cv) {
-                  var _this$initVariant3 = _this.initVariant(baseData, classificationData, availableLanguages, cv, undefined, classificationFields, fieldConfiguration, customBaseFields, classificationConfig),
+                  var _this$initVariant3 = _this.initVariant(baseData, classificationData, availableLanguages, catalogData, basket, cv.VariantID, undefined, classificationFields, fieldConfiguration, customBaseFields, classificationConfig),
                     variant = _this$initVariant3.variant,
                     modified = _this$initVariant3.modified;
                   currentVariantPos = currentVariantPos + 1;
@@ -592,60 +372,61 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                   variantDataModified.push(modified);
                   addedProducts.push(variant._id);
                 });
+              }
 
-                //get opt data
-                differingOPTs = Object.entries(((_basket$OrderSets$0$F = basket.OrderSets[0].Favorites) === null || _basket$OrderSets$0$F === void 0 ? void 0 : _basket$OrderSets$0$F.VariantValues) || []).filter(function (_ref6) {
-                  var _ref7 = _slicedToArray(_ref6, 2);
-                    _ref7[0];
-                    var value = _ref7[1];
-                  return Object.keys(value).length > 1;
-                }).map(function (_ref8) {
-                  var _ref9 = _slicedToArray(_ref8, 2),
-                    opt = _ref9[0];
-                    _ref9[1];
-                  return opt.replace('OPT', '');
-                });
-                if (basket.OrderSets[0].ConfigVariants) {
-                  optFields = ((_basket$OrderSets$0$C4 = basket.OrderSets[0].ConfigVariants[0]) === null || _basket$OrderSets$0$C4 === void 0 ? void 0 : _basket$OrderSets$0$C4.VariantBasketDatas.map(function (vd) {
-                    var _vd$OPTName;
-                    return {
-                      field: vd.OptionOCD ? vd.OptionOCD.substring(3) : vd.OPT,
-                      type: 'string',
-                      title: (_vd$OPTName = vd.OPTName) !== null && _vd$OPTName !== void 0 ? _vd$OPTName : vd.OPT,
-                      readOnly: true,
-                      fieldType: 'OPT'
-                    };
-                  })) || [];
-                  //remove duplicates
-                  opts = {};
-                  for (_i2 = optFields.length - 1; _i2 >= 0; _i2--) {
-                    if (!opts[optFields[_i2].field]) {
-                      opts[optFields[_i2].field] = true;
-                    } else {
-                      optFields.splice(_i2, 1);
-                    }
+              //get opt data
+              differingOPTs = Object.entries(((_baseProduct15 = baseProduct) === null || _baseProduct15 === void 0 || (_baseProduct15 = _baseProduct15.configuration) === null || _baseProduct15 === void 0 || (_baseProduct15 = _baseProduct15.OrderSets[0].Favorites) === null || _baseProduct15 === void 0 ? void 0 : _baseProduct15.VariantValues) || []).filter(function (_ref3) {
+                var _ref4 = _slicedToArray(_ref3, 2);
+                  _ref4[0];
+                  var value = _ref4[1];
+                return Object.keys(value).length > 1;
+              }).map(function (_ref5) {
+                var _ref6 = _slicedToArray(_ref5, 2),
+                  opt = _ref6[0];
+                  _ref6[1];
+                return opt.replace('OPT', '');
+              });
+              if (variantData) {
+                optFields = ((_variantData$ = variantData[0]) === null || _variantData$ === void 0 || (_variantData$ = _variantData$.configuration) === null || _variantData$ === void 0 ? void 0 : _variantData$.OrderSets[0].OrderLines[0].VariantBasketDatas.map(function (vd) {
+                  var _catalogData, _vd$OptionOCD, _option$Name;
+                  var option = (_catalogData = catalogData) === null || _catalogData === void 0 ? void 0 : _catalogData[0].options[(_vd$OptionOCD = vd.OptionOCD) !== null && _vd$OptionOCD !== void 0 ? _vd$OptionOCD : 'OPT' + vd.OPT];
+                  return {
+                    field: option.OptionOCD ? option.OptionOCD.substring(3) : vd.OPT,
+                    type: 'string',
+                    title: (_option$Name = option === null || option === void 0 ? void 0 : option.Name) !== null && _option$Name !== void 0 ? _option$Name : vd.OPT,
+                    readOnly: true,
+                    fieldType: 'OPT'
+                  };
+                })) || [];
+                //remove duplicates
+                opts = {};
+                for (_i = optFields.length - 1; _i >= 0; _i--) {
+                  if (!opts[optFields[_i].field]) {
+                    opts[optFields[_i].field] = true;
+                  } else {
+                    optFields.splice(_i, 1);
                   }
                 }
-
-                //mark all fields where there are differences between the variants as initaly selected
-                initialSelectedFields = optFields.filter(function (f) {
-                  return differingOPTs.includes(f.field);
-                });
-                ProductHandlerAbstract.baseDataFields.forEach(function (field) {
-                  if (variantDataModified.some(function (mod) {
-                    return mod[field.field];
-                  })) {
-                    initialSelectedFields.push(field);
-                  }
-                });
-                customBaseFields === null || customBaseFields === void 0 || customBaseFields.forEach(function (f) {
-                  if (variantDataModified.some(function (mod) {
-                    return mod['customData.' + f.field];
-                  })) {
-                    initialSelectedFields.push(f);
-                  }
-                });
               }
+
+              //mark all fields where there are differences between the variants as initaly selected
+              initialSelectedFields = optFields.filter(function (f) {
+                return differingOPTs.includes(f.field);
+              });
+              ProductHandlerAbstract.baseDataFields.forEach(function (field) {
+                if (variantDataModified.some(function (mod) {
+                  return mod[field.field];
+                })) {
+                  initialSelectedFields.push(field);
+                }
+              });
+              customBaseFields === null || customBaseFields === void 0 || customBaseFields.forEach(function (f) {
+                if (variantDataModified.some(function (mod) {
+                  return mod['customData.' + f.field];
+                })) {
+                  initialSelectedFields.push(f);
+                }
+              });
               initializedOptMap = this.initOpvMap(optFields, classificationConfig, optMap);
               return _context2.abrupt("return", {
                 baseData: baseData,
@@ -653,6 +434,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                 optFields: optFields,
                 initialSelectedFields: initialSelectedFields,
                 variantData: variantData,
+                catalogData: catalogData,
                 optClassMap: initializedOptMap,
                 addedProducts: products.total ? addedProducts : [],
                 removedProducts: products.total ? removedProducts : [],
@@ -666,7 +448,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                 availableLanguages: availableLanguages,
                 currentLang: currentLang
               });
-            case 47:
+            case 50:
             case "end":
               return _context2.stop();
           }
@@ -677,6 +459,191 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
       }
       return loadProducts;
     }())
+  }, {
+    key: "getProductDataByBasket",
+    value: function getProductDataByBasket(basket, catalogData, fieldConfiguration, baseProduct) {
+      var dataByBasket = {};
+      var isSet = !!(basket !== null && basket !== void 0 && basket.SetPlannerInfos);
+      dataByBasket.isSet = isSet;
+      if (basket) {
+        dataByBasket.dockingPoints = isSet ? undefined : basket.OrderSets[0].getDockingPointInfo();
+        dataByBasket.technicalDescription = isSet ? basket.OrderSets.reduce(function (total, os) {
+          return total + os.SetName + '\n' + os.VariantDescription + '\n\n';
+        }, '') : basket.OrderSets[0].VariantDescription;
+        dataByBasket.technicalDescription_locales = basket.OrderSets[0].VariantDescription_locales;
+        dataByBasket.modelName = catalogData === null || catalogData === void 0 ? void 0 : catalogData.map(function (c) {
+          return c.name;
+        }).filter(function (name) {
+          return name;
+        }).join(' - ');
+        dataByBasket.catalogDataBrand = catalogData === null || catalogData === void 0 ? void 0 : catalogData.map(function (c) {
+          return c.brand;
+        }).filter(function (brand) {
+          return brand;
+        }).join(' - ');
+        dataByBasket.info = catalogData === null || catalogData === void 0 ? void 0 : catalogData.map(function (c) {
+          return c.description;
+        }).filter(function (description) {
+          return description;
+        }).join('<br/>');
+        dataByBasket.modelName_locales = {};
+        for (var i = 0; i < (catalogData !== null && catalogData !== void 0 ? catalogData : []).length; i++) {
+          var c = catalogData[i];
+          for (var key in c.name_locales) {
+            if (!dataByBasket.modelName_locales[key]) {
+              dataByBasket.modelName_locales[key] = c.name_locales[key];
+            } else {
+              dataByBasket.modelName_locales[key] = dataByBasket.modelName_locales[key] + ' - ' + c.name_locales[key];
+            }
+          }
+          dataByBasket.info_locales = {};
+          for (var _key in c.description_locales) {
+            if (!dataByBasket.info_locales[_key]) {
+              dataByBasket.info_locales[_key] = c.description_locales[_key];
+            } else {
+              dataByBasket.info_locales[_key] = dataByBasket.info_locales[_key] + ' - ' + c.description_locales[_key];
+            }
+          }
+        }
+        if (fieldConfiguration !== null && fieldConfiguration !== void 0 && fieldConfiguration.delivery) {
+          var _baseProduct$delivery, _baseProduct$delivery2, _baseProduct$delivery3, _baseProduct$delivery4, _baseProduct$delivery5, _baseProduct$delivery6, _baseProduct$delivery7, _baseProduct$delivery8, _baseProduct$delivery9, _baseProduct$delivery10, _ref7, _baseProduct$delivery11, _baseProduct$delivery12, _fieldConfiguration$d, _ref8, _baseProduct$delivery13, _baseProduct$delivery14, _fieldConfiguration$d2, _ref9, _baseProduct$delivery15, _baseProduct$delivery16, _fieldConfiguration$d3;
+          var config = {
+            addedPackageWeight: 0,
+            addedPackageHeight: 0,
+            addedPackageWidth: 0,
+            addedPackageDepth: 0,
+            defaultDeliveryTime: 0,
+            defaultDeliveryPrice: 0,
+            defaultInstallationPrice: 0
+          };
+          if (typeof fieldConfiguration.delivery != 'boolean') {
+            config = _objectSpread(_objectSpread({}, config), fieldConfiguration.delivery);
+          }
+          var packages = [];
+          basket.OrderSets.flatMap(function (os) {
+            return os.OrderLines;
+          }).forEach(function (ol) {
+            packages.push({
+              height: ol.Height ? ol.Height + config.addedPackageHeight : 0,
+              width: ol.Width ? ol.Width + config.addedPackageWidth : 0,
+              depth: ol.Depth ? ol.Depth + config.addedPackageDepth : 0,
+              weight: ol.Weight ? ol.Weight + config.addedPackageWeight : 0
+            });
+          });
+          dataByBasket.delivery = {
+            estPackages: packages,
+            estMaxPackages: (_baseProduct$delivery = baseProduct === null || baseProduct === void 0 || (_baseProduct$delivery2 = baseProduct.delivery) === null || _baseProduct$delivery2 === void 0 ? void 0 : _baseProduct$delivery2.estMaxPackages) !== null && _baseProduct$delivery !== void 0 ? _baseProduct$delivery : packages.length,
+            estMaxPackageWeight: (_baseProduct$delivery3 = baseProduct === null || baseProduct === void 0 || (_baseProduct$delivery4 = baseProduct.delivery) === null || _baseProduct$delivery4 === void 0 ? void 0 : _baseProduct$delivery4.estMaxPackageWeight) !== null && _baseProduct$delivery3 !== void 0 ? _baseProduct$delivery3 : Math.max.apply(Math, [0].concat(_toConsumableArray(packages.map(function (p) {
+              return p.weight;
+            }).filter(function (f) {
+              return f;
+            })))),
+            estMaxPackageHeight: (_baseProduct$delivery5 = baseProduct === null || baseProduct === void 0 || (_baseProduct$delivery6 = baseProduct.delivery) === null || _baseProduct$delivery6 === void 0 ? void 0 : _baseProduct$delivery6.estMaxPackageHeight) !== null && _baseProduct$delivery5 !== void 0 ? _baseProduct$delivery5 : Math.max.apply(Math, [0].concat(_toConsumableArray(packages.map(function (p) {
+              return p.height;
+            }).filter(function (f) {
+              return f;
+            })))),
+            estMaxPackageWidth: (_baseProduct$delivery7 = baseProduct === null || baseProduct === void 0 || (_baseProduct$delivery8 = baseProduct.delivery) === null || _baseProduct$delivery8 === void 0 ? void 0 : _baseProduct$delivery8.estMaxPackageWidth) !== null && _baseProduct$delivery7 !== void 0 ? _baseProduct$delivery7 : Math.max.apply(Math, [0].concat(_toConsumableArray(packages.map(function (p) {
+              return p.width;
+            }).filter(function (f) {
+              return f;
+            })))),
+            estMaxPackageDepth: (_baseProduct$delivery9 = baseProduct === null || baseProduct === void 0 || (_baseProduct$delivery10 = baseProduct.delivery) === null || _baseProduct$delivery10 === void 0 ? void 0 : _baseProduct$delivery10.estMaxPackageDepth) !== null && _baseProduct$delivery9 !== void 0 ? _baseProduct$delivery9 : Math.max.apply(Math, [0].concat(_toConsumableArray(packages.map(function (p) {
+              return p.depth;
+            }).filter(function (f) {
+              return f;
+            })))),
+            deliveryTime: (_ref7 = (_baseProduct$delivery11 = baseProduct === null || baseProduct === void 0 || (_baseProduct$delivery12 = baseProduct.delivery) === null || _baseProduct$delivery12 === void 0 ? void 0 : _baseProduct$delivery12.deliveryTime) !== null && _baseProduct$delivery11 !== void 0 ? _baseProduct$delivery11 : (_fieldConfiguration$d = fieldConfiguration.delivery) === null || _fieldConfiguration$d === void 0 ? void 0 : _fieldConfiguration$d.defaultDeliveryTime) !== null && _ref7 !== void 0 ? _ref7 : 0,
+            deliveryPrice: (_ref8 = (_baseProduct$delivery13 = baseProduct === null || baseProduct === void 0 || (_baseProduct$delivery14 = baseProduct.delivery) === null || _baseProduct$delivery14 === void 0 ? void 0 : _baseProduct$delivery14.deliveryPrice) !== null && _baseProduct$delivery13 !== void 0 ? _baseProduct$delivery13 : (_fieldConfiguration$d2 = fieldConfiguration.delivery) === null || _fieldConfiguration$d2 === void 0 ? void 0 : _fieldConfiguration$d2.defaultDeliveryPrice) !== null && _ref8 !== void 0 ? _ref8 : 0,
+            installationPrice: (_ref9 = (_baseProduct$delivery15 = baseProduct === null || baseProduct === void 0 || (_baseProduct$delivery16 = baseProduct.delivery) === null || _baseProduct$delivery16 === void 0 ? void 0 : _baseProduct$delivery16.installationPrice) !== null && _baseProduct$delivery15 !== void 0 ? _baseProduct$delivery15 : (_fieldConfiguration$d3 = fieldConfiguration.delivery) === null || _fieldConfiguration$d3 === void 0 ? void 0 : _fieldConfiguration$d3.defaultInstallationPrice) !== null && _ref9 !== void 0 ? _ref9 : 0
+          };
+        }
+        var ismanual = (baseProduct === null || baseProduct === void 0 ? void 0 : baseProduct.calculatedPrice) !== (baseProduct === null || baseProduct === void 0 ? void 0 : baseProduct.addedPrice);
+        var price = {
+          calculatedPrice: basket === null || basket === void 0 ? void 0 : basket.SummaryPrice,
+          addedPrice: baseProduct === null || baseProduct === void 0 ? void 0 : baseProduct.addedPrice,
+          discountPrice: baseProduct === null || baseProduct === void 0 ? void 0 : baseProduct.discountedPrice
+        };
+        if (!(baseProduct !== null && baseProduct !== void 0 && baseProduct.calculatedPrice)) {
+          price = ProductHandlerAbstract.calcPrice(basket === null || basket === void 0 ? void 0 : basket.SummaryPrice, basket === null || basket === void 0 ? void 0 : basket.Discounts, baseProduct === null || baseProduct === void 0 ? void 0 : baseProduct.calculatedPrice, ismanual);
+        }
+        dataByBasket.price = price;
+        dataByBasket.calculatedPrice = price.calculatedPrice;
+        if (isSet) {
+          var _basket$SetPlannerInf, _basket$SetPlannerInf2, _basket$OrderSets$0$B, _basket$SetPlannerInf3, _basket$SetPlannerInf4;
+          dataByBasket.width = (_basket$SetPlannerInf = basket.SetPlannerInfos) === null || _basket$SetPlannerInf === void 0 || (_basket$SetPlannerInf = _basket$SetPlannerInf.BBox) === null || _basket$SetPlannerInf === void 0 ? void 0 : _basket$SetPlannerInf.X;
+          dataByBasket.height = (_basket$SetPlannerInf2 = basket.SetPlannerInfos) === null || _basket$SetPlannerInf2 === void 0 || (_basket$SetPlannerInf2 = _basket$SetPlannerInf2.BBox) === null || _basket$SetPlannerInf2 === void 0 ? void 0 : _basket$SetPlannerInf2.Z;
+          dataByBasket.depth = basket === null || basket === void 0 || (_basket$OrderSets$0$B = basket.OrderSets[0].BBox) === null || _basket$OrderSets$0$B === void 0 ? void 0 : _basket$OrderSets$0$B.Y;
+          dataByBasket.image = (_basket$SetPlannerInf3 = basket.SetPlannerInfos) === null || _basket$SetPlannerInf3 === void 0 ? void 0 : _basket$SetPlannerInf3.SetPlannerImg3D;
+          dataByBasket.image2D = (_basket$SetPlannerInf4 = basket.SetPlannerInfos) === null || _basket$SetPlannerInf4 === void 0 ? void 0 : _basket$SetPlannerInf4.SetPlannerImg2D;
+          dataByBasket.catalogId = basket.OrderSets.map(function (os) {
+            return os.CatalogGUID;
+          });
+          dataByBasket.collection = basket.OrderSets.map(function (os) {
+            return os.AccountName;
+          });
+          dataByBasket.collectionId = basket.OrderSets.map(function (os) {
+            return os.CollectionGUID;
+          });
+          dataByBasket.catCodex = basket.OrderSets.map(function (os) {
+            return os.CatalogCodex;
+          });
+        } else {
+          var _basket$OrderSets$0$B2, _basket$OrderSets$0$B3, _basket$OrderSets$0$B4;
+          dataByBasket.width = basket === null || basket === void 0 || (_basket$OrderSets$0$B2 = basket.OrderSets[0].BBox) === null || _basket$OrderSets$0$B2 === void 0 ? void 0 : _basket$OrderSets$0$B2.X;
+          dataByBasket.height = basket === null || basket === void 0 || (_basket$OrderSets$0$B3 = basket.OrderSets[0].BBox) === null || _basket$OrderSets$0$B3 === void 0 ? void 0 : _basket$OrderSets$0$B3.Z;
+          dataByBasket.depth = basket === null || basket === void 0 || (_basket$OrderSets$0$B4 = basket.OrderSets[0].BBox) === null || _basket$OrderSets$0$B4 === void 0 ? void 0 : _basket$OrderSets$0$B4.Y;
+          dataByBasket.image = basket.OrderSets[0].SetImage;
+          dataByBasket.image2D = basket.OrderSets[0].Set2DImage;
+          dataByBasket.catalogId = [basket.OrderSets[0].CatalogGUID];
+          dataByBasket.collection = [basket.OrderSets[0].AccountName];
+          dataByBasket.collectionId = [basket.OrderSets[0].CollectionGUID];
+          dataByBasket.catCodex = [basket.OrderSets[0].CatalogCodex];
+        }
+        dataByBasket.weight = basket === null || basket === void 0 ? void 0 : basket.OrderSets.flatMap(function (os) {
+          return os.OrderLines.map(function (ol) {
+            return ol.Weight;
+          }).filter(function (f) {
+            return f;
+          });
+        }).reduce(function (sum, v) {
+          return sum + v;
+        }, 0);
+        dataByBasket.supplierId = catalogData === null || catalogData === void 0 ? void 0 : catalogData.map(function (c) {
+          return c.supplierGuid;
+        }).filter(function (c) {
+          return c;
+        });
+        dataByBasket.retailCatalogNr = catalogData === null || catalogData === void 0 ? void 0 : catalogData.map(function (c) {
+          return c.retailCatalogNr;
+        }).filter(function (c) {
+          return c;
+        });
+        dataByBasket.supplierArticleNr = basket.OrderSets.flatMap(function (os) {
+          return os.OrderLines.map(function (ol) {
+            return ol.ConfigArticleCodex;
+          }).filter(function (f) {
+            return f;
+          });
+        }).filter(function (f) {
+          return f;
+        });
+        dataByBasket.retailCatalogArticleNr = basket.OrderSets.flatMap(function (os) {
+          return os.OrderLines.map(function (ol) {
+            return ol.RetailArticleNr;
+          }).filter(function (f) {
+            return f;
+          });
+        }).filter(function (f) {
+          return f;
+        });
+        dataByBasket.orderText = basket.getEKText(true);
+        dataByBasket.uniqueHash = isSet ? ProductHandlerAbstract.getHashValue(basket.OrderSets.map(function (os) {
+          return os.SetHash;
+        }).join(''), basket.Diva3DProject) : ProductHandlerAbstract.getHashValue(basket.SetHash, basket.Diva3DProject);
+      }
+      return dataByBasket;
+    }
   }, {
     key: "checkAndAddClassificationConfigCategories",
     value: function checkAndAddClassificationConfigCategories(baseProduct, classificationConfig) {
@@ -767,11 +734,11 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
     value: function () {
       var _prepareData = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref11) {
         var _this3 = this;
-        var baseData, classificationData, variantData, removedProducts, removedMedia, classificationFields, fieldConfiguration, optMap, _ref11$oldClassificat, oldClassificationData, originProductId, products, originProduct, sapEinaLifNr, sapEineEkgrp, result, _this$closeModal, _originProduct$percen, _originProduct$discou, _baseData$variantId, _originProduct$create, _originProduct$create2, _originProduct$create3, baseProduct, j, mediaRef, _this$openModal, _this$t, _j, _this$openModal2, _this$t2, savedMedia, _loop, _j2;
+        var basket, baseData, classificationData, variantData, removedProducts, removedMedia, classificationFields, fieldConfiguration, optMap, _ref11$oldClassificat, oldClassificationData, originProductId, products, originProduct, sapEinaLifNr, sapEineEkgrp, result, _this$closeModal, _originProduct$percen, _originProduct$discou, _baseData$variantId, _originProduct$create, _originProduct$create2, _originProduct$create3, baseProduct, j, mediaRef, _this$openModal, _this$t, _j, _this$openModal2, _this$t2, savedMedia, _loop, _j2;
         return _regeneratorRuntime.wrap(function _callee3$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              baseData = _ref11.baseData, classificationData = _ref11.classificationData, variantData = _ref11.variantData, removedProducts = _ref11.removedProducts, removedMedia = _ref11.removedMedia, classificationFields = _ref11.classificationFields, fieldConfiguration = _ref11.fieldConfiguration, optMap = _ref11.optMap, _ref11$oldClassificat = _ref11.oldClassificationData, oldClassificationData = _ref11$oldClassificat === void 0 ? {} : _ref11$oldClassificat, originProductId = _ref11.originProductId;
+              basket = _ref11.basket, baseData = _ref11.baseData, classificationData = _ref11.classificationData, variantData = _ref11.variantData, removedProducts = _ref11.removedProducts, removedMedia = _ref11.removedMedia, classificationFields = _ref11.classificationFields, fieldConfiguration = _ref11.fieldConfiguration, optMap = _ref11.optMap, _ref11$oldClassificat = _ref11.oldClassificationData, oldClassificationData = _ref11$oldClassificat === void 0 ? {} : _ref11$oldClassificat, originProductId = _ref11.originProductId;
               products = [];
               originProduct = undefined;
               if (!originProductId) {
@@ -850,11 +817,11 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                     var value = _ref17[1];
                   return value;
                 }).forEach(function (_ref18) {
-                  var _baseProduct51;
+                  var _baseProduct16;
                   var _ref19 = _slicedToArray(_ref18, 2),
                     key = _ref19[0],
                     value = _ref19[1];
-                  return baseProduct["dc_".concat(key)] = _objectSpread(_objectSpread({}, (_baseProduct51 = baseProduct["dc_".concat(key)]) !== null && _baseProduct51 !== void 0 ? _baseProduct51 : {}), {}, {
+                  return baseProduct["dc_".concat(key)] = _objectSpread(_objectSpread({}, (_baseProduct16 = baseProduct["dc_".concat(key)]) !== null && _baseProduct16 !== void 0 ? _baseProduct16 : {}), {}, {
                     opt: value.field
                   });
                 });
@@ -939,7 +906,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                 baseProduct.parent = baseProduct._id;
               }
               _loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop() {
-                var _originProduct;
+                var _originProduct, _basket$getProductCon2;
                 var vd, varinatBase, classData, customData, variantPos, productId, preparedProduct, product, _this3$openModal, _this3$t, k, _savedMedia;
                 return _regeneratorRuntime.wrap(function _loop$(_context3) {
                   while (1) switch (_context3.prev = _context3.next) {
@@ -1049,6 +1016,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                         modelName_locales: vd.modelName_locales,
                         shortDescription_locales: vd.shortDescription_locales,
                         width: vd.width,
+                        configuration: (_basket$getProductCon2 = basket === null || basket === void 0 ? void 0 : basket.getProductConfiguration(typeof vd.variantId == 'string' ? Number(vd.variantId) : vd.variantId)) !== null && _basket$getProductCon2 !== void 0 ? _basket$getProductCon2 : vd.configuration,
                         height: vd.height,
                         depth: vd.depth,
                         calculatedPrice: vd.calculatedPrice,
@@ -1059,7 +1027,6 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                         variantPosition: variantPos,
                         image: vd.image,
                         image2D: vd.image2D,
-                        articles: vd.articles,
                         affiliate: vd.affiliate,
                         originDivaNr: vd.originDivaNr,
                         organizationId: baseProduct.organizationId,
@@ -1161,43 +1128,66 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
       }
     }
   }, {
-    key: "saveBasketAndProducts",
+    key: "saveProducts",
     value: function () {
-      var _saveBasketAndProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref28) {
-        var products, removedProducts, basket, awaitPDF, _this$closeModal2, savedProducts, _this$closeModal3;
+      var _saveProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref28) {
+        var products, removedProducts, awaitPDF, _this$closeModal2, savedProducts, _this$closeModal3;
         return _regeneratorRuntime.wrap(function _callee4$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              products = _ref28.products, removedProducts = _ref28.removedProducts, basket = _ref28.basket, awaitPDF = _ref28.awaitPDF;
+              products = _ref28.products, removedProducts = _ref28.removedProducts, awaitPDF = _ref28.awaitPDF;
               if (this.jwt) {
                 _context5.next = 3;
                 break;
               }
               throw new Error('jwt not set');
             case 3:
-              _context5.prev = 3;
-              _context5.next = 6;
-              return this.apiSaveBasketAndProducts(this.catalogService, this.jwt, products, awaitPDF, basket, removedProducts);
-            case 6:
+              this.setFirstVariant(products);
+              _context5.prev = 4;
+              _context5.next = 7;
+              return this.apiSaveProducts(this.catalogService, this.jwt, products, awaitPDF, removedProducts);
+            case 7:
               savedProducts = _context5.sent;
               (_this$closeModal2 = this.closeModal) === null || _this$closeModal2 === void 0 || _this$closeModal2.call(this);
               return _context5.abrupt("return", savedProducts);
-            case 11:
-              _context5.prev = 11;
-              _context5.t0 = _context5["catch"](3);
+            case 12:
+              _context5.prev = 12;
+              _context5.t0 = _context5["catch"](4);
               (_this$closeModal3 = this.closeModal) === null || _this$closeModal3 === void 0 || _this$closeModal3.call(this);
               throw new Error(_context5.t0.message);
-            case 15:
+            case 16:
             case "end":
               return _context5.stop();
           }
-        }, _callee4, this, [[3, 11]]);
+        }, _callee4, this, [[4, 12]]);
       }));
-      function saveBasketAndProducts(_x4) {
-        return _saveBasketAndProducts.apply(this, arguments);
+      function saveProducts(_x4) {
+        return _saveProducts.apply(this, arguments);
       }
-      return saveBasketAndProducts;
-    }()
+      return saveProducts;
+    }() //variant with lowest variantId gets a flag for filtering purposes
+  }, {
+    key: "setFirstVariant",
+    value: function setFirstVariant(products) {
+      var _variants$;
+      products.map(function (p) {
+        return p.firstVariant = false;
+      });
+      var variants = products.filter(function (p) {
+        return p.variantId !== undefined;
+      });
+      if (!(variants !== null && variants !== void 0 && variants.length)) return;
+      var firstVariant = variants[0];
+      var lowestId = (_variants$ = variants[0]) === null || _variants$ === void 0 ? void 0 : _variants$.variantId;
+      for (var i = 0; i < variants.length; i++) {
+        if (lowestId > variants[i].variantId) {
+          lowestId = variants[i].variantId;
+          firstVariant = variants[i];
+        }
+      }
+      firstVariant.firstVariant = true;
+    }
+
     /**
      * Calculates the inital state of one varinat data entry
      *
@@ -1207,11 +1197,15 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
      */
   }, {
     key: "initVariant",
-    value: function initVariant(baseData, baseClassification, availableLanguages, cv, product, classificationFields, fieldConfiguration, customBaseFields, classificationConfig) {
-      var _cv$VariantDescriptio, _cv$VariantDescriptio2, _baseData$articles, _classificationFields;
-      var _this$parseClassifica = this.parseClassificationFields(product),
+    value: function initVariant(baseData, baseClassification, availableLanguages, catalogData, basket, cv, variantProduct, classificationFields, fieldConfiguration, customBaseFields, classificationConfig) {
+      var _basket$OrderSets$0$C3, _ref30, _variantProduct$confi, _classificationFields;
+      var _this$parseClassifica = this.parseClassificationFields(variantProduct),
         parsedProduct = _this$parseClassifica.product;
-      var _ref29 = cv || {},
+      var _ref29 = (basket === null || basket === void 0 || (_basket$OrderSets$0$C3 = basket.OrderSets[0].ConfigVariants) === null || _basket$OrderSets$0$C3 === void 0 ? void 0 : _basket$OrderSets$0$C3.find(function (vd) {
+          return vd.VariantID === cv;
+        })) || {
+          VariantBasketDatas: ProductHandlerAbstract.getVariantBasketDatasByOrderlines((_ref30 = variantProduct === null || variantProduct === void 0 || (_variantProduct$confi = variantProduct.configuration) === null || _variantProduct$confi === void 0 ? void 0 : _variantProduct$confi.OrderSets[0].OrderLines) !== null && _ref30 !== void 0 ? _ref30 : [], catalogData)
+        },
         VariantID = _ref29.VariantID,
         SetImage = _ref29.SetImage,
         Set2DImage = _ref29.Set2DImage,
@@ -1222,27 +1216,29 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
         MetaData_locales = _ref29.MetaData_locales,
         Variant = _ref29.Variant,
         SetHash = _ref29.SetHash,
-        Diva3DProject = _ref29.Diva3DProject;
+        Diva3DProject = _ref29.Diva3DProject,
+        VariantDescription_locales = _ref29.VariantDescription_locales,
+        VariantDescription = _ref29.VariantDescription;
       //total and summary price are currently not avialable per varinat,
       //most of the time the prices will allways be the same and since we currently not support varinats for multiple sets
       //we use the addedPrice of the baseData as long as the calculatedPrice is the same as the SetPrice of the variant
 
-      var ismanual = (product === null || product === void 0 ? void 0 : product.calculatedPrice) !== (product === null || product === void 0 ? void 0 : product.addedPrice);
-      var price = ProductHandlerAbstract.calcPrice(SetPrice !== null && SetPrice !== void 0 ? SetPrice : 0, [], product === null || product === void 0 ? void 0 : product.calculatedPrice, ismanual);
+      var ismanual = (variantProduct === null || variantProduct === void 0 ? void 0 : variantProduct.calculatedPrice) !== (variantProduct === null || variantProduct === void 0 ? void 0 : variantProduct.addedPrice);
+      var price = ProductHandlerAbstract.calcPrice(SetPrice !== null && SetPrice !== void 0 ? SetPrice : 0, [], variantProduct === null || variantProduct === void 0 ? void 0 : variantProduct.calculatedPrice, ismanual);
       var addedPrice;
       if (SetPrice == baseData.calculatedPrice) {
         addedPrice = baseData.addedPrice;
       } else {
         addedPrice = price.calculatedPrice;
       }
-      var isManual = (product === null || product === void 0 ? void 0 : product.addedPrice) !== (product === null || product === void 0 ? void 0 : product.calculatedPrice);
+      var isManual = (variantProduct === null || variantProduct === void 0 ? void 0 : variantProduct.addedPrice) !== (variantProduct === null || variantProduct === void 0 ? void 0 : variantProduct.calculatedPrice);
       if (isManual) {
-        addedPrice = product === null || product === void 0 ? void 0 : product.addedPrice;
+        addedPrice = variantProduct === null || variantProduct === void 0 ? void 0 : variantProduct.addedPrice;
       }
-      var _this$parseMetaDataAn2 = this.parseMetaDataAndClassificationInformation(MetaData !== null && MetaData !== void 0 ? MetaData : {}, MetaData_locales, product, classificationConfig, customBaseFields),
+      var _this$parseMetaDataAn2 = this.parseMetaDataAndClassificationInformation(MetaData !== null && MetaData !== void 0 ? MetaData : {}, MetaData_locales, variantProduct, classificationConfig, customBaseFields),
         classificationData = _this$parseMetaDataAn2.classificationData,
         customData = _this$parseMetaDataAn2.customData;
-      customData = _objectSpread(_objectSpread({}, product === null || product === void 0 ? void 0 : product.customData), customData);
+      customData = _objectSpread(_objectSpread({}, variantProduct === null || variantProduct === void 0 ? void 0 : variantProduct.customData), customData);
       var variant = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, baseData), {}, {
         media: undefined,
         //set media undefined, just in case "baseData" has media but "parsedProduct" does not have media to overwrite it
@@ -1252,8 +1248,8 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
         width: BBox === null || BBox === void 0 ? void 0 : BBox.X,
         height: BBox === null || BBox === void 0 ? void 0 : BBox.Z,
         depth: BBox === null || BBox === void 0 ? void 0 : BBox.Y,
-        technicalDescription: (_cv$VariantDescriptio = cv === null || cv === void 0 ? void 0 : cv.VariantDescription) !== null && _cv$VariantDescriptio !== void 0 ? _cv$VariantDescriptio : baseData.technicalDescription,
-        technicalDescription_locales: (_cv$VariantDescriptio2 = cv === null || cv === void 0 ? void 0 : cv.VariantDescription_locales) !== null && _cv$VariantDescriptio2 !== void 0 ? _cv$VariantDescriptio2 : baseData.technicalDescription_locales
+        technicalDescription: VariantDescription !== null && VariantDescription !== void 0 ? VariantDescription : baseData.technicalDescription,
+        technicalDescription_locales: VariantDescription_locales !== null && VariantDescription_locales !== void 0 ? VariantDescription_locales : baseData.technicalDescription_locales
       }, parsedProduct), {}, {
         customData: customData
       }, classificationData), {}, {
@@ -1262,18 +1258,6 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
         //only if cv is not defined fallback to the values in product
         addedPrice: addedPrice,
         calculatedPrice: price.calculatedPrice,
-        articles: VariantBasketDatas ? (_baseData$articles = baseData.articles) === null || _baseData$articles === void 0 ? void 0 : _baseData$articles.map(function (art) {
-          return _objectSpread(_objectSpread({}, art), {}, {
-            variantValues: VariantBasketDatas === null || VariantBasketDatas === void 0 ? void 0 : VariantBasketDatas.filter(function (vb) {
-              return !vb.IsDescribingState;
-            }).map(function (vb) {
-              return {
-                OPT: vb.OptionOCD ? vb.OptionOCD.substring(3) : vb.OPT,
-                OPV: vb.OCD ? vb.OCD.substring(3) : vb.OPV
-              };
-            })
-          });
-        }) : parsedProduct.articles,
         variantId: VariantID !== null && VariantID !== void 0 ? VariantID : parsedProduct.variantId,
         image: SetImage !== null && SetImage !== void 0 ? SetImage : parsedProduct.image,
         image2D: Set2DImage !== null && Set2DImage !== void 0 ? Set2DImage : parsedProduct.image2D,
@@ -1363,10 +1347,10 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
     key: "initOpvMap",
     value: function initOpvMap(optFields, classificationConfig, savedOptMap) {
       var optMap = {};
-      Object.entries((classificationConfig === null || classificationConfig === void 0 ? void 0 : classificationConfig.classMap) || {}).forEach(function (_ref30) {
-        var _ref31 = _slicedToArray(_ref30, 2),
-          c = _ref31[0],
-          optMapping = _ref31[1].optMapping;
+      Object.entries((classificationConfig === null || classificationConfig === void 0 ? void 0 : classificationConfig.classMap) || {}).forEach(function (_ref31) {
+        var _ref32 = _slicedToArray(_ref31, 2),
+          c = _ref32[0],
+          optMapping = _ref32[1].optMapping;
         var optField;
         if (savedOptMap !== null && savedOptMap !== void 0 && savedOptMap[c]) {
           optField = optFields.find(function (opt) {
@@ -1427,16 +1411,16 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
       var _classificationConfig;
       //add metadata defined as classification to classificationdata
       var metadataAsClassification = {};
-      Object.entries(metaData).filter(function (_ref32) {
-        var _ref33 = _slicedToArray(_ref32, 1),
-          key = _ref33[0];
+      Object.entries(metaData !== null && metaData !== void 0 ? metaData : {}).filter(function (_ref33) {
+        var _ref34 = _slicedToArray(_ref33, 1),
+          key = _ref34[0];
         return classificationConfig === null || classificationConfig === void 0 ? void 0 : classificationConfig.classMap[key];
       })
       //if it is defiend as multi field, use full array otherwise only first element of array
-      .forEach(function (_ref34) {
-        var _ref35 = _slicedToArray(_ref34, 2),
-          key = _ref35[0],
-          value = _ref35[1];
+      .forEach(function (_ref35) {
+        var _ref36 = _slicedToArray(_ref35, 2),
+          key = _ref36[0],
+          value = _ref36[1];
         return metadataAsClassification[key] = classificationConfig.classMap[key].multi ? value : value === null || value === void 0 ? void 0 : value[0];
       });
 
@@ -1446,14 +1430,14 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
         optMap = _this$parseClassifica2.optMap;
       var classificationData = _objectSpread(_objectSpread({}, metadataAsClassification), productClassification);
       var customData = {};
-      Object.entries(metaData).filter(function (_ref36) {
-        var _ref37 = _slicedToArray(_ref36, 1),
-          key = _ref37[0];
+      Object.entries(metaData !== null && metaData !== void 0 ? metaData : {}).filter(function (_ref37) {
+        var _ref38 = _slicedToArray(_ref37, 1),
+          key = _ref38[0];
         return !(classificationConfig !== null && classificationConfig !== void 0 && classificationConfig.classMap[key]);
-      }).forEach(function (_ref38) {
-        var _ref39 = _slicedToArray(_ref38, 2),
-          key = _ref39[0],
-          value = _ref39[1];
+      }).forEach(function (_ref39) {
+        var _ref40 = _slicedToArray(_ref39, 2),
+          key = _ref40[0],
+          value = _ref40[1];
         var langs = {};
         if (metaData_locales !== null && metaData_locales !== void 0 && metaData_locales[key]) {
           for (var i = 0; i < metaData_locales[key].length; i++) {
@@ -1485,19 +1469,19 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
 
       //repare customData
       //if it is defiend as multi field, use full array otherwise only first element of array
-      Object.entries((_classificationConfig = classificationConfig === null || classificationConfig === void 0 ? void 0 : classificationConfig.additional) !== null && _classificationConfig !== void 0 ? _classificationConfig : []).filter(function (_ref40) {
-        var _ref41 = _slicedToArray(_ref40, 1),
-          key = _ref41[0];
+      Object.entries((_classificationConfig = classificationConfig === null || classificationConfig === void 0 ? void 0 : classificationConfig.additional) !== null && _classificationConfig !== void 0 ? _classificationConfig : []).filter(function (_ref41) {
+        var _ref42 = _slicedToArray(_ref41, 1),
+          key = _ref42[0];
         return customData[key] != undefined;
-      }).forEach(function (_ref42) {
-        var _ref43 = _slicedToArray(_ref42, 2),
-          key = _ref43[0],
-          value = _ref43[1];
+      }).forEach(function (_ref43) {
+        var _ref44 = _slicedToArray(_ref43, 2),
+          key = _ref44[0],
+          value = _ref44[1];
         if (value.multi && !Array.isArray(customData[key])) {
           customData[key] = [customData[key]];
         } else if (!value.multi && Array.isArray(customData[key])) {
-          var _key3;
-          customData[key] = (_key3 = customData[key]) === null || _key3 === void 0 ? void 0 : _key3[0];
+          var _key2;
+          customData[key] = (_key2 = customData[key]) === null || _key2 === void 0 ? void 0 : _key2[0];
         }
       });
       return {
@@ -1622,52 +1606,172 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
       }
       return apiGetProducts;
     }()
+  }, {
+    key: "apiGetCatalogData",
+    value: function () {
+      var _apiGetCatalogData = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7(catalogCodex, language, accountId) {
+        var _response$CollectionG, _response$Properties, _response$Properties2;
+        var currentAccountSessionId, fullUrl, response, actCatalogInfoData;
+        return _regeneratorRuntime.wrap(function _callee7$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
+            case 0:
+              _context8.next = 2;
+              return this.apiAccountLogin(accountId);
+            case 2:
+              currentAccountSessionId = _context8.sent;
+              if (currentAccountSessionId) {
+                _context8.next = 5;
+                break;
+              }
+              return _context8.abrupt("return");
+            case 5:
+              fullUrl = this.api2 + '?function=GetJsonCatalogData' + '&catalogCodex=' + catalogCodex + '&IncludeVariantValues=True&lang=' + language.toLocaleUpperCase();
+              _context8.next = 8;
+              return fetch(fullUrl, {
+                headers: {
+                  sessionGuid: currentAccountSessionId
+                }
+              }).then(function (res) {
+                if (res.status !== 200) {
+                  throw new Error('Collections not loaded.');
+                }
+                return res.json();
+              });
+            case 8:
+              response = _context8.sent;
+              if (!response.Error) {
+                _context8.next = 11;
+                break;
+              }
+              throw new Error(response.Error);
+            case 11:
+              actCatalogInfoData = {
+                lang: language,
+                guid: response.GUID,
+                name: response.Name,
+                name_locales: response.Name_locales,
+                codex: catalogCodex,
+                accountLogo: response.AccountLogo,
+                description: response.LongDescription,
+                description_locales: response.LongDescription_locales,
+                hasPlanner: response.HasIDMPlanner == 'True',
+                brand: response.Brandname,
+                supplierGuid: response.SupplierGUID,
+                retailCatalogNr: response.RetailCatalogNr,
+                accountGuid: (_response$CollectionG = response.CollectionGuid) !== null && _response$CollectionG !== void 0 ? _response$CollectionG : response.AccountGuid,
+                options: response.Options,
+                optionValues: response.Optionvalues,
+                currency: response.currency,
+                has3D: !!((_response$Properties = response.Properties) !== null && _response$Properties !== void 0 && (_response$Properties = _response$Properties.find(function (p) {
+                  return p.Codex == 'DIVA3D_RENDERING';
+                })) !== null && _response$Properties !== void 0 && _response$Properties.Value),
+                images: [],
+                documents: [],
+                accountSessionId: response.AccountSessionGuid,
+                arReady: !!((_response$Properties2 = response.Properties) !== null && _response$Properties2 !== void 0 && (_response$Properties2 = _response$Properties2.find(function (p) {
+                  return p.Codex == 'DIVA3D_AR_READY';
+                })) !== null && _response$Properties2 !== void 0 && _response$Properties2.Value)
+              };
+              return _context8.abrupt("return", actCatalogInfoData);
+            case 13:
+            case "end":
+              return _context8.stop();
+          }
+        }, _callee7, this);
+      }));
+      function apiGetCatalogData(_x9, _x10, _x11) {
+        return _apiGetCatalogData.apply(this, arguments);
+      }
+      return apiGetCatalogData;
+    }()
+  }, {
+    key: "apiAccountLogin",
+    value: function () {
+      var _apiAccountLogin = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8(accountId) {
+        var fullUrl, response;
+        return _regeneratorRuntime.wrap(function _callee8$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
+            case 0:
+              fullUrl = this.api2 + '?function=JsonAccountLogin&UserRole=v&accountGuid=' + accountId;
+              _context9.t0 = fetch;
+              _context9.t1 = fullUrl;
+              _context9.next = 5;
+              return this.sessionGuid;
+            case 5:
+              _context9.t2 = _context9.sent;
+              _context9.t3 = {
+                sessionGuid: _context9.t2
+              };
+              _context9.t4 = {
+                headers: _context9.t3
+              };
+              _context9.next = 10;
+              return (0, _context9.t0)(_context9.t1, _context9.t4).then(function (res) {
+                if (res.status !== 200) {
+                  throw new Error('Collections not loaded.');
+                }
+                return res.json();
+              });
+            case 10:
+              response = _context9.sent;
+              return _context9.abrupt("return", response.SessionGUID);
+            case 12:
+            case "end":
+              return _context9.stop();
+          }
+        }, _callee8, this);
+      }));
+      function apiAccountLogin(_x12) {
+        return _apiAccountLogin.apply(this, arguments);
+      }
+      return apiAccountLogin;
+    }()
   }, {
     key: "apiGetProductVariants",
     value: function () {
-      var _apiGetProductVariants = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7(id, full) {
+      var _apiGetProductVariants = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9(id, full) {
         var _res2;
         var fullUrl, res, resData;
-        return _regeneratorRuntime.wrap(function _callee7$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        return _regeneratorRuntime.wrap(function _callee9$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               fullUrl = this.catalogService + '/v1/products/' + id + '/variants' + (full ? '?full=true' : '');
-              _context8.prev = 1;
-              _context8.next = 4;
+              _context10.prev = 1;
+              _context10.next = 4;
               return axios.get(fullUrl, {
                 headers: _objectSpread(_objectSpread({}, this.getHeaders()), {}, {
                   'Content-Type': 'application/json'
                 })
               });
             case 4:
-              res = _context8.sent;
-              _context8.next = 7;
+              res = _context10.sent;
+              _context10.next = 7;
               return res.data;
             case 7:
-              resData = _context8.sent;
-              _context8.next = 13;
+              resData = _context10.sent;
+              _context10.next = 13;
               break;
             case 10:
-              _context8.prev = 10;
-              _context8.t0 = _context8["catch"](1);
+              _context10.prev = 10;
+              _context10.t0 = _context10["catch"](1);
               throw new Error('Could not get existing products', {
-                cause: _context8.t0
+                cause: _context10.t0
               });
             case 13:
               if (!(((_res2 = res) === null || _res2 === void 0 ? void 0 : _res2.status) == 200)) {
-                _context8.next = 15;
+                _context10.next = 15;
                 break;
               }
-              return _context8.abrupt("return", resData);
+              return _context10.abrupt("return", resData);
             case 15:
               throw new Error(resData.error);
             case 16:
             case "end":
-              return _context8.stop();
+              return _context10.stop();
           }
-        }, _callee7, this, [[1, 10]]);
+        }, _callee9, this, [[1, 10]]);
       }));
-      function apiGetProductVariants(_x9, _x10) {
+      function apiGetProductVariants(_x13, _x14) {
         return _apiGetProductVariants.apply(this, arguments);
       }
       return apiGetProductVariants;
@@ -1675,7 +1779,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
   }, {
     key: "apiGetProductByFilter",
     value: function () {
-      var _apiGetProductByFilter = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8(filter) {
+      var _apiGetProductByFilter = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee10(filter) {
         var _res3;
         var limit,
           useFilter,
@@ -1684,39 +1788,39 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
           res,
           resData,
           filterParam,
-          _args9 = arguments;
-        return _regeneratorRuntime.wrap(function _callee8$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+          _args11 = arguments;
+        return _regeneratorRuntime.wrap(function _callee10$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              limit = _args9.length > 1 && _args9[1] !== undefined ? _args9[1] : 1;
-              useFilter = _args9.length > 2 ? _args9[2] : undefined;
-              hierarchy = _args9.length > 3 ? _args9[3] : undefined;
+              limit = _args11.length > 1 && _args11[1] !== undefined ? _args11[1] : 1;
+              useFilter = _args11.length > 2 ? _args11[2] : undefined;
+              hierarchy = _args11.length > 3 ? _args11[3] : undefined;
               fullUrl = this.catalogService + '/v1/products';
-              _context9.prev = 4;
+              _context11.prev = 4;
               filterParam = useFilter ? 'filter' : 'search';
-              _context9.next = 8;
+              _context11.next = 8;
               return axios.get("".concat(fullUrl, "?organizationIds=").concat(this.organization._id, "&").concat(filterParam, "=").concat(encodeURIComponent(this.parseFilter(filter)), "&limit=").concat(limit, "&hierarchy=").concat(hierarchy !== null && hierarchy !== void 0 ? hierarchy : false), {
                 headers: _objectSpread(_objectSpread({}, this.getHeaders()), {}, {
                   'Content-Type': 'application/json'
                 })
               });
             case 8:
-              res = _context9.sent;
-              _context9.next = 11;
+              res = _context11.sent;
+              _context11.next = 11;
               return res.data;
             case 11:
-              resData = _context9.sent;
-              _context9.next = 17;
+              resData = _context11.sent;
+              _context11.next = 17;
               break;
             case 14:
-              _context9.prev = 14;
-              _context9.t0 = _context9["catch"](4);
+              _context11.prev = 14;
+              _context11.t0 = _context11["catch"](4);
               throw new Error('Could not get existing products', {
-                cause: _context9.t0
+                cause: _context11.t0
               });
             case 17:
               if (!(((_res3 = res) === null || _res3 === void 0 ? void 0 : _res3.status) == 200)) {
-                _context9.next = 20;
+                _context11.next = 20;
                 break;
               }
               //in order to be backwardscompatible we must transform old products here
@@ -1729,16 +1833,16 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                 }
                 return d;
               });
-              return _context9.abrupt("return", resData);
+              return _context11.abrupt("return", resData);
             case 20:
               throw new Error(resData.error);
             case 21:
             case "end":
-              return _context9.stop();
+              return _context11.stop();
           }
-        }, _callee8, this, [[4, 14]]);
+        }, _callee10, this, [[4, 14]]);
       }));
-      function apiGetProductByFilter(_x11) {
+      function apiGetProductByFilter(_x15) {
         return _apiGetProductByFilter.apply(this, arguments);
       }
       return apiGetProductByFilter;
@@ -1746,51 +1850,51 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
   }, {
     key: "apiSetCustomFlag",
     value: function () {
-      var _apiSetCustomFlag = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9(id, flagName, organizationId, dependsOn) {
+      var _apiSetCustomFlag = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee11(id, flagName, organizationId, dependsOn) {
         var _res4;
         var fullUrl, res, resData;
-        return _regeneratorRuntime.wrap(function _callee9$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime.wrap(function _callee11$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               fullUrl = new URL(this.catalogService + '/v1/products/' + id + '/' + flagName);
               fullUrl.searchParams.append('organizationId', organizationId);
               if (dependsOn) fullUrl.searchParams.append('dependsOn', dependsOn);
-              _context10.prev = 3;
-              _context10.next = 6;
+              _context12.prev = 3;
+              _context12.next = 6;
               return axios.post(fullUrl.toString(), undefined, {
                 headers: _objectSpread(_objectSpread({}, this.getHeaders()), {}, {
                   'Content-Type': 'application/json'
                 })
               });
             case 6:
-              res = _context10.sent;
-              _context10.next = 9;
+              res = _context12.sent;
+              _context12.next = 9;
               return res.data;
             case 9:
-              resData = _context10.sent;
-              _context10.next = 15;
+              resData = _context12.sent;
+              _context12.next = 15;
               break;
             case 12:
-              _context10.prev = 12;
-              _context10.t0 = _context10["catch"](3);
+              _context12.prev = 12;
+              _context12.t0 = _context12["catch"](3);
               throw new Error('Could not get existing products', {
-                cause: _context10.t0
+                cause: _context12.t0
               });
             case 15:
               if (!(((_res4 = res) === null || _res4 === void 0 ? void 0 : _res4.status) == 200)) {
-                _context10.next = 17;
+                _context12.next = 17;
                 break;
               }
-              return _context10.abrupt("return", resData);
+              return _context12.abrupt("return", resData);
             case 17:
               throw new Error(resData.error);
             case 18:
             case "end":
-              return _context10.stop();
+              return _context12.stop();
           }
-        }, _callee9, this, [[3, 12]]);
+        }, _callee11, this, [[3, 12]]);
       }));
-      function apiSetCustomFlag(_x12, _x13, _x14, _x15) {
+      function apiSetCustomFlag(_x16, _x17, _x18, _x19) {
         return _apiSetCustomFlag.apply(this, arguments);
       }
       return apiSetCustomFlag;
@@ -1798,10 +1902,10 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
   }, {
     key: "apiDeleteProducts",
     value: function () {
-      var _apiDeleteProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee10(products) {
+      var _apiDeleteProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee12(products) {
         var fullUrl, headers, productsInChunks, i, _this$openModal3, _this$t3, promises;
-        return _regeneratorRuntime.wrap(function _callee10$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime.wrap(function _callee12$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               fullUrl = this.catalogService + '/products';
               fullUrl = "".concat(fullUrl, "?organizationId=").concat(this.organization._id);
@@ -1812,7 +1916,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
               i = 0;
             case 5:
               if (!(i < productsInChunks.length)) {
-                _context11.next = 13;
+                _context13.next = 13;
                 break;
               }
               promises = productsInChunks[i].map(function (p) {
@@ -1834,19 +1938,19 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                 title: (_this$t3 = this.t) === null || _this$t3 === void 0 ? void 0 : _this$t3.call(this, 'productcreator.delete_old_products'),
                 dontRenderForm: true
               });
-              _context11.next = 10;
+              _context13.next = 10;
               return Promise.all(promises);
             case 10:
               i++;
-              _context11.next = 5;
+              _context13.next = 5;
               break;
             case 13:
             case "end":
-              return _context11.stop();
+              return _context13.stop();
           }
-        }, _callee10, this);
+        }, _callee12, this);
       }));
-      function apiDeleteProducts(_x16) {
+      function apiDeleteProducts(_x20) {
         return _apiDeleteProducts.apply(this, arguments);
       }
       return apiDeleteProducts;
@@ -1863,12 +1967,12 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
   }, {
     key: "apiLoadProductVariantsGrouped",
     value: function () {
-      var _apiLoadProductVariantsGrouped = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref44) {
-        var limit, skip, fields, _ref44$search, search, sort, abortController, fullUrl, headers, promise;
-        return _regeneratorRuntime.wrap(function _callee11$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+      var _apiLoadProductVariantsGrouped = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref45) {
+        var limit, skip, fields, _ref45$search, search, sort, abortController, fullUrl, headers, promise;
+        return _regeneratorRuntime.wrap(function _callee13$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
-              limit = _ref44.limit, skip = _ref44.skip, fields = _ref44.fields, _ref44$search = _ref44.search, search = _ref44$search === void 0 ? [] : _ref44$search, sort = _ref44.sort, _ref44.showAllProducts, abortController = _ref44.abortController;
+              limit = _ref45.limit, skip = _ref45.skip, fields = _ref45.fields, _ref45$search = _ref45.search, search = _ref45$search === void 0 ? [] : _ref45$search, sort = _ref45.sort, _ref45.showAllProducts, abortController = _ref45.abortController;
               fullUrl = this.catalogService + '/v1/products/groups' + '?organizationId=' + this.organization._id + (this._organization.parentOrganizationIds ? '&parentOrganizationIds=' + this._organization.parentOrganizationIds.join(',') : '') + (limit ? '&limit=' + limit : '') + (skip ? '&skip=' + skip : '') + (fields ? '&fileds=' + DivaUtils.fixedEncodeURIComponent('{' + fields.join(',') + '}') : '') + (search ? '&search=' + DivaUtils.fixedEncodeURIComponent(this.parseFilter(search)) : '') + (sort ? '&sort=' + DivaUtils.fixedEncodeURIComponent(sort) : '');
               headers = {
                 'Content-Type': 'application/json'
@@ -1890,32 +1994,32 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                   reject('Error loading products grouped by variants: ' + error.message);
                 });
               });
-              _context12.next = 7;
+              _context14.next = 7;
               return promise;
             case 7:
-              return _context12.abrupt("return", _context12.sent);
+              return _context14.abrupt("return", _context14.sent);
             case 8:
             case "end":
-              return _context12.stop();
+              return _context14.stop();
           }
-        }, _callee11, this);
+        }, _callee13, this);
       }));
-      function apiLoadProductVariantsGrouped(_x17) {
+      function apiLoadProductVariantsGrouped(_x21) {
         return _apiLoadProductVariantsGrouped.apply(this, arguments);
       }
       return apiLoadProductVariantsGrouped;
     }()
   }, {
-    key: "apiSaveBasketAndProducts",
+    key: "apiSaveProducts",
     value: function () {
-      var _apiSaveBasketAndProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee12(serverUrl, jwt, products, awaitPDF, basket, removedProductIds) {
+      var _apiSaveProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee14(serverUrl, jwt, products, awaitPDF, removedProductIds) {
         var fullUrl, response, status;
-        return _regeneratorRuntime.wrap(function _callee12$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime.wrap(function _callee14$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               fullUrl = serverUrl + '/v1/products/groups';
-              _context13.prev = 1;
-              _context13.next = 4;
+              _context15.prev = 1;
+              _context15.next = 4;
               return fetch(fullUrl, {
                 method: 'PUT',
                 headers: {
@@ -1923,7 +2027,6 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                   'Content-Type': 'application/json'
                 },
                 body: JSON.stringify({
-                  basket: basket ? basket.getAsJson() : undefined,
                   products: products,
                   removedProductIds: removedProductIds,
                   awaitPDF: awaitPDF
@@ -1936,31 +2039,31 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                 return res.json();
               });
             case 4:
-              response = _context13.sent;
+              response = _context15.sent;
               if (!response.Error) {
-                _context13.next = 7;
+                _context15.next = 7;
                 break;
               }
               throw new Error('Error saving Basket and Products. serverError: ' + response.Error);
             case 7:
-              _context13.next = 12;
+              _context15.next = 12;
               break;
             case 9:
-              _context13.prev = 9;
-              _context13.t0 = _context13["catch"](1);
+              _context15.prev = 9;
+              _context15.t0 = _context15["catch"](1);
               throw Error(status);
             case 12:
-              return _context13.abrupt("return", response.products);
+              return _context15.abrupt("return", response.products);
             case 13:
             case "end":
-              return _context13.stop();
+              return _context15.stop();
           }
-        }, _callee12, null, [[1, 9]]);
+        }, _callee14, null, [[1, 9]]);
       }));
-      function apiSaveBasketAndProducts(_x18, _x19, _x20, _x21, _x22, _x23) {
-        return _apiSaveBasketAndProducts.apply(this, arguments);
+      function apiSaveProducts(_x22, _x23, _x24, _x25, _x26) {
+        return _apiSaveProducts.apply(this, arguments);
       }
-      return apiSaveBasketAndProducts;
+      return apiSaveProducts;
     }()
   }, {
     key: "parseFilter",
@@ -1992,53 +2095,53 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
   }], [{
     key: "isSameProduct",
     value: function isSameProduct(product, setHash, diva3dProject, orderLines, varinatData, catalogCodex) {
-      var _product$articles;
+      var _product$configuratio, _product$configuratio2, _product$configuratio3;
       //For new products we store the setHash and Diva3DProject in order to determine if the product changed.
       if (product.uniqueHash !== undefined) {
         return product.uniqueHash === 'v1' + setHash + (diva3dProject ? md5(diva3dProject) : '');
       }
 
       //For older products without setHash we use the old comparison logic
-      if (((_product$articles = product.articles) === null || _product$articles === void 0 ? void 0 : _product$articles.length) != (orderLines === null || orderLines === void 0 ? void 0 : orderLines.length)) {
+      if (((_product$configuratio = product.configuration) === null || _product$configuratio === void 0 || (_product$configuratio = _product$configuratio.OrderSets[0].OrderLines) === null || _product$configuratio === void 0 ? void 0 : _product$configuratio.length) != (orderLines === null || orderLines === void 0 ? void 0 : orderLines.length)) {
         return false;
       }
       if (!varinatData) {
         //the old logic was only for variants, not for base products
         return true;
       }
+      var orderlines = (_product$configuratio2 = (_product$configuratio3 = product.configuration) === null || _product$configuratio3 === void 0 ? void 0 : _product$configuratio3.OrderSets[0].OrderLines) !== null && _product$configuratio2 !== void 0 ? _product$configuratio2 : [];
       var _loop2 = function _loop2() {
-          var _article$variantValue;
-          var article = product.articles[i];
+          var article = orderlines[i];
           var orderLine = orderLines.find(function (ol) {
-            return ol.ArticleCodex == article.articleCodex && catalogCodex == article.catalogCodex;
+            return ol.ArticleCodex == article.ArticleCodex && catalogCodex == article.CatalogCodex;
           });
-          if (!orderLine || ((_article$variantValue = article.variantValues) === null || _article$variantValue === void 0 ? void 0 : _article$variantValue.length) != (varinatData === null || varinatData === void 0 ? void 0 : varinatData.length)) {
+          if (!orderLine) {
             return {
               v: false
             };
           }
-          var _loop3 = function _loop3() {
-              var varinatValue = article.variantValues[j];
-              if (!(varinatData !== null && varinatData !== void 0 && varinatData.find(function (vb) {
-                return vb.OPT == varinatValue['OPT'] && vb.OPV == varinatValue['OPV'];
-              }))) {
-                return {
-                  v: {
-                    v: false
-                  }
-                };
-              }
-            },
-            _ret2;
-          for (var j = 0; j < (((_article$variantValue2 = article.variantValues) === null || _article$variantValue2 === void 0 ? void 0 : _article$variantValue2.length) || 0); j++) {
-            var _article$variantValue2;
-            _ret2 = _loop3();
-            if (_ret2) return _ret2.v;
+          if (article.VariantBasketDatas.length) {
+            var _loop3 = function _loop3() {
+                var varinatValue = article.VariantBasketDatas[j];
+                if (!varinatData.find(function (vb) {
+                  return vb.OPT == varinatValue['OPT'] && vb.OPV == varinatValue['OPV'];
+                })) {
+                  return {
+                    v: {
+                      v: false
+                    }
+                  };
+                }
+              },
+              _ret2;
+            for (var j = 0; j < article.VariantBasketDatas.length; j++) {
+              _ret2 = _loop3();
+              if (_ret2) return _ret2.v;
+            }
           }
         },
         _ret;
-      for (var i = 0; i < ((_product$articles$len = (_product$articles2 = product.articles) === null || _product$articles2 === void 0 ? void 0 : _product$articles2.length) !== null && _product$articles$len !== void 0 ? _product$articles$len : 0); i++) {
-        var _product$articles$len, _product$articles2;
+      for (var i = 0; i < orderlines.length; i++) {
         _ret = _loop2();
         if (_ret) return _ret.v;
       }
@@ -2165,16 +2268,16 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
   }, {
     key: "assign",
     value: function assign(target) {
-      for (var _len = arguments.length, sources = new Array(_len > 1 ? _len - 1 : 0), _key4 = 1; _key4 < _len; _key4++) {
-        sources[_key4 - 1] = arguments[_key4];
+      for (var _len = arguments.length, sources = new Array(_len > 1 ? _len - 1 : 0), _key3 = 1; _key3 < _len; _key3++) {
+        sources[_key3 - 1] = arguments[_key3];
       }
       return Object.assign.apply(Object, [target].concat(_toConsumableArray(sources.filter(function (s) {
         return s;
       }).map(function (x) {
-        return Object.fromEntries(Object.entries(x).filter(function (_ref45) {
-          var _ref46 = _slicedToArray(_ref45, 2);
-            _ref46[0];
-            var value = _ref46[1];
+        return Object.fromEntries(Object.entries(x).filter(function (_ref46) {
+          var _ref47 = _slicedToArray(_ref46, 2);
+            _ref47[0];
+            var value = _ref47[1];
           return value !== undefined;
         }));
       }))));
@@ -2182,10 +2285,10 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
   }, {
     key: "loadSelectOptions",
     value: function () {
-      var _loadSelectOptions = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee13(sessionGuid, dataSource, additionalFilter) {
-        var values, apiUrl, i, apiResult, _i3, value, text;
-        return _regeneratorRuntime.wrap(function _callee13$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+      var _loadSelectOptions = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee15(sessionGuid, dataSource, additionalFilter) {
+        var values, apiUrl, i, apiResult, _i2, value, text;
+        return _regeneratorRuntime.wrap(function _callee15$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               values = [];
               apiUrl = dataSource.url;
@@ -2194,7 +2297,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                   apiUrl += '&' + additionalFilter[i].key + '=' + additionalFilter[i].value;
                 }
               }
-              _context14.next = 5;
+              _context16.next = 5;
               return fetch(apiUrl, {
                 headers: {
                   sessionGuid: sessionGuid
@@ -2206,26 +2309,26 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                 return res.json();
               });
             case 5:
-              apiResult = _context14.sent;
+              apiResult = _context16.sent;
               if (dataSource.useKey) {
                 apiResult = apiResult[dataSource.useKey];
               }
-              for (_i3 = 0; _i3 < apiResult.length; _i3++) {
-                value = apiResult[_i3][dataSource.fieldValueMapping];
-                text = apiResult[_i3][dataSource.fieldDescriptionMapping];
+              for (_i2 = 0; _i2 < apiResult.length; _i2++) {
+                value = apiResult[_i2][dataSource.fieldValueMapping];
+                text = apiResult[_i2][dataSource.fieldDescriptionMapping];
                 values.push({
                   value: value,
                   text: text
                 });
               }
-              return _context14.abrupt("return", values);
+              return _context16.abrupt("return", values);
             case 9:
             case "end":
-              return _context14.stop();
+              return _context16.stop();
           }
-        }, _callee13);
+        }, _callee15);
       }));
-      function loadSelectOptions(_x24, _x25, _x26) {
+      function loadSelectOptions(_x27, _x28, _x29) {
         return _loadSelectOptions.apply(this, arguments);
       }
       return loadSelectOptions;
@@ -2238,6 +2341,36 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
         return rv;
       }, {});
     }
+  }, {
+    key: "getVariantBasketDatasByOrderlines",
+    value: function getVariantBasketDatasByOrderlines(orderLines, catalogData) {
+      var variantBasketDatas = [];
+      var _loop5 = function _loop5() {
+        var ol = orderLines[i];
+        var catalog = catalogData.find(function (c) {
+          return c.codex === ol.CatalogCodex;
+        });
+        if (!ol.VariantBasketDatas) return 1; // continue
+        for (var j = 0; j < ol.VariantBasketDatas.length; j++) {
+          var v = ol.VariantBasketDatas[j];
+          var opt = catalog === null || catalog === void 0 ? void 0 : catalog.options['OPT' + v.OPT];
+          var opv = catalog === null || catalog === void 0 ? void 0 : catalog.optionValues['OPV' + v.OPV];
+          {
+            variantBasketDatas.push({
+              BasketID: ol.BasketID,
+              OPT: v.OPT,
+              OPV: v.OPV,
+              OPTName: opt.Name,
+              OPVName: opv.Name
+            });
+          }
+        }
+      };
+      for (var i = 0; i < orderLines.length; i++) {
+        if (_loop5()) continue;
+      }
+      return variantBasketDatas;
+    }
   }]);
 }();
 _ProductHandlerAbstract = ProductHandlerAbstract;