@crystaldesign/product-handler 24.13.0-beta.3 → 24.13.0-beta.30

package/build/esm/index.js

@@ -498,7 +498,6 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
       var isSet = !!(basket !== null && basket !== void 0 && basket.SetPlannerInfos);
       dataByBasket.isSet = isSet;
       if (basket) {
-        dataByBasket.hqRenderScript = basket === null || basket === void 0 ? void 0 : basket.OrderSets[0].HQRenderScript;
         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';
@@ -759,49 +758,55 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
      */
   }, {
     key: "saveProductMedia",
-    value: function saveProductMedia(productmedia, organizationId) {
+    value: function saveProductMedia(productmedia, organizationId, refCount) {
       return Promise.resolve(undefined);
     }
+  }, {
+    key: "saveMedias",
+    value: function saveMedias(mediasToSave, organizationId) {
+      return Promise.resolve({});
+    }
   }, {
     key: "prepareData",
     value: function () {
       var _prepareData = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref12) {
         var _this3 = this;
-        var basket, baseData, classificationData, variantData, removedProducts, removedMedia, classificationFields, fieldConfiguration, optMap, _ref12$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) {
+        var basket, baseData, classificationData, variantData, removedProducts, removedMedia, classificationFields, fieldConfiguration, optMap, _ref12$oldClassificat, oldClassificationData, originProductId, products, originProduct, mediasToSave, 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, _loop, _j2, mediasForProducts, _loop2, productId;
+        return _regeneratorRuntime.wrap(function _callee3$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               basket = _ref12.basket, baseData = _ref12.baseData, classificationData = _ref12.classificationData, variantData = _ref12.variantData, removedProducts = _ref12.removedProducts, removedMedia = _ref12.removedMedia, classificationFields = _ref12.classificationFields, fieldConfiguration = _ref12.fieldConfiguration, optMap = _ref12.optMap, _ref12$oldClassificat = _ref12.oldClassificationData, oldClassificationData = _ref12$oldClassificat === void 0 ? {} : _ref12$oldClassificat, originProductId = _ref12.originProductId;
               products = [];
               originProduct = undefined;
+              mediasToSave = [];
               if (!originProductId) {
-                _context4.next = 15;
+                _context5.next = 16;
                 break;
               }
-              _context4.next = 6;
+              _context5.next = 7;
               return this.apiGetProductByFilter([{
                 id: '_id',
                 op: 'eq',
                 value: originProductId
               }], undefined, true);
-            case 6:
-              result = _context4.sent;
+            case 7:
+              result = _context5.sent;
               originProduct = result.data[0];
               if (originProduct) {
-                _context4.next = 10;
+                _context5.next = 11;
                 break;
               }
               throw new Error('Origin Product not found');
-            case 10:
+            case 11:
               sapEinaLifNr = originProduct.customData.SAP_EINA_LIFNR.value;
               sapEineEkgrp = originProduct.customData.SAP_EINE_EKGRP.value;
               if (!(!sapEinaLifNr || !sapEineEkgrp)) {
-                _context4.next = 15;
+                _context5.next = 16;
                 break;
               }
               (_this$closeModal = this.closeModal) === null || _this$closeModal === void 0 || _this$closeModal.call(this);
               throw new Error('LiefNr or EkGrp not found');
-            case 15:
+            case 16:
               if (originProduct) {
                 baseData = _objectSpread(_objectSpread(_objectSpread({}, originProduct), baseData), {}, {
                   classificationInfo: originProduct.classificationInfo,
@@ -862,14 +867,14 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
 
               //media removed from the products is deleted from the server
               j = 0;
-            case 21:
+            case 22:
               if (!(removedMedia && j < removedMedia.length)) {
-                _context4.next = 30;
+                _context5.next = 31;
                 break;
               }
               mediaRef = removedMedia[j];
               if (!mediaRef.ref) {
-                _context4.next = 27;
+                _context5.next = 28;
                 break;
               }
               (_this$openModal = this.openModal) === null || _this$openModal === void 0 || _this$openModal.call(this, {
@@ -877,54 +882,29 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                 title: (_this$t = this.t) === null || _this$t === void 0 ? void 0 : _this$t.call(this, 'productcreator.remove_old_media_refs'),
                 dontRenderForm: true
               });
-              _context4.next = 27;
+              _context5.next = 28;
               return this.apiRemoveMedia(this.mediaService, mediaRef.ref, this.jwt);
-            case 27:
+            case 28:
               j++;
-              _context4.next = 21;
+              _context5.next = 22;
               break;
-            case 30:
-              if (!baseData.media) {
-                _context4.next = 42;
-                break;
-              }
-              baseProduct.media = [];
-              _j = 0;
-            case 33:
-              if (!(_j < baseData.media.length)) {
-                _context4.next = 42;
-                break;
-              }
-              //if a new media is added, the file is present in media object and needs to be saved to the server
-              (_this$openModal2 = this.openModal) === null || _this$openModal2 === void 0 || _this$openModal2.call(this, {
-                progress: _j / baseData.media.length / 6 + 2 / 6,
-                title: (_this$t2 = this.t) === null || _this$t2 === void 0 ? void 0 : _this$t2.call(this, 'productcreator.save_media'),
-                dontRenderForm: true
-              });
-              _context4.next = 37;
-              return this.saveProductMedia(baseData.media[_j], baseProduct.organizationId);
-            case 37:
-              savedMedia = _context4.sent;
-              if (savedMedia) {
-                baseProduct.media.push(savedMedia);
-              } else {
-                //otherwise the file already exists on the server
-                baseProduct.media.push({
-                  url: baseData.media[_j].url,
-                  thumbnail: baseData.media[_j].thumbnail,
-                  ref: baseData.media[_j].ref,
-                  mediaType: baseData.media[_j].mediaType,
-                  functionType: baseData.media[_j].functionType,
-                  description: baseData.media[_j].description,
-                  name: baseData.media[_j].name,
-                  "class": baseData.media[_j]["class"]
-                });
+            case 31:
+              if (baseData.media) {
+                baseProduct.media = [];
+                for (_j = 0; _j < baseData.media.length; _j++) {
+                  //if a new media is added, the file is present in media object and needs to be saved to the server
+                  (_this$openModal2 = this.openModal) === null || _this$openModal2 === void 0 || _this$openModal2.call(this, {
+                    progress: _j / baseData.media.length / 6 + 2 / 6,
+                    title: (_this$t2 = this.t) === null || _this$t2 === void 0 ? void 0 : _this$t2.call(this, 'productcreator.save_media'),
+                    dontRenderForm: true
+                  });
+                  mediasToSave.push({
+                    media: baseData.media[_j],
+                    id: baseData._id
+                  });
+                }
               }
-            case 39:
-              _j++;
-              _context4.next = 33;
-              break;
-            case 42:
+
               //orderDescription is only needed in FE to display it, it should not be stored to the server
               delete baseProduct.orderDescription;
 
@@ -939,8 +919,8 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                 baseProduct.parent = baseProduct._id;
               }
               _loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop() {
-                var _basket$getProductCon2, _originProduct, _configuration$OrderS;
-                var vd, varinatBase, classData, customData, variantPos, productId, preparedProduct, configuration, product, _this3$openModal, _this3$t, k, _savedMedia;
+                var _basket$getProductCon2, _originProduct;
+                var vd, varinatBase, classData, customData, variantPos, productId, preparedProduct, configuration, product, _this3$openModal, _this3$t, k;
                 return _regeneratorRuntime.wrap(function _loop$(_context3) {
                   while (1) switch (_context3.prev = _context3.next) {
                     case 0:
@@ -1051,7 +1031,6 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                         shortDescription_locales: vd.shortDescription_locales,
                         width: vd.width,
                         configuration: configuration,
-                        hqRenderScript: (_configuration$OrderS = configuration === null || configuration === void 0 ? void 0 : configuration.OrderSets[0].HQRenderScript) !== null && _configuration$OrderS !== void 0 ? _configuration$OrderS : vd.hqRenderScript,
                         height: vd.height,
                         depth: vd.depth,
                         calculatedPrice: vd.calculatedPrice,
@@ -1072,79 +1051,91 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                         archived: baseProduct.archived ? baseProduct.archived : false,
                         uniqueHash: vd.uniqueHash
                       });
-                      if (!vd.media) {
-                        _context3.next = 28;
-                        break;
-                      }
-                      product.media = [];
-                      (_this3$openModal = _this3.openModal) === null || _this3$openModal === void 0 || _this3$openModal.call(_this3, {
-                        progress: _j2 / variantData.length / 6 + 3 / 6,
-                        title: (_this3$t = _this3.t) === null || _this3$t === void 0 ? void 0 : _this3$t.call(_this3, 'productcreator.save_media_variants'),
-                        dontRenderForm: true
-                      });
-                      k = 0;
-                    case 20:
-                      if (!(k < vd.media.length)) {
-                        _context3.next = 28;
-                        break;
-                      }
-                      _context3.next = 23;
-                      return _this3.saveProductMedia(vd.media[k], baseProduct.organizationId);
-                    case 23:
-                      _savedMedia = _context3.sent;
-                      if (_savedMedia) {
-                        product.media.push(_savedMedia);
-                      } else {
-                        //otherwise the file already exists on the server
-                        product.media.push({
-                          url: vd.media[k].url,
-                          thumbnail: vd.media[k].thumbnail,
-                          ref: vd.media[k].ref,
-                          mediaType: vd.media[k].mediaType,
-                          functionType: vd.media[k].functionType,
-                          description: vd.media[k].description,
-                          name: vd.media[k].name,
-                          "class": vd.media[k]["class"]
+                      if (vd.media) {
+                        product.media = [];
+                        (_this3$openModal = _this3.openModal) === null || _this3$openModal === void 0 || _this3$openModal.call(_this3, {
+                          progress: _j2 / variantData.length / 6 + 3 / 6,
+                          title: (_this3$t = _this3.t) === null || _this3$t === void 0 ? void 0 : _this3$t.call(_this3, 'productcreator.save_media_variants'),
+                          dontRenderForm: true
                         });
+                        for (k = 0; k < vd.media.length; k++) {
+                          mediasToSave.push({
+                            media: vd.media[k],
+                            id: vd._id
+                          });
+                        }
                       }
-                    case 25:
-                      k++;
-                      _context3.next = 20;
-                      break;
-                    case 28:
                       //add the variant product it the list of products to be saved
                       products.push(product);
-                    case 29:
+                    case 18:
                     case "end":
                       return _context3.stop();
                   }
                 }, _loop);
               });
               _j2 = 0;
-            case 47:
+            case 37:
               if (!(variantData && _j2 < variantData.length)) {
-                _context4.next = 54;
+                _context5.next = 44;
                 break;
               }
-              return _context4.delegateYield(_loop(), "t0", 49);
-            case 49:
-              if (!_context4.t0) {
-                _context4.next = 51;
+              return _context5.delegateYield(_loop(), "t0", 39);
+            case 39:
+              if (!_context5.t0) {
+                _context5.next = 41;
                 break;
               }
-              return _context4.abrupt("continue", 51);
-            case 51:
+              return _context5.abrupt("continue", 41);
+            case 41:
               _j2++;
-              _context4.next = 47;
+              _context5.next = 37;
+              break;
+            case 44:
+              _context5.next = 46;
+              return this.saveMedias(mediasToSave, baseData.organizationId);
+            case 46:
+              mediasForProducts = _context5.sent;
+              _loop2 = /*#__PURE__*/_regeneratorRuntime.mark(function _loop2(productId) {
+                var p;
+                return _regeneratorRuntime.wrap(function _loop2$(_context4) {
+                  while (1) switch (_context4.prev = _context4.next) {
+                    case 0:
+                      mediasForProducts[productId];
+                      p = products.find(function (p) {
+                        return p._id == productId;
+                      });
+                      if (p) {
+                        _context4.next = 4;
+                        break;
+                      }
+                      throw Error('Product with id ' + productId + ' not fount during saving');
+                    case 4:
+                      p.media = mediasForProducts[productId].medias;
+                    case 5:
+                    case "end":
+                      return _context4.stop();
+                  }
+                }, _loop2);
+              });
+              _context5.t1 = _regeneratorRuntime.keys(mediasForProducts);
+            case 49:
+              if ((_context5.t2 = _context5.t1()).done) {
+                _context5.next = 54;
+                break;
+              }
+              productId = _context5.t2.value;
+              return _context5.delegateYield(_loop2(productId), "t3", 52);
+            case 52:
+              _context5.next = 49;
               break;
             case 54:
-              return _context4.abrupt("return", {
+              return _context5.abrupt("return", {
                 products: products,
                 removedProducts: removedProducts
               });
             case 55:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
         }, _callee3, this);
       }));
@@ -1167,32 +1158,32 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
     value: function () {
       var _saveProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref29) {
         var products, removedProducts, awaitPDF, _this$closeModal2, savedProducts, _this$closeModal3;
-        return _regeneratorRuntime.wrap(function _callee4$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regeneratorRuntime.wrap(function _callee4$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               products = _ref29.products, removedProducts = _ref29.removedProducts, awaitPDF = _ref29.awaitPDF;
               if (this.jwt) {
-                _context5.next = 3;
+                _context6.next = 3;
                 break;
               }
               throw new Error('jwt not set');
             case 3:
               this.setFirstVariant(products);
-              _context5.prev = 4;
-              _context5.next = 7;
+              _context6.prev = 4;
+              _context6.next = 7;
               return this.apiSaveProducts(this.catalogService, this.jwt, products, awaitPDF, removedProducts);
             case 7:
-              savedProducts = _context5.sent;
+              savedProducts = _context6.sent;
               (_this$closeModal2 = this.closeModal) === null || _this$closeModal2 === void 0 || _this$closeModal2.call(this);
-              return _context5.abrupt("return", savedProducts);
+              return _context6.abrupt("return", savedProducts);
             case 12:
-              _context5.prev = 12;
-              _context5.t0 = _context5["catch"](4);
+              _context6.prev = 12;
+              _context6.t0 = _context6["catch"](4);
               (_this$closeModal3 = this.closeModal) === null || _this$closeModal3 === void 0 || _this$closeModal3.call(this);
-              throw new Error(_context5.t0.message);
+              throw new Error(_context6.t0.message);
             case 16:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
         }, _callee4, this, [[4, 12]]);
       }));
@@ -1259,7 +1250,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
       //we use the addedPrice of the baseData as long as the calculatedPrice is the same as the SetPrice of the variant
 
       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 price = ProductHandlerAbstract.calcPrice(SetPrice !== null && SetPrice !== void 0 ? SetPrice : variantProduct === null || variantProduct === void 0 ? void 0 : variantProduct.addedPrice, [], variantProduct === null || variantProduct === void 0 ? void 0 : variantProduct.calculatedPrice, ismanual);
       var addedPrice;
       if (SetPrice == baseData.calculatedPrice) {
         addedPrice = baseData.addedPrice;
@@ -1530,35 +1521,35 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
     value: function () {
       var _apiRemoveMedia = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(serviceUrl, ref, jwt) {
         var url, response;
-        return _regeneratorRuntime.wrap(function _callee5$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime.wrap(function _callee5$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               url = new URL("".concat(serviceUrl, "/v1/mediaitems/refs/") + ref);
-              _context6.prev = 1;
-              _context6.next = 4;
+              _context7.prev = 1;
+              _context7.next = 4;
               return axios["delete"](url.toString(), {
                 headers: _objectSpread(_objectSpread({}, this.getHeaders()), {}, {
                   'Content-Type': 'application/json'
                 })
               });
             case 4:
-              response = _context6.sent;
+              response = _context7.sent;
               if (!((response === null || response === void 0 ? void 0 : response.status) == 200)) {
-                _context6.next = 7;
+                _context7.next = 7;
                 break;
               }
-              return _context6.abrupt("return", response.data);
+              return _context7.abrupt("return", response.data);
             case 7:
               throw new Error('Could not remove Media');
             case 10:
-              _context6.prev = 10;
-              _context6.t0 = _context6["catch"](1);
+              _context7.prev = 10;
+              _context7.t0 = _context7["catch"](1);
               throw new Error('Could not remove Media', {
-                cause: _context6.t0
+                cause: _context7.t0
               });
             case 13:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
         }, _callee5, this, [[1, 10]]);
       }));
@@ -1587,34 +1578,34 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
       var _apiGetProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6(divanrOrID) {
         var _res;
         var fullUrl, res, resData;
-        return _regeneratorRuntime.wrap(function _callee6$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regeneratorRuntime.wrap(function _callee6$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               fullUrl = this.catalogService + '/v1/products/' + divanrOrID + '/list';
-              _context7.prev = 1;
-              _context7.next = 4;
+              _context8.prev = 1;
+              _context8.next = 4;
               return axios.get(fullUrl, {
                 headers: _objectSpread(_objectSpread({}, this.getHeaders()), {}, {
                   'Content-Type': 'application/json'
                 })
               });
             case 4:
-              res = _context7.sent;
-              _context7.next = 7;
+              res = _context8.sent;
+              _context8.next = 7;
               return res.data;
             case 7:
-              resData = _context7.sent;
-              _context7.next = 13;
+              resData = _context8.sent;
+              _context8.next = 13;
               break;
             case 10:
-              _context7.prev = 10;
-              _context7.t0 = _context7["catch"](1);
+              _context8.prev = 10;
+              _context8.t0 = _context8["catch"](1);
               throw new Error('Could not get existing products', {
-                cause: _context7.t0
+                cause: _context8.t0
               });
             case 13:
               if (!(((_res = res) === null || _res === void 0 ? void 0 : _res.status) == 200)) {
-                _context7.next = 16;
+                _context8.next = 16;
                 break;
               }
               //in order to be backwardscompatible we must transform old products here
@@ -1627,12 +1618,12 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                 }
                 return d;
               });
-              return _context7.abrupt("return", resData);
+              return _context8.abrupt("return", resData);
             case 16:
               throw new Error(resData.error);
             case 17:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
         }, _callee6, this, [[1, 10]]);
       }));
@@ -1647,21 +1638,21 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
       var _apiGetCatalogData = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7(catalogCodex, catalogId, 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) {
+        return _regeneratorRuntime.wrap(function _callee7$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              _context8.next = 2;
+              _context9.next = 2;
               return this.apiAccountLogin(accountId, catalogId);
             case 2:
-              currentAccountSessionId = _context8.sent;
+              currentAccountSessionId = _context9.sent;
               if (currentAccountSessionId) {
-                _context8.next = 5;
+                _context9.next = 5;
                 break;
               }
-              return _context8.abrupt("return");
+              return _context9.abrupt("return");
             case 5:
               fullUrl = this.api2 + '?function=GetJsonCatalogData' + '&catalogCodex=' + catalogCodex + '&IncludeVariantValues=True&lang=' + language.toLocaleUpperCase();
-              _context8.next = 8;
+              _context9.next = 8;
               return fetch(fullUrl, {
                 headers: {
                   sessionGuid: currentAccountSessionId
@@ -1673,9 +1664,9 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                 return res.json();
               });
             case 8:
-              response = _context8.sent;
+              response = _context9.sent;
               if (!response.Error) {
-                _context8.next = 11;
+                _context9.next = 11;
                 break;
               }
               throw new Error(response.Error);
@@ -1701,16 +1692,17 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                   return p.Codex == 'DIVA3D_RENDERING';
                 })) !== null && _response$Properties !== void 0 && _response$Properties.Value),
                 images: [],
+                mediaUrl: new URL(this.api2).origin + '/files/33/' + response.SubFolder + '/',
                 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);
+              return _context9.abrupt("return", actCatalogInfoData);
             case 13:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
         }, _callee7, this);
       }));
@@ -1724,63 +1716,63 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
     value: function () {
       var _apiAccountLogin = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8(accountId, catalogId) {
         var fullUrl, response, fallbackUrl, fallbackResponse;
-        return _regeneratorRuntime.wrap(function _callee8$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        return _regeneratorRuntime.wrap(function _callee8$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               fullUrl = this.api2 + '?function=JsonAccountLogin&UserRole=v&accountGuid=' + accountId;
-              _context9.t0 = fetch;
-              _context9.t1 = fullUrl;
-              _context9.next = 5;
+              _context10.t0 = fetch;
+              _context10.t1 = fullUrl;
+              _context10.next = 5;
               return this.sessionGuid;
             case 5:
-              _context9.t2 = _context9.sent;
-              _context9.t3 = {
-                sessionGuid: _context9.t2
+              _context10.t2 = _context10.sent;
+              _context10.t3 = {
+                sessionGuid: _context10.t2
               };
-              _context9.t4 = {
-                headers: _context9.t3
+              _context10.t4 = {
+                headers: _context10.t3
               };
-              _context9.next = 10;
-              return (0, _context9.t0)(_context9.t1, _context9.t4).then(function (res) {
+              _context10.next = 10;
+              return (0, _context10.t0)(_context10.t1, _context10.t4).then(function (res) {
                 if (res.status !== 200) {
                   throw new Error('Collections not loaded.');
                 }
                 return res.json();
               });
             case 10:
-              response = _context9.sent;
+              response = _context10.sent;
               if (!response.SessionGUID) {
-                _context9.next = 13;
+                _context10.next = 13;
                 break;
               }
-              return _context9.abrupt("return", response.SessionGUID);
+              return _context10.abrupt("return", response.SessionGUID);
             case 13:
               fallbackUrl = this.api2 + '?function=JsonAccountLogin&UserRole=v&catalogGuid=' + catalogId;
-              _context9.t5 = fetch;
-              _context9.t6 = fallbackUrl;
-              _context9.next = 18;
+              _context10.t5 = fetch;
+              _context10.t6 = fallbackUrl;
+              _context10.next = 18;
               return this.sessionGuid;
             case 18:
-              _context9.t7 = _context9.sent;
-              _context9.t8 = {
-                sessionGuid: _context9.t7
+              _context10.t7 = _context10.sent;
+              _context10.t8 = {
+                sessionGuid: _context10.t7
               };
-              _context9.t9 = {
-                headers: _context9.t8
+              _context10.t9 = {
+                headers: _context10.t8
               };
-              _context9.next = 23;
-              return (0, _context9.t5)(_context9.t6, _context9.t9).then(function (res) {
+              _context10.next = 23;
+              return (0, _context10.t5)(_context10.t6, _context10.t9).then(function (res) {
                 if (res.status !== 200) {
                   throw new Error('Collections not loaded.');
                 }
                 return res.json();
               });
             case 23:
-              fallbackResponse = _context9.sent;
-              return _context9.abrupt("return", fallbackResponse.SessionGUID);
+              fallbackResponse = _context10.sent;
+              return _context10.abrupt("return", fallbackResponse.SessionGUID);
             case 25:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
         }, _callee8, this);
       }));
@@ -1795,42 +1787,42 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
       var _apiGetProductVariants = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9(id, full) {
         var _res2;
         var fullUrl, res, resData;
-        return _regeneratorRuntime.wrap(function _callee9$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime.wrap(function _callee9$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               fullUrl = this.catalogService + '/v1/products/' + id + '/variants' + (full ? '?full=true' : '');
-              _context10.prev = 1;
-              _context10.next = 4;
+              _context11.prev = 1;
+              _context11.next = 4;
               return axios.get(fullUrl, {
                 headers: _objectSpread(_objectSpread({}, this.getHeaders()), {}, {
                   'Content-Type': 'application/json'
                 })
               });
             case 4:
-              res = _context10.sent;
-              _context10.next = 7;
+              res = _context11.sent;
+              _context11.next = 7;
               return res.data;
             case 7:
-              resData = _context10.sent;
-              _context10.next = 13;
+              resData = _context11.sent;
+              _context11.next = 13;
               break;
             case 10:
-              _context10.prev = 10;
-              _context10.t0 = _context10["catch"](1);
+              _context11.prev = 10;
+              _context11.t0 = _context11["catch"](1);
               throw new Error('Could not get existing products', {
-                cause: _context10.t0
+                cause: _context11.t0
               });
             case 13:
               if (!(((_res2 = res) === null || _res2 === void 0 ? void 0 : _res2.status) == 200)) {
-                _context10.next = 15;
+                _context11.next = 15;
                 break;
               }
-              return _context10.abrupt("return", resData);
+              return _context11.abrupt("return", resData);
             case 15:
               throw new Error(resData.error);
             case 16:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
         }, _callee9, this, [[1, 10]]);
       }));
@@ -1851,39 +1843,39 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
           res,
           resData,
           filterParam,
-          _args11 = arguments;
-        return _regeneratorRuntime.wrap(function _callee10$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+          _args12 = arguments;
+        return _regeneratorRuntime.wrap(function _callee10$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              limit = _args11.length > 1 && _args11[1] !== undefined ? _args11[1] : 1;
-              useFilter = _args11.length > 2 ? _args11[2] : undefined;
-              hierarchy = _args11.length > 3 ? _args11[3] : undefined;
+              limit = _args12.length > 1 && _args12[1] !== undefined ? _args12[1] : 1;
+              useFilter = _args12.length > 2 ? _args12[2] : undefined;
+              hierarchy = _args12.length > 3 ? _args12[3] : undefined;
               fullUrl = this.catalogService + '/v1/products';
-              _context11.prev = 4;
+              _context12.prev = 4;
               filterParam = useFilter ? 'filter' : 'search';
-              _context11.next = 8;
+              _context12.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 = _context11.sent;
-              _context11.next = 11;
+              res = _context12.sent;
+              _context12.next = 11;
               return res.data;
             case 11:
-              resData = _context11.sent;
-              _context11.next = 17;
+              resData = _context12.sent;
+              _context12.next = 17;
               break;
             case 14:
-              _context11.prev = 14;
-              _context11.t0 = _context11["catch"](4);
+              _context12.prev = 14;
+              _context12.t0 = _context12["catch"](4);
               throw new Error('Could not get existing products', {
-                cause: _context11.t0
+                cause: _context12.t0
               });
             case 17:
               if (!(((_res3 = res) === null || _res3 === void 0 ? void 0 : _res3.status) == 200)) {
-                _context11.next = 20;
+                _context12.next = 20;
                 break;
               }
               //in order to be backwardscompatible we must transform old products here
@@ -1896,12 +1888,12 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                 }
                 return d;
               });
-              return _context11.abrupt("return", resData);
+              return _context12.abrupt("return", resData);
             case 20:
               throw new Error(resData.error);
             case 21:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
         }, _callee10, this, [[4, 14]]);
       }));
@@ -1911,64 +1903,63 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
       return apiGetProductByFilter;
     }()
   }, {
-    key: "apiSetCustomFlag",
+    key: "apiActivateProduct",
     value: function () {
-      var _apiSetCustomFlag = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee11(id, flagName, organizationId, dependsOn) {
+      var _apiActivateProduct = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee11(id, organizationId) {
         var _res4;
         var fullUrl, res, resData;
-        return _regeneratorRuntime.wrap(function _callee11$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime.wrap(function _callee11$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              fullUrl = new URL(this.catalogService + '/v1/products/' + id + '/' + flagName);
+              fullUrl = new URL(this.catalogService + '/v1/products/' + id + '/activate');
               fullUrl.searchParams.append('organizationId', organizationId);
-              if (dependsOn) fullUrl.searchParams.append('dependsOn', dependsOn);
-              _context12.prev = 3;
-              _context12.next = 6;
+              _context13.prev = 2;
+              _context13.next = 5;
               return axios.post(fullUrl.toString(), undefined, {
                 headers: _objectSpread(_objectSpread({}, this.getHeaders()), {}, {
                   'Content-Type': 'application/json'
                 })
               });
-            case 6:
-              res = _context12.sent;
-              _context12.next = 9;
+            case 5:
+              res = _context13.sent;
+              _context13.next = 8;
               return res.data;
-            case 9:
-              resData = _context12.sent;
-              _context12.next = 15;
+            case 8:
+              resData = _context13.sent;
+              _context13.next = 14;
               break;
-            case 12:
-              _context12.prev = 12;
-              _context12.t0 = _context12["catch"](3);
-              throw new Error('Could not get existing products', {
-                cause: _context12.t0
+            case 11:
+              _context13.prev = 11;
+              _context13.t0 = _context13["catch"](2);
+              throw new Error('Error on activate product', {
+                cause: _context13.t0
               });
-            case 15:
+            case 14:
               if (!(((_res4 = res) === null || _res4 === void 0 ? void 0 : _res4.status) == 200)) {
-                _context12.next = 17;
+                _context13.next = 16;
                 break;
               }
-              return _context12.abrupt("return", resData);
-            case 17:
+              return _context13.abrupt("return", resData);
+            case 16:
               throw new Error(resData.error);
-            case 18:
+            case 17:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee11, this, [[3, 12]]);
+        }, _callee11, this, [[2, 11]]);
       }));
-      function apiSetCustomFlag(_x18, _x19, _x20, _x21) {
-        return _apiSetCustomFlag.apply(this, arguments);
+      function apiActivateProduct(_x18, _x19) {
+        return _apiActivateProduct.apply(this, arguments);
       }
-      return apiSetCustomFlag;
+      return apiActivateProduct;
     }()
   }, {
     key: "apiDeleteProducts",
     value: function () {
       var _apiDeleteProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee12(products) {
         var fullUrl, headers, productsInChunks, i, _this$openModal3, _this$t3, promises;
-        return _regeneratorRuntime.wrap(function _callee12$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime.wrap(function _callee12$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               fullUrl = this.catalogService + '/products';
               fullUrl = "".concat(fullUrl, "?organizationId=").concat(this.organization._id);
@@ -1979,7 +1970,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
               i = 0;
             case 5:
               if (!(i < productsInChunks.length)) {
-                _context13.next = 13;
+                _context14.next = 13;
                 break;
               }
               promises = productsInChunks[i].map(function (p) {
@@ -2001,19 +1992,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
               });
-              _context13.next = 10;
+              _context14.next = 10;
               return Promise.all(promises);
             case 10:
               i++;
-              _context13.next = 5;
+              _context14.next = 5;
               break;
             case 13:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
         }, _callee12, this);
       }));
-      function apiDeleteProducts(_x22) {
+      function apiDeleteProducts(_x20) {
         return _apiDeleteProducts.apply(this, arguments);
       }
       return apiDeleteProducts;
@@ -2032,8 +2023,8 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
     value: function () {
       var _apiLoadProductVariantsGrouped = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref46) {
         var limit, skip, fields, _ref46$search, search, sort, abortController, fullUrl, headers, promise;
-        return _regeneratorRuntime.wrap(function _callee13$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime.wrap(function _callee13$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               limit = _ref46.limit, skip = _ref46.skip, fields = _ref46.fields, _ref46$search = _ref46.search, search = _ref46$search === void 0 ? [] : _ref46$search, sort = _ref46.sort, _ref46.showAllProducts, abortController = _ref46.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) : '');
@@ -2057,17 +2048,17 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                   reject('Error loading products grouped by variants: ' + error.message);
                 });
               });
-              _context14.next = 7;
+              _context15.next = 7;
               return promise;
             case 7:
-              return _context14.abrupt("return", _context14.sent);
+              return _context15.abrupt("return", _context15.sent);
             case 8:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
         }, _callee13, this);
       }));
-      function apiLoadProductVariantsGrouped(_x23) {
+      function apiLoadProductVariantsGrouped(_x21) {
         return _apiLoadProductVariantsGrouped.apply(this, arguments);
       }
       return apiLoadProductVariantsGrouped;
@@ -2076,9 +2067,9 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
     key: "apiSaveProducts",
     value: function () {
       var _apiSaveProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee14(serverUrl, jwt, products, awaitPDF, removedProductIds) {
-        var fullUrl, response, status, BATCH_SIZE, productsPackages, groupIndex, baseProduct, i, _productsPackages$gro, _productsPackages$gro2, responseProducts, _i2, _loop2, j;
-        return _regeneratorRuntime.wrap(function _callee14$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        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) {
             case 0:
               fullUrl = serverUrl + '/v1/products/groups';
               BATCH_SIZE = 40;
@@ -2087,34 +2078,34 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
               i = 0;
             case 5:
               if (!(i < products.length)) {
-                _context16.next = 15;
+                _context17.next = 15;
                 break;
               }
               if (!products[i].baseProduct) {
-                _context16.next = 9;
+                _context17.next = 9;
                 break;
               }
               baseProduct = products[i];
-              return _context16.abrupt("continue", 12);
+              return _context17.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++;
-              _context16.next = 5;
+              _context17.next = 5;
               break;
             case 15:
               responseProducts = [];
               _i2 = 0;
             case 17:
               if (!(_i2 < productsPackages.length)) {
-                _context16.next = 40;
+                _context17.next = 40;
                 break;
               }
               if (baseProduct) productsPackages[_i2].unshift(baseProduct);
-              _context16.prev = 19;
-              _context16.next = 22;
+              _context17.prev = 19;
+              _context17.next = 22;
               return fetch(fullUrl, {
                 method: 'PUT',
                 headers: {
@@ -2134,25 +2125,25 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                 return res.json();
               });
             case 22:
-              response = _context16.sent;
+              response = _context17.sent;
               if (!response.Error) {
-                _context16.next = 25;
+                _context17.next = 25;
                 break;
               }
               throw new Error('Error saving Basket and Products. serverError: ' + response.Error);
             case 25:
-              _context16.next = 30;
+              _context17.next = 30;
               break;
             case 27:
-              _context16.prev = 27;
-              _context16.t0 = _context16["catch"](19);
+              _context17.prev = 27;
+              _context17.t0 = _context17["catch"](19);
               throw Error(status);
             case 30:
-              _loop2 = /*#__PURE__*/_regeneratorRuntime.mark(function _loop2(j) {
-                return _regeneratorRuntime.wrap(function _loop2$(_context15) {
-                  while (1) switch (_context15.prev = _context15.next) {
+              _loop3 = /*#__PURE__*/_regeneratorRuntime.mark(function _loop3(j) {
+                return _regeneratorRuntime.wrap(function _loop3$(_context16) {
+                  while (1) switch (_context16.prev = _context16.next) {
                     case 0:
-                      if (response.products[_i2].baseProduct) baseProduct = response.products[_i2];
+                      if (response.products[j].baseProduct) baseProduct = response.products[j];
                       if (!responseProducts.find(function (p) {
                         return p._id == response.products[j]._id;
                       })) {
@@ -2160,34 +2151,34 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                       }
                     case 2:
                     case "end":
-                      return _context15.stop();
+                      return _context16.stop();
                   }
-                }, _loop2);
+                }, _loop3);
               });
               j = 0;
             case 32:
               if (!(j < response.products.length)) {
-                _context16.next = 37;
+                _context17.next = 37;
                 break;
               }
-              return _context16.delegateYield(_loop2(j), "t1", 34);
+              return _context17.delegateYield(_loop3(j), "t1", 34);
             case 34:
               j++;
-              _context16.next = 32;
+              _context17.next = 32;
               break;
             case 37:
               _i2++;
-              _context16.next = 17;
+              _context17.next = 17;
               break;
             case 40:
-              return _context16.abrupt("return", responseProducts);
+              return _context17.abrupt("return", responseProducts);
             case 41:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
         }, _callee14, null, [[19, 27]]);
       }));
-      function apiSaveProducts(_x24, _x25, _x26, _x27, _x28) {
+      function apiSaveProducts(_x22, _x23, _x24, _x25, _x26) {
         return _apiSaveProducts.apply(this, arguments);
       }
       return apiSaveProducts;
@@ -2237,7 +2228,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
         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 _loop3 = function _loop3() {
+      var _loop4 = function _loop4() {
           var article = orderlines[i];
           var orderLine = orderLines.find(function (ol) {
             return ol.ArticleCodex == article.ArticleCodex && catalogCodex == article.CatalogCodex;
@@ -2248,7 +2239,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
             };
           }
           if (article.VariantBasketDatas.length) {
-            var _loop4 = function _loop4() {
+            var _loop5 = function _loop5() {
                 var varinatValue = article.VariantBasketDatas[j];
                 if (!varinatData.find(function (vb) {
                   return vb.OPT == varinatValue['OPT'] && vb.OPV == varinatValue['OPV'];
@@ -2262,14 +2253,14 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
               },
               _ret2;
             for (var j = 0; j < article.VariantBasketDatas.length; j++) {
-              _ret2 = _loop4();
+              _ret2 = _loop5();
               if (_ret2) return _ret2.v;
             }
           }
         },
         _ret;
       for (var i = 0; i < orderlines.length; i++) {
-        _ret = _loop3();
+        _ret = _loop4();
         if (_ret) return _ret.v;
       }
       return true;
@@ -2347,7 +2338,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
       //calculate defaultShortDescription from template string
       var shortDescriptionTemplate = (_configurationData$sh = configurationData === null || configurationData === void 0 ? void 0 : configurationData.shortDescription) !== null && _configurationData$sh !== void 0 ? _configurationData$sh : '${modelName} ${subCategory} ${mainColor}';
       var parts = shortDescriptionTemplate.split(/\${|}/);
-      var _loop5 = function _loop5() {
+      var _loop6 = function _loop6() {
         var _classificationConfig2, _classificationConfig4, _value;
         var field = parts[i];
         var value;
@@ -2379,7 +2370,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
         shortDescriptionTemplate = shortDescriptionTemplate.replace("${".concat(field, "}"), (_value = value) !== null && _value !== void 0 ? _value : '');
       };
       for (var i = 1; i < parts.length; i = i + 2) {
-        _loop5();
+        _loop6();
       }
 
       //as long as shortDescription is not modified by user, autocalc it
@@ -2414,8 +2405,8 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
     value: function () {
       var _loadSelectOptions = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee15(sessionGuid, dataSource, additionalFilter) {
         var values, apiUrl, i, apiResult, _i3, value, text;
-        return _regeneratorRuntime.wrap(function _callee15$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime.wrap(function _callee15$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               values = [];
               apiUrl = dataSource.url;
@@ -2424,7 +2415,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                   apiUrl += '&' + additionalFilter[i].key + '=' + additionalFilter[i].value;
                 }
               }
-              _context17.next = 5;
+              _context18.next = 5;
               return fetch(apiUrl, {
                 headers: {
                   sessionGuid: sessionGuid
@@ -2436,7 +2427,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                 return res.json();
               });
             case 5:
-              apiResult = _context17.sent;
+              apiResult = _context18.sent;
               if (dataSource.useKey) {
                 apiResult = apiResult[dataSource.useKey];
               }
@@ -2448,14 +2439,14 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
                   text: text
                 });
               }
-              return _context17.abrupt("return", values);
+              return _context18.abrupt("return", values);
             case 9:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
         }, _callee15);
       }));
-      function loadSelectOptions(_x29, _x30, _x31) {
+      function loadSelectOptions(_x27, _x28, _x29) {
         return _loadSelectOptions.apply(this, arguments);
       }
       return loadSelectOptions;
@@ -2472,7 +2463,7 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
     key: "getVariantBasketDatasByOrderlines",
     value: function getVariantBasketDatasByOrderlines(orderLines, catalogData) {
       var variantBasketDatas = [];
-      var _loop6 = function _loop6() {
+      var _loop7 = function _loop7() {
         var ol = orderLines[i];
         var catalog = catalogData.find(function (c) {
           return c.codex === ol.CatalogCodex;
@@ -2482,19 +2473,20 @@ var ProductHandlerAbstract = /*#__PURE__*/function () {
           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];
-          {
+          if (opt && opv) {
             variantBasketDatas.push({
               BasketID: ol.BasketID,
               OPT: v.OPT,
               OPV: v.OPV,
               OPTName: opt.Name,
-              OPVName: opv.Name
+              OPVName: opv.Name,
+              OPVImage: catalog.mediaUrl + opv.Image
             });
           }
         }
       };
       for (var i = 0; i < orderLines.length; i++) {
-        if (_loop6()) continue;
+        if (_loop7()) continue;
       }
       return variantBasketDatas;
     }