@crystaldesign/product-handler 24.15.0-beta.8 → 24.15.0-rc.0

package/build/esm/index.js

@@ -40,6 +40,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
     _defineProperty(this, "_apiKey", void 0);
     _defineProperty(this, "_catalogService", '');
     _defineProperty(this, "_mediaService", '');
+    _defineProperty(this, "_basketService", '');
     _defineProperty(this, "_api2", '');
     _defineProperty(this, "_sessionGuid", '');
     _defineProperty(this, "_organization", {});
@@ -60,6 +61,14 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
     set: function set(val) {
       this._catalogService = val;
     }
+  }, {
+    key: "basketService",
+    get: function get() {
+      return this._basketService;
+    },
+    set: function set(val) {
+      this._basketService = val;
+    }
   }, {
     key: "mediaService",
     get: function get() {
@@ -184,46 +193,47 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
     value: (function () {
       var _loadProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref2) {
         var _this = this,
+          _baseProduct$divaNr,
           _baseProduct,
-          _basket$getProductCon,
           _baseProduct2,
           _baseProduct3,
-          _baseProduct$divaNr,
+          _basket$getProductCon,
           _baseProduct4,
+          _baseProduct5,
           _dataByBasket$price$a,
           _dataByBasket$price,
-          _baseProduct5,
-          _dataByBasket$image,
           _baseProduct6,
-          _dataByBasket$image2D,
+          _dataByBasket$image,
           _baseProduct7,
-          _dataByBasket$docking,
+          _dataByBasket$image2D,
           _baseProduct8,
-          _baseProduct$organiza,
+          _dataByBasket$docking,
           _baseProduct9,
+          _baseProduct$organiza,
+          _baseProduct10,
           _this$organization$pa,
           _this$organization$pa2,
           _baseProduct$createdB,
-          _baseProduct10,
-          _this$user,
           _baseProduct11,
+          _this$user,
           _baseProduct12,
           _baseProduct13,
           _baseProduct14,
-          _dataByBasket$orderTe,
           _baseProduct15,
-          _dataByBasket$technic,
+          _dataByBasket$orderTe,
           _baseProduct16,
+          _dataByBasket$technic,
           _baseProduct17,
+          _baseProduct18,
           _ref3,
           _baseProduct$configur3,
-          _baseProduct18;
-        var basket, divaNr, catalogData, productData, classificationFields, fieldConfiguration, customBaseFields, classificationConfig, _ref2$availableLangua, availableLanguages, _ref2$currentLang, currentLang, products, baseProduct, variantProducts, _baseProduct$configur, _baseProduct$configur2, _basket$OrderSets$map, dataByBasket, oldClassificationData, i, variant, key, oldUniqueHash, configuration, 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;
+          _baseProduct19;
+        var basket, divaNr, catalogData, productData, classificationFields, fieldConfiguration, customBaseFields, classificationConfig, _ref2$availableLangua, availableLanguages, _ref2$currentLang, currentLang, getUniqueNewDivaNr, products, baseProduct, variantProducts, _baseProduct$configur, _baseProduct$configur2, _basket$OrderSets$map, myDivaNr, dataByBasket, oldClassificationData, i, variant, key, oldUniqueHash, configuration, 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, 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)) {
+              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, getUniqueNewDivaNr = _ref2.getUniqueNewDivaNr;
+              if (!(!productData && !divaNr && !getUniqueNewDivaNr)) {
                 _context2.next = 3;
                 break;
               }
@@ -290,7 +300,17 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
               }
               throw new Error('If existing products are fetched, there has to be atleast a base product.');
             case 25:
-              dataByBasket = this.getProductDataByBasket(basket, catalogData, fieldConfiguration, baseProduct); //to remember what for position was previously set for the classification
+              myDivaNr = (_baseProduct$divaNr = (_baseProduct = baseProduct) === null || _baseProduct === void 0 ? void 0 : _baseProduct.divaNr) !== null && _baseProduct$divaNr !== void 0 ? _baseProduct$divaNr : basket === null || basket === void 0 ? void 0 : basket.DivaNr;
+              if (!(!((_baseProduct2 = baseProduct) !== null && _baseProduct2 !== void 0 && _baseProduct2.divaNr) && getUniqueNewDivaNr)) {
+                _context2.next = 30;
+                break;
+              }
+              _context2.next = 29;
+              return this.apiGetUniqueDivaNr();
+            case 29:
+              myDivaNr = _context2.sent;
+            case 30:
+              dataByBasket = this.getProductDataByBasket(basket, catalogData, fieldConfiguration, baseProduct, getUniqueNewDivaNr ? myDivaNr : undefined); //to remember what for position was previously set for the classification
               oldClassificationData = {};
               for (i = 0; i < products.data.length; i++) {
                 variant = products.data[i];
@@ -301,27 +321,32 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                   }
                 }
               }
-              oldUniqueHash = (_baseProduct = baseProduct) === null || _baseProduct === void 0 ? void 0 : _baseProduct.uniqueHash;
-              configuration = (_basket$getProductCon = basket === null || basket === void 0 ? void 0 : basket.getProductConfiguration()) !== null && _basket$getProductCon !== void 0 ? _basket$getProductCon : (_baseProduct2 = baseProduct) === null || _baseProduct2 === void 0 ? void 0 : _baseProduct2.configuration;
+              oldUniqueHash = (_baseProduct3 = baseProduct) === null || _baseProduct3 === void 0 ? void 0 : _baseProduct3.uniqueHash;
+              configuration = (_basket$getProductCon = basket === null || basket === void 0 ? void 0 : basket.getProductConfiguration()) !== null && _basket$getProductCon !== void 0 ? _basket$getProductCon : (_baseProduct4 = baseProduct) === null || _baseProduct4 === void 0 ? void 0 : _baseProduct4.configuration;
+              if (getUniqueNewDivaNr && myDivaNr) {
+                configuration = _objectSpread(_objectSpread({}, configuration), {}, {
+                  DivaNr: myDivaNr
+                });
+              }
               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,
-                image: (_dataByBasket$image = dataByBasket === null || dataByBasket === void 0 ? void 0 : dataByBasket.image) !== null && _dataByBasket$image !== void 0 ? _dataByBasket$image : (_baseProduct6 = baseProduct) === null || _baseProduct6 === void 0 ? void 0 : _baseProduct6.image,
-                image2D: (_dataByBasket$image2D = dataByBasket === null || dataByBasket === void 0 ? void 0 : dataByBasket.image2D) !== null && _dataByBasket$image2D !== void 0 ? _dataByBasket$image2D : (_baseProduct7 = baseProduct) === null || _baseProduct7 === void 0 ? void 0 : _baseProduct7.image2D,
+                _id: ((_baseProduct5 = baseProduct) === null || _baseProduct5 === void 0 ? void 0 : _baseProduct5._id) || nanoid(),
+                divaNr: myDivaNr,
+                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 : (_baseProduct6 = baseProduct) === null || _baseProduct6 === void 0 ? void 0 : _baseProduct6.addedPrice,
+                image: (_dataByBasket$image = dataByBasket === null || dataByBasket === void 0 ? void 0 : dataByBasket.image) !== null && _dataByBasket$image !== void 0 ? _dataByBasket$image : (_baseProduct7 = baseProduct) === null || _baseProduct7 === void 0 ? void 0 : _baseProduct7.image,
+                image2D: (_dataByBasket$image2D = dataByBasket === null || dataByBasket === void 0 ? void 0 : dataByBasket.image2D) !== null && _dataByBasket$image2D !== void 0 ? _dataByBasket$image2D : (_baseProduct8 = baseProduct) === null || _baseProduct8 === void 0 ? void 0 : _baseProduct8.image2D,
                 configuration: configuration,
-                dockingPoints: (_dataByBasket$docking = dataByBasket.dockingPoints) !== null && _dataByBasket$docking !== void 0 ? _dataByBasket$docking : (_baseProduct8 = baseProduct) === null || _baseProduct8 === void 0 ? void 0 : _baseProduct8.dockingPoints,
+                dockingPoints: (_dataByBasket$docking = dataByBasket.dockingPoints) !== null && _dataByBasket$docking !== void 0 ? _dataByBasket$docking : (_baseProduct9 = baseProduct) === null || _baseProduct9 === void 0 ? void 0 : _baseProduct9.dockingPoints,
                 currency: DivaUtils.defaultPriceFormat.currency,
-                organizationId: (_baseProduct$organiza = (_baseProduct9 = baseProduct) === null || _baseProduct9 === void 0 ? void 0 : _baseProduct9.organizationId) !== null && _baseProduct$organiza !== void 0 ? _baseProduct$organiza : this.organization._id,
+                organizationId: (_baseProduct$organiza = (_baseProduct10 = baseProduct) === null || _baseProduct10 === void 0 ? void 0 : _baseProduct10.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]),
-                createdBy: (_baseProduct$createdB = (_baseProduct10 = baseProduct) === null || _baseProduct10 === void 0 ? void 0 : _baseProduct10.createdBy) !== null && _baseProduct$createdB !== void 0 ? _baseProduct$createdB : (_this$user = this.user) === null || _this$user === void 0 ? void 0 : _this$user._id,
-                createdBy_displayText: (_baseProduct11 = baseProduct) === null || _baseProduct11 === void 0 ? void 0 : _baseProduct11.createdBy_displayText,
-                archived: (_baseProduct12 = baseProduct) !== null && _baseProduct12 !== void 0 && _baseProduct12.archived ? (_baseProduct13 = baseProduct) === null || _baseProduct13 === void 0 ? void 0 : _baseProduct13.archived : false,
-                isTopseller: !!((_baseProduct14 = baseProduct) !== null && _baseProduct14 !== void 0 && _baseProduct14.isTopseller),
-                orderText: (_dataByBasket$orderTe = dataByBasket.orderText) !== null && _dataByBasket$orderTe !== void 0 ? _dataByBasket$orderTe : (_baseProduct15 = baseProduct) === null || _baseProduct15 === void 0 ? void 0 : _baseProduct15.orderText,
-                technicalDescription: (_dataByBasket$technic = dataByBasket.technicalDescription) !== null && _dataByBasket$technic !== void 0 ? _dataByBasket$technic : (_baseProduct16 = baseProduct) === null || _baseProduct16 === void 0 ? void 0 : _baseProduct16.technicalDescription
+                createdBy: (_baseProduct$createdB = (_baseProduct11 = baseProduct) === null || _baseProduct11 === void 0 ? void 0 : _baseProduct11.createdBy) !== null && _baseProduct$createdB !== void 0 ? _baseProduct$createdB : (_this$user = this.user) === null || _this$user === void 0 ? void 0 : _this$user._id,
+                createdBy_displayText: (_baseProduct12 = baseProduct) === null || _baseProduct12 === void 0 ? void 0 : _baseProduct12.createdBy_displayText,
+                archived: (_baseProduct13 = baseProduct) !== null && _baseProduct13 !== void 0 && _baseProduct13.archived ? (_baseProduct14 = baseProduct) === null || _baseProduct14 === void 0 ? void 0 : _baseProduct14.archived : false,
+                isTopseller: !!((_baseProduct15 = baseProduct) !== null && _baseProduct15 !== void 0 && _baseProduct15.isTopseller),
+                orderText: (_dataByBasket$orderTe = dataByBasket.orderText) !== null && _dataByBasket$orderTe !== void 0 ? _dataByBasket$orderTe : (_baseProduct16 = baseProduct) === null || _baseProduct16 === void 0 ? void 0 : _baseProduct16.orderText,
+                technicalDescription: (_dataByBasket$technic = dataByBasket.technicalDescription) !== null && _dataByBasket$technic !== void 0 ? _dataByBasket$technic : (_baseProduct17 = baseProduct) === null || _baseProduct17 === void 0 ? void 0 : _baseProduct17.technicalDescription
               });
               metaData = basket === null || basket === void 0 ? void 0 : basket.OrderSets.reduce(function (prev, curr) {
                 return _objectSpread(_objectSpread({}, prev), curr.MetaData || {});
@@ -330,7 +355,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                 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({}, (_baseProduct17 = baseProduct) === null || _baseProduct17 === void 0 ? void 0 : _baseProduct17.customData), customData);
+              baseData.customData = _objectSpread(_objectSpread({}, (_baseProduct18 = baseProduct) === null || _baseProduct18 === void 0 ? void 0 : _baseProduct18.customData), customData);
 
               //add livingarea,maincategorie,subcategorie of loaded product if not exists
               classificationConfig = this.checkAndAddClassificationConfigCategories(baseProduct, classificationConfig);
@@ -347,11 +372,11 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
               optFields = [];
               initialSelectedFields = [];
               if (!dataByBasket.isSet) {
-                _context2.next = 46;
+                _context2.next = 52;
                 break;
               }
               throw new Error('Variants are currently not supported for set products');
-            case 46:
+            case 52:
               //iterate all existing variant products and add them to the variants
               usedVariantIds = [];
               variantProducts.forEach(function (product) {
@@ -407,7 +432,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
               }
 
               //get opt data
-              differingOPTs = Object.entries(((_ref3 = (_baseProduct$configur3 = (_baseProduct18 = baseProduct) === null || _baseProduct18 === void 0 ? void 0 : _baseProduct18.configuration) !== null && _baseProduct$configur3 !== void 0 ? _baseProduct$configur3 : basket) === null || _ref3 === void 0 || (_ref3 = _ref3.OrderSets[0].Favorites) === null || _ref3 === void 0 ? void 0 : _ref3.VariantValues) || []).filter(function (_ref4) {
+              differingOPTs = Object.entries(((_ref3 = (_baseProduct$configur3 = (_baseProduct19 = baseProduct) === null || _baseProduct19 === void 0 ? void 0 : _baseProduct19.configuration) !== null && _baseProduct$configur3 !== void 0 ? _baseProduct$configur3 : basket) === null || _ref3 === void 0 || (_ref3 = _ref3.OrderSets[0].Favorites) === null || _ref3 === void 0 ? void 0 : _ref3.VariantValues) || []).filter(function (_ref4) {
                 var _ref5 = _slicedToArray(_ref4, 2);
                   _ref5[0];
                   var value = _ref5[1];
@@ -482,7 +507,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                 availableLanguages: availableLanguages,
                 currentLang: currentLang
               });
-            case 59:
+            case 65:
             case "end":
               return _context2.stop();
           }
@@ -495,7 +520,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
     }())
   }, {
     key: "getProductDataByBasket",
-    value: function getProductDataByBasket(basket, catalogData, fieldConfiguration, baseProduct) {
+    value: function getProductDataByBasket(basket, catalogData, fieldConfiguration, baseProduct, customDivaNr) {
       var dataByBasket = {};
       var isSet = !!(basket !== null && basket !== void 0 && basket.SetPlannerInfos);
       dataByBasket.isSet = isSet;
@@ -671,7 +696,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
         }).filter(function (f) {
           return f;
         });
-        dataByBasket.orderText = basket.getEKText(true);
+        dataByBasket.orderText = basket.getEKText(true, customDivaNr);
         dataByBasket.uniqueHash = isSet ? ProductHandlerAbstract.getHashValue(basket.OrderSets.map(function (os) {
           return os.SetHash;
         }).join(''), basket.Diva3DProject) : ProductHandlerAbstract.getHashValue(basket.SetHash, basket.Diva3DProject);
@@ -825,10 +850,11 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
               this.trimStrings(baseData);
               //the base product is constructed, based on baseData and classification data
               baseProduct = _objectSpread(_objectSpread(_objectSpread({}, baseData), Object.entries(classificationData || {}).reduce(function (prev, _ref13) {
+                var _fieldConfiguration$c;
                 var _ref14 = _slicedToArray(_ref13, 2),
                   key = _ref14[0],
                   value = _ref14[1];
-                prev["dc_".concat(key)] = _this3.mapClass(value, fieldConfiguration === null || fieldConfiguration === void 0 ? void 0 : fieldConfiguration.classMap[key].values);
+                prev["dc_".concat(key)] = _this3.mapClass(value, fieldConfiguration === null || fieldConfiguration === void 0 || (_fieldConfiguration$c = fieldConfiguration.classMap[key]) === null || _fieldConfiguration$c === void 0 ? void 0 : _fieldConfiguration$c.values);
                 return prev;
               }, {})), {}, {
                 _id: originProductId && !(variantData !== null && variantData !== void 0 && variantData.length) ? originProductId : baseData._id,
@@ -858,11 +884,11 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                     var value = _ref18[1];
                   return value;
                 }).forEach(function (_ref19) {
-                  var _baseProduct19;
+                  var _baseProduct20;
                   var _ref20 = _slicedToArray(_ref19, 2),
                     key = _ref20[0],
                     value = _ref20[1];
-                  return baseProduct["dc_".concat(key)] = _objectSpread(_objectSpread({}, (_baseProduct19 = baseProduct["dc_".concat(key)]) !== null && _baseProduct19 !== void 0 ? _baseProduct19 : {}), {}, {
+                  return baseProduct["dc_".concat(key)] = _objectSpread(_objectSpread({}, (_baseProduct20 = baseProduct["dc_".concat(key)]) !== null && _baseProduct20 !== void 0 ? _baseProduct20 : {}), {}, {
                     opt: value.field
                   });
                 });
@@ -1005,7 +1031,8 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                         preparedProduct = {
                           parent: baseProduct._id,
                           baseProduct: false,
-                          _id: productId
+                          _id: productId,
+                          organizationId: baseProduct.organizationId
                         };
                       }
                       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;
@@ -1264,6 +1291,11 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
       if (isManual) {
         addedPrice = variantProduct === null || variantProduct === void 0 ? void 0 : variantProduct.addedPrice;
       }
+      var discountedPrice = variantProduct === null || variantProduct === void 0 ? void 0 : variantProduct.discountedPrice;
+      var noDiscountManual = (variantProduct === null || variantProduct === void 0 ? void 0 : variantProduct.discountedPrice) === undefined && (variantProduct === null || variantProduct === void 0 ? void 0 : variantProduct.percentageDiscount) === 0;
+      if (noDiscountManual) {
+        discountedPrice = undefined;
+      }
       var _this$parseMetaDataAn2 = this.parseMetaDataAndClassificationInformation(MetaData !== null && MetaData !== void 0 ? MetaData : {}, MetaData_locales, variantProduct, classificationConfig, customBaseFields),
         classificationData = _this$parseMetaDataAn2.classificationData,
         customData = _this$parseMetaDataAn2.customData;
@@ -1287,6 +1319,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
         //only if cv is not defined fallback to the values in product
         addedPrice: addedPrice,
         calculatedPrice: price.calculatedPrice,
+        discountedPrice: discountedPrice,
         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,
@@ -1957,12 +1990,62 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
       return apiMarkAsFavorite;
     }()
   }, {
-    key: "apiDeleteProducts",
+    key: "apiGetUniqueDivaNr",
     value: function () {
-      var _apiDeleteProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee12(products) {
-        var fullUrl, headers, productsInChunks, i, _this$openModal3, _this$t3, promises;
+      var _apiGetUniqueDivaNr = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
+        var _res5;
+        var fullUrl, res, resData;
         return _regeneratorRuntime.wrap(function _callee12$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
+            case 0:
+              fullUrl = new URL(this.basketService + '/baskets/uniqueDivaNr');
+              _context14.prev = 1;
+              _context14.next = 4;
+              return axios.get(fullUrl.toString(), {
+                headers: _objectSpread(_objectSpread({}, this.getHeaders()), {}, {
+                  'Content-Type': 'application/json'
+                })
+              });
+            case 4:
+              res = _context14.sent;
+              _context14.next = 7;
+              return res.data;
+            case 7:
+              resData = _context14.sent;
+              _context14.next = 13;
+              break;
+            case 10:
+              _context14.prev = 10;
+              _context14.t0 = _context14["catch"](1);
+              throw new Error('Error on activate product', {
+                cause: _context14.t0
+              });
+            case 13:
+              if (!(((_res5 = res) === null || _res5 === void 0 ? void 0 : _res5.status) == 200)) {
+                _context14.next = 15;
+                break;
+              }
+              return _context14.abrupt("return", resData.divaNr);
+            case 15:
+              throw new Error(resData.error);
+            case 16:
+            case "end":
+              return _context14.stop();
+          }
+        }, _callee12, this, [[1, 10]]);
+      }));
+      function apiGetUniqueDivaNr() {
+        return _apiGetUniqueDivaNr.apply(this, arguments);
+      }
+      return apiGetUniqueDivaNr;
+    }()
+  }, {
+    key: "apiDeleteProducts",
+    value: function () {
+      var _apiDeleteProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee13(products) {
+        var fullUrl, headers, productsInChunks, i, _this$openModal3, _this$t3, promises;
+        return _regeneratorRuntime.wrap(function _callee13$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               fullUrl = this.catalogService + '/products';
               fullUrl = "".concat(fullUrl, "?organizationId=").concat(this.organization._id);
@@ -1973,7 +2056,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
               i = 0;
             case 5:
               if (!(i < productsInChunks.length)) {
-                _context14.next = 13;
+                _context15.next = 13;
                 break;
               }
               promises = productsInChunks[i].map(function (p) {
@@ -1995,17 +2078,17 @@ 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
               });
-              _context14.next = 10;
+              _context15.next = 10;
               return Promise.all(promises);
             case 10:
               i++;
-              _context14.next = 5;
+              _context15.next = 5;
               break;
             case 13:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
-        }, _callee12, this);
+        }, _callee13, this);
       }));
       function apiDeleteProducts(_x20) {
         return _apiDeleteProducts.apply(this, arguments);
@@ -2024,13 +2107,13 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
   }, {
     key: "apiLoadProductVariantsGrouped",
     value: function () {
-      var _apiLoadProductVariantsGrouped = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref45) {
+      var _apiLoadProductVariantsGrouped = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee14(_ref45) {
         var limit, skip, fields, _ref45$search, search, sort, favorites, abortController, fullUrl, headers, promise;
-        return _regeneratorRuntime.wrap(function _callee13$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime.wrap(function _callee14$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               limit = _ref45.limit, skip = _ref45.skip, fields = _ref45.fields, _ref45$search = _ref45.search, search = _ref45$search === void 0 ? [] : _ref45$search, sort = _ref45.sort, favorites = _ref45.favorites, 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) : '') + (favorites ? '&favorites=true' : '');
+              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.length ? '&search=' + DivaUtils.fixedEncodeURIComponent(this.parseFilter(search)) : '') + (sort ? '&sort=' + DivaUtils.fixedEncodeURIComponent(sort) : '') + (favorites ? '&favorites=true' : '');
               headers = {
                 'Content-Type': 'application/json'
               };
@@ -2051,15 +2134,15 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                   reject('Error loading products grouped by variants: ' + error.message);
                 });
               });
-              _context15.next = 7;
+              _context16.next = 7;
               return promise;
             case 7:
-              return _context15.abrupt("return", _context15.sent);
+              return _context16.abrupt("return", _context16.sent);
             case 8:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
-        }, _callee13, this);
+        }, _callee14, this);
       }));
       function apiLoadProductVariantsGrouped(_x21) {
         return _apiLoadProductVariantsGrouped.apply(this, arguments);
@@ -2069,46 +2152,46 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
   }, {
     key: "apiSaveProducts",
     value: function () {
-      var _apiSaveProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee14(serverUrl, jwt, products, awaitPDF, removedProductIds) {
+      var _apiSaveProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee15(serverUrl, jwt, products, awaitPDF, removedProductIds) {
         var fullUrl, response, status, BATCH_SIZE, productsPackages, groupIndex, baseProduct, i, _productsPackages$gro, _productsPackages$gro2, responseProducts, _i2, _loop3, j;
-        return _regeneratorRuntime.wrap(function _callee14$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime.wrap(function _callee15$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               fullUrl = serverUrl + '/v1/products/groups';
-              BATCH_SIZE = 40;
+              BATCH_SIZE = 10;
               productsPackages = [];
               groupIndex = 0;
               i = 0;
             case 5:
               if (!(i < products.length)) {
-                _context17.next = 15;
+                _context18.next = 15;
                 break;
               }
               if (!products[i].baseProduct) {
-                _context17.next = 9;
+                _context18.next = 9;
                 break;
               }
               baseProduct = products[i];
-              return _context17.abrupt("continue", 12);
+              return _context18.abrupt("continue", 12);
             case 9:
               if (BATCH_SIZE < ((_productsPackages$gro = (_productsPackages$gro2 = productsPackages[groupIndex]) === null || _productsPackages$gro2 === void 0 ? void 0 : _productsPackages$gro2.length) !== null && _productsPackages$gro !== void 0 ? _productsPackages$gro : 0)) groupIndex++;
               if (!productsPackages[groupIndex]) productsPackages[groupIndex] = [];
               productsPackages[groupIndex].push(products[i]);
             case 12:
               i++;
-              _context17.next = 5;
+              _context18.next = 5;
               break;
             case 15:
               responseProducts = [];
               _i2 = 0;
             case 17:
               if (!(_i2 < productsPackages.length)) {
-                _context17.next = 40;
+                _context18.next = 40;
                 break;
               }
-              if (baseProduct) productsPackages[_i2].unshift(baseProduct);
-              _context17.prev = 19;
-              _context17.next = 22;
+              if (baseProduct && _i2 == 0) productsPackages[_i2].unshift(baseProduct);
+              _context18.prev = 19;
+              _context18.next = 22;
               return fetch(fullUrl, {
                 method: 'PUT',
                 headers: {
@@ -2128,23 +2211,23 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                 return res.json();
               });
             case 22:
-              response = _context17.sent;
+              response = _context18.sent;
               if (!response.Error) {
-                _context17.next = 25;
+                _context18.next = 25;
                 break;
               }
               throw new Error('Error saving Basket and Products. serverError: ' + response.Error);
             case 25:
-              _context17.next = 30;
+              _context18.next = 30;
               break;
             case 27:
-              _context17.prev = 27;
-              _context17.t0 = _context17["catch"](19);
+              _context18.prev = 27;
+              _context18.t0 = _context18["catch"](19);
               throw Error(status);
             case 30:
               _loop3 = /*#__PURE__*/_regeneratorRuntime.mark(function _loop3(j) {
-                return _regeneratorRuntime.wrap(function _loop3$(_context16) {
-                  while (1) switch (_context16.prev = _context16.next) {
+                return _regeneratorRuntime.wrap(function _loop3$(_context17) {
+                  while (1) switch (_context17.prev = _context17.next) {
                     case 0:
                       if (response.products[j].baseProduct) baseProduct = response.products[j];
                       if (!responseProducts.find(function (p) {
@@ -2154,32 +2237,32 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                       }
                     case 2:
                     case "end":
-                      return _context16.stop();
+                      return _context17.stop();
                   }
                 }, _loop3);
               });
               j = 0;
             case 32:
               if (!(j < response.products.length)) {
-                _context17.next = 37;
+                _context18.next = 37;
                 break;
               }
-              return _context17.delegateYield(_loop3(j), "t1", 34);
+              return _context18.delegateYield(_loop3(j), "t1", 34);
             case 34:
               j++;
-              _context17.next = 32;
+              _context18.next = 32;
               break;
             case 37:
               _i2++;
-              _context17.next = 17;
+              _context18.next = 17;
               break;
             case 40:
-              return _context17.abrupt("return", responseProducts);
+              return _context18.abrupt("return", responseProducts);
             case 41:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
-        }, _callee14, null, [[19, 27]]);
+        }, _callee15, null, [[19, 27]]);
       }));
       function apiSaveProducts(_x22, _x23, _x24, _x25, _x26) {
         return _apiSaveProducts.apply(this, arguments);
@@ -2201,14 +2284,14 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
             filter.push("+[".concat(groups[key].filter(function (f) {
               return f.or;
             }).map(function (f) {
-              return "{".concat(f.id, ",").concat(f.op, ",").concat(f.value, "}");
+              return "{".concat(f.id, ",").concat(f.op, ",").concat(typeof f.value == 'string' ? "\"".concat(f.value, "\"") : f.value, "}");
             }).join(), "]"));
           }
         }
         filters.filter(function (f) {
           return !f.or;
         }).forEach(function (f) {
-          return filter.push("{".concat(f.id, ",").concat(f.op, ",").concat(f.value, "}"));
+          return filter.push("{".concat(f.id, ",").concat(f.op, ",").concat(typeof f.value == 'string' ? "\"".concat(f.value, "\"") : f.value, "}"));
         });
       }
       return "[".concat(filter.join(), "]");
@@ -2406,10 +2489,10 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
   }, {
     key: "loadSelectOptions",
     value: function () {
-      var _loadSelectOptions = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee15(sessionGuid, dataSource, additionalFilter) {
+      var _loadSelectOptions = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee16(sessionGuid, dataSource, additionalFilter) {
         var values, apiUrl, i, apiResult, _i3, value, text;
-        return _regeneratorRuntime.wrap(function _callee15$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime.wrap(function _callee16$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               values = [];
               apiUrl = dataSource.url;
@@ -2418,7 +2501,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                   apiUrl += '&' + additionalFilter[i].key + '=' + additionalFilter[i].value;
                 }
               }
-              _context18.next = 5;
+              _context19.next = 5;
               return fetch(apiUrl, {
                 headers: {
                   sessionGuid: sessionGuid
@@ -2430,7 +2513,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                 return res.json();
               });
             case 5:
-              apiResult = _context18.sent;
+              apiResult = _context19.sent;
               if (dataSource.useKey) {
                 apiResult = apiResult[dataSource.useKey];
               }
@@ -2442,12 +2525,12 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                   text: text
                 });
               }
-              return _context18.abrupt("return", values);
+              return _context19.abrupt("return", values);
             case 9:
             case "end":
-              return _context18.stop();
+              return _context19.stop();
           }
-        }, _callee15);
+        }, _callee16);
       }));
       function loadSelectOptions(_x27, _x28, _x29) {
         return _loadSelectOptions.apply(this, arguments);
@@ -2483,7 +2566,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
               OPV: v.OPV,
               OPTName: opt.Name,
               OPVName: opv.Name,
-              OPVImage: catalog.mediaUrl + opv.Image
+              OPVImage: opv.Image ? catalog.mediaUrl + opv.Image : undefined
             });
           }
         }