@crystaldesign/web-planner-logic 25.13.0-beta.3 → 25.13.0-beta.31

package/build/cjs/{index-a94c390e.js → index-769e6ea1.js}

@@ -45,6 +45,8 @@ var _typeof__default = /*#__PURE__*/_interopDefaultLegacy(_typeof);
 var _excluded = ["type"];
 function ownKeys$k(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$k(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$k(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$k(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+// Import types from AI service
+
 var LOG$p = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var JsonDataCache = /*#__PURE__*/function () {
   function JsonDataCache() {
@@ -99,6 +101,26 @@ var DivaApiHandler = /*#__PURE__*/function () {
     }
   }
   return _createClass__default["default"](DivaApiHandler, [{
+    key: "getAiServiceAuthHeaders",
+    value:
+    /**
+     * Get standardized authentication headers for AI service calls
+     */
+    function getAiServiceAuthHeaders(leadKey) {
+      var headers = {};
+      if (this.jwt) headers = {
+        Authorization: 'Bearer ' + this.jwt
+      };else if (this.apiKey) headers = {
+        'X-API-KEY': this.apiKey
+      };
+
+      // Add lead key header if provided
+      if (leadKey) {
+        headers['x-lead-key'] = leadKey;
+      }
+      return headers;
+    }
+  }, {
     key: "setJsonDataCache",
     value: function setJsonDataCache(cache) {
       this.jsonDataCache = cache;
@@ -122,6 +144,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
           finalUrl,
           data,
           nextSkip,
+          _e$response,
           _args = arguments;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -193,8 +216,21 @@ var DivaApiHandler = /*#__PURE__*/function () {
             case 37:
               _context.prev = 37;
               _context.t5 = _context["catch"](4);
+              if (!(axios__default["default"].isAxiosError(_context.t5) && ((_e$response = _context.t5.response) === null || _e$response === void 0 ? void 0 : _e$response.status) === 429)) {
+                _context.next = 42;
+                break;
+              }
+              LOG$p.warn('Rate limit exceeded (429) for URL: ' + url, 'DivaApiHandler.fetchData');
+              throw new DivaUtils.DivaError('Rate limit exceeded. Please try again later.', {
+                code: 'WC_0429',
+                custom: {
+                  url: url,
+                  status: 429
+                }
+              });
+            case 42:
               throw Error('fetch failed! ' + url + ' Error: ' + _context.t5);
-            case 40:
+            case 43:
             case "end":
               return _context.stop();
           }
@@ -515,17 +551,23 @@ var DivaApiHandler = /*#__PURE__*/function () {
       var _this$apiConfig$media, _this$apiConfig7;
       return (_this$apiConfig$media = (_this$apiConfig7 = this.apiConfig) === null || _this$apiConfig7 === void 0 ? void 0 : _this$apiConfig7.mediaService) !== null && _this$apiConfig$media !== void 0 ? _this$apiConfig$media : '';
     }
+  }, {
+    key: "getDivaAiServiceUrl",
+    value: function getDivaAiServiceUrl() {
+      var _this$apiConfig$aiSer, _this$apiConfig8;
+      return (_this$apiConfig$aiSer = (_this$apiConfig8 = this.apiConfig) === null || _this$apiConfig8 === void 0 ? void 0 : _this$apiConfig8.aiService) !== null && _this$apiConfig$aiSer !== void 0 ? _this$apiConfig$aiSer : '';
+    }
   }, {
     key: "getConstructorServiceUrl",
     value: function getConstructorServiceUrl() {
-      var _this$apiConfig$const, _this$apiConfig8;
-      return (_this$apiConfig$const = (_this$apiConfig8 = this.apiConfig) === null || _this$apiConfig8 === void 0 ? void 0 : _this$apiConfig8.constructorService) !== null && _this$apiConfig$const !== void 0 ? _this$apiConfig$const : '';
+      var _this$apiConfig$const, _this$apiConfig9;
+      return (_this$apiConfig$const = (_this$apiConfig9 = this.apiConfig) === null || _this$apiConfig9 === void 0 ? void 0 : _this$apiConfig9.constructorService) !== null && _this$apiConfig$const !== void 0 ? _this$apiConfig$const : '';
     }
   }, {
     key: "getDivaBasketServiceUrl",
     value: function getDivaBasketServiceUrl() {
-      var _this$apiConfig$baske, _this$apiConfig9;
-      return (_this$apiConfig$baske = (_this$apiConfig9 = this.apiConfig) === null || _this$apiConfig9 === void 0 ? void 0 : _this$apiConfig9.basketService) !== null && _this$apiConfig$baske !== void 0 ? _this$apiConfig$baske : '';
+      var _this$apiConfig$baske, _this$apiConfig10;
+      return (_this$apiConfig$baske = (_this$apiConfig10 = this.apiConfig) === null || _this$apiConfig10 === void 0 ? void 0 : _this$apiConfig10.basketService) !== null && _this$apiConfig$baske !== void 0 ? _this$apiConfig$baske : '';
     }
   }, {
     key: "getLoadProductBasketParams",
@@ -536,8 +578,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "get3DServerUrl",
     value: function get3DServerUrl() {
-      var _this$apiConfig$host, _this$apiConfig10;
-      return (_this$apiConfig$host = (_this$apiConfig10 = this.apiConfig) === null || _this$apiConfig10 === void 0 ? void 0 : _this$apiConfig10.host3d) !== null && _this$apiConfig$host !== void 0 ? _this$apiConfig$host : '';
+      var _this$apiConfig$host, _this$apiConfig11;
+      return (_this$apiConfig$host = (_this$apiConfig11 = this.apiConfig) === null || _this$apiConfig11 === void 0 ? void 0 : _this$apiConfig11.host3d) !== null && _this$apiConfig$host !== void 0 ? _this$apiConfig$host : '';
     }
   }, {
     key: "doCheckForProductsPrice",
@@ -605,9 +647,9 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getBaseUrl",
     value: function getBaseUrl() {
-      var _this$apiConfig11, _this$apiConfig12;
-      var url = (_this$apiConfig11 = this.apiConfig) === null || _this$apiConfig11 === void 0 ? void 0 : _this$apiConfig11.api2["default"];
-      if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig12 = this.apiConfig) !== null && _this$apiConfig12 !== void 0 && _this$apiConfig12.api2.web) {
+      var _this$apiConfig12, _this$apiConfig13;
+      var url = (_this$apiConfig12 = this.apiConfig) === null || _this$apiConfig12 === void 0 ? void 0 : _this$apiConfig12.api2["default"];
+      if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig13 = this.apiConfig) !== null && _this$apiConfig13 !== void 0 && _this$apiConfig13.api2.web) {
         url = this.apiConfig.api2.web;
       }
       if (!url) throw new Error('No API2 defined');
@@ -730,41 +772,49 @@ var DivaApiHandler = /*#__PURE__*/function () {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               os = _ref.os, accountGuid = _ref.accountGuid, catalogGuid = _ref.catalogGuid;
+              if (!os.IsIDMFormat) {
+                _context5.next = 3;
+                break;
+              }
+              return _context5.abrupt("return");
+            case 3:
               if (!accountGuid) {
-                _context5.next = 5;
+                _context5.next = 7;
                 break;
               }
-              _context5.next = 4;
+              _context5.next = 6;
               return this.getDataCache(this.getApiAccountLogin(accountGuid));
-            case 4:
+            case 6:
               response = _context5.sent;
-            case 5:
+            case 7:
               if (!((!response || response.Error) && catalogGuid)) {
-                _context5.next = 9;
+                _context5.next = 11;
                 break;
               }
-              _context5.next = 8;
+              _context5.next = 10;
               return this.getDataCache(this.getApiAccountLoginByCatalogGuid(catalogGuid));
-            case 8:
+            case 10:
               response = _context5.sent;
-            case 9:
+            case 11:
               if (!response.SessionGUID) {
-                _context5.next = 14;
+                _context5.next = 16;
                 break;
               }
               os.AccountSessionGUID = response.SessionGUID;
               os.AccountGUID = response.AccountGUID;
-              _context5.next = 16;
+              _context5.next = 18;
               break;
-            case 14:
-              if (this.applicationEnvironment == 'SELLER') (_this$actions = this.actions) === null || _this$actions === void 0 || _this$actions.openComponent({
-                type: 'SELLER',
-                parameters: {
-                  module: 'Collections'
-                }
-              });
-              throw new Error("account login failed with accountGuid: '" + accountGuid + "' and catalogGuid: '" + catalogGuid + "'");
             case 16:
+              if (this.applicationEnvironment == 'SELLER') {
+                (_this$actions = this.actions) === null || _this$actions === void 0 || _this$actions.openComponent({
+                  type: 'SELLER',
+                  parameters: {
+                    module: 'Collections'
+                  }
+                });
+              }
+              throw new Error("account login failed with accountGuid: '" + accountGuid + "' and catalogGuid: '" + catalogGuid + "'");
+            case 18:
             case "end":
               return _context5.stop();
           }
@@ -855,39 +905,39 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "apiUrl",
     value: function apiUrl(queryString, useWebServiceApi) {
-      var _this$apiConfig23, _this$apiConfig24, _this$apiConfig25;
+      var _this$apiConfig24, _this$apiConfig25, _this$apiConfig26;
       if (useWebServiceApi == 'catalog') {
-        var _this$apiConfig13, _this$apiConfig14;
-        if (!((_this$apiConfig13 = this.apiConfig) !== null && _this$apiConfig13 !== void 0 && _this$apiConfig13.catalogService)) throw new Error('No catalog Service defined');
-        return ((_this$apiConfig14 = this.apiConfig) === null || _this$apiConfig14 === void 0 ? void 0 : _this$apiConfig14.catalogService) + queryString;
+        var _this$apiConfig14, _this$apiConfig15;
+        if (!((_this$apiConfig14 = this.apiConfig) !== null && _this$apiConfig14 !== void 0 && _this$apiConfig14.catalogService)) throw new Error('No catalog Service defined');
+        return ((_this$apiConfig15 = this.apiConfig) === null || _this$apiConfig15 === void 0 ? void 0 : _this$apiConfig15.catalogService) + queryString;
       }
       if (useWebServiceApi == 'basket') {
-        var _this$apiConfig15, _this$apiConfig16;
-        if (!((_this$apiConfig15 = this.apiConfig) !== null && _this$apiConfig15 !== void 0 && _this$apiConfig15.basketService)) throw new Error('No basket Service defined');
-        return ((_this$apiConfig16 = this.apiConfig) === null || _this$apiConfig16 === void 0 ? void 0 : _this$apiConfig16.basketService) + queryString;
+        var _this$apiConfig16, _this$apiConfig17;
+        if (!((_this$apiConfig16 = this.apiConfig) !== null && _this$apiConfig16 !== void 0 && _this$apiConfig16.basketService)) throw new Error('No basket Service defined');
+        return ((_this$apiConfig17 = this.apiConfig) === null || _this$apiConfig17 === void 0 ? void 0 : _this$apiConfig17.basketService) + queryString;
       }
       if (useWebServiceApi == 'report') {
-        var _this$apiConfig17, _this$apiConfig18;
-        if (!((_this$apiConfig17 = this.apiConfig) !== null && _this$apiConfig17 !== void 0 && _this$apiConfig17.reportService)) throw new Error('No report Service defined');
-        return ((_this$apiConfig18 = this.apiConfig) === null || _this$apiConfig18 === void 0 ? void 0 : _this$apiConfig18.reportService) + queryString;
+        var _this$apiConfig18, _this$apiConfig19;
+        if (!((_this$apiConfig18 = this.apiConfig) !== null && _this$apiConfig18 !== void 0 && _this$apiConfig18.reportService)) throw new Error('No report Service defined');
+        return ((_this$apiConfig19 = this.apiConfig) === null || _this$apiConfig19 === void 0 ? void 0 : _this$apiConfig19.reportService) + queryString;
       }
       if (useWebServiceApi == 'enricher') {
-        var _this$apiConfig21, _this$apiConfig22;
+        var _this$apiConfig22, _this$apiConfig23;
         if (this.useIDMService) {
-          var _this$apiConfig19, _this$apiConfig20;
-          if (!((_this$apiConfig19 = this.apiConfig) !== null && _this$apiConfig19 !== void 0 && _this$apiConfig19.idmService)) throw new Error('No report Service defined');
-          return ((_this$apiConfig20 = this.apiConfig) === null || _this$apiConfig20 === void 0 ? void 0 : _this$apiConfig20.idmService) + queryString;
+          var _this$apiConfig20, _this$apiConfig21;
+          if (!((_this$apiConfig20 = this.apiConfig) !== null && _this$apiConfig20 !== void 0 && _this$apiConfig20.idmService)) throw new Error('No report Service defined');
+          return ((_this$apiConfig21 = this.apiConfig) === null || _this$apiConfig21 === void 0 ? void 0 : _this$apiConfig21.idmService) + queryString;
         }
-        if (!((_this$apiConfig21 = this.apiConfig) !== null && _this$apiConfig21 !== void 0 && _this$apiConfig21.enricherService)) throw new Error('No report Service defined');
-        return ((_this$apiConfig22 = this.apiConfig) === null || _this$apiConfig22 === void 0 ? void 0 : _this$apiConfig22.enricherService) + queryString;
+        if (!((_this$apiConfig22 = this.apiConfig) !== null && _this$apiConfig22 !== void 0 && _this$apiConfig22.enricherService)) throw new Error('No report Service defined');
+        return ((_this$apiConfig23 = this.apiConfig) === null || _this$apiConfig23 === void 0 ? void 0 : _this$apiConfig23.enricherService) + queryString;
       }
-      var url = (_this$apiConfig23 = this.apiConfig) === null || _this$apiConfig23 === void 0 ? void 0 : _this$apiConfig23.api2["default"];
-      if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig24 = this.apiConfig) !== null && _this$apiConfig24 !== void 0 && _this$apiConfig24.api2.web) {
+      var url = (_this$apiConfig24 = this.apiConfig) === null || _this$apiConfig24 === void 0 ? void 0 : _this$apiConfig24.api2["default"];
+      if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig25 = this.apiConfig) !== null && _this$apiConfig25 !== void 0 && _this$apiConfig25.api2.web) {
         url = this.apiConfig.api2.web;
       }
-      if (this.useEkPrices && (_this$apiConfig25 = this.apiConfig) !== null && _this$apiConfig25 !== void 0 && _this$apiConfig25.api2.ek) {
-        var _this$apiConfig26;
-        url = (_this$apiConfig26 = this.apiConfig) === null || _this$apiConfig26 === void 0 ? void 0 : _this$apiConfig26.api2.ek;
+      if (this.useEkPrices && (_this$apiConfig26 = this.apiConfig) !== null && _this$apiConfig26 !== void 0 && _this$apiConfig26.api2.ek) {
+        var _this$apiConfig27;
+        url = (_this$apiConfig27 = this.apiConfig) === null || _this$apiConfig27 === void 0 ? void 0 : _this$apiConfig27.api2.ek;
       }
       if (!url) throw new Error('No API2 defined');
       return url + '?' + queryString;
@@ -1182,12 +1232,151 @@ var DivaApiHandler = /*#__PURE__*/function () {
       return loadArticlePricesQS;
     }()
   }, {
-    key: "postHQRenderScript",
+    key: "generateAiImageWithReferenceImages",
     value: function () {
-      var _postHQRenderScript = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee9(data) {
+      var _generateAiImageWithReferenceImages = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee9(data, leadKey) {
         var url, headers, res;
         return _regeneratorRuntime__default["default"].wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
+            case 0:
+              url = this.getDivaAiServiceUrl() + '/generate-image-with-references';
+              headers = this.getAiServiceAuthHeaders(leadKey);
+              _context9.next = 4;
+              return this.fetchData(url, {
+                data: _objectSpread$k(_objectSpread$k({}, data), {}, {
+                  organizationId: this.OrganizationId
+                }),
+                config: {
+                  headers: headers
+                },
+                method: 'POST'
+              });
+            case 4:
+              res = _context9.sent;
+              return _context9.abrupt("return", res);
+            case 6:
+            case "end":
+              return _context9.stop();
+          }
+        }, _callee9, this);
+      }));
+      function generateAiImageWithReferenceImages(_x24, _x25) {
+        return _generateAiImageWithReferenceImages.apply(this, arguments);
+      }
+      return generateAiImageWithReferenceImages;
+    }()
+  }, {
+    key: "getUsageLimits",
+    value: function () {
+      var _getUsageLimits = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee10(data) {
+        var url, headers, res;
+        return _regeneratorRuntime__default["default"].wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
+            case 0:
+              url = this.getDivaAiServiceUrl() + '/usage/limits?organizationId=' + data.organizationId + '&userId=' + data.userId;
+              headers = this.getAiServiceAuthHeaders();
+              _context10.next = 4;
+              return this.fetchData(url, {
+                data: {},
+                config: {
+                  headers: headers
+                },
+                method: 'GET'
+              });
+            case 4:
+              res = _context10.sent;
+              return _context10.abrupt("return", res);
+            case 6:
+            case "end":
+              return _context10.stop();
+          }
+        }, _callee10, this);
+      }));
+      function getUsageLimits(_x26) {
+        return _getUsageLimits.apply(this, arguments);
+      }
+      return getUsageLimits;
+    }()
+  }, {
+    key: "getAiRoomRenderings",
+    value: function () {
+      var _getAiRoomRenderings = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee11(organizationId) {
+        var orgParam, url, headers, res;
+        return _regeneratorRuntime__default["default"].wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
+            case 0:
+              orgParam = organizationId ? "?organizationId=".concat(organizationId) : '';
+              url = this.getDivaAiServiceUrl() + '/room-renderings' + orgParam; // No authentication headers needed - public endpoint
+              headers = this.getAiServiceAuthHeaders();
+              _context11.next = 5;
+              return this.fetchData(url, {
+                data: {},
+                config: {
+                  headers: headers
+                },
+                method: 'GET'
+              });
+            case 5:
+              res = _context11.sent;
+              return _context11.abrupt("return", res);
+            case 7:
+            case "end":
+              return _context11.stop();
+          }
+        }, _callee11, this);
+      }));
+      function getAiRoomRenderings(_x27) {
+        return _getAiRoomRenderings.apply(this, arguments);
+      }
+      return getAiRoomRenderings;
+    }()
+  }, {
+    key: "createLeadKey",
+    value: function () {
+      var _createLeadKey = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee12(email) {
+        var url, headers, res;
+        return _regeneratorRuntime__default["default"].wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
+            case 0:
+              url = this.getDivaAiServiceUrl() + '/lead-key';
+              headers = this.getAiServiceAuthHeaders();
+              _context12.prev = 2;
+              _context12.next = 5;
+              return this.fetchData(url, {
+                data: {
+                  email: email
+                },
+                config: {
+                  headers: headers
+                },
+                method: 'POST'
+              });
+            case 5:
+              res = _context12.sent;
+              return _context12.abrupt("return", res);
+            case 9:
+              _context12.prev = 9;
+              _context12.t0 = _context12["catch"](2);
+              LOG$p.error(new Error("Failed to create lead key for email ".concat(email, ": ").concat((_context12.t0 === null || _context12.t0 === void 0 ? void 0 : _context12.t0.message) || _context12.t0)));
+              throw _context12.t0;
+            case 13:
+            case "end":
+              return _context12.stop();
+          }
+        }, _callee12, this, [[2, 9]]);
+      }));
+      function createLeadKey(_x28) {
+        return _createLeadKey.apply(this, arguments);
+      }
+      return createLeadKey;
+    }()
+  }, {
+    key: "postHQRenderScript",
+    value: function () {
+      var _postHQRenderScript = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee13(data) {
+        var url, headers, res;
+        return _regeneratorRuntime__default["default"].wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               url = this.getDivaMediaServiceUrl() + '/hqrenderscripts';
               headers = {};
@@ -1196,7 +1385,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
               };else if (this.apiKey) headers = {
                 'X-API-KEY': this.apiKey
               };
-              _context9.next = 5;
+              _context13.next = 5;
               return this.fetchData(url, {
                 data: data,
                 config: {
@@ -1205,15 +1394,15 @@ var DivaApiHandler = /*#__PURE__*/function () {
                 method: 'POST'
               });
             case 5:
-              res = _context9.sent;
-              return _context9.abrupt("return", res);
+              res = _context13.sent;
+              return _context13.abrupt("return", res);
             case 7:
             case "end":
-              return _context9.stop();
+              return _context13.stop();
           }
-        }, _callee9, this);
+        }, _callee13, this);
       }));
-      function postHQRenderScript(_x24) {
+      function postHQRenderScript(_x29) {
         return _postHQRenderScript.apply(this, arguments);
       }
       return postHQRenderScript;
@@ -1221,10 +1410,10 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "postPlanningInfo",
     value: function () {
-      var _postPlanningInfo = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee10(planningInfo, divaNr, imgUrl, price, name, userId, firstName, lastName, organizationId) {
+      var _postPlanningInfo = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee14(planningInfo, divaNr, imgUrl, price, name, userId, firstName, lastName, organizationId) {
         var data, url, headers;
-        return _regeneratorRuntime__default["default"].wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               data = {
                 info: JSON.stringify(planningInfo),
@@ -1243,8 +1432,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
               };else if (this.apiKey) headers = {
                 'X-API-KEY': this.apiKey
               };
-              _context10.prev = 4;
-              _context10.next = 7;
+              _context14.prev = 4;
+              _context14.next = 7;
               return this.fetchData(url, {
                 data: data,
                 config: {
@@ -1253,21 +1442,21 @@ var DivaApiHandler = /*#__PURE__*/function () {
                 method: 'POST'
               });
             case 7:
-              _context10.next = 12;
+              _context14.next = 12;
               break;
             case 9:
-              _context10.prev = 9;
-              _context10.t0 = _context10["catch"](4);
+              _context14.prev = 9;
+              _context14.t0 = _context14["catch"](4);
               LOG$p.error(new DivaUtils.DivaError('Error Connecting to Support-Service-LivePlanner', {
-                cause: _context10.t0
+                cause: _context14.t0
               }));
             case 12:
             case "end":
-              return _context10.stop();
+              return _context14.stop();
           }
-        }, _callee10, this, [[4, 9]]);
+        }, _callee14, this, [[4, 9]]);
       }));
-      function postPlanningInfo(_x25, _x26, _x27, _x28, _x29, _x30, _x31, _x32, _x33) {
+      function postPlanningInfo(_x30, _x31, _x32, _x33, _x34, _x35, _x36, _x37, _x38) {
         return _postPlanningInfo.apply(this, arguments);
       }
       return postPlanningInfo;
@@ -1275,21 +1464,21 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getDimensionbyId",
     value: function () {
-      var _getDimensionbyId = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee11(id, iln, catalogCodex, plannedOptions) {
-        var _this$apiConfig27;
+      var _getDimensionbyId = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee15(id, iln, catalogCodex, plannedOptions) {
+        var _this$apiConfig28;
         var fullUrl, res, headers;
-        return _regeneratorRuntime__default["default"].wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              fullUrl = this.getConstructorServiceUrl() + '/dimension/' + id + '?iln=' + iln + '&catalogCodex=' + catalogCodex + '&debug=' + ((_this$apiConfig27 = this.apiConfig) === null || _this$apiConfig27 === void 0 ? void 0 : _this$apiConfig27.useDebugUrl);
+              fullUrl = this.getConstructorServiceUrl() + '/dimension/' + id + '?iln=' + iln + '&catalogCodex=' + catalogCodex + '&debug=' + ((_this$apiConfig28 = this.apiConfig) === null || _this$apiConfig28 === void 0 ? void 0 : _this$apiConfig28.useDebugUrl);
               headers = {};
               if (this.jwt) headers = {
                 Authorization: 'Bearer ' + this.jwt
               };else if (this.apiKey) headers = {
                 'X-API-KEY': this.apiKey
               };
-              _context11.prev = 3;
-              _context11.next = 6;
+              _context15.prev = 3;
+              _context15.next = 6;
               return this.fetchData(fullUrl, {
                 method: 'POST',
                 data: {
@@ -1300,23 +1489,23 @@ var DivaApiHandler = /*#__PURE__*/function () {
                 }
               });
             case 6:
-              res = _context11.sent;
-              return _context11.abrupt("return", res);
+              res = _context15.sent;
+              return _context15.abrupt("return", res);
             case 10:
-              _context11.prev = 10;
-              _context11.t0 = _context11["catch"](3);
+              _context15.prev = 10;
+              _context15.t0 = _context15["catch"](3);
               LOG$p.error({
                 message: 'Could not fetch dimension',
                 name: 'get dimension error'
               });
-              return _context11.abrupt("return", undefined);
+              return _context15.abrupt("return", undefined);
             case 14:
             case "end":
-              return _context11.stop();
+              return _context15.stop();
           }
-        }, _callee11, this, [[3, 10]]);
+        }, _callee15, this, [[3, 10]]);
       }));
-      function getDimensionbyId(_x34, _x35, _x36, _x37) {
+      function getDimensionbyId(_x39, _x40, _x41, _x42) {
         return _getDimensionbyId.apply(this, arguments);
       }
       return getDimensionbyId;
@@ -1324,7 +1513,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "createBasketReport",
     value: function () {
-      var _createBasketReport = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee12(basket, _ref2) {
+      var _createBasketReport = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee16(basket, _ref2) {
         var type,
           printOptions,
           savePdf,
@@ -1333,12 +1522,12 @@ var DivaApiHandler = /*#__PURE__*/function () {
           headers,
           result,
           val,
-          _args12 = arguments;
-        return _regeneratorRuntime__default["default"].wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+          _args16 = arguments;
+        return _regeneratorRuntime__default["default"].wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               type = _ref2.type, printOptions = _objectWithoutProperties__default["default"](_ref2, _excluded);
-              savePdf = _args12.length > 2 && _args12[2] !== undefined ? _args12[2] : false;
+              savePdf = _args16.length > 2 && _args16[2] !== undefined ? _args16[2] : false;
               data = {
                 type: type,
                 printOptions: printOptions,
@@ -1351,8 +1540,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
               };else if (this.apiKey) headers = {
                 'X-API-KEY': this.apiKey
               };
-              _context12.prev = 6;
-              _context12.next = 9;
+              _context16.prev = 6;
+              _context16.next = 9;
               return this.fetchData(url, {
                 data: data,
                 config: {
@@ -1361,7 +1550,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
                 method: 'POST'
               });
             case 9:
-              result = _context12.sent;
+              result = _context16.sent;
               if (savePdf) {
                 val = {};
                 val[type] = result.url;
@@ -1380,20 +1569,20 @@ var DivaApiHandler = /*#__PURE__*/function () {
                   }
                 });
               }
-              return _context12.abrupt("return", result.url);
+              return _context16.abrupt("return", result.url);
             case 14:
-              _context12.prev = 14;
-              _context12.t0 = _context12["catch"](6);
+              _context16.prev = 14;
+              _context16.t0 = _context16["catch"](6);
               LOG$p.error(new DivaUtils.DivaError('Error Connecting to Report Service', {
-                cause: _context12.t0
+                cause: _context16.t0
               }));
             case 17:
             case "end":
-              return _context12.stop();
+              return _context16.stop();
           }
-        }, _callee12, this, [[6, 14]]);
+        }, _callee16, this, [[6, 14]]);
       }));
-      function createBasketReport(_x38, _x39) {
+      function createBasketReport(_x43, _x44) {
         return _createBasketReport.apply(this, arguments);
       }
       return createBasketReport;
@@ -1916,112 +2105,11 @@ var CatalogPlannerArticleData = /*#__PURE__*/function () {
 var LOG$o = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var OptionCatalogData = /*#__PURE__*/function () {
   function OptionCatalogData(opt, catalogData) {
+    var _this$opt$property;
     _classCallCheck__default["default"](this, OptionCatalogData);
     _defineProperty__default["default"](this, "opt", void 0);
     this.opt = opt;
-    for (var i = 0; i < ((_this$opt$property = this.opt.property) === null || _this$opt$property === void 0 ? void 0 : _this$opt$property.length); i++) {
-      var _this$opt$property;
-      var prop = this.opt.property[i];
-      var key = prop.Codex;
-      if (key.startsWith(catalogData.catalogCodex + '__')) key = key.replace(catalogData.catalogCodex + '__', '');
-      switch (key) {
-        case 'INFO_URL':
-          this.opt.url = prop.Value;
-          break;
-        case 'IGNORE_GROUPS':
-          this.opt.ignoreGroups = prop.Value == '1';
-          break;
-        case 'IGNORE_PGR_GROUP_POSITION':
-          this.opt.ignorePgrGroupPosition = prop.Value == '1';
-          break;
-        case 'SHOW_SEARCHBAR':
-          this.opt.showSearchbar = prop.Value == '1';
-          break;
-        case 'SHOW_FILTER':
-          this.opt.showFilter = prop.Value == '1';
-          break;
-        case 'INFO_PDF':
-          this.opt.pdfUrl = prop.Value;
-          break;
-        case 'DIAMETER':
-          this.opt.diameter = !!prop.Value;
-          break;
-        case 'PAIROPTION':
-          this.opt.pairWithOptionsToGroup = prop.Value;
-          break;
-        case 'REQUIRES_USER_INPUT':
-          this.opt.requiresUserInput = !!prop.Value;
-          break;
-        case 'IS_STATE':
-          this.opt.isDescribingState = !!prop.Value;
-          break;
-        case 'CUSTOM_DIMENSION':
-          this.opt.customDimension = !!prop.Value;
-          break;
-        case 'CUSTOM_DIMENSION_TEXT':
-          this.opt.customDimensionText = prop.Value;
-          break;
-        case 'HIDE_OPTION_IN_CONFIGURATOR':
-          this.opt.hideOptionInConfigurator = !!prop.Value;
-          break;
-        case 'MERGE_IDM_TO_OPG':
-          this.opt.mergeIDMToOPG = prop.Value;
-          break;
-        case 'ONLY_VISIBLE_IF_NOT_UNDOCK':
-          this.opt.onlyVisibleIfNotDocked = prop.Value;
-          break;
-        case 'ONLY_VISIBLE_IF_CONFIG_SINGLE':
-          this.opt.onlyVisibleIfConfigSingle = prop.Value;
-          break;
-        case 'ONLY_VISIBLE_IF_CONFIG_ALL':
-          this.opt.onlyVisibleIfConfigAll = prop.Value;
-          break;
-        case 'ISDEFAULTVALUEFOROPTIONS':
-          this.opt.isDefaultValueForOptions = prop.Value;
-          break;
-        case 'FREETEXT_DEFAULT_VALUE':
-          this.opt.freetextDefaultValue = prop.Value;
-          break;
-        case 'SHOW_IN_VARIANTDESC':
-          this.opt.forceShowVariantDesc = prop.Value;
-          break;
-        case 'SHOW_SEPARAT_ON_TABGROUP':
-          this.opt.showOnSeparatTabgroup = prop.Value;
-          break;
-        case 'SETNAME':
-          this.opt.setName = prop.Value;
-          break;
-        case 'ADD_OPT_TO_TABGROUP_IN_PL_SUM':
-          this.opt.addOptionToTabgroupInPartlistSummary = prop.Value;
-          break;
-        case 'ADD_TO_WWS':
-          this.opt.addToWWS = prop.Value;
-          break;
-        case 'DEFAULT_SIBLING_OPTION':
-          this.opt.isDefaultSiblingOption = prop.Value;
-          break;
-        case 'CONTENT_ITEM':
-          this.opt.contentItemId = prop.Value;
-          break;
-        case 'SendToPim':
-          this.opt.sendToPIM = prop.Value == '1';
-          break;
-        case 'Multiselect':
-          this.opt.isMultiselect = prop.Value == '1';
-          break;
-        case 'ION_COMMENT_TEXT':
-        case 'SHOW_IN_BASKET_WHEN_HAS_PRICE':
-        case 'FEATURE_TYPE':
-        case 'EshopCategoryMapping':
-        case 'EshopSearchRelevant':
-        case 'IsSalesText':
-        case 'IsArtName':
-          break;
-        default:
-          LOG$o.debug('implement mapping for these props for options: ' + prop.Codex);
-          break;
-      }
-    }
+    setOptionsProperties(catalogData, this.opt.propertyObj, (_this$opt$property = this.opt.property) !== null && _this$opt$property !== void 0 ? _this$opt$property : []);
   }
 
   /**************************************************GETTER ***************************************************/
@@ -2105,10 +2193,15 @@ var OptionCatalogData = /*#__PURE__*/function () {
     get: function get() {
       return this.opt.articlePlaceholder;
     }
+  }, {
+    key: "isMultiselect",
+    get: function get() {
+      return this.opt.isMultiselect;
+    }
   }, {
     key: "isDefaultSiblingOption",
     get: function get() {
-      return this.opt.isDefaultSiblingOption;
+      return this.opt.propertyObj.isDefaultSiblingOption;
     }
   }, {
     key: "layout",
@@ -2119,90 +2212,90 @@ var OptionCatalogData = /*#__PURE__*/function () {
       this.opt.layout = layout;
     }
   }, {
-    key: "pairWithOptionsToGroup",
+    key: "measureKey",
     get: function get() {
-      return this.opt.pairWithOptionsToGroup;
+      return this.opt.measureKey;
     }
   }, {
-    key: "isDescribingState",
+    key: "pairWithOptionsToGroup",
     get: function get() {
-      return this.opt.isDescribingState;
+      return this.opt.propertyObj.pairWithOptionsToGroup;
     }
   }, {
-    key: "requiresUserInput",
+    key: "isDescribingState",
     get: function get() {
-      return this.opt.requiresUserInput;
+      return this.opt.propertyObj.isDescribingState;
     }
   }, {
-    key: "isMultiselect",
+    key: "requiresUserInput",
     get: function get() {
-      return this.opt.isMultiselect;
+      return this.opt.propertyObj.requiresUserInput;
     }
   }, {
     key: "hideOptionInConfigurator",
     get: function get() {
-      return this.opt.hideOptionInConfigurator;
+      return this.opt.propertyObj.hideOptionInConfigurator;
     }
   }, {
     key: "mergeIDMToOPG",
     get: function get() {
-      return this.opt.mergeIDMToOPG;
+      return this.opt.propertyObj.mergeIDMToOPG;
     }
   }, {
     key: "onlyVisibleIfNotDocked",
     get: function get() {
       // deprecated: was used for Bail amalfi accessoires
-      return this.opt.onlyVisibleIfNotDocked;
+      return this.opt.propertyObj.onlyVisibleIfNotDocked;
     }
   }, {
     key: "onlyVisibleIfConfigSingle",
     get: function get() {
-      return this.opt.onlyVisibleIfConfigSingle;
+      return this.opt.propertyObj.onlyVisibleIfConfigSingle;
     }
   }, {
     key: "onlyVisibleIfConfigAll",
     get: function get() {
-      return this.opt.onlyVisibleIfConfigAll;
+      return this.opt.propertyObj.onlyVisibleIfConfigAll;
     }
   }, {
     key: "isDefaultValueForOptions",
     get: function get() {
-      return this.opt.isDefaultValueForOptions;
+      return this.opt.propertyObj.isDefaultValueForOptions;
     }
   }, {
     key: "freetextDefaultValue",
     get: function get() {
-      return this.opt.freetextDefaultValue;
+      return this.opt.propertyObj.freetextDefaultValue;
     }
   }, {
     key: "url",
     get: function get() {
-      return this.opt.url;
+      return this.opt.propertyObj.url;
     }
   }, {
     key: "showSearchbar",
     get: function get() {
-      return this.opt.showSearchbar;
+      return this.opt.propertyObj.showSearchbar;
     }
   }, {
     key: "showFilter",
     get: function get() {
-      return this.opt.showFilter;
+      return this.opt.propertyObj.showFilter;
     }
   }, {
     key: "pdfUrl",
     get: function get() {
-      return this.opt.pdfUrl;
+      return this.opt.propertyObj.pdfUrl;
     }
   }, {
     key: "diameter",
     get: function get() {
-      return this.opt.diameter;
+      return this.opt.propertyObj.diameter;
     }
   }, {
     key: "forceShowVariantDesc",
     get: function get() {
-      return this.opt.forceShowVariantDesc;
+      return this.opt.propertyObj.forceShowVariantDesc;
     }
   }, {
     key: "maskTabgroup",
@@ -2212,47 +2305,42 @@ var OptionCatalogData = /*#__PURE__*/function () {
   }, {
     key: "showOnSeparatTabgroup",
     get: function get() {
-      return this.opt.showOnSeparatTabgroup;
+      return this.opt.propertyObj.showOnSeparatTabgroup;
     }
   }, {
     key: "setName",
     get: function get() {
-      return this.opt.setName;
+      return this.opt.propertyObj.setName;
     }
   }, {
     key: "addOptionToTabgroupInPartlistSummary",
     get: function get() {
-      return this.opt.addOptionToTabgroupInPartlistSummary;
+      return this.opt.propertyObj.addOptionToTabgroupInPartlistSummary;
     }
   }, {
     key: "addToWWS",
     get: function get() {
-      return this.opt.addToWWS;
+      return this.opt.propertyObj.addToWWS;
     }
   }, {
     key: "sendToPIM",
     get: function get() {
-      return this.opt.sendToPIM;
-    }
-  }, {
-    key: "measureKey",
-    get: function get() {
-      return this.opt.measureKey;
+      return this.opt.propertyObj.sendToPIM;
     }
   }, {
     key: "contentItemId",
     get: function get() {
-      return this.opt.contentItemId;
+      return this.opt.propertyObj.contentItemId;
     }
   }, {
     key: "customDimension",
     get: function get() {
-      return this.opt.customDimension;
+      return this.opt.propertyObj.customDimension;
     }
   }, {
     key: "customDimensionText",
     get: function get() {
-      return this.opt.customDimensionText;
+      return this.opt.propertyObj.customDimensionText;
     }
   }, {
     key: "sequenceNo",
@@ -2262,15 +2350,121 @@ var OptionCatalogData = /*#__PURE__*/function () {
   }, {
     key: "ignoreGroups",
     get: function get() {
-      return this.opt.ignoreGroups;
+      return this.opt.propertyObj.ignoreGroups;
     }
   }, {
     key: "ignorePgrGroupPosition",
     get: function get() {
-      return this.opt.ignorePgrGroupPosition;
+      return this.opt.propertyObj.ignorePgrGroupPosition;
+    }
+  }, {
+    key: "additionalGroupFilter",
+    get: function get() {
+      return this.opt.propertyObj.additionalGroupFilter;
     }
   }]);
 }();
+var setOptionsProperties = function setOptionsProperties(catalogData, opt, properties) {
+  for (var i = 0; i < (properties === null || properties === void 0 ? void 0 : properties.length); i++) {
+    var prop = properties[i];
+    var key = prop.Codex;
+    if (key.startsWith(catalogData.catalogCodex + '__')) key = key.replace(catalogData.catalogCodex + '__', '');
+    switch (key) {
+      case 'INFO_URL':
+        opt.url = prop.Value;
+        break;
+      case 'IGNORE_GROUPS':
+        opt.ignoreGroups = prop.Value == '1';
+        break;
+      case 'IGNORE_PGR_GROUP_POSITION':
+        opt.ignorePgrGroupPosition = prop.Value == '1';
+        break;
+      case 'SHOW_SEARCHBAR':
+        opt.showSearchbar = prop.Value == '1';
+        break;
+      case 'SHOW_FILTER':
+        opt.showFilter = prop.Value == '1';
+        break;
+      case 'INFO_PDF':
+        opt.pdfUrl = prop.Value;
+        break;
+      case 'DIAMETER':
+        opt.diameter = !!prop.Value;
+        break;
+      case 'PAIROPTION':
+        opt.pairWithOptionsToGroup = prop.Value;
+        break;
+      case 'REQUIRES_USER_INPUT':
+        opt.requiresUserInput = !!prop.Value;
+        break;
+      case 'IS_STATE':
+        opt.isDescribingState = !!prop.Value;
+        break;
+      case 'CUSTOM_DIMENSION':
+        opt.customDimension = !!prop.Value;
+        break;
+      case 'CUSTOM_DIMENSION_TEXT':
+        opt.customDimensionText = prop.Value;
+        break;
+      case 'HIDE_OPTION_IN_CONFIGURATOR':
+        opt.hideOptionInConfigurator = !!prop.Value;
+        break;
+      case 'MERGE_IDM_TO_OPG':
+        opt.mergeIDMToOPG = prop.Value;
+        break;
+      case 'ONLY_VISIBLE_IF_NOT_UNDOCK':
+        opt.onlyVisibleIfNotDocked = prop.Value;
+        break;
+      case 'ONLY_VISIBLE_IF_CONFIG_SINGLE':
+        opt.onlyVisibleIfConfigSingle = prop.Value;
+        break;
+      case 'ONLY_VISIBLE_IF_CONFIG_ALL':
+        opt.onlyVisibleIfConfigAll = prop.Value;
+        break;
+      case 'ISDEFAULTVALUEFOROPTIONS':
+        opt.isDefaultValueForOptions = prop.Value;
+        break;
+      case 'FREETEXT_DEFAULT_VALUE':
+        opt.freetextDefaultValue = prop.Value;
+        break;
+      case 'SHOW_IN_VARIANTDESC':
+        opt.forceShowVariantDesc = prop.Value;
+        break;
+      case 'SHOW_SEPARAT_ON_TABGROUP':
+        opt.showOnSeparatTabgroup = prop.Value;
+        break;
+      case 'SETNAME':
+        opt.setName = !!prop.Value;
+        break;
+      case 'ADD_OPT_TO_TABGROUP_IN_PL_SUM':
+        opt.addOptionToTabgroupInPartlistSummary = prop.Value;
+        break;
+      case 'ADD_TO_WWS':
+        opt.addToWWS = !!prop.Value;
+        break;
+      case 'DEFAULT_SIBLING_OPTION':
+        opt.isDefaultSiblingOption = prop.Value;
+        break;
+      case 'CONTENT_ITEM':
+        opt.contentItemId = prop.Value;
+        break;
+      case 'ADDITIONAL_GROUP_FILTER':
+        opt.additionalGroupFilter = JSON.parse(prop.Value);
+        break;
+      case 'ION_COMMENT_TEXT':
+      case 'SHOW_IN_BASKET_WHEN_HAS_PRICE':
+      case 'FEATURE_TYPE':
+      case 'EshopCategoryMapping':
+      case 'EshopSearchRelevant':
+      case 'IsSalesText':
+      case 'IsArtName':
+        break;
+      default:
+        LOG$o.debug('implement mapping for these props for options: ' + prop.Codex);
+        break;
+    }
+  }
+};
 
 //https://en.wikipedia.org/wiki/List_of_RAL_colors#RAL_Effect
 var ralEffect = [{
@@ -16064,7 +16258,8 @@ var ralClassics = [{
 var LOG$n = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var OptionValueCatalogData = /*#__PURE__*/function () {
   function OptionValueCatalogData(opv, catalogData) {
-    var _this = this;
+    var _this = this,
+      _this$opv$property;
     _classCallCheck__default["default"](this, OptionValueCatalogData);
     _defineProperty__default["default"](this, "opv", void 0);
     /**
@@ -16121,114 +16316,7 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
     });
     this.opv = opv;
     opv.colorGroups = this.mapRALColorToGroup();
-    var metaDatas = [];
-    for (var i = 0; i < ((_this$opv$property$le = (_this$opv$property = this.opv.property) === null || _this$opv$property === void 0 ? void 0 : _this$opv$property.length) !== null && _this$opv$property$le !== void 0 ? _this$opv$property$le : 0); i++) {
-      var _this$opv$property$le, _this$opv$property, _this$opv$property2;
-      var prop = (_this$opv$property2 = this.opv.property) === null || _this$opv$property2 === void 0 ? void 0 : _this$opv$property2[i];
-      var key = prop.Codex;
-      if (key.startsWith(catalogData.catalogCodex + '__')) key = key.replace(catalogData.catalogCodex + '__', '');
-      switch (key) {
-        case 'INFO_URL':
-          this.opv.url = prop.Value;
-          break;
-        case 'INFO_PDF':
-          this.opv.pdfUrl = prop.Value;
-          break;
-        case 'SAME_OPV':
-          this.opv.sameopv = prop.Value;
-          break;
-        case 'ONLY_VISIBLE_IF_NOT_UNDOCK':
-          this.opv.onlyVisibleIfNotDocked = prop.Value;
-          break;
-        case 'DEFAULT_VALUE':
-          this.opv.defaultValue = prop.Value;
-          break;
-        case 'SUMMARY_CODEX':
-          this.opv.summaryCodex = prop.Value;
-          break;
-        case 'VIEWPOINTNAME':
-          this.opv.viewPointName = prop.Value;
-          break;
-        case 'HIDE_IN_SUMMARY':
-          this.opv.hideInSummary = !!prop.Value;
-          break;
-        case 'SETNAME':
-          this.opv.setName = prop.Value;
-          break;
-        case 'SET_CONFIG':
-          this.opv.setConfig = prop.Value;
-          break;
-        case 'CUSTOM_DIMENSION':
-          if (prop.Value == 1 || prop.Value == 0) {
-            this.opv.customDimension = !!prop.Value;
-          } else if (!isNaN(Number(prop.Value))) {
-            this.opv.customDimension = Number(prop.Value);
-          } else {
-            console.error('Error: Invalid custom dimension value: ' + prop.Value + ' at opv: ' + this.opv.codex);
-            this.opv.customDimension = undefined;
-          }
-          break;
-        case 'ON_RULE':
-          this.opv.onRule = prop.Value;
-          break;
-        case 'CONTENT_ITEM':
-          this.opv.contentItemId = prop.Value;
-          break;
-        case 'IS_NOT_RELEVANT':
-          this.opv.isNotRelevant = prop.Value;
-          break;
-        case 'GROUP_CONTENT_ITEM':
-          this.opv.groupContentItemId = prop.Value;
-          break;
-        case 'SET_BY_RULE':
-          this.opv.setByRule = prop.Value;
-          break;
-        case 'ADD_TO_MEASURE':
-          this.opv.addToMeasure = prop.Value.split(';').map(function (v) {
-            return {
-              op: v.split(':')[0],
-              value: Number(v.split(':')[1]),
-              opt: 'OPT' + v.split(':')[2]
-            };
-          });
-          break;
-        case 'PIMFlatValues':
-          this.opv.isPIMFlatValue = prop.Value == '1';
-          break;
-        case 'IsVariantAttribute':
-          this.opv.isVariantAttribute = prop.Value == '1';
-          break;
-        case 'ION_COMMENT_TEXT':
-        case 'EshopCategoryMapping':
-        case 'TopFilterAttribute':
-        case 'PriceTageRelevant':
-        case 'IsArtName':
-          break;
-        default:
-          if (key.includes('__')) break;
-          LOG$n.debug('implement mapping for these props for optionValue: ' + prop.Codex);
-          var values_locales = [];
-          if (prop.Value_locales) {
-            var _prop$Value_locales;
-            var langs = Object.keys((_prop$Value_locales = prop.Value_locales) !== null && _prop$Value_locales !== void 0 ? _prop$Value_locales : {});
-            for (var j = 0; j < langs.length; j++) {
-              var lang = langs[j];
-              var values = prop.Value_locales[lang].split(';');
-              for (var m = 0; m < values.length; m++) {
-                if (!values_locales[m]) values_locales[m] = {};
-                values_locales[m][lang] = values[m];
-              }
-            }
-          }
-          metaDatas.push({
-            codex: prop.Codex,
-            name: prop.Name,
-            values: prop.Value.split(';'),
-            values_locales: values_locales
-          });
-          break;
-      }
-    }
+    var metaDatas = setOptionValueProperties(catalogData, this.opv.propertyObj, (_this$opv$property = this.opv.property) !== null && _this$opv$property !== void 0 ? _this$opv$property : []);
     this.opv.metaData = metaDatas;
   }
   /**************************************************GETTER ************************************************** */
@@ -16242,11 +16330,6 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
     get: function get() {
       return this.opv.vCodex;
     }
-  }, {
-    key: "isNotRelevant",
-    get: function get() {
-      return this.opv.isNotRelevant;
-    }
   }, {
     key: "name",
     get: function get() {
@@ -16375,15 +16458,20 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
     get: function get() {
       return this.opv.value;
     }
+  }, {
+    key: "isNotRelevant",
+    get: function get() {
+      return this.opv.propertyObj.isNotRelevant;
+    }
   }, {
     key: "contentItemId",
     get: function get() {
-      return this.opv.contentItemId;
+      return this.opv.propertyObj.contentItemId;
     }
   }, {
     key: "groupContentItemId",
     get: function get() {
-      return this.opv.groupContentItemId;
+      return this.opv.propertyObj.groupContentItemId;
     }
   }, {
     key: "metaData",
@@ -16412,18 +16500,13 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
       var _this$opv$metaData;
       return (_this$opv$metaData = this.opv.metaData) !== null && _this$opv$metaData !== void 0 ? _this$opv$metaData : [];
     }
-  }, {
-    key: "url",
-    get: function get() {
-      return this.opv.url;
-    }
   }, {
     key: "pdfUrl",
     get: function get() {
       var _this$opv$textbaustei, _this$opv$textbaustei2;
       return (_this$opv$textbaustei = (_this$opv$textbaustei2 = this.opv.textbausteine) === null || _this$opv$textbaustei2 === void 0 || (_this$opv$textbaustei2 = _this$opv$textbaustei2.find(function (item) {
         return item.Memo.endsWith('.pdf');
-      })) === null || _this$opv$textbaustei2 === void 0 ? void 0 : _this$opv$textbaustei2.Memo) !== null && _this$opv$textbaustei !== void 0 ? _this$opv$textbaustei : this.opv.pdfUrl;
+      })) === null || _this$opv$textbaustei2 === void 0 ? void 0 : _this$opv$textbaustei2.Memo) !== null && _this$opv$textbaustei !== void 0 ? _this$opv$textbaustei : this.opv.propertyObj.pdfUrl;
     }
   }, {
     key: "rals",
@@ -16435,10 +16518,15 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
     get: function get() {
       return this.opv.colorGroups;
     }
+  }, {
+    key: "url",
+    get: function get() {
+      return this.opv.propertyObj.url;
+    }
   }, {
     key: "sameopv",
     get: function get() {
-      return this.opv.sameopv;
+      return this.opv.propertyObj.sameopv;
     }
   }, {
     key: "isCustomAttribute",
@@ -16448,27 +16536,27 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
   }, {
     key: "onlyVisibleIfNotDocked",
     get: function get() {
-      return this.opv.onlyVisibleIfNotDocked;
+      return this.opv.propertyObj.onlyVisibleIfNotDocked;
     }
   }, {
     key: "defaultValue",
     get: function get() {
-      return this.opv.defaultValue;
+      return this.opv.propertyObj.defaultValue;
     }
   }, {
     key: "summaryCodex",
     get: function get() {
-      return this.opv.summaryCodex;
+      return this.opv.propertyObj.summaryCodex;
     }
   }, {
     key: "viewPointName",
     get: function get() {
-      return this.opv.viewPointName;
+      return this.opv.propertyObj.viewPointName;
     }
   }, {
     key: "hideInSummary",
     get: function get() {
-      return this.opv.hideInSummary;
+      return this.opv.propertyObj.hideInSummary;
     }
   }, {
     key: "hiddenByMask",
@@ -16478,45 +16566,156 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
   }, {
     key: "setName",
     get: function get() {
-      return this.opv.setName;
+      return this.opv.propertyObj.setName;
     }
   }, {
     key: "setConfig",
     get: function get() {
-      return this.opv.setConfig;
+      return this.opv.propertyObj.setConfig;
     }
   }, {
     key: "setByRule",
     get: function get() {
-      return this.opv.setByRule;
+      return this.opv.propertyObj.setByRule;
     }
   }, {
     key: "onRule",
     get: function get() {
-      return this.opv.onRule;
+      return this.opv.propertyObj.onRule;
     }
   }, {
     key: "customDimension",
     get: function get() {
-      return this.opv.customDimension;
+      return this.opv.propertyObj.customDimension;
     }
   }, {
     key: "addToMeasure",
     get: function get() {
-      return this.opv.addToMeasure;
+      return this.opv.propertyObj.addToMeasure;
     }
   }, {
     key: "isPIMFlatValue",
     get: function get() {
-      return this.opv.isPIMFlatValue;
+      return this.opv.propertyObj.isPIMFlatValue;
     }
   }, {
     key: "isVariantAttribute",
     get: function get() {
-      return this.opv.isVariantAttribute;
+      return this.opv.propertyObj.isVariantAttribute;
     }
   }]);
 }();
+var setOptionValueProperties = function setOptionValueProperties(catalogData, opv, properties) {
+  var metaDatas = [];
+  for (var i = 0; i < ((_properties$length = properties === null || properties === void 0 ? void 0 : properties.length) !== null && _properties$length !== void 0 ? _properties$length : 0); i++) {
+    var _properties$length;
+    var prop = properties === null || properties === void 0 ? void 0 : properties[i];
+    var key = prop.Codex;
+    if (key.startsWith(catalogData.catalogCodex + '__')) key = key.replace(catalogData.catalogCodex + '__', '');
+    switch (key) {
+      case 'INFO_URL':
+        opv.url = prop.Value;
+        break;
+      case 'INFO_PDF':
+        opv.pdfUrl = prop.Value;
+        break;
+      case 'SAME_OPV':
+        opv.sameopv = prop.Value;
+        break;
+      case 'ONLY_VISIBLE_IF_NOT_UNDOCK':
+        opv.onlyVisibleIfNotDocked = prop.Value;
+        break;
+      case 'DEFAULT_VALUE':
+        opv.defaultValue = prop.Value;
+        break;
+      case 'SUMMARY_CODEX':
+        opv.summaryCodex = prop.Value;
+        break;
+      case 'VIEWPOINTNAME':
+        opv.viewPointName = prop.Value;
+        break;
+      case 'HIDE_IN_SUMMARY':
+        opv.hideInSummary = !!prop.Value;
+        break;
+      case 'SETNAME':
+        opv.setName = prop.Value;
+        break;
+      case 'SET_CONFIG':
+        opv.setConfig = prop.Value;
+        break;
+      case 'CUSTOM_DIMENSION':
+        if (prop.Value == '1' || prop.Value == '0') {
+          opv.customDimension = !!prop.Value;
+        } else if (!isNaN(Number(prop.Value))) {
+          opv.customDimension = Number(prop.Value);
+        } else {
+          console.error('Error: Invalid custom dimension value: ' + prop.Value + ' at opv: ' + opv);
+          opv.customDimension = undefined;
+        }
+        break;
+      case 'ON_RULE':
+        opv.onRule = prop.Value;
+        break;
+      case 'CONTENT_ITEM':
+        opv.contentItemId = prop.Value;
+        break;
+      case 'IS_NOT_RELEVANT':
+        opv.isNotRelevant = !!prop.Value;
+        break;
+      case 'GROUP_CONTENT_ITEM':
+        opv.groupContentItemId = prop.Value;
+        break;
+      case 'SET_BY_RULE':
+        opv.setByRule = prop.Value;
+        break;
+      case 'ADD_TO_MEASURE':
+        opv.addToMeasure = prop.Value.split(';').map(function (v) {
+          return {
+            op: v.split(':')[0],
+            value: Number(v.split(':')[1]),
+            opt: 'OPT' + v.split(':')[2]
+          };
+        });
+        break;
+      case 'PIMFlatValues':
+        opv.isPIMFlatValue = prop.Value == '1';
+        break;
+      case 'IsVariantAttribute':
+        opv.isVariantAttribute = prop.Value == '1';
+        break;
+      case 'ION_COMMENT_TEXT':
+      case 'EshopCategoryMapping':
+      case 'TopFilterAttribute':
+      case 'PriceTageRelevant':
+      case 'IsArtName':
+        break;
+      default:
+        if (key.includes('__')) break;
+        LOG$n.debug('implement mapping for these props for optionValue: ' + prop.Codex);
+        var values_locales = [];
+        if (prop.Value_locales) {
+          var _prop$Value_locales;
+          var langs = Object.keys((_prop$Value_locales = prop.Value_locales) !== null && _prop$Value_locales !== void 0 ? _prop$Value_locales : {});
+          for (var j = 0; j < langs.length; j++) {
+            var lang = langs[j];
+            var values = prop.Value_locales[lang].split(';');
+            for (var m = 0; m < values.length; m++) {
+              if (!values_locales[m]) values_locales[m] = {};
+              values_locales[m][lang] = values[m];
+            }
+          }
+        }
+        metaDatas.push({
+          codex: prop.Codex,
+          name: prop.Name,
+          values: prop.Value.split(';'),
+          values_locales: values_locales
+        });
+        break;
+    }
+  }
+  return metaDatas;
+};
 
 function _createForOfIteratorHelper$b(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$b(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$b(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$b(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$b(r, a) : void 0; } }
@@ -16532,7 +16731,7 @@ var CatalogArticleData = /*#__PURE__*/function () {
       if (!_this._catalogArticle.metaData) return metaData;
       for (var i = 0; i < _this._catalogArticle.metaData.length; i++) {
         var data = _this._catalogArticle.metaData[i];
-        metaData[data.codex] = locales ? data.values_locales : data.values;
+        metaData[data.codex] = locales && data.values_locales ? data.values_locales : data.values;
       }
       return metaData;
     });
@@ -17398,8 +17597,9 @@ function setCatalogPlannsCompletely(catalogData) {
   }
 }
 function getCatalogArticle$1(jsonArticle, catalogData) {
-  var _catalogData$catalogM, _articleMask$name$cat, _articleMask$name, _jsonArticle$Metadata, _articleMask$properti, _articleMask$groupnam, _articleMask$groupnam2, _articleMask$hidden;
+  var _catalogData$catalogM, _catalogData$catalogM2, _catalogData$catalogM3, _articleMask$name$cat, _articleMask$name, _jsonArticle$Metadata, _articleMask$groupnam, _articleMask$groupnam2, _articleMask$hidden;
   var articleMask = (_catalogData$catalogM = catalogData.catalogMask) === null || _catalogData$catalogM === void 0 || (_catalogData$catalogM = _catalogData$catalogM.articles) === null || _catalogData$catalogM === void 0 ? void 0 : _catalogData$catalogM[jsonArticle.Codex];
+  var maskProperties = getPropertiesForItemNo((_catalogData$catalogM2 = (_catalogData$catalogM3 = catalogData.catalogMask) === null || _catalogData$catalogM3 === void 0 ? void 0 : _catalogData$catalogM3.properties) !== null && _catalogData$catalogM2 !== void 0 ? _catalogData$catalogM2 : [], jsonArticle.Codex, catalogData.api.getLanguage());
   //parse den Json Article und erstelle  CatalogArticle
   return {
     articleCodex: jsonArticle.Codex,
@@ -17416,7 +17616,7 @@ function getCatalogArticle$1(jsonArticle, catalogData) {
     articleOptions: {},
     decisions: [],
     idmDecisions: [],
-    properties: [].concat(_toConsumableArray__default["default"]((_jsonArticle$Metadata = jsonArticle.Metadatas) !== null && _jsonArticle$Metadata !== void 0 ? _jsonArticle$Metadata : []), _toConsumableArray__default["default"]((_articleMask$properti = articleMask === null || articleMask === void 0 ? void 0 : articleMask.properties) !== null && _articleMask$properti !== void 0 ? _articleMask$properti : [])),
+    properties: [].concat(_toConsumableArray__default["default"]((_jsonArticle$Metadata = jsonArticle.Metadatas) !== null && _jsonArticle$Metadata !== void 0 ? _jsonArticle$Metadata : []), _toConsumableArray__default["default"](maskProperties !== null && maskProperties !== void 0 ? maskProperties : [])),
     image: jsonArticle.Image && jsonArticle.Image != '' ? jsonArticle.Image : undefined,
     groupName: (_articleMask$groupnam = articleMask === null || articleMask === void 0 || (_articleMask$groupnam2 = articleMask.groupname) === null || _articleMask$groupnam2 === void 0 ? void 0 : _articleMask$groupnam2[catalogData.api.getLanguage()]) !== null && _articleMask$groupnam !== void 0 ? _articleMask$groupnam : jsonArticle.GroupName,
     origGroupName: jsonArticle.GroupName,
@@ -17502,9 +17702,10 @@ function initCatalogOptions(catalogData, jsonOptions) {
   return options;
 }
 function getCatalogOptionDataType(codex, jsonOPT, catalogData) {
-  var _catalogData$catalogM2, _catalogData$catalogM3, _catalogData$catalogM4, _jsonOPT$Properties, _optionMask$propertie, _optionMask$name$cata, _optionMask$name, _optionMask$name2, _optionMask$hidden, _optionMask$tabGroup, _ref, _optionMask$layout, _properties$find, _jsonOPT$showOPVAsArt;
-  var optionMask = (_catalogData$catalogM2 = (_catalogData$catalogM3 = catalogData.catalogMask) === null || _catalogData$catalogM3 === void 0 || (_catalogData$catalogM3 = _catalogData$catalogM3.options) === null || _catalogData$catalogM3 === void 0 ? void 0 : _catalogData$catalogM3[codex]) !== null && _catalogData$catalogM2 !== void 0 ? _catalogData$catalogM2 : codex.startsWith('OPT') ? (_catalogData$catalogM4 = catalogData.catalogMask) === null || _catalogData$catalogM4 === void 0 || (_catalogData$catalogM4 = _catalogData$catalogM4.options) === null || _catalogData$catalogM4 === void 0 ? void 0 : _catalogData$catalogM4[codex.substring(3)] : undefined;
-  var properties = [].concat(_toConsumableArray__default["default"]((_jsonOPT$Properties = jsonOPT.Properties) !== null && _jsonOPT$Properties !== void 0 ? _jsonOPT$Properties : []), _toConsumableArray__default["default"]((_optionMask$propertie = optionMask === null || optionMask === void 0 ? void 0 : optionMask.properties) !== null && _optionMask$propertie !== void 0 ? _optionMask$propertie : []));
+  var _catalogData$catalogM4, _catalogData$catalogM5, _catalogData$catalogM6, _catalogData$catalogM7, _catalogData$catalogM8, _jsonOPT$Properties, _optionMask$name$cata, _optionMask$name, _optionMask$name2, _optionMask$hidden, _optionMask$tabGroup, _ref, _optionMask$layout, _properties$find, _jsonOPT$showOPVAsArt, _properties$find2, _properties$find3;
+  var maskProperties = getPropertiesForFeatureNo((_catalogData$catalogM4 = (_catalogData$catalogM5 = catalogData.catalogMask) === null || _catalogData$catalogM5 === void 0 ? void 0 : _catalogData$catalogM5.properties) !== null && _catalogData$catalogM4 !== void 0 ? _catalogData$catalogM4 : [], undefined, codex, catalogData.api.getLanguage());
+  var optionMask = (_catalogData$catalogM6 = (_catalogData$catalogM7 = catalogData.catalogMask) === null || _catalogData$catalogM7 === void 0 || (_catalogData$catalogM7 = _catalogData$catalogM7.options) === null || _catalogData$catalogM7 === void 0 ? void 0 : _catalogData$catalogM7[codex]) !== null && _catalogData$catalogM6 !== void 0 ? _catalogData$catalogM6 : codex.startsWith('OPT') ? (_catalogData$catalogM8 = catalogData.catalogMask) === null || _catalogData$catalogM8 === void 0 || (_catalogData$catalogM8 = _catalogData$catalogM8.options) === null || _catalogData$catalogM8 === void 0 ? void 0 : _catalogData$catalogM8[codex.substring(3)] : undefined;
+  var properties = [].concat(_toConsumableArray__default["default"]((_jsonOPT$Properties = jsonOPT.Properties) !== null && _jsonOPT$Properties !== void 0 ? _jsonOPT$Properties : []), _toConsumableArray__default["default"](maskProperties !== null && maskProperties !== void 0 ? maskProperties : []));
   var opt = {
     codex: codex,
     name: (_optionMask$name$cata = optionMask === null || optionMask === void 0 || (_optionMask$name = optionMask.name) === null || _optionMask$name === void 0 ? void 0 : _optionMask$name[catalogData.api.getLanguage()]) !== null && _optionMask$name$cata !== void 0 ? _optionMask$name$cata : jsonOPT.Name,
@@ -17518,8 +17719,6 @@ function getCatalogOptionDataType(codex, jsonOPT, catalogData) {
     layout: (_ref = (_optionMask$layout = optionMask === null || optionMask === void 0 ? void 0 : optionMask.layout) !== null && _optionMask$layout !== void 0 ? _optionMask$layout : properties === null || properties === void 0 || (_properties$find = properties.find(function (p) {
       return p.Codex == 'LAYOUT';
     })) === null || _properties$find === void 0 ? void 0 : _properties$find.Value) !== null && _ref !== void 0 ? _ref : jsonOPT.Layout != undefined ? jsonOPT.Layout : 'IMAGE',
-    multiselect: jsonOPT.Multiselect != undefined ? jsonOPT.Multiselect == 'True' : false,
-    sendToPIM: !!jsonOPT.SendToPIM,
     useMaxPriceOfGroup: jsonOPT.UseMaxPriceOfGroup != undefined ? Number(jsonOPT.UseMaxPriceOfGroup) : undefined,
     calcPercentOnOptions: jsonOPT.CalcPercentOnOptions,
     hideGroupNameInOrderText: jsonOPT.hideGroupNameInOrderText != undefined ? jsonOPT.hideGroupNameInOrderText == 'True' : false,
@@ -17529,7 +17728,13 @@ function getCatalogOptionDataType(codex, jsonOPT, catalogData) {
     property: properties,
     parentOptionCodex: jsonOPT.ParentOptionCodex,
     articlePlaceholder: jsonOPT.ArticlePlaceholder && jsonOPT.ArticlePlaceholder == 'True' ? true : false,
-    isMultiselect: jsonOPT.Multiselect != undefined ? jsonOPT.Multiselect == 'True' : false
+    sendToPIM: !!jsonOPT.SendToPIM || !!(properties !== null && properties !== void 0 && (_properties$find2 = properties.find(function (p) {
+      return p.Codex == 'SendToPim';
+    })) !== null && _properties$find2 !== void 0 && _properties$find2.Value),
+    isMultiselect: jsonOPT.Multiselect != undefined ? jsonOPT.Multiselect == 'True' : !!(properties !== null && properties !== void 0 && (_properties$find3 = properties.find(function (p) {
+      return p.Codex == 'Multiselect';
+    })) !== null && _properties$find3 !== void 0 && _properties$find3.Value),
+    propertyObj: {}
   };
   opt.showOPVCodex = opt.showOPVCodex || opt.showOPVAsArticleNr;
   opt.invisible = opt.invisible || opt.headerPosVariationType == 'U';
@@ -17544,9 +17749,11 @@ function initCatalogOptionValues(catalogData, jsonOptions) {
   return optionValues;
 }
 function getCatalogOptionValueDataType(codex, jsonOPV, catalogData) {
-  var _catalogData$catalogM5, _catalogData$catalogM6, _catalogData$catalogM7, _optionvalues$codex, _mask$name$catalogDat, _mask$name, _mask$name2, _mask$groupname$catal, _mask$groupname, _mask$groupname2, _jsonOPV$MeasureStep, _jsonOPV$Value, _jsonOPV$Metadatas, _mask$properties;
-  var optionvalues = (_catalogData$catalogM5 = (_catalogData$catalogM6 = catalogData.catalogMask) === null || _catalogData$catalogM6 === void 0 ? void 0 : _catalogData$catalogM6.optionvalues) !== null && _catalogData$catalogM5 !== void 0 ? _catalogData$catalogM5 : (_catalogData$catalogM7 = catalogData.catalogMask) === null || _catalogData$catalogM7 === void 0 ? void 0 : _catalogData$catalogM7.optionValues;
+  var _catalogData$catalogM9, _catalogData$catalogM10, _catalogData$catalogM11, _optionvalues$codex, _catalogData$catalogM12, _catalogData$catalogM13, _jsonOPV$Metadatas, _mask$name$catalogDat, _mask$name, _mask$name2, _mask$groupname$catal, _mask$groupname, _mask$groupname2, _jsonOPV$MeasureStep, _jsonOPV$Value;
+  var optionvalues = (_catalogData$catalogM9 = (_catalogData$catalogM10 = catalogData.catalogMask) === null || _catalogData$catalogM10 === void 0 ? void 0 : _catalogData$catalogM10.optionvalues) !== null && _catalogData$catalogM9 !== void 0 ? _catalogData$catalogM9 : (_catalogData$catalogM11 = catalogData.catalogMask) === null || _catalogData$catalogM11 === void 0 ? void 0 : _catalogData$catalogM11.optionValues;
   var mask = (_optionvalues$codex = optionvalues === null || optionvalues === void 0 ? void 0 : optionvalues[codex]) !== null && _optionvalues$codex !== void 0 ? _optionvalues$codex : codex.startsWith('OPV') ? optionvalues === null || optionvalues === void 0 ? void 0 : optionvalues[codex.substring(3)] : undefined;
+  var maskProperties = getPropertiesForOptionKey((_catalogData$catalogM12 = (_catalogData$catalogM13 = catalogData.catalogMask) === null || _catalogData$catalogM13 === void 0 ? void 0 : _catalogData$catalogM13.properties) !== null && _catalogData$catalogM12 !== void 0 ? _catalogData$catalogM12 : [], undefined, codex, catalogData.api.getLanguage());
+  var properties = [].concat(_toConsumableArray__default["default"]((_jsonOPV$Metadatas = jsonOPV.Metadatas) !== null && _jsonOPV$Metadatas !== void 0 ? _jsonOPV$Metadatas : []), _toConsumableArray__default["default"](maskProperties !== null && maskProperties !== void 0 ? maskProperties : []));
   var opv = {
     codex: codex,
     vCodex: jsonOPV.VCodex,
@@ -17574,8 +17781,9 @@ function getCatalogOptionValueDataType(codex, jsonOPV, catalogData) {
     showOnlyWhenHasPrice: jsonOPV.ShowOnlyWhenHasPrice && jsonOPV.ShowOnlyWhenHasPrice == 'True' ? true : false,
     priceUnit: jsonOPV.PriceUnit,
     value: (_jsonOPV$Value = jsonOPV.Value) !== null && _jsonOPV$Value !== void 0 ? _jsonOPV$Value : jsonOPV.Name.endsWith(' cm') && !isNaN(Number(jsonOPV.Name.replace(' cm', ''))) ? Number(jsonOPV.Name.replace(' cm', '')) : undefined,
-    property: [].concat(_toConsumableArray__default["default"]((_jsonOPV$Metadatas = jsonOPV.Metadatas) !== null && _jsonOPV$Metadatas !== void 0 ? _jsonOPV$Metadatas : []), _toConsumableArray__default["default"]((_mask$properties = mask === null || mask === void 0 ? void 0 : mask.properties) !== null && _mask$properties !== void 0 ? _mask$properties : [])),
-    textbausteine: jsonOPV.Textbausteine
+    property: properties,
+    textbausteine: jsonOPV.Textbausteine,
+    propertyObj: {}
   };
   if (jsonOPV.MeasureUnit) {
     switch (jsonOPV.MeasureUnit) {
@@ -17868,12 +18076,66 @@ function getImageURL(image, mediaUrl) {
   }
   return ret;
 }
+function getPropertiesForFeatureNo(properties, typeNo, featureNo, lang) {
+  return properties.filter(function (p) {
+    var _p$featureNos, _p$optionKeys, _p$typeNos, _p$typeNos2;
+    return ((_p$featureNos = p.featureNos) === null || _p$featureNos === void 0 ? void 0 : _p$featureNos.includes(featureNo)) && !((_p$optionKeys = p.optionKeys) !== null && _p$optionKeys !== void 0 && _p$optionKeys.length) && (!typeNo || !((_p$typeNos = p.typeNos) !== null && _p$typeNos !== void 0 && _p$typeNos.length) || ((_p$typeNos2 = p.typeNos) === null || _p$typeNos2 === void 0 ? void 0 : _p$typeNos2.includes(typeNo)));
+  }).map(function (p) {
+    return {
+      Value: DivaUtils__default["default"].getLocals(p.value, lang),
+      Codex: p.key,
+      Name: DivaUtils__default["default"].getLocals(p.name, lang),
+      Value_locales: p.valueLocales
+    };
+  });
+}
+function getPropertiesForOptionKey(properties, featureNo, optionKey, lang) {
+  return properties.filter(function (p) {
+    var _p$featureNos2, _p$optionKeys2;
+    return (!((_p$featureNos2 = p.featureNos) !== null && _p$featureNos2 !== void 0 && _p$featureNos2.length) || featureNo !== undefined && p.featureNos.includes(featureNo)) && ((_p$optionKeys2 = p.optionKeys) === null || _p$optionKeys2 === void 0 ? void 0 : _p$optionKeys2.includes(optionKey));
+  }).map(function (p) {
+    return {
+      Value: DivaUtils__default["default"].getLocals(p.value, lang),
+      Codex: p.key,
+      Name: DivaUtils__default["default"].getLocals(p.name, lang),
+      Value_locales: p.valueLocales
+    };
+  });
+}
+function getPropertiesForSerieNo(properties, serieNo, lang) {
+  return properties.filter(function (p) {
+    var _p$serieNos;
+    return (_p$serieNos = p.serieNos) === null || _p$serieNos === void 0 ? void 0 : _p$serieNos.includes(serieNo);
+  }).map(function (p) {
+    return {
+      Value: DivaUtils__default["default"].getLocals(p.value, lang),
+      Codex: p.key,
+      Name: DivaUtils__default["default"].getLocals(p.name, lang),
+      Value_locales: p.valueLocales
+    };
+  });
+}
+function getPropertiesForItemNo(properties, itemNo, lang) {
+  return properties.filter(function (p) {
+    var _p$typeNos3;
+    return (_p$typeNos3 = p.typeNos) === null || _p$typeNos3 === void 0 ? void 0 : _p$typeNos3.includes(itemNo);
+  }).map(function (p) {
+    return {
+      Value: DivaUtils__default["default"].getLocals(p.value, lang),
+      Codex: p.key,
+      Name: DivaUtils__default["default"].getLocals(p.name, lang),
+      Value_locales: p.valueLocales
+    };
+  });
+}
 
 var ArticleOptionValueData = /*#__PURE__*/function () {
-  function ArticleOptionValueData(opv) {
+  function ArticleOptionValueData(opv, catalogData) {
+    var _this$opv$property;
     _classCallCheck__default["default"](this, ArticleOptionValueData);
     _defineProperty__default["default"](this, "opv", void 0);
     this.opv = opv;
+    setOptionValueProperties(catalogData, this.opv.propertyObj, (_this$opv$property = this.opv.property) !== null && _this$opv$property !== void 0 ? _this$opv$property : []);
   }
   return _createClass__default["default"](ArticleOptionValueData, [{
     key: "initOPVsInOPG",
@@ -17896,6 +18158,7 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
     key: "isNotRelevant",
     get: function get() {
       var _this$opv$catalogOPV$, _this$ocd;
+      if (this.opv.propertyObj.isNotRelevant !== undefined) return this.opv.propertyObj.isNotRelevant;
       return (_this$opv$catalogOPV$ = this.opv.catalogOPV.isNotRelevant) !== null && _this$opv$catalogOPV$ !== void 0 ? _this$opv$catalogOPV$ : ['OPVNR', 'OPVNRR', 'OPVNR_0'].includes((_this$ocd = this.ocd) !== null && _this$ocd !== void 0 ? _this$ocd : this.codex);
     }
   }, {
@@ -18057,11 +18320,13 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
   }, {
     key: "contentItemId",
     get: function get() {
+      if (this.opv.propertyObj.contentItemId !== undefined) return this.opv.propertyObj.contentItemId;
       return this.opv.catalogOPV.contentItemId;
     }
   }, {
     key: "groupContentItemId",
     get: function get() {
+      if (this.opv.propertyObj.groupContentItemId !== undefined) return this.opv.propertyObj.groupContentItemId;
       return this.opv.catalogOPV.groupContentItemId;
     }
   }, {
@@ -18077,6 +18342,7 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
   }, {
     key: "addToMeasure",
     get: function get() {
+      if (this.opv.propertyObj.addToMeasure !== undefined) return this.opv.propertyObj.addToMeasure;
       return this.opv.catalogOPV.addToMeasure;
     }
   }, {
@@ -18174,11 +18440,13 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
   }, {
     key: "url",
     get: function get() {
+      if (this.opv.propertyObj.url !== undefined) return this.opv.propertyObj.url;
       return this.opv.catalogOPV.url;
     }
   }, {
     key: "pdfUrl",
     get: function get() {
+      if (this.opv.propertyObj.pdfUrl !== undefined) return this.opv.propertyObj.pdfUrl;
       return this.opv.catalogOPV.pdfUrl;
     }
   }, {
@@ -18194,6 +18462,7 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
   }, {
     key: "sameopv",
     get: function get() {
+      if (this.opv.propertyObj.sameopv !== undefined) return this.opv.propertyObj.sameopv;
       return this.opv.catalogOPV.sameopv;
     }
   }, {
@@ -18204,26 +18473,31 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
   }, {
     key: "onlyVisibleIfNotDocked",
     get: function get() {
+      if (this.opv.propertyObj.onlyVisibleIfNotDocked !== undefined) return this.opv.propertyObj.onlyVisibleIfNotDocked;
       return this.opv.catalogOPV.onlyVisibleIfNotDocked;
     }
   }, {
     key: "defaultValue",
     get: function get() {
+      if (this.opv.propertyObj.defaultValue !== undefined) return this.opv.propertyObj.defaultValue;
       return this.opv.catalogOPV.defaultValue;
     }
   }, {
     key: "summaryCodex",
     get: function get() {
+      if (this.opv.propertyObj.summaryCodex !== undefined) return this.opv.propertyObj.summaryCodex;
       return this.opv.catalogOPV.summaryCodex;
     }
   }, {
     key: "viewPointName",
     get: function get() {
+      if (this.opv.propertyObj.viewPointName !== undefined) return this.opv.propertyObj.viewPointName;
       return this.opv.catalogOPV.viewPointName;
     }
   }, {
     key: "hideInSummary",
     get: function get() {
+      if (this.opv.propertyObj.hideInSummary !== undefined) return this.opv.propertyObj.hideInSummary;
       return this.opv.catalogOPV.hideInSummary;
     }
   }, {
@@ -18234,36 +18508,43 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
   }, {
     key: "isPIMFlatValue",
     get: function get() {
+      if (this.opv.propertyObj.isPIMFlatValue !== undefined) return this.opv.propertyObj.isPIMFlatValue;
       return this.opv.isPIMFlatValue || this.opv.catalogOPV.isPIMFlatValue;
     }
   }, {
     key: "isVariantAttribute",
     get: function get() {
+      if (this.opv.propertyObj.isVariantAttribute !== undefined) return this.opv.propertyObj.isVariantAttribute;
       return this.opv.isVariantAttribute || this.opv.catalogOPV.isVariantAttribute;
     }
   }, {
     key: "setName",
     get: function get() {
+      if (this.opv.propertyObj.setName !== undefined) return this.opv.propertyObj.setName;
       return this.opv.catalogOPV.setName;
     }
   }, {
     key: "setConfig",
     get: function get() {
+      if (this.opv.propertyObj.setConfig !== undefined) return this.opv.propertyObj.setConfig;
       return this.opv.catalogOPV.setConfig;
     }
   }, {
     key: "setByRule",
     get: function get() {
+      if (this.opv.propertyObj.setByRule !== undefined) return this.opv.propertyObj.setByRule;
       return this.opv.catalogOPV.setByRule;
     }
   }, {
     key: "onRule",
     get: function get() {
+      if (this.opv.propertyObj.onRule !== undefined) return this.opv.propertyObj.onRule;
       return this.opv.catalogOPV.onRule;
     }
   }, {
     key: "customDimension",
     get: function get() {
+      if (this.opv.propertyObj.customDimension !== undefined) return this.opv.propertyObj.customDimension;
       return this.opv.catalogOPV.customDimension;
     }
   }]);
@@ -18273,8 +18554,8 @@ function _createForOfIteratorHelper$a(r, e) { var t = "undefined" != typeof Symb
 function _unsupportedIterableToArray$a(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$a(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$a(r, a) : void 0; } }
 function _arrayLikeToArray$a(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var ArticleOptionData = /*#__PURE__*/function () {
-  function ArticleOptionData(opt) {
-    var _this$tabGroup;
+  function ArticleOptionData(opt, catalogData) {
+    var _this$tabGroup, _this$opt$property;
     _classCallCheck__default["default"](this, ArticleOptionData);
     _defineProperty__default["default"](this, "opt", void 0);
     this.opt = opt;
@@ -18285,6 +18566,7 @@ var ArticleOptionData = /*#__PURE__*/function () {
     } else {
       this.opt.subTabGroup = undefined;
     }
+    setOptionsProperties(catalogData, this.opt.propertyObj, (_this$opt$property = this.opt.property) !== null && _this$opt$property !== void 0 ? _this$opt$property : []);
   }
   return _createClass__default["default"](ArticleOptionData, [{
     key: "initOPVsInOPT",
@@ -18468,6 +18750,7 @@ var ArticleOptionData = /*#__PURE__*/function () {
   }, {
     key: "isDefaultSiblingOption",
     get: function get() {
+      if (this.opt.propertyObj.isDefaultSiblingOption !== undefined) return this.opt.propertyObj.isDefaultSiblingOption;
       return this.opt.catalogOPT.isDefaultSiblingOption;
     }
   }, {
@@ -18478,11 +18761,13 @@ var ArticleOptionData = /*#__PURE__*/function () {
   }, {
     key: "pairWithOptionsToGroup",
     get: function get() {
+      if (this.opt.propertyObj.pairWithOptionsToGroup !== undefined) return this.opt.propertyObj.pairWithOptionsToGroup;
       return this.opt.catalogOPT.pairWithOptionsToGroup;
     }
   }, {
     key: "isDescribingState",
     get: function get() {
+      if (this.opt.propertyObj.isDescribingState !== undefined) return this.opt.propertyObj.isDescribingState;
       return this.opt.catalogOPT.isDescribingState;
     }
   }, {
@@ -18493,51 +18778,61 @@ var ArticleOptionData = /*#__PURE__*/function () {
   }, {
     key: "requiresUserInput",
     get: function get() {
+      if (this.opt.propertyObj.requiresUserInput !== undefined) return this.opt.propertyObj.requiresUserInput;
       return this.opt.catalogOPT.requiresUserInput;
     }
   }, {
     key: "onlyVisibleIfNotDocked",
     get: function get() {
+      if (this.opt.propertyObj.onlyVisibleIfNotDocked !== undefined) return this.opt.propertyObj.onlyVisibleIfNotDocked;
       return this.opt.catalogOPT.onlyVisibleIfNotDocked;
     }
   }, {
     key: "onlyVisibleIfConfigSingle",
     get: function get() {
+      if (this.opt.propertyObj.onlyVisibleIfConfigSingle !== undefined) return this.opt.propertyObj.onlyVisibleIfConfigSingle;
       return this.opt.catalogOPT.onlyVisibleIfConfigSingle;
     }
   }, {
     key: "onlyVisibleIfConfigAll",
     get: function get() {
+      if (this.opt.propertyObj.onlyVisibleIfConfigAll !== undefined) return this.opt.propertyObj.onlyVisibleIfConfigAll;
       return this.opt.catalogOPT.onlyVisibleIfConfigAll;
     }
   }, {
     key: "isDefaultValueForOptions",
     get: function get() {
+      if (this.opt.propertyObj.isDefaultValueForOptions !== undefined) return this.opt.propertyObj.isDefaultValueForOptions;
       return this.opt.catalogOPT.isDefaultValueForOptions;
     }
   }, {
     key: "freetextDefaultValue",
     get: function get() {
+      if (this.opt.propertyObj.freetextDefaultValue !== undefined) return this.opt.propertyObj.freetextDefaultValue;
       return this.opt.catalogOPT.freetextDefaultValue;
     }
   }, {
     key: "url",
     get: function get() {
+      if (this.opt.propertyObj.url !== undefined) return this.opt.propertyObj.url;
       return this.opt.catalogOPT.url;
     }
   }, {
     key: "contentItemId",
     get: function get() {
+      if (this.opt.propertyObj.contentItemId !== undefined) return this.opt.propertyObj.contentItemId;
       return this.opt.catalogOPT.contentItemId;
     }
   }, {
     key: "customDimension",
     get: function get() {
+      if (this.opt.propertyObj.customDimension !== undefined) return this.opt.propertyObj.customDimension;
       return this.opt.catalogOPT.customDimension;
     }
   }, {
     key: "customDimensionText",
     get: function get() {
+      if (this.opt.propertyObj.customDimensionText !== undefined) return this.opt.propertyObj.customDimensionText;
       return this.opt.catalogOPT.customDimensionText;
     }
   }, {
@@ -18548,51 +18843,61 @@ var ArticleOptionData = /*#__PURE__*/function () {
   }, {
     key: "showSearchbar",
     get: function get() {
+      if (this.opt.propertyObj.showSearchbar !== undefined) return this.opt.propertyObj.showSearchbar;
       return this.opt.catalogOPT.showSearchbar;
     }
   }, {
     key: "showFilter",
     get: function get() {
+      if (this.opt.propertyObj.showFilter !== undefined) return this.opt.propertyObj.showFilter;
       return this.opt.catalogOPT.showFilter;
     }
   }, {
     key: "pdfUrl",
     get: function get() {
+      if (this.opt.propertyObj.pdfUrl !== undefined) return this.opt.propertyObj.pdfUrl;
       return this.opt.catalogOPT.pdfUrl;
     }
   }, {
     key: "diameter",
     get: function get() {
+      if (this.opt.propertyObj.diameter !== undefined) return this.opt.propertyObj.diameter;
       return this.opt.catalogOPT.diameter;
     }
   }, {
     key: "forceShowVariantDesc",
     get: function get() {
+      if (this.opt.propertyObj.forceShowVariantDesc !== undefined) return this.opt.propertyObj.forceShowVariantDesc;
       return this.opt.catalogOPT.forceShowVariantDesc;
     }
   }, {
     key: "showOnSeparatTabgroup",
     get: function get() {
+      if (this.opt.propertyObj.showOnSeparatTabgroup !== undefined) return this.opt.propertyObj.showOnSeparatTabgroup;
       return this.opt.catalogOPT.showOnSeparatTabgroup;
     }
   }, {
     key: "setName",
     get: function get() {
+      if (this.opt.propertyObj.setName !== undefined) return this.opt.propertyObj.setName;
       return this.opt.catalogOPT.setName;
     }
   }, {
     key: "addOptionToTabgroupInPartlistSummary",
     get: function get() {
+      if (this.opt.propertyObj.addOptionToTabgroupInPartlistSummary !== undefined) return this.opt.propertyObj.addOptionToTabgroupInPartlistSummary;
       return this.opt.catalogOPT.addOptionToTabgroupInPartlistSummary;
     }
   }, {
     key: "addToWWS",
     get: function get() {
+      if (this.opt.propertyObj.addToWWS !== undefined) return this.opt.propertyObj.addToWWS;
       return this.opt.catalogOPT.addToWWS;
     }
   }, {
     key: "sendToPIM",
     get: function get() {
+      if (this.opt.propertyObj.sendToPIM !== undefined) return this.opt.propertyObj.sendToPIM;
       return this.opt.catalogOPT.sendToPIM;
     }
   }, {
@@ -18603,16 +18908,19 @@ var ArticleOptionData = /*#__PURE__*/function () {
   }, {
     key: "ignoreGroups",
     get: function get() {
+      if (this.opt.propertyObj.ignoreGroups !== undefined) return this.opt.propertyObj.ignoreGroups;
       return this.opt.catalogOPT.ignoreGroups;
     }
   }, {
     key: "ignorePgrGroupPosition",
     get: function get() {
+      if (this.opt.propertyObj.ignorePgrGroupPosition !== undefined) return this.opt.propertyObj.ignorePgrGroupPosition;
       return this.opt.catalogOPT.ignorePgrGroupPosition;
     }
   }, {
     key: "mergeIDMToOPG",
     get: function get() {
+      if (this.opt.propertyObj.mergeIDMToOPG !== undefined) return this.opt.propertyObj.mergeIDMToOPG;
       return this.opt.catalogOPT.mergeIDMToOPG;
     }
   }, {
@@ -18628,14 +18936,14 @@ var ArticleOptionData = /*#__PURE__*/function () {
 }();
 
 var LOG$l = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
-function addSupplierColors(catalogArticleData, allOPVsOfOPT, supplierColors, catalog, newOPT, rule) {
+function addSupplierColors(set, catalogArticleData, allOPVsOfOPT, supplierColors, catalog, newOPT, rule) {
   var catalogOPG = new OptionValueCatalogData(getCatalogOptionValueDataType('OPVSUPPLIER_COLORS', {
     Name: 'Lieferantenfarben',
     IsOPVG: '1'
   }, catalog), catalog);
-  var articleOPG = new ArticleOptionValueData(getArticleOptionValueType('OPVSUPPLIER_COLORS', {
+  var articleOPG = new ArticleOptionValueData(getArticleOptionValueType(set, 'OPVSUPPLIER_COLORS', {
     RUL: rule
-  }, catalogOPG, catalogArticleData, false, newOPT, catalog.multiselectOptions));
+  }, catalogOPG, catalogArticleData, false, newOPT, catalog.multiselectOptions), catalog);
   allOPVsOfOPT.set('OPVSUPPLIER_COLORS', articleOPG);
   var supplierColorsOpvs = new Map();
   for (var i = 0; i < supplierColors.length; i++) {
@@ -18646,7 +18954,7 @@ function addSupplierColors(catalogArticleData, allOPVsOfOPT, supplierColors, cat
       HexColor: col.HexColor,
       GroupName: 'Lieferantenfarben'
     }, catalog), catalog);
-    supplierColorsOpvs.set('OPV' + col.OptionValueCodex, new ArticleOptionValueData(getArticleOptionValueType('OPV' + col.OptionValueCodex, {}, colorCatalogOpv, catalogArticleData, true, articleOPG, catalog.multiselectOptions)));
+    supplierColorsOpvs.set('OPV' + col.OptionValueCodex, new ArticleOptionValueData(getArticleOptionValueType(set, 'OPV' + col.OptionValueCodex, {}, colorCatalogOpv, catalogArticleData, true, articleOPG, catalog.multiselectOptions), catalog));
   }
   articleOPG.initOPVsInOPG(supplierColorsOpvs);
 }
@@ -18803,7 +19111,7 @@ function loadArticleOptions(json, catalogArticleData, set) {
     for (var i = 0; i < json.OPT.length; i++) {
       var myOPT = json.OPT[i];
       var allOPVsOfOPT = new Map();
-      var newOPT = new ArticleOptionData(getArticleOptionType(myOPT, set));
+      var newOPT = new ArticleOptionData(getArticleOptionType(myOPT, set, catalogArticleData.articleCodex), set.CatalogData);
 
       //Items initalisieren
       if (newOPT.hasOPG) {
@@ -18813,14 +19121,14 @@ function loadArticleOptions(json, catalogArticleData, set) {
           var tmpOPG = myOPT.OPG[j],
             catOPG = set.CatalogData.getOptionValue(tmpOPG.OCD ? tmpOPG.OCD : tmpOPG.Codex);
           if (catOPG) {
-            var newOPG = new ArticleOptionValueData(getArticleOptionValueType(tmpOPG.Codex, tmpOPG, catOPG, catalogArticleData, false, newOPT, multiselectOptions));
+            var newOPG = new ArticleOptionValueData(getArticleOptionValueType(set, tmpOPG.Codex, tmpOPG, catOPG, catalogArticleData, false, newOPT, multiselectOptions), set.CatalogData);
             allOPVsOfOPT.set(tmpOPG.Codex, newOPG);
             for (var m = 0; m < tmpOPG.OPV.length; m++) {
               var tmpOPV = tmpOPG.OPV[m],
                 catOPV = set.CatalogData.getOptionValue(tmpOPV.OCD ? tmpOPV.OCD : tmpOPV.Codex);
               if (catOPV) {
                 if (!(catOPV !== null && catOPV !== void 0 && catOPV.groupName) && catOPG) catOPV.groupName = catOPG.name;
-                var myOPV = new ArticleOptionValueData(getArticleOptionValueType(tmpOPV.Codex, tmpOPV, catOPV, catalogArticleData, true, newOPG, multiselectOptions));
+                var myOPV = new ArticleOptionValueData(getArticleOptionValueType(set, tmpOPV.Codex, tmpOPV, catOPV, catalogArticleData, true, newOPG, multiselectOptions), set.CatalogData);
                 allOPVsOfOPG.set(tmpOPV.Codex, myOPV);
               }
             }
@@ -18833,11 +19141,11 @@ function loadArticleOptions(json, catalogArticleData, set) {
             var _tmpOPG = myOPT.OPV[_j],
               _catOPG = set.CatalogData.getOptionValue(_tmpOPG.OCD ? _tmpOPG.OCD : _tmpOPG.Codex);
             if (_catOPG) {
-              var _newOPG = new ArticleOptionValueData(getArticleOptionValueType(_tmpOPG.Codex, _tmpOPG, _catOPG, catalogArticleData, false, newOPT, multiselectOptions));
+              var _newOPG = new ArticleOptionValueData(getArticleOptionValueType(set, _tmpOPG.Codex, _tmpOPG, _catOPG, catalogArticleData, false, newOPT, multiselectOptions), set.CatalogData);
               allOPVsOfOPT.set(_tmpOPG.Codex, _newOPG);
               var _catOPV = set.CatalogData.getOptionValue(_tmpOPG.OCD ? _tmpOPG.OCD : _tmpOPG.Codex);
               if (_catOPV) {
-                var _myOPV = new ArticleOptionValueData(getArticleOptionValueType(_tmpOPG.Codex, _tmpOPG, _catOPV, catalogArticleData, true, _newOPG, multiselectOptions));
+                var _myOPV = new ArticleOptionValueData(getArticleOptionValueType(set, _tmpOPG.Codex, _tmpOPG, _catOPV, catalogArticleData, true, _newOPG, multiselectOptions), set.CatalogData);
                 _allOPVsOfOPG.set(_tmpOPG.Codex, _myOPV);
               }
               _newOPG.initOPVsInOPG(_allOPVsOfOPG);
@@ -18849,7 +19157,7 @@ function loadArticleOptions(json, catalogArticleData, set) {
           var _tmpOPV = myOPT.OPV[_j2],
             _catOPV2 = set.CatalogData.getOptionValue(_tmpOPV.OCD ? _tmpOPV.OCD : _tmpOPV.Codex);
           if (_catOPV2) {
-            var _myOPV2 = new ArticleOptionValueData(getArticleOptionValueType(_tmpOPV.Codex, _tmpOPV, _catOPV2, catalogArticleData, true, newOPT, multiselectOptions));
+            var _myOPV2 = new ArticleOptionValueData(getArticleOptionValueType(set, _tmpOPV.Codex, _tmpOPV, _catOPV2, catalogArticleData, true, newOPT, multiselectOptions), set.CatalogData);
             allOPVsOfOPT.set(_tmpOPV.Codex, _myOPV2);
           }
         }
@@ -18860,7 +19168,7 @@ function loadArticleOptions(json, catalogArticleData, set) {
           return (_item$codex = item.codex) === null || _item$codex === void 0 ? void 0 : _item$codex.endsWith('OPV_FARBE_BASIS');
         });
         if (supplierColorFound) {
-          addSupplierColors(catalogArticleData, allOPVsOfOPT, set.supplierColors, set.CatalogData, newOPT, supplierColorFound.rul);
+          addSupplierColors(set, catalogArticleData, allOPVsOfOPT, set.supplierColors, set.CatalogData, newOPT, supplierColorFound.rul);
         }
       }
       newOPT.initOPVsInOPT(allOPVsOfOPT);
@@ -18970,13 +19278,15 @@ function initDecisions(catalog, catalogArticleData) {
     }
   }
 }
-function getArticleOptionType(myOPT, set) {
-  var _set$CatalogData$cata, _set$CatalogData$cata2, _set$CatalogData$cata3, _optionMask$hidden;
+function getArticleOptionType(myOPT, set, articleCodex) {
+  var _set$CatalogData$cata, _set$CatalogData$cata2, _set$CatalogData$cata3, _set$CatalogData$cata4, _set$CatalogData$cata5, _myOPT$Properties, _optionMask$hidden;
   var OP = myOPT.OCD ? myOPT.OCD : myOPT.Codex;
   var catOPT = set.CatalogData.getOption(OP);
   var optionMask = (_set$CatalogData$cata = (_set$CatalogData$cata2 = set.CatalogData.catalogMask) === null || _set$CatalogData$cata2 === void 0 || (_set$CatalogData$cata2 = _set$CatalogData$cata2.options) === null || _set$CatalogData$cata2 === void 0 ? void 0 : _set$CatalogData$cata2[OP]) !== null && _set$CatalogData$cata !== void 0 ? _set$CatalogData$cata : OP.startsWith('OPT') ? (_set$CatalogData$cata3 = set.CatalogData.catalogMask) === null || _set$CatalogData$cata3 === void 0 || (_set$CatalogData$cata3 = _set$CatalogData$cata3.options) === null || _set$CatalogData$cata3 === void 0 ? void 0 : _set$CatalogData$cata3[OP.substring(3)] : undefined;
   if (!catOPT) throw new Error('Option: ' + OP + ' not in CatalogData');
   var optHasOpg = myOPT.OPG && myOPT.OPG.length > 0;
+  var maskProperties = getPropertiesForFeatureNo((_set$CatalogData$cata4 = (_set$CatalogData$cata5 = set.CatalogData.catalogMask) === null || _set$CatalogData$cata5 === void 0 ? void 0 : _set$CatalogData$cata5.properties) !== null && _set$CatalogData$cata4 !== void 0 ? _set$CatalogData$cata4 : [], articleCodex, OP, set.CatalogData.api.getLanguage());
+  var properties = [].concat(_toConsumableArray__default["default"]((_myOPT$Properties = myOPT.Properties) !== null && _myOPT$Properties !== void 0 ? _myOPT$Properties : []), _toConsumableArray__default["default"](maskProperties !== null && maskProperties !== void 0 ? maskProperties : []));
   return {
     codex: myOPT.Codex,
     catalogOPT: catOPT,
@@ -18990,10 +19300,14 @@ function getArticleOptionType(myOPT, set) {
     articlePlaceholder: myOPT.ArticlePlaceholder,
     hasOPG: optHasOpg,
     invisible: (_optionMask$hidden = optionMask === null || optionMask === void 0 ? void 0 : optionMask.hidden) !== null && _optionMask$hidden !== void 0 ? _optionMask$hidden : myOPT.Invisible == 'True' ? true : myOPT.Invisible == 'False' ? false : undefined,
-    parentOptionCodex: myOPT.ParentOptionCodex
+    parentOptionCodex: myOPT.ParentOptionCodex,
+    propertyObj: {},
+    property: properties
   };
 }
-function getArticleOptionValueType(codex, jsonOPV, catalogOPV, myArticle, isParentOPVG, parent, multiselectOptions) {
+function getArticleOptionValueType(set, codex, jsonOPV, catalogOPV, myArticle, isParentOPVG, parent, multiselectOptions) {
+  var _set$CatalogData$cata6, _set$CatalogData$cata7;
+  var maskProperties = getPropertiesForOptionKey((_set$CatalogData$cata6 = (_set$CatalogData$cata7 = set.CatalogData.catalogMask) === null || _set$CatalogData$cata7 === void 0 ? void 0 : _set$CatalogData$cata7.properties) !== null && _set$CatalogData$cata6 !== void 0 ? _set$CatalogData$cata6 : [], parent.codex, codex, set.CatalogData.api.getLanguage());
   var opv = {
     codex: codex,
     catalogOPV: catalogOPV,
@@ -19019,7 +19333,9 @@ function getArticleOptionValueType(codex, jsonOPV, catalogOPV, myArticle, isPare
     ocd: jsonOPV.OCD,
     quantity: jsonOPV.Quantity ? Number(jsonOPV.Quantity) : 1,
     isPIMFlatValue: jsonOPV.PIMFlatValues === 'True',
-    isVariantAttribute: jsonOPV.IsVariantAttribute
+    isVariantAttribute: jsonOPV.IsVariantAttribute,
+    propertyObj: {},
+    property: maskProperties !== null && maskProperties !== void 0 ? maskProperties : []
   };
   var myPriceRef = null;
   var myBasePriceRef = null;
@@ -19466,18 +19782,19 @@ var initFeature = function initFeature(feature, catalogArticleData, set) {
     catFeature = new OptionCatalogData(getCatalogFeatureType(feature, catalogArticleData, set), set.CatalogData);
     set.CatalogData.setOption(catFeature);
   }
-  var newArticleFeature = new ArticleOptionData(getArticleFeatureType(feature, catalogArticleData, catFeature, set));
+  var newArticleFeature = new ArticleOptionData(getArticleFeatureType(feature, catalogArticleData, catFeature, set), set.CatalogData);
   initOption(feature, newArticleFeature, catalogArticleData, set);
   catalogArticleData.articleOptions[newArticleFeature.codex] = newArticleFeature;
 };
 function getCatalogFeatureType(feature, catalogArticleData, set) {
-  var _set$CatalogData$cata, _feature$detailInfos, _ref, _feature$properties, _feature$options$, _optionMask$hidden;
+  var _set$CatalogData$cata, _set$CatalogData$cata2, _set$CatalogData$cata3, _feature$detailInfos, _properties$find, _properties$find2, _ref, _properties$find3, _feature$options$, _optionMask$hidden;
   var featureClass = set.CatalogData.getFeatureClass(catalogArticleData.featureClassRefNo);
   var optionMask = (_set$CatalogData$cata = set.CatalogData.catalogMask) === null || _set$CatalogData$cata === void 0 || (_set$CatalogData$cata = _set$CatalogData$cata.options) === null || _set$CatalogData$cata === void 0 ? void 0 : _set$CatalogData$cata[feature.featureNo];
+  var maskProperties = getPropertiesForFeatureNo((_set$CatalogData$cata2 = (_set$CatalogData$cata3 = set.CatalogData.catalogMask) === null || _set$CatalogData$cata3 === void 0 ? void 0 : _set$CatalogData$cata3.properties) !== null && _set$CatalogData$cata2 !== void 0 ? _set$CatalogData$cata2 : [], undefined, feature.featureNo, set.CatalogData.api.getLanguage());
+  var properties = [].concat(_toConsumableArray__default["default"](convertProperties(feature.properties, set.api.getLanguageLowercase())), _toConsumableArray__default["default"](maskProperties !== null && maskProperties !== void 0 ? maskProperties : []));
   return {
     name: DivaUtils__default["default"].getLocals(feature.featureText, set.api.getLanguageLowercase()),
     origName: DivaUtils__default["default"].getLocals(feature.featureText, set.api.getLanguageLowercase()),
-    property: convertProperties(feature.properties, set.api.getLanguageLowercase()),
     name_locales: feature.featureText,
     codex: feature.featureNo,
     idmVariantenArt: feature.featureNo ? Number(feature.featureNo) : undefined,
@@ -19487,23 +19804,32 @@ function getCatalogFeatureType(feature, catalogArticleData, set) {
     headerPosVariationType: feature.headerPosVariationType,
     measureKey: feature.measureParameter,
     sequenceNo: feature.sequenceNo,
-    layout: (_ref = (_feature$properties = feature.properties) === null || _feature$properties === void 0 || (_feature$properties = _feature$properties.find(function (p) {
-      return p.key == 'LAYOUT';
-    })) === null || _feature$properties === void 0 ? void 0 : _feature$properties.value) !== null && _ref !== void 0 ? _ref : (_feature$options$ = feature.options[0]) !== null && _feature$options$ !== void 0 && (_feature$options$ = _feature$options$.detailInfos) !== null && _feature$options$ !== void 0 && _feature$options$.find(function (d) {
+    sendToPIM: !!(properties !== null && properties !== void 0 && (_properties$find = properties.find(function (p) {
+      return p.Codex == 'SendToPim';
+    })) !== null && _properties$find !== void 0 && _properties$find.Value),
+    isMultiselect: !!(properties !== null && properties !== void 0 && (_properties$find2 = properties.find(function (p) {
+      return p.Codex == 'Multiselect';
+    })) !== null && _properties$find2 !== void 0 && _properties$find2.Value),
+    layout: (_ref = properties === null || properties === void 0 || (_properties$find3 = properties.find(function (p) {
+      return p.Codex == 'LAYOUT';
+    })) === null || _properties$find3 === void 0 ? void 0 : _properties$find3.Value) !== null && _ref !== void 0 ? _ref : (_feature$options$ = feature.options[0]) !== null && _feature$options$ !== void 0 && (_feature$options$ = _feature$options$.detailInfos) !== null && _feature$options$ !== void 0 && _feature$options$.find(function (d) {
       return d.functionType == 'OPV';
     }) ? 'IMAGE' : 'TEXT',
-    invisible: (_optionMask$hidden = optionMask === null || optionMask === void 0 ? void 0 : optionMask.hidden) !== null && _optionMask$hidden !== void 0 ? _optionMask$hidden : !!(featureClass !== null && featureClass !== void 0 && featureClass.featureRefs[feature.featureNo])
+    invisible: (_optionMask$hidden = optionMask === null || optionMask === void 0 ? void 0 : optionMask.hidden) !== null && _optionMask$hidden !== void 0 ? _optionMask$hidden : !!(featureClass !== null && featureClass !== void 0 && featureClass.featureRefs[feature.featureNo]),
+    property: properties,
+    propertyObj: {}
   };
 }
 function getArticleFeatureType(feature, catalogArticleData, catOPT, set) {
-  var _catalogArticleData$f, _set$CatalogData$tabG;
-  var props = (_catalogArticleData$f = catalogArticleData.featureProperties) === null || _catalogArticleData$f === void 0 ? void 0 : _catalogArticleData$f.filter(function (p) {
+  var _catalogArticleData$f, _catalogArticleData$f2, _set$CatalogData$tabG, _set$CatalogData$cata4, _set$CatalogData$cata5;
+  var props = (_catalogArticleData$f = (_catalogArticleData$f2 = catalogArticleData.featureProperties) === null || _catalogArticleData$f2 === void 0 ? void 0 : _catalogArticleData$f2.filter(function (p) {
     return p.FeatureNos.includes(feature.featureNo);
-  });
+  })) !== null && _catalogArticleData$f !== void 0 ? _catalogArticleData$f : [];
   var featureClass = set.CatalogData.getFeatureClass(catalogArticleData.featureClassRefNo);
   var tabgroup = (_set$CatalogData$tabG = set.CatalogData.tabGroups) === null || _set$CatalogData$tabG === void 0 ? void 0 : _set$CatalogData$tabG.find(function (t) {
     return t.featureNos.includes(feature.featureNo);
   });
+  var maskProperties = getPropertiesForFeatureNo((_set$CatalogData$cata4 = (_set$CatalogData$cata5 = set.CatalogData.catalogMask) === null || _set$CatalogData$cata5 === void 0 ? void 0 : _set$CatalogData$cata5.properties) !== null && _set$CatalogData$cata4 !== void 0 ? _set$CatalogData$cata4 : [], catalogArticleData.articleCodex, feature.featureNo, set.CatalogData.api.getLanguage());
   var opt = {
     codex: feature.featureNo,
     catalogOPT: catOPT,
@@ -19513,23 +19839,10 @@ function getArticleFeatureType(feature, catalogArticleData, catOPT, set) {
     hasOPG: false,
     invisible: !!(featureClass !== null && featureClass !== void 0 && featureClass.featureRefs[feature.featureNo]),
     tabGroup: tabgroup !== null && tabgroup !== void 0 && tabgroup.name ? DivaUtils__default["default"].getLocals(tabgroup.name, set.api.getLanguage()) : undefined,
-    tabGroup_locales: tabgroup === null || tabgroup === void 0 ? void 0 : tabgroup.name
+    tabGroup_locales: tabgroup === null || tabgroup === void 0 ? void 0 : tabgroup.name,
+    property: [].concat(_toConsumableArray__default["default"](maskProperties), _toConsumableArray__default["default"](props)),
+    propertyObj: {}
   };
-  if (props !== null && props !== void 0 && props.length) {
-    for (var i = 0; i < props.length; i++) {
-      var prop = props[i];
-      switch (prop.Codex) {
-        case 'IsVariantAttribute': // ist in den daten?!
-        case 'TopFilterAttribute':
-        case 'PriceTageRelevant':
-        case 'EshopCategoryMapping':
-        case 'IsArtName':
-          break;
-        default:
-          LOG$k.debug('implement mapping for these props for options: ' + prop.Codex);
-      }
-    }
-  }
   return opt;
 }
 
@@ -19544,7 +19857,7 @@ function initOption(feature, articleFeature, catalogArticle, set) {
       return o.codex == option.optionKey;
     });
     if (!catOption) catOption = getCatalogOptionType(option, set);
-    var articleIDMOption = new ArticleOptionValueData(getArticleOption(option, catOption, articleFeature, catalogArticle));
+    var articleIDMOption = new ArticleOptionValueData(getArticleOption(set, option, catOption, articleFeature, catalogArticle), set.CatalogData);
     allOptionsOfFeature.set(articleIDMOption.codex, articleIDMOption);
   };
   for (var j = 0; j < options.length; j++) {
@@ -19554,14 +19867,17 @@ function initOption(feature, articleFeature, catalogArticle, set) {
   catalogArticle.articleOptions[articleFeature.codex];
 }
 function getCatalogOptionType(option, set) {
-  var _option$detailInfos, _option$detailInfos2, _option$measureValue;
+  var _catalogData$catalogM, _catalogData$catalogM2, _option$detailInfos, _option$detailInfos2, _option$measureValue;
   var catalogData = set.CatalogData;
   var name = DivaUtils__default["default"].getLocals(option.optionText, set.api.getLanguageLowercase());
+  var maskProperties = getPropertiesForOptionKey((_catalogData$catalogM = (_catalogData$catalogM2 = catalogData.catalogMask) === null || _catalogData$catalogM2 === void 0 ? void 0 : _catalogData$catalogM2.properties) !== null && _catalogData$catalogM !== void 0 ? _catalogData$catalogM : [], undefined, option.optionKey, set.CatalogData.api.getLanguage());
+  var properties = [].concat(_toConsumableArray__default["default"](convertProperties(option.properties, set.CatalogData.api.getLanguageLowercase())), _toConsumableArray__default["default"](maskProperties !== null && maskProperties !== void 0 ? maskProperties : []));
   var opiton = {
     codex: option.optionKey,
     name: name,
     origName: name,
     name_locales: option.optionText,
+    property: properties,
     image: (_option$detailInfos = option.detailInfos) === null || _option$detailInfos === void 0 || (_option$detailInfos = _option$detailInfos.find(function (d) {
       return d.functionType == 'OPV';
     })) === null || _option$detailInfos === void 0 ? void 0 : _option$detailInfos.url,
@@ -19606,7 +19922,7 @@ function getCatalogOptionType(option, set) {
     // TODO IDM Pricelogic,
     value: (_option$measureValue = option.measureValue) !== null && _option$measureValue !== void 0 ? _option$measureValue : name.endsWith(' cm') && !isNaN(Number(name.replace(' cm', ''))) ? Number(name.replace(' cm', '')) : undefined,
     measureUnit: option.measureUnit,
-    property: convertProperties(option.properties, catalogData.api.getLanguageLowercase())
+    propertyObj: {}
   };
   if (option.detailInfos) {
     for (var i = 0; i < ((_option$detailInfos3 = option.detailInfos) !== null && _option$detailInfos3 !== void 0 ? _option$detailInfos3 : []).length; i++) {
@@ -19628,11 +19944,12 @@ function getCatalogOptionType(option, set) {
   }
   return new OptionValueCatalogData(opiton, catalogData);
 }
-function getArticleOption(option, catalogOption, feature, catalogArticleData) {
-  var _catalogArticleData$o;
+function getArticleOption(set, option, catalogOption, feature, catalogArticleData) {
+  var _catalogArticleData$o, _set$CatalogData$cata6, _set$CatalogData$cata7;
   var props = (_catalogArticleData$o = catalogArticleData.optionProperties) === null || _catalogArticleData$o === void 0 ? void 0 : _catalogArticleData$o.filter(function (p) {
     return p.OptionKeys.includes(option.optionKey);
   });
+  var maskProperties = getPropertiesForOptionKey((_set$CatalogData$cata6 = (_set$CatalogData$cata7 = set.CatalogData.catalogMask) === null || _set$CatalogData$cata7 === void 0 ? void 0 : _set$CatalogData$cata7.properties) !== null && _set$CatalogData$cata6 !== void 0 ? _set$CatalogData$cata6 : [], undefined, option.optionKey, set.api.getLanguage());
   //TODO add these props that are articleSpecific
   var opv = {
     codex: option.optionKey,
@@ -19641,25 +19958,10 @@ function getArticleOption(option, catalogOption, feature, catalogArticleData) {
     isParentOPVG: false,
     parent: feature,
     price: 0,
-    quantity: 1
+    quantity: 1,
+    propertyObj: {},
+    property: [].concat(_toConsumableArray__default["default"](props !== null && props !== void 0 ? props : []), _toConsumableArray__default["default"](maskProperties !== null && maskProperties !== void 0 ? maskProperties : []))
   };
-  if (props !== null && props !== void 0 && props.length) {
-    for (var i = 0; i < props.length; i++) {
-      var prop = props[i];
-      switch (prop.Codex) {
-        case 'IsVariantAttribute':
-          opv.isVariantAttribute = prop.Value == '1';
-          break;
-        case 'EshopCategoryMapping':
-        case 'TopFilterAttribute':
-        case 'PriceTageRelevant':
-        case 'IsArtName':
-          break;
-        default:
-          LOG$k.debug('implement mapping for these props for options: ' + prop.Codex);
-      }
-    }
-  }
   return opv;
 }
 function componentToHex(c) {
@@ -20097,9 +20399,10 @@ var DivaCatalogData = /*#__PURE__*/function () {
     this._api = api;
     this.additionalModelInfos = additionalModelInfos;
     if (json.Properties) {
-      var _json$Properties, _this$catalogMask$cat, _this$catalogMask;
+      var _this$catalogMask$pro, _this$catalogMask, _json$Properties;
       this.origProperties = json.Properties;
-      this.initProperties(catalogCodex, [].concat(_toConsumableArray__default["default"]((_json$Properties = json.Properties) !== null && _json$Properties !== void 0 ? _json$Properties : []), _toConsumableArray__default["default"]((_this$catalogMask$cat = (_this$catalogMask = this.catalogMask) === null || _this$catalogMask === void 0 || (_this$catalogMask = _this$catalogMask.catalog) === null || _this$catalogMask === void 0 ? void 0 : _this$catalogMask.properties) !== null && _this$catalogMask$cat !== void 0 ? _this$catalogMask$cat : [])));
+      var maskProperties = getPropertiesForSerieNo((_this$catalogMask$pro = (_this$catalogMask = this.catalogMask) === null || _this$catalogMask === void 0 ? void 0 : _this$catalogMask.properties) !== null && _this$catalogMask$pro !== void 0 ? _this$catalogMask$pro : [], 1, this.api.getLanguage());
+      this.initProperties(catalogCodex, [].concat(_toConsumableArray__default["default"]((_json$Properties = json.Properties) !== null && _json$Properties !== void 0 ? _json$Properties : []), _toConsumableArray__default["default"](maskProperties !== null && maskProperties !== void 0 ? maskProperties : [])));
     }
     this.plannerPaletteViewInfo = {
       catalogPlannerArticles: [],
@@ -20131,8 +20434,9 @@ var DivaCatalogData = /*#__PURE__*/function () {
       initIDMArticles(articleJson, this);
     }
     if (this.origProperties) {
-      var _json$Properties2, _this$catalogMask$cat2, _this$catalogMask2;
-      this.initPropertiesAfterOptionsInit(catalogCodex, [].concat(_toConsumableArray__default["default"]((_json$Properties2 = json.Properties) !== null && _json$Properties2 !== void 0 ? _json$Properties2 : []), _toConsumableArray__default["default"]((_this$catalogMask$cat2 = (_this$catalogMask2 = this.catalogMask) === null || _this$catalogMask2 === void 0 || (_this$catalogMask2 = _this$catalogMask2.catalog) === null || _this$catalogMask2 === void 0 ? void 0 : _this$catalogMask2.properties) !== null && _this$catalogMask$cat2 !== void 0 ? _this$catalogMask$cat2 : [])));
+      var _this$catalogMask$pro2, _this$catalogMask2, _json$Properties2;
+      var _maskProperties = getPropertiesForSerieNo((_this$catalogMask$pro2 = (_this$catalogMask2 = this.catalogMask) === null || _this$catalogMask2 === void 0 ? void 0 : _this$catalogMask2.properties) !== null && _this$catalogMask$pro2 !== void 0 ? _this$catalogMask$pro2 : [], 1, this.api.getLanguage());
+      this.initPropertiesAfterOptionsInit(catalogCodex, [].concat(_toConsumableArray__default["default"]((_json$Properties2 = json.Properties) !== null && _json$Properties2 !== void 0 ? _json$Properties2 : []), _toConsumableArray__default["default"](_maskProperties !== null && _maskProperties !== void 0 ? _maskProperties : [])));
     }
   }
   return _createClass__default["default"](DivaCatalogData, [{
@@ -20648,6 +20952,16 @@ var DivaCatalogData = /*#__PURE__*/function () {
     get: function get() {
       return this.catalogProps.mergeOptionsToSameOption;
     }
+  }, {
+    key: "checkIfUseBoxPlanner",
+    value: function checkIfUseBoxPlanner(articleCodex) {
+      if (Array.isArray(this.catalogProps.useBoxPlanner)) {
+        this.catalogProps.useBoxPlanner = !!this.catalogProps.useBoxPlanner.find(function (a) {
+          return articleCodex.includes(a);
+        });
+      }
+      return this.catalogProps.useBoxPlanner;
+    }
   }, {
     key: "useBoxPlanner",
     get: function get() {
@@ -21098,7 +21412,7 @@ var DivaCatalogData = /*#__PURE__*/function () {
             _this5.catalogProps.useGlobalSVGScale = item.Value == '1';
             break;
           case 'USEBOXPLANNER':
-            _this5.catalogProps.useBoxPlanner = item.Value == '1';
+            _this5.catalogProps.useBoxPlanner = item.Value == '1' ? true : item.Value.split(';');
             break;
           case 'PLANNERTYPE':
             _this5.catalogProps.plannerType = item.Value;
@@ -21463,10 +21777,14 @@ var DivaCatalogData = /*#__PURE__*/function () {
     value: function initMask(initProps) {
       var _this$catalogMask3;
       if ((_this$catalogMask3 = this.catalogMask) !== null && _this$catalogMask3 !== void 0 && _this$catalogMask3.catalog) {
-        var _this$catalogMask$cat3;
-        if ((_this$catalogMask$cat3 = this.catalogMask.catalog.name) !== null && _this$catalogMask$cat3 !== void 0 && _this$catalogMask$cat3[this.api.getLanguage()]) this.catalogData.catalogName = this.catalogMask.catalog.name[this.api.getLanguage()];
+        var _this$catalogMask$cat;
+        if ((_this$catalogMask$cat = this.catalogMask.catalog.name) !== null && _this$catalogMask$cat !== void 0 && _this$catalogMask$cat[this.api.getLanguage()]) this.catalogData.catalogName = this.catalogMask.catalog.name[this.api.getLanguage()];
         if (this.catalogMask.catalog.name) this.catalogData.name_locales = this.catalogMask.catalog.name;
-        if (this.catalogMask.catalog.properties && initProps) this.initProperties(this.catalogCodex, [].concat(_toConsumableArray__default["default"](this.origProperties), _toConsumableArray__default["default"](this.catalogMask.catalog.properties)));
+        if (initProps) {
+          var _this$catalogMask$pro3, _this$catalogMask4;
+          var maskProperties = getPropertiesForSerieNo((_this$catalogMask$pro3 = (_this$catalogMask4 = this.catalogMask) === null || _this$catalogMask4 === void 0 ? void 0 : _this$catalogMask4.properties) !== null && _this$catalogMask$pro3 !== void 0 ? _this$catalogMask$pro3 : [], 1, this.api.getLanguage());
+          this.initProperties(this.catalogCodex, [].concat(_toConsumableArray__default["default"](this.origProperties), _toConsumableArray__default["default"](maskProperties !== null && maskProperties !== void 0 ? maskProperties : [])));
+        }
       }
     }
   }]);
@@ -21483,7 +21801,8 @@ var mapMask = function mapMask(mask) {
       mappedProps.push({
         Codex: key,
         Name: prop.name,
-        Value: prop.value
+        Value: prop.value,
+        Value_locales: prop.valueLocales
       });
     }
     return mappedProps;
@@ -25068,14 +25387,15 @@ var IDMEngine = /*#__PURE__*/function () {
           var index = _this$getMatchingOpti2[1];
         this.logPrice(priceFeatureGroup, index);
         if (index !== undefined) {
-          var _this$article$catalog, _this$article$catalog2;
+          var _this$article$catalog, _this$article$catalog4;
           var matichingFinish = priceFeatureGroup.finishes[index];
           var priceKey = 'PRFG' + priceFeatureGroup.priceFeatureGroupNo + '_' + matichingFinish.priceField;
           if (((_this$article$catalog = this.article.catalogArticle.idmPrices) === null || _this$article$catalog === void 0 ? void 0 : _this$article$catalog.prices[priceKey]) === undefined) {
-            LOG$f.error(new DivaUtils.DivaError('priceKey: ' + priceKey + ' not found'));
+            var _this$article$catalog2, _this$article$catalog3;
+            LOG$f.error(new DivaUtils.DivaError('priceKey: ' + priceKey + ' not found. valid prices: ' + Object.keys((_this$article$catalog2 = (_this$article$catalog3 = this.article.catalogArticle.idmPrices) === null || _this$article$catalog3 === void 0 ? void 0 : _this$article$catalog3.prices) !== null && _this$article$catalog2 !== void 0 ? _this$article$catalog2 : {}).join(', ')));
             continue;
           }
-          var price = (_this$article$catalog2 = this.article.catalogArticle.idmPrices) === null || _this$article$catalog2 === void 0 ? void 0 : _this$article$catalog2.prices[priceKey];
+          var price = (_this$article$catalog4 = this.article.catalogArticle.idmPrices) === null || _this$article$catalog4 === void 0 ? void 0 : _this$article$catalog4.prices[priceKey];
           articleUsedCalcPrice += price;
           this.article.priceRefs.push({
             ID: matichingFinish._id,
@@ -25101,13 +25421,13 @@ var IDMEngine = /*#__PURE__*/function () {
   }, {
     key: "logPrice",
     value: function logPrice(priceFeatureGroup, index) {
-      var _this$article$catalog3;
+      var _this$article$catalog5;
       if (!this.article.set.logDecisions) return;
       var finish = priceFeatureGroup.finishes[index !== null && index !== void 0 ? index : -1];
       this.priceDebugStack.push({
         nr: priceFeatureGroup.priceFeatureGroupNo,
         variantValues: this.article.VariantValues,
-        text: DivaUtils__default["default"].getLocals(priceFeatureGroup.priceFeatureGroupText, this.article.set.api.getLanguage()) + ' ' + (finish ? (_this$article$catalog3 = this.article.catalogArticle.idmPrices) === null || _this$article$catalog3 === void 0 || (_this$article$catalog3 = _this$article$catalog3.prices['PRFG' + priceFeatureGroup.priceFeatureGroupNo + '_' + finish.priceField]) === null || _this$article$catalog3 === void 0 ? void 0 : _this$article$catalog3.toString() : ''),
+        text: DivaUtils__default["default"].getLocals(priceFeatureGroup.priceFeatureGroupText, this.article.set.api.getLanguage()) + ' ' + (finish ? (_this$article$catalog5 = this.article.catalogArticle.idmPrices) === null || _this$article$catalog5 === void 0 || (_this$article$catalog5 = _this$article$catalog5.prices['PRFG' + priceFeatureGroup.priceFeatureGroupNo + '_' + finish.priceField]) === null || _this$article$catalog5 === void 0 ? void 0 : _this$article$catalog5.toString() : ''),
         priceFeatureGroup: _objectSpread$f(_objectSpread$f({}, priceFeatureGroup), {}, {
           activeCombination: finish === null || finish === void 0 ? void 0 : finish.sequence
         })
@@ -25160,9 +25480,9 @@ var IDMEngine = /*#__PURE__*/function () {
   }, {
     key: "evalPartlist",
     value: function evalPartlist(newConfigValues) {
-      var _this$article$catalog4;
+      var _this$article$catalog6;
       var partlistArticlesToLoad = [];
-      var myPartlistArticles = (_this$article$catalog4 = this.article.catalogArticle.idmPartlist) === null || _this$article$catalog4 === void 0 ? void 0 : _this$article$catalog4.partlistPos;
+      var myPartlistArticles = (_this$article$catalog6 = this.article.catalogArticle.idmPartlist) === null || _this$article$catalog6 === void 0 ? void 0 : _this$article$catalog6.partlistPos;
       if (!(myPartlistArticles !== null && myPartlistArticles !== void 0 && myPartlistArticles.length)) return [];
       var partlistGroup = [];
       for (var i = 0; i < myPartlistArticles.length; i++) {
@@ -25460,8 +25780,8 @@ var IDMEngine = /*#__PURE__*/function () {
       for (var i = 0; i < allKeys.length; i++) {
         var key = allKeys[i];
         var value = this.article.getValueByMeasureKey(key);
-        if (value === undefined) throw new Error('measureParameter: ' + key + ' has no value defined');
-        keysMap[key] = value;
+        if (value === undefined) LOG$f.warn('measureParameter: ' + key + ' has no value defined');
+        keysMap[key] = value !== null && value !== void 0 ? value : 0;
       }
       while (allKeys.find(function (key) {
         return formula.includes(key);
@@ -25484,7 +25804,7 @@ var IDMEngine = /*#__PURE__*/function () {
   }, {
     key: "updateConfigDependentMedia",
     value: function updateConfigDependentMedia() {
-      var _this$article$catalog5,
+      var _this$article$catalog7,
         _this4 = this;
       var catalogData = this.article.CatalogData;
       //articlebild berechnung
@@ -25576,10 +25896,10 @@ var IDMEngine = /*#__PURE__*/function () {
       }
       var newSVGFile = null;
       var svgChangedViaSvgTausch = false;
-      if (!((_this$article$catalog5 = this.article.catalogArticle.svgs) !== null && _this$article$catalog5 !== void 0 && _this$article$catalog5.length)) {
-        var _this$article$catalog6;
+      if (!((_this$article$catalog7 = this.article.catalogArticle.svgs) !== null && _this$article$catalog7 !== void 0 && _this$article$catalog7.length)) {
+        var _this$article$catalog8;
         //falls der Arikel kein SVG hat könnte eines seiner ParlistArtikel eines haben
-        if (this.article.hasPartlistArticle && !((_this$article$catalog6 = this.article.catalogArticle.catalogPlannerArticle) !== null && _this$article$catalog6 !== void 0 && _this$article$catalog6.topSvg)) {
+        if (this.article.hasPartlistArticle && !((_this$article$catalog8 = this.article.catalogArticle.catalogPlannerArticle) !== null && _this$article$catalog8 !== void 0 && _this$article$catalog8.topSvg)) {
           for (var key in this.article.partlistArticles) if (this.article.partlistArticles[key].actPlannerData) {
             this.article.plannerData = this.article.partlistArticles[key].actPlannerData;
             newSVGFile = true;
@@ -28385,7 +28705,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-20d69956.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-5a04c5bb.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -28843,7 +29163,7 @@ var DivaArticle = /*#__PURE__*/function () {
           var checkPrice = this.article.priceRefs[i];
           if (checkPrice.Price) {
             if (typeof checkPrice.ISABP == 'string' && checkPrice.ISABP == 'True' || typeof checkPrice.ISABP == 'boolean' && checkPrice.ISABP) {
-              var _checkPrice$PPG, _checkPrice$RuleDesc_, _myPriceData$BasePric;
+              var _checkPrice$PPG, _checkPrice$RuleDesc_, _myPriceData$BasePric, _checkPrice$RuleDescU;
               myPriceData.BasePrice = checkPrice.Price;
               myPriceData.FormatedPrice = DivaUtils__default["default"].formatPrice(checkPrice.Price);
               myPriceData.BasePriceGroup = (_checkPrice$PPG = checkPrice.PPG) !== null && _checkPrice$PPG !== void 0 ? _checkPrice$PPG : '';
@@ -28853,7 +29173,7 @@ var DivaArticle = /*#__PURE__*/function () {
               (_myPriceData$BasePric = myPriceData.BasePrices) === null || _myPriceData$BasePric === void 0 || _myPriceData$BasePric.push({
                 BasePrice: checkPrice.Price,
                 FormatedPrice: DivaUtils__default["default"].formatPrice(checkPrice.Price),
-                BasePriceTitle: checkPrice.RuleDesc,
+                BasePriceTitle: (_checkPrice$RuleDescU = checkPrice.RuleDescUsedOpts) !== null && _checkPrice$RuleDescU !== void 0 ? _checkPrice$RuleDescU : checkPrice.RuleDesc,
                 BasePriceGroup: checkPrice.PPG
               });
             } else {
@@ -28869,8 +29189,8 @@ var DivaArticle = /*#__PURE__*/function () {
                   }
                 }
               } else {
-                var _checkPrice$RuleDescU;
-                myPriceData.addAdditionalPrice((_checkPrice$RuleDescU = checkPrice.RuleDescUsedOpts) !== null && _checkPrice$RuleDescU !== void 0 ? _checkPrice$RuleDescU : checkPrice.RuleDesc, checkPrice.Price, DivaUtils__default["default"].formatPrice(checkPrice.Price), checkPrice.PPG ? checkPrice.PPG : '', checkPrice.OPT ? checkPrice.OPT.replace('OPT', '') : '', '');
+                var _checkPrice$RuleDescU2;
+                myPriceData.addAdditionalPrice((_checkPrice$RuleDescU2 = checkPrice.RuleDescUsedOpts) !== null && _checkPrice$RuleDescU2 !== void 0 ? _checkPrice$RuleDescU2 : checkPrice.RuleDesc, checkPrice.Price, DivaUtils__default["default"].formatPrice(checkPrice.Price), checkPrice.PPG ? checkPrice.PPG : '', checkPrice.OPT ? checkPrice.OPT.replace('OPT', '') : '', '');
               }
             }
           }
@@ -29011,6 +29331,8 @@ var DivaArticle = /*#__PURE__*/function () {
         _iterator40.f();
       }
       clonedArticle.initEngine();
+      clonedArticle.hasDecisionsInitialized = true;
+      clonedArticle.hasPartlistArticleInitialized = true;
       clonedArticle.article.partlistArticles = {};
       clonedArticle.article.previousPartlistArticles = {};
       for (var key in this.partlistArticles) {
@@ -31649,6 +31971,7 @@ var DivaSet = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "favoritesChanged", false);
     _defineProperty__default["default"](this, "setState", void 0);
     _defineProperty__default["default"](this, "modifiedJ3D", []);
+    _defineProperty__default["default"](this, "aiImageForBasket", void 0);
     /**
      * This function is called when the docking of two Elements is changed
      */
@@ -31921,6 +32244,24 @@ var DivaSet = /*#__PURE__*/function () {
     };
   }
   return _createClass__default["default"](DivaSet, [{
+    key: "getAiImageAsJpg",
+    value: function getAiImageAsJpg() {
+      return this.aiImageForBasket;
+    }
+  }, {
+    key: "setAiImageAsJpg",
+    value: function setAiImageAsJpg(promptId, aiImageAsJPGBase64) {
+      this.aiImageForBasket = {
+        base64: aiImageAsJPGBase64,
+        promptId: promptId
+      };
+    }
+  }, {
+    key: "clearAiImageAsJpg",
+    value: function clearAiImageAsJpg() {
+      this.aiImageForBasket = undefined;
+    }
+  }, {
     key: "addRelationsToArticles",
     value: function addRelationsToArticles(article1, article2) {
       if (article2.checkArtCodexIsAccessoire(article1.articleCodex)) {
@@ -32916,7 +33257,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context5.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-17dc699e.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-787eb542.js'); });
             case 3:
               _yield$import = _context5.sent;
               DoorPlanner = _yield$import["default"];
@@ -36156,9 +36497,12 @@ var DivaSetHandler = /*#__PURE__*/function () {
             case 3:
               catalogData = _context6.sent;
               articlesToInitialize = !((_orderSet$OrderLines = orderSet.OrderLines) !== null && _orderSet$OrderLines !== void 0 && _orderSet$OrderLines.length) ? (_initSetState$article = initSetState.articlesToInitialize) !== null && _initSetState$article !== void 0 ? _initSetState$article : catalogData.startPlannerArticle : undefined;
-              _context6.next = 7;
+              catalogData.checkIfUseBoxPlanner(articlesToInitialize !== null && articlesToInitialize !== void 0 ? articlesToInitialize : orderSet.OrderLines.map(function (o) {
+                return o.ArticleCodex;
+              }));
+              _context6.next = 8;
               return this.createSet(catalogData, orderSet, initSetState, lastSetToInitialize);
-            case 7:
+            case 8:
               set = _context6.sent;
               if (set.api.getLoadSupplierColors() && initSetState.supplierColors) {
                 set.supplierColors = initSetState.supplierColors;
@@ -36177,35 +36521,35 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 }
               }
               if (!(articlesToInitialize && articlesToInitialize.length > 0)) {
-                _context6.next = 23;
+                _context6.next = 24;
                 break;
               }
               DivaUtils__default["default"].startSpanOfApm('Articles initialize');
               j = 0;
-            case 14:
+            case 15:
               if (!(j < articlesToInitialize.length)) {
-                _context6.next = 21;
+                _context6.next = 22;
                 break;
               }
               variantValues = (_initSetState$initVar = initSetState.initVariantValues) !== null && _initSetState$initVar !== void 0 ? _initSetState$initVar : catalogData === null || catalogData === void 0 || (_catalogData$promoted = catalogData.promotedOpvs) === null || _catalogData$promoted === void 0 || (_catalogData$promoted = _catalogData$promoted.articles) === null || _catalogData$promoted === void 0 || (_catalogData$promoted = _catalogData$promoted[articlesToInitialize[j]]) === null || _catalogData$promoted === void 0 || (_catalogData$promoted = _catalogData$promoted[0]) === null || _catalogData$promoted === void 0 ? void 0 : _catalogData$promoted.variantValues;
-              _context6.next = 18;
+              _context6.next = 19;
               return this.addPlannerElement(set, articlesToInitialize[j], _objectSpread$a(_objectSpread$a({}, params), variantValues ? {
                 variantValues: variantValues
               } : {}));
-            case 18:
+            case 19:
               j++;
-              _context6.next = 14;
+              _context6.next = 15;
               break;
-            case 21:
+            case 22:
               //display image of article if there is no planner
               if (!set.onlyRunLogic && set.getPlannerMode() == 'No') {
                 image = set.getImageOfOnlyElement();
                 if (image && updateSetImage) updateSetImage(image);
               }
               DivaUtils__default["default"].endSpanOfApm('Articles initialize');
-            case 23:
-              return _context6.abrupt("return", set);
             case 24:
+              return _context6.abrupt("return", set);
+            case 25:
             case "end":
               return _context6.stop();
           }
@@ -37563,8 +37907,8 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "loadConfigItemsOfActSetByConfigStepKey",
     value: function () {
-      var _loadConfigItemsOfActSetByConfigStepKey = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee22(set, configStepKey, visible) {
-        var _configItems$option;
+      var _loadConfigItemsOfActSetByConfigStepKey = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee22(set, configStepKey, visible, hidePricePreview) {
+        var _configItems$option, _configItems$option2;
         var configItems, paletteType, filterType, stepInfo, contentItemId;
         return _regeneratorRuntime__default["default"].wrap(function _callee22$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
@@ -37576,7 +37920,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               paletteType = set.configTree.getCurPaletteType(set, configStepKey);
               configItems.configItems = this.removeDockingInfluencableconfigItems(set, configItems.configItems, configStepKey);
               _context24.next = 7;
-              return this.variantsEvaluator(set, configItems.configItems, configStepKey, paletteType);
+              return this.variantsEvaluator(set, configItems.configItems, configStepKey, paletteType, hidePricePreview);
             case 7:
               configItems.configItems = _context24.sent;
               filterType = set.configTree.getCurFilterType(configStepKey, configItems.configItems);
@@ -37591,7 +37935,8 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 filterType: filterType,
                 stepInfo: stepInfo
               }, set.configTree.getOptionStuff(configStepKey, set)), {}, {
-                contentItemId: contentItemId
+                contentItemId: contentItemId,
+                conceptFilter: (_configItems$option2 = configItems.option) === null || _configItems$option2 === void 0 ? void 0 : _configItems$option2.additionalGroupFilter
               }));
             case 12:
             case "end":
@@ -37599,7 +37944,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee22, this);
       }));
-      function loadConfigItemsOfActSetByConfigStepKey(_x81, _x82, _x83) {
+      function loadConfigItemsOfActSetByConfigStepKey(_x81, _x82, _x83, _x84) {
         return _loadConfigItemsOfActSetByConfigStepKey.apply(this, arguments);
       }
       return loadConfigItemsOfActSetByConfigStepKey;
@@ -37641,7 +37986,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "variantsEvaluator",
     value: (function () {
-      var _variantsEvaluator = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee23(set, configItems, configStepKey, paletteType) {
+      var _variantsEvaluator = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee23(set, configItems, configStepKey, paletteType, hidePricePreview) {
         var _configItems$0$option, _set$api$ReturnToFrom, _set$CatalogData$show, _set$CatalogData$hide;
         var opt, previewType, targetArticles, variants, pricesVisible;
         return _regeneratorRuntime__default["default"].wrap(function _callee23$(_context25) {
@@ -37661,7 +38006,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               }
               return _context25.abrupt("return", configItems);
             case 6:
-              if (!(!previewType || previewType == 'off' || configItems.length == 1 || opt.isDescribingState || configItems.length > 300 && !configItems[0].groupName || (_set$CatalogData$show = set.CatalogData.showPricePreviewOnlyOnOptions) !== null && _set$CatalogData$show !== void 0 && _set$CatalogData$show.length && !set.CatalogData.showPricePreviewOnlyOnOptions.includes(opt.codex.substring(3)) || (_set$CatalogData$hide = set.CatalogData.hidePricePreviewOnlyOnOptions) !== null && _set$CatalogData$hide !== void 0 && _set$CatalogData$hide.length && set.CatalogData.hidePricePreviewOnlyOnOptions.includes(opt.codex.substring(3)))) {
+              if (!(!previewType || previewType == 'off' || configItems.length == 1 || opt.isDescribingState || configItems.length > 300 && !configItems[0].groupName || (_set$CatalogData$show = set.CatalogData.showPricePreviewOnlyOnOptions) !== null && _set$CatalogData$show !== void 0 && _set$CatalogData$show.length && !set.CatalogData.showPricePreviewOnlyOnOptions.includes(opt.codex.substring(3)) || (_set$CatalogData$hide = set.CatalogData.hidePricePreviewOnlyOnOptions) !== null && _set$CatalogData$hide !== void 0 && _set$CatalogData$hide.length && set.CatalogData.hidePricePreviewOnlyOnOptions.includes(opt.codex.substring(3)) || hidePricePreview)) {
                 _context25.next = 9;
                 break;
               }
@@ -37692,7 +38037,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee23, this);
       }));
-      function variantsEvaluator(_x84, _x85, _x86, _x87) {
+      function variantsEvaluator(_x85, _x86, _x87, _x88, _x89) {
         return _variantsEvaluator.apply(this, arguments);
       }
       return variantsEvaluator;
@@ -37773,7 +38118,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee24, this);
       }));
-      function calcVariants(_x88, _x89, _x90, _x91) {
+      function calcVariants(_x90, _x91, _x92, _x93) {
         return _calcVariants.apply(this, arguments);
       }
       return calcVariants;
@@ -37882,7 +38227,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee25, this);
       }));
-      function getVariant(_x92, _x93, _x94, _x95, _x96, _x97, _x98, _x99, _x100) {
+      function getVariant(_x94, _x95, _x96, _x97, _x98, _x99, _x100, _x101, _x102) {
         return _getVariant.apply(this, arguments);
       }
       return getVariant;
@@ -37936,7 +38281,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee26);
       }));
-      function checkIfPriceDiffers(_x101) {
+      function checkIfPriceDiffers(_x103) {
         return _checkIfPriceDiffers.apply(this, arguments);
       }
       return checkIfPriceDiffers;
@@ -38099,7 +38444,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee27, this);
       }));
-      function updateArticlesOptionStatesOfActSet(_x102, _x103, _x104, _x105, _x106, _x107) {
+      function updateArticlesOptionStatesOfActSet(_x104, _x105, _x106, _x107, _x108, _x109) {
         return _updateArticlesOptionStatesOfActSet.apply(this, arguments);
       }
       return updateArticlesOptionStatesOfActSet;
@@ -38192,7 +38537,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee28, this);
       }));
-      function updateEdoArticles(_x108, _x109) {
+      function updateEdoArticles(_x110, _x111) {
         return _updateEdoArticles.apply(this, arguments);
       }
       return updateEdoArticles;
@@ -38475,7 +38820,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee29, this);
       }));
-      function fillOrderLinesAndOrderSets(_x110, _x111, _x112, _x113, _x114) {
+      function fillOrderLinesAndOrderSets(_x112, _x113, _x114, _x115, _x116) {
         return _fillOrderLinesAndOrderSets.apply(this, arguments);
       }
       return fillOrderLinesAndOrderSets;
@@ -38566,8 +38911,8 @@ var DivaSetHandler = /*#__PURE__*/function () {
     key: "getOrderSet",
     value: function () {
       var _getOrderSet = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee30(set, catalogData, divaNr, repairOnly, returnTo) {
-        var _Object$values$, _set$getDivaArticles, _hqRenderScript, _set$basketConfigVari2, _set$basketConfigVari3;
-        var dontGenerateImages, orderSet, GroupType, plannerData, setImage, urlToPlanning2D, alternateSetImages, hqRenderScript, dimensions, promise3D, promise2D, promise3DAlternate, _yield$Promise$all, _yield$Promise$all2, _yield$Promise$all2$, plannerWarnings, bruttoPrice;
+        var _Object$values$, _set$getDivaArticles, _hqRenderScript, _alternateSetImages, _set$basketConfigVari2, _set$basketConfigVari3;
+        var dontGenerateImages, orderSet, GroupType, plannerData, setImage, urlToPlanning2D, urlToAiImage, alternateSetImages, hqRenderScript, dimensions, promise3D, promise2D, promiseAiImage, promise3DAlternate, _yield$Promise$all, _yield$Promise$all2, _yield$Promise$all2$, plannerWarnings, bruttoPrice;
         return _regeneratorRuntime__default["default"].wrap(function _callee30$(_context32) {
           while (1) switch (_context32.prev = _context32.next) {
             case 0:
@@ -38577,30 +38922,35 @@ var DivaSetHandler = /*#__PURE__*/function () {
               plannerData = set.plannerHandler.savePlanner(set.getSetId());
               setImage = undefined;
               urlToPlanning2D = undefined;
+              urlToAiImage = undefined;
               alternateSetImages = undefined;
               hqRenderScript = undefined;
               dimensions = {};
               if (dontGenerateImages) {
-                _context32.next = 23;
+                _context32.next = 26;
                 break;
               }
               promise3D = this.getSetImage(set, typeof window === 'undefined');
               promise2D = this.get2DSetImage(set);
+              if (set.getAiImageAsJpg()) {
+                promiseAiImage = this.getAiImage(set);
+              }
               if (!catalogData.dontSaveAlternativeRenderings && set.CatalogData.alternateRenderingsForSummary.length) {
                 promise3DAlternate = this.getAlternateSetImages(set);
               }
-              _context32.next = 15;
-              return Promise.all([promise3D, promise2D, promise3DAlternate, this.getHQRenderScript(set, divaNr)]);
-            case 15:
+              _context32.next = 17;
+              return Promise.all([promise3D, promise2D, promiseAiImage, promise3DAlternate, this.getHQRenderScript(set, divaNr)]);
+            case 17:
               _yield$Promise$all = _context32.sent;
-              _yield$Promise$all2 = _slicedToArray__default["default"](_yield$Promise$all, 4);
+              _yield$Promise$all2 = _slicedToArray__default["default"](_yield$Promise$all, 5);
               _yield$Promise$all2$ = _yield$Promise$all2[0];
               setImage = _yield$Promise$all2$.url;
               dimensions = _yield$Promise$all2$.dimensions;
               urlToPlanning2D = _yield$Promise$all2[1];
-              alternateSetImages = _yield$Promise$all2[2];
-              hqRenderScript = _yield$Promise$all2[3];
-            case 23:
+              urlToAiImage = _yield$Promise$all2[2];
+              alternateSetImages = _yield$Promise$all2[3];
+              hqRenderScript = _yield$Promise$all2[4];
+            case 26:
               plannerWarnings = [];
               if (!this.getPlanningIsComplete(set)) plannerWarnings.push('INCOMPLETE');
               DivaUtils__default["default"].endSpanOfApm('GetSet3D und 2D Image');
@@ -38637,7 +38987,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 Set2DImage: urlToPlanning2D,
                 VariantDescription: DivaUtils__default["default"].stripTags(set.getVariantsDescription()),
                 VariantDescription_locales: DivaUtils__default["default"].stripTagsFromDict(set.getVariantsDescription_locales()),
-                SetImages: alternateSetImages,
+                SetImages: [].concat(_toConsumableArray__default["default"](urlToAiImage ? [urlToAiImage] : []), _toConsumableArray__default["default"]((_alternateSetImages = alternateSetImages) !== null && _alternateSetImages !== void 0 ? _alternateSetImages : [])),
                 SetHash: set.setHash,
                 SetPlanData: plannerData != undefined ? DivaUtils__default["default"].encodeBase64(JSON.stringify(plannerData)) : '',
                 SetID: set.getSetId(),
@@ -38664,13 +39014,13 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 MetaData_locales: !((_set$basketConfigVari3 = set.basketConfigVariants) !== null && _set$basketConfigVari3 !== void 0 && _set$basketConfigVari3.length) ? set.MetaData_locales : undefined
               });
               return _context32.abrupt("return", orderSet);
-            case 29:
+            case 32:
             case "end":
               return _context32.stop();
           }
         }, _callee30, this);
       }));
-      function getOrderSet(_x115, _x116, _x117, _x118, _x119) {
+      function getOrderSet(_x117, _x118, _x119, _x120, _x121) {
         return _getOrderSet.apply(this, arguments);
       }
       return getOrderSet;
@@ -38720,7 +39070,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee31);
       }));
-      function getSetImage(_x120, _x121) {
+      function getSetImage(_x122, _x123) {
         return _getSetImage.apply(this, arguments);
       }
       return getSetImage;
@@ -38766,7 +39116,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee32);
       }));
-      function getHQRenderScript(_x122, _x123) {
+      function getHQRenderScript(_x124, _x125) {
         return _getHQRenderScript.apply(this, arguments);
       }
       return getHQRenderScript;
@@ -38807,7 +39157,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee33);
       }));
-      function getAlternateSetImages(_x124) {
+      function getAlternateSetImages(_x126) {
         return _getAlternateSetImages.apply(this, arguments);
       }
       return getAlternateSetImages;
@@ -38816,18 +39166,18 @@ var DivaSetHandler = /*#__PURE__*/function () {
     key: "get2DSetImage",
     value: function () {
       var _get2DSetImage = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee34(set) {
-        var urlToPlanning2D, catalogData, planning2DAsJPGBase64;
+        var urlToPlanning2D, planning2DAsJPGBase64;
         return _regeneratorRuntime__default["default"].wrap(function _callee34$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
             case 0:
-              urlToPlanning2D = undefined, catalogData = set.CatalogData;
+              urlToPlanning2D = undefined;
               planning2DAsJPGBase64 = set.getPlanning2DAsJpg();
               if (!(planning2DAsJPGBase64 != undefined && planning2DAsJPGBase64 != '' && planning2DAsJPGBase64 != 'data:,')) {
                 _context36.next = 6;
                 break;
               }
               _context36.next = 5;
-              return set.plannerHandler.saveSet2DImage(set.getSetId(), catalogData.catalogCodex, catalogData.catalogGuid, planning2DAsJPGBase64);
+              return set.plannerHandler.saveSet2DImage(set.CatalogData.catalogCodex, set.CatalogData.catalogGuid, planning2DAsJPGBase64);
             case 5:
               urlToPlanning2D = _context36.sent;
             case 6:
@@ -38838,11 +39188,36 @@ var DivaSetHandler = /*#__PURE__*/function () {
           }
         }, _callee34);
       }));
-      function get2DSetImage(_x125) {
+      function get2DSetImage(_x127) {
         return _get2DSetImage.apply(this, arguments);
       }
       return get2DSetImage;
     }()
+  }, {
+    key: "getAiImage",
+    value: function () {
+      var _getAiImage = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee35(set) {
+        var catalogData, _ref3, promptId, base64;
+        return _regeneratorRuntime__default["default"].wrap(function _callee35$(_context37) {
+          while (1) switch (_context37.prev = _context37.next) {
+            case 0:
+              catalogData = set.CatalogData;
+              _ref3 = set.getAiImageAsJpg(), promptId = _ref3.promptId, base64 = _ref3.base64;
+              _context37.next = 4;
+              return set.plannerHandler.saveAiImage(promptId, catalogData.catalogCodex, catalogData.catalogGuid, base64);
+            case 4:
+              return _context37.abrupt("return", _context37.sent);
+            case 5:
+            case "end":
+              return _context37.stop();
+          }
+        }, _callee35);
+      }));
+      function getAiImage(_x128) {
+        return _getAiImage.apply(this, arguments);
+      }
+      return getAiImage;
+    }()
   }, {
     key: "getBBoxObject",
     value: function getBBoxObject(set, dimensions) {
@@ -38878,25 +39253,25 @@ var DivaSetHandler = /*#__PURE__*/function () {
   }, {
     key: "addOrderSetArticlesToExistingSet",
     value: function () {
-      var _addOrderSetArticlesToExistingSet = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee35(set, orderSet, lastSetToInitialize) {
-        return _regeneratorRuntime__default["default"].wrap(function _callee35$(_context37) {
-          while (1) switch (_context37.prev = _context37.next) {
+      var _addOrderSetArticlesToExistingSet = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee36(set, orderSet, lastSetToInitialize) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee36$(_context38) {
+          while (1) switch (_context38.prev = _context38.next) {
             case 0:
               //TODO: GLOBAL STUFF
               //this.updateActSet(set);
               orderSet.changeBasketIds();
-              _context37.next = 3;
+              _context38.next = 3;
               return this.initOrderLineArticles(set, orderSet);
             case 3:
-              _context37.next = 5;
+              _context38.next = 5;
               return set.plannerHandler.extendSet(set, orderSet.SetPlanData, lastSetToInitialize);
             case 5:
             case "end":
-              return _context37.stop();
+              return _context38.stop();
           }
-        }, _callee35, this);
+        }, _callee36, this);
       }));
-      function addOrderSetArticlesToExistingSet(_x126, _x127, _x128) {
+      function addOrderSetArticlesToExistingSet(_x129, _x130, _x131) {
         return _addOrderSetArticlesToExistingSet.apply(this, arguments);
       }
       return addOrderSetArticlesToExistingSet;
@@ -39968,7 +40343,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context12.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-edc45ac1.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-88281688.js'); });
             case 5:
               _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -39976,7 +40351,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 9:
               _context12.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-79580044.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-1602ea8b.js'); });
             case 11:
               _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -39984,7 +40359,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 15:
               _context12.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-fd41e561.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-d007567f.js'); });
             case 17:
               _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -39992,7 +40367,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 21:
               _context12.next = 23;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-28bf51c2.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-0e412d7e.js'); });
             case 23:
               _yield$import4 = _context12.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -40589,12 +40964,7 @@ var Rendering = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "uiInfo", void 0);
     _defineProperty__default["default"](this, "urlToSavedRendering", void 0);
     // viewPoint: string;
-    //   private posInfo: any;
-    //private doStream: boolean;        Streaming over 3D Host is deprected
-    //private byteChunkArr: any;
-    //private byteChunkLayerMaskArr: any;
     _defineProperty__default["default"](this, "hasLayerMask", void 0);
-    //private imgBytes: any;
     _defineProperty__default["default"](this, "imgForSrc", void 0);
     _defineProperty__default["default"](this, "layerMaskAsBase64", void 0);
     _defineProperty__default["default"](this, "layerMaskThreeTexture", void 0);
@@ -41421,7 +41791,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _context3.next = 2;
-              return Promise.resolve().then(function () { return require('./Host3DSignalR-3843e7c8.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-c60988bd.js'); });
             case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -41557,6 +41927,11 @@ var PlannerHandler3D = /*#__PURE__*/function () {
       var cachedRendering = this.getRenderingFromCache(params.hash);
       var waitedRendering = this.getWaitForRendering(params.hash);
       if (!cachedRendering && !waitedRendering) {
+        if (params.saveMode == '1' && params.url) {
+          var rendering = new Rendering('PLACEHOLDER', 'PLACEHOLDER', '', 0, 0, false, false, 0, false, false, 'PERMANENT');
+          rendering.UrlToSavedRendering = params.url;
+          this.updatePlannerRenderingInView(rendering, true);
+        }
         LOG$4.error(new DivaUtils.DivaError('Error when handling receive Rendering. Not waiting for new Rendering but also not in cache ' + params.hash + '; saveMode: ' + params.saveMode));
         return;
       }
@@ -41577,6 +41952,10 @@ var PlannerHandler3D = /*#__PURE__*/function () {
 
         if (this.checkRenderingReady(params.hash, waitedRendering) && waitedRendering.MediaServiceSaveMode == 'STREAM') {
           this.updatePlannerRendering(waitedRendering);
+        } else {
+          if (waitedRendering.MediaServiceSaveMode == 'PERMANENT') {
+            this.updatePlannerRenderingInView(waitedRendering, true);
+          }
         }
         return;
       }
@@ -42355,17 +42734,22 @@ var DivaMediaServiceHandler = /*#__PURE__*/function () {
     key: "base64ToBlob",
     value: function base64ToBlob(base64String, hash) {
       DivaUtils__default["default"].startSpanOfApm('MediaServiceHandler base64ToBlob');
+      var type = 'image/jpeg';
       if (base64String.startsWith('data:image/jpeg;base64,')) {
         base64String = base64String.replace('data:image/jpeg;base64,', '');
       }
+      if (base64String.startsWith('data:image/png;base64,')) {
+        base64String = base64String.replace('data:image/png;base64,', '');
+        type = 'image/png';
+      }
       var binary_string = window.atob(base64String);
       var len = binary_string.length;
       var bytes = new Uint8Array(len);
       for (var i = 0; i < len; i++) {
         bytes[i] = binary_string.charCodeAt(i);
       }
-      var blob = new File([bytes.buffer], hash + '.jpg', {
-        type: 'image/jpeg'
+      var blob = new File([bytes.buffer], hash + (type === 'image/jpeg' ? '.jpg' : '.png'), {
+        type: type
       });
       DivaUtils__default["default"].endSpanOfApm('MediaServiceHandler base64ToBlob');
       return blob;
@@ -42435,6 +42819,90 @@ var DivaMediaServiceHandler = /*#__PURE__*/function () {
       }
       return savePlanning2DPermanent;
     }()
+    /**
+     * Save AI-generated base64 image to media service
+     * @param hash Unique identifier for the image
+     * @param base64Image Base64 encoded image data
+     * @param promptId Optional prompt ID for reference
+     * @param userId Optional user ID for tracking
+     * @param organizationId Optional organization ID (defaults to instance organizationId)
+     * @returns Promise<string> URL of the saved image or empty string on error
+     */
+  }, {
+    key: "saveAiImagePermanent",
+    value: (function () {
+      var _saveAiImagePermanent = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(hash, base64Image, catalogCodex, catalogGUID, organizationId) {
+        var imageBlob, url, data, mediaItem, mediaItemRef, response, _res$variants$big, _res$variants, res;
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              DivaUtils__default["default"].startSpanOfApm('MediaServiceHandler saveAiImagePermanent');
+              imageBlob = this.base64ToBlob(base64Image, hash);
+              url = this.mediaServiceUrl + this.POST_mediaItem;
+              data = new FormData();
+              data.append('file', imageBlob);
+              mediaItem = {
+                organizationId: organizationId || this.organizationId,
+                mediaType: 'PCT',
+                fileName: hash + '.png'
+              };
+              data.append('mediaItem', JSON.stringify(mediaItem));
+              mediaItemRef = {
+                functionType: 'ART',
+                aiImageHash: hash,
+                catalogCodex: catalogCodex,
+                catalogGuid: catalogGUID
+              };
+              data.append('mediaItemRef', JSON.stringify(mediaItemRef));
+              _context2.prev = 9;
+              _context2.next = 12;
+              return fetch(url, {
+                method: 'POST',
+                body: data,
+                headers: {
+                  Authorization: 'Bearer ' + this.jwt
+                }
+              });
+            case 12:
+              response = _context2.sent;
+              if (!response.ok) {
+                _context2.next = 22;
+                break;
+              }
+              _context2.next = 16;
+              return response.json();
+            case 16:
+              res = _context2.sent;
+              LOG$3.debug('Successfully saved AI image in media Service. URL: ' + res.url);
+              DivaUtils__default["default"].endSpanOfApm('MediaServiceHandler saveAiImagePermanent');
+              return _context2.abrupt("return", (_res$variants$big = (_res$variants = res.variants) === null || _res$variants === void 0 ? void 0 : _res$variants.big) !== null && _res$variants$big !== void 0 ? _res$variants$big : res.url);
+            case 22:
+              LOG$3.error(new DivaUtils.DivaError('Error when saving the AI image on mediaService. Hash: ' + hash + ' response: ' + response, {
+                code: 'AI_001'
+              }));
+            case 23:
+              _context2.next = 28;
+              break;
+            case 25:
+              _context2.prev = 25;
+              _context2.t0 = _context2["catch"](9);
+              LOG$3.error(new DivaUtils.DivaError('Exception when saving AI image. Hash: ' + hash + ' error: ' + _context2.t0, {
+                code: 'AI_002'
+              }));
+            case 28:
+              DivaUtils__default["default"].endSpanOfApm('MediaServiceHandler saveAiImagePermanent');
+              return _context2.abrupt("return", '');
+            case 30:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this, [[9, 25]]);
+      }));
+      function saveAiImagePermanent(_x5, _x6, _x7, _x8, _x9) {
+        return _saveAiImagePermanent.apply(this, arguments);
+      }
+      return saveAiImagePermanent;
+    }())
   }]);
 }();
 var mediaServiceHandler = new DivaMediaServiceHandler();
@@ -42979,7 +43447,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context4.next = 10;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-f44f3a03.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-72604cbb.js'); });
             case 10:
               _yield$import = _context4.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -42990,7 +43458,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context4.abrupt("break", 21);
             case 15:
               _context4.next = 17;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-f865ff9c.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-91e237e4.js'); });
             case 17:
               _yield$import2 = _context4.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -43446,7 +43914,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
   }, {
     key: "saveSet2DImage",
     value: function () {
-      var _saveSet2DImage = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee12(setId, catCodex, catGUID, planning2DAsJPGBase64) {
+      var _saveSet2DImage = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee12(catCodex, catGUID, planning2DAsJPGBase64) {
         var curPlanningHash, urlToPlanning2D;
         return _regeneratorRuntime__default["default"].wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
@@ -43466,11 +43934,46 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
           }
         }, _callee12, this);
       }));
-      function saveSet2DImage(_x19, _x20, _x21, _x22) {
+      function saveSet2DImage(_x19, _x20, _x21) {
         return _saveSet2DImage.apply(this, arguments);
       }
       return saveSet2DImage;
     }()
+  }, {
+    key: "saveAiImage",
+    value: function () {
+      var _saveAiImage = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee13(promptId, catCodex, catGUID, aiImageAsJPGBase64) {
+        var curPlanningHash, urlToAiImage;
+        return _regeneratorRuntime__default["default"].wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
+            case 0:
+              //Get current hash.
+              DivaUtils__default["default"].startSpanOfApm('DivaPlannerHandler saveAiImage');
+              curPlanningHash = this.createPlanningHash();
+              _context13.next = 4;
+              return mediaServiceHandler.saveAiImagePermanent(promptId + '_' + curPlanningHash, aiImageAsJPGBase64, catCodex, catGUID);
+            case 4:
+              urlToAiImage = _context13.sent;
+              DivaUtils__default["default"].endSpanOfApm('DivaPlannerHandler saveAiImage');
+              return _context13.abrupt("return", {
+                RenderWidth: 1024,
+                RenderHeight: 1024,
+                Description: 'AI Image',
+                Filename: promptId + '_' + curPlanningHash + '.png',
+                Id: promptId + '_' + curPlanningHash,
+                URL: urlToAiImage
+              });
+            case 7:
+            case "end":
+              return _context13.stop();
+          }
+        }, _callee13, this);
+      }));
+      function saveAiImage(_x22, _x23, _x24, _x25) {
+        return _saveAiImage.apply(this, arguments);
+      }
+      return saveAiImage;
+    }()
     /**
      * This function is called in order to destroy a planner. All elements are cleared all saved resources are cleared.
      * @param setId The setID the planner belongs to
@@ -43521,35 +44024,35 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
   }, {
     key: "addPlannerElement",
     value: function () {
-      var _addPlannerElement = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee13(setId, basketId, initParams) {
+      var _addPlannerElement = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee14(setId, basketId, initParams) {
         var _this$plannerList$get;
-        return _regeneratorRuntime__default["default"].wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               DivaUtils__default["default"].startSpanOfApm('DivaPlannerHandler addPlannerElement');
               if (this.plannerList.has(setId)) {
-                _context13.next = 4;
+                _context14.next = 4;
                 break;
               }
               DivaUtils__default["default"].endSpanOfApm('DivaPlannerHandler addPlannerElement');
-              return _context13.abrupt("return");
+              return _context14.abrupt("return");
             case 4:
-              _context13.next = 6;
+              _context14.next = 6;
               return this.plannerList.get(setId).addPlannerElement(basketId, initParams);
             case 6:
               this.setPlannerHandler.updateSetPosNr(this.plannerList);
               this.setPlannerHandler.calcGlobalBoundingBox(this.plannerList);
               DivaUtils__default["default"].endSpanOfApm('DivaPlannerHandler addPlannerElement');
-              return _context13.abrupt("return", (_this$plannerList$get = this.plannerList.get(setId)) === null || _this$plannerList$get === void 0 ? void 0 : _this$plannerList$get.getAllViewPlannerElements().find(function (item) {
+              return _context14.abrupt("return", (_this$plannerList$get = this.plannerList.get(setId)) === null || _this$plannerList$get === void 0 ? void 0 : _this$plannerList$get.getAllViewPlannerElements().find(function (item) {
                 return item.getBasketId() == basketId;
               }));
             case 10:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee13, this);
+        }, _callee14, this);
       }));
-      function addPlannerElement(_x23, _x24, _x25) {
+      function addPlannerElement(_x26, _x27, _x28) {
         return _addPlannerElement.apply(this, arguments);
       }
       return addPlannerElement;
@@ -43557,36 +44060,36 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
   }, {
     key: "deletePlannerElement",
     value: function () {
-      var _deletePlannerElement = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee14(setId, elementId, autoCorrectAVL_AVR, deletionType) {
+      var _deletePlannerElement = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee15(setId, elementId, autoCorrectAVL_AVR, deletionType) {
         var response;
-        return _regeneratorRuntime__default["default"].wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               DivaUtils__default["default"].startSpanOfApm('DivaPlannerHandler deletePlannerElement');
               if (this.plannerList.has(setId)) {
-                _context14.next = 4;
+                _context15.next = 4;
                 break;
               }
               DivaUtils__default["default"].endSpanOfApm('DivaPlannerHandler deletePlannerElement');
-              return _context14.abrupt("return", {
+              return _context15.abrupt("return", {
                 newElementToSelect: -1
               });
             case 4:
-              _context14.next = 6;
+              _context15.next = 6;
               return this.plannerList.get(setId).deletePlannerElement(elementId, autoCorrectAVL_AVR, deletionType);
             case 6:
-              response = _context14.sent;
+              response = _context15.sent;
               this.setPlannerHandler.updateSetPosNr(this.plannerList);
               this.setPlannerHandler.calcGlobalBoundingBox(this.plannerList);
               DivaUtils__default["default"].endSpanOfApm('DivaPlannerHandler deletePlannerElement');
-              return _context14.abrupt("return", response);
+              return _context15.abrupt("return", response);
             case 11:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
-        }, _callee14, this);
+        }, _callee15, this);
       }));
-      function deletePlannerElement(_x26, _x27, _x28, _x29) {
+      function deletePlannerElement(_x29, _x30, _x31, _x32) {
         return _deletePlannerElement.apply(this, arguments);
       }
       return deletePlannerElement;
@@ -43629,31 +44132,31 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
   }, {
     key: "copyPlannerElements",
     value: (function () {
-      var _copyPlannerElements = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee15(setId, articleCopyRelation, copyInfo) {
+      var _copyPlannerElements = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee16(setId, articleCopyRelation, copyInfo) {
         var response;
-        return _regeneratorRuntime__default["default"].wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               if (!(!this.plannerList.has(setId) || !copyInfo)) {
-                _context15.next = 2;
+                _context16.next = 2;
                 break;
               }
-              return _context15.abrupt("return");
+              return _context16.abrupt("return");
             case 2:
-              _context15.next = 4;
+              _context16.next = 4;
               return this.plannerList.get(setId).copyPlannerElement(articleCopyRelation, copyInfo);
             case 4:
-              response = _context15.sent;
+              response = _context16.sent;
               this.setPlannerHandler.updateSetPosNr(this.plannerList);
               this.setPlannerHandler.calcGlobalBoundingBox(this.plannerList);
-              return _context15.abrupt("return", response);
+              return _context16.abrupt("return", response);
             case 8:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
-        }, _callee15, this);
+        }, _callee16, this);
       }));
-      function copyPlannerElements(_x30, _x31, _x32) {
+      function copyPlannerElements(_x33, _x34, _x35) {
         return _copyPlannerElements.apply(this, arguments);
       }
       return copyPlannerElements;
@@ -43789,29 +44292,29 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
   }, {
     key: "request3D",
     value: function () {
-      var _request3D = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee16(doRequestRendering, doRequestHqRenderScript, alternateRenderingsExist, alternateRenderInfo, forceReloadPlanning, renderRequestInfos, hybrid3DInfo, useLatestHybridInfo) {
+      var _request3D = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee17(doRequestRendering, doRequestHqRenderScript, alternateRenderingsExist, alternateRenderInfo, forceReloadPlanning, renderRequestInfos, hybrid3DInfo, useLatestHybridInfo) {
         var _this3 = this;
         var plannerData, loadedCatData, plannerExists, savedSetId;
-        return _regeneratorRuntime__default["default"].wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               if (!doRequestRendering) {
-                _context16.next = 9;
+                _context17.next = 9;
                 break;
               }
               if (renderRequestInfos) {
-                _context16.next = 6;
+                _context17.next = 6;
                 break;
               }
               LOG$2.error(new DivaUtils.DivaError('Error requesting 3D rendering. No renderRequestInfo is set'));
-              return _context16.abrupt("return");
+              return _context17.abrupt("return");
             case 6:
               if (!(renderRequestInfos.width <= 0 || isNaN(renderRequestInfos.width) || renderRequestInfos.height <= 0 || isNaN(renderRequestInfos.height))) {
-                _context16.next = 9;
+                _context17.next = 9;
                 break;
               }
               LOG$2.error(new DivaUtils.DivaError('Error requesting rendering. Not valid width or height request width: ' + renderRequestInfos.width + ' height: ' + renderRequestInfos.height));
-              return _context16.abrupt("return");
+              return _context17.abrupt("return");
             case 9:
               plannerData = this.handler3D.initPlannerData(this.plannerHandlerFunctions.doAllowSetPlanner());
               loadedCatData = [];
@@ -43841,7 +44344,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
                 });
               });
               if (!plannerExists) {
-                _context16.next = 19;
+                _context17.next = 19;
                 break;
               }
               // if not in set planner mode overwrite s1 with correct setId
@@ -43849,7 +44352,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
                 plannerData.SCE.ROO[0].SET[0].ID = savedSetId;
                 plannerData.SCE.ROO[0].SelectSet = savedSetId;
               }
-              _context16.next = 18;
+              _context17.next = 18;
               return this.handler3D.request3D({
                 doRequestRendering: doRequestRendering,
                 doRequestHqRenderScript: doRequestHqRenderScript,
@@ -43864,16 +44367,16 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
                 useLatestHybridInfo: useLatestHybridInfo
               });
             case 18:
-              return _context16.abrupt("return", _context16.sent);
+              return _context17.abrupt("return", _context17.sent);
             case 19:
-              return _context16.abrupt("return");
+              return _context17.abrupt("return");
             case 20:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
-        }, _callee16, this);
+        }, _callee17, this);
       }));
-      function request3D(_x33, _x34, _x35, _x36, _x37, _x38, _x39, _x40) {
+      function request3D(_x36, _x37, _x38, _x39, _x40, _x41, _x42, _x43) {
         return _request3D.apply(this, arguments);
       }
       return request3D;
@@ -44096,15 +44599,16 @@ var DivaWebPlanner = /*#__PURE__*/function () {
      */
     _defineProperty__default["default"](this, "updatePlannerRendering", function (rendering) {
       var _this$state;
+      var onlyUpdateState = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       if (rendering.getIsFullscreenRendering()) {
         _this.updateFullscreenRendering(rendering);
       } else {
-        var _this$actSet;
-        _this.updatePlanner3DImage(rendering, ((_this$actSet = _this.actSet()) === null || _this$actSet === void 0 ? void 0 : _this$actSet.getAlternateRenderInfo().length) > 0);
+        var _this$updatePlanner3D;
+        (_this$updatePlanner3D = _this.updatePlanner3DImage) === null || _this$updatePlanner3D === void 0 || _this$updatePlanner3D.call(_this, rendering, onlyUpdateState);
       }
-      if (_this.actions && (_this$state = _this.state) !== null && _this$state !== void 0 && _this$state.enableSupport) {
-        var _this$actSet2, _this$state$user, _this$state$user2, _this$state$user3;
-        _this.api.postPlanningInfo((_this$actSet2 = _this.actSet()) === null || _this$actSet2 === void 0 ? void 0 : _this$actSet2.getVariantBasketData(), _this.divaNr, rendering.getImageForSrc(), _this.getCurSetPrice() + setHandlerInstance.getActSetPriceFormat(_this.actSet()), _this.getCurCatalogName(), (_this$state$user = _this.state.user) === null || _this$state$user === void 0 ? void 0 : _this$state$user._id, (_this$state$user2 = _this.state.user) === null || _this$state$user2 === void 0 ? void 0 : _this$state$user2.name, (_this$state$user3 = _this.state.user) === null || _this$state$user3 === void 0 ? void 0 : _this$state$user3.familyName, _this.state.organization._id);
+      if (!onlyUpdateState && _this.actions && (_this$state = _this.state) !== null && _this$state !== void 0 && _this$state.enableSupport) {
+        var _this$actSet, _this$state$user, _this$state$user2, _this$state$user3;
+        _this.api.postPlanningInfo((_this$actSet = _this.actSet()) === null || _this$actSet === void 0 ? void 0 : _this$actSet.getVariantBasketData(), _this.divaNr, rendering.getImageForSrc(), _this.getCurSetPrice() + setHandlerInstance.getActSetPriceFormat(_this.actSet()), _this.getCurCatalogName(), (_this$state$user = _this.state.user) === null || _this$state$user === void 0 ? void 0 : _this$state$user._id, (_this$state$user2 = _this.state.user) === null || _this$state$user2 === void 0 ? void 0 : _this$state$user2.name, (_this$state$user3 = _this.state.user) === null || _this$state$user3 === void 0 ? void 0 : _this$state$user3.familyName, _this.state.organization._id);
       }
     });
     /**
@@ -44163,16 +44667,16 @@ var DivaWebPlanner = /*#__PURE__*/function () {
      */
     _defineProperty__default["default"](this, "loadConfigItemsOfOptions", /*#__PURE__*/function () {
       var _ref = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(configStepKey, paletteId, isUpdate, visible) {
-        var _this$updateConfigIte;
+        var _this$state2, _this$state3, _this$updateConfigIte;
         var retValues;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return setHandlerInstance.loadConfigItemsOfActSetByConfigStepKey(_this.actSet(), configStepKey, visible);
+              return setHandlerInstance.loadConfigItemsOfActSetByConfigStepKey(_this.actSet(), configStepKey, visible, !!((_this$state2 = _this.state) !== null && _this$state2 !== void 0 && _this$state2.hidePrices || (_this$state3 = _this.state) !== null && _this$state3 !== void 0 && _this$state3.hideConfigPricePreview));
             case 2:
               retValues = _context.sent;
-              (_this$updateConfigIte = _this.updateConfigItems) === null || _this$updateConfigIte === void 0 || _this$updateConfigIte.call(_this, configStepKey, retValues.configItems, retValues.selectedItems, retValues.actStepName, retValues.paletteType, retValues.filterType, paletteId, isUpdate, retValues.visible, retValues.stepInfo, retValues.isRenderedInAccessorieStep, retValues.isRenderedNotInSettingPalette, retValues.optionCodex, retValues.notTotallyMatichingOPVs, retValues.subTabGroup, retValues.pairWithOptionsToGroup, retValues.isMultiselect, retValues.groupsDefaultClosed, retValues.contentItemId);
+              (_this$updateConfigIte = _this.updateConfigItems) === null || _this$updateConfigIte === void 0 || _this$updateConfigIte.call(_this, configStepKey, retValues.configItems, retValues.selectedItems, retValues.actStepName, retValues.paletteType, retValues.filterType, paletteId, isUpdate, retValues.visible, retValues.stepInfo, retValues.isRenderedInAccessorieStep, retValues.isRenderedNotInSettingPalette, retValues.optionCodex, retValues.notTotallyMatichingOPVs, retValues.subTabGroup, retValues.pairWithOptionsToGroup, retValues.isMultiselect, retValues.groupsDefaultClosed, retValues.contentItemId, retValues.conceptFilter);
             case 4:
             case "end":
               return _context.stop();
@@ -44984,7 +45488,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     value: function onInitializationError(e) {
       var _e$message,
         _this$actions19,
-        _this$state2,
+        _this$state4,
         _this2 = this,
         _this$actions21,
         _this$actions21$toggl;
@@ -44999,7 +45503,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
         });
         return;
       }
-      if ((_this$state2 = this.state) !== null && _this$state2 !== void 0 && _this$state2.isFullscreenComponent) {
+      if ((_this$state4 = this.state) !== null && _this$state4 !== void 0 && _this$state4.isFullscreenComponent) {
         var _this$actions20;
         (_this$actions20 = this.actions) === null || _this$actions20 === void 0 || _this$actions20.closeComponentInFullscreen();
         return;
@@ -45055,16 +45559,16 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getDivaArticles",
     value: function getDivaArticles(visiblePartlistArticlesAlso, allPartlistArticlesAlso) {
-      var _this$actSet3;
-      return (_this$actSet3 = this.actSet()) === null || _this$actSet3 === void 0 ? void 0 : _this$actSet3.getDivaArticles(visiblePartlistArticlesAlso, allPartlistArticlesAlso);
+      var _this$actSet2;
+      return (_this$actSet2 = this.actSet()) === null || _this$actSet2 === void 0 ? void 0 : _this$actSet2.getDivaArticles(visiblePartlistArticlesAlso, allPartlistArticlesAlso);
     }
 
     //for debugging
   }, {
     key: "getFirstDivaArticles",
     value: function getFirstDivaArticles() {
-      var _this$actSet$getDivaA, _this$actSet4;
-      return Object.values((_this$actSet$getDivaA = (_this$actSet4 = this.actSet()) === null || _this$actSet4 === void 0 ? void 0 : _this$actSet4.getDivaArticles()) !== null && _this$actSet$getDivaA !== void 0 ? _this$actSet$getDivaA : {})[0];
+      var _this$actSet$getDivaA, _this$actSet3;
+      return Object.values((_this$actSet$getDivaA = (_this$actSet3 = this.actSet()) === null || _this$actSet3 === void 0 ? void 0 : _this$actSet3.getDivaArticles()) !== null && _this$actSet$getDivaA !== void 0 ? _this$actSet$getDivaA : {})[0];
     }
   }, {
     key: "getHiddenOptions",
@@ -45132,8 +45636,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "updateWebConfiguratorTitle",
     value: function updateWebConfiguratorTitle() {
-      var _this$setWebConifgura, _this$actSet5;
-      (_this$setWebConifgura = this.setWebConifguratorTitle) === null || _this$setWebConifgura === void 0 || _this$setWebConifgura.call(this, (_this$actSet5 = this.actSet()) === null || _this$actSet5 === void 0 ? void 0 : _this$actSet5.getSetTitle());
+      var _this$setWebConifgura, _this$actSet4;
+      (_this$setWebConifgura = this.setWebConifguratorTitle) === null || _this$setWebConifgura === void 0 || _this$setWebConifgura.call(this, (_this$actSet4 = this.actSet()) === null || _this$actSet4 === void 0 ? void 0 : _this$actSet4.getSetTitle());
     }
   }, {
     key: "updateConfigStructure",
@@ -45144,8 +45648,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "runInitMode",
     value: function () {
       var _runInitMode = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee17(plannerMode) {
-        var _this$plannerConfig$i, _this$state3;
-        var doDefault, _this$navigateToTabGr2, _this$saveToBasketWra, configStepKey, _this$navigateToConfi, _this$actSet6, _this$navigateToTabGr3, _this$navigateToTabGr4, _this$navigateToTabGr5;
+        var _this$plannerConfig$i, _this$state5;
+        var doDefault, _this$navigateToTabGr2, _this$saveToBasketWra, configStepKey, _this$navigateToConfi, _this$actSet5, _this$navigateToTabGr3, _this$navigateToTabGr4, _this$navigateToTabGr5;
         return _regeneratorRuntime__default["default"].wrap(function _callee17$(_context17) {
           while (1) switch (_context17.prev = _context17.next) {
             case 0:
@@ -45164,7 +45668,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _context17.next = 10;
               break;
             case 9:
-              if (this.plannerConfig.initMode == 'OPENCONFIGTABGROUP' || this.api.getPlannerType() == 'JUMP_OVER_PLANNER' || this.api.getPlannerType() == 'JUMP_OVER_PLANNER_ONLY_MOBILE' && (_this$state3 = this.state) !== null && _this$state3 !== void 0 && _this$state3.dimensions.isMobile) {
+              if (this.plannerConfig.initMode == 'OPENCONFIGTABGROUP' || this.api.getPlannerType() == 'JUMP_OVER_PLANNER' || this.api.getPlannerType() == 'JUMP_OVER_PLANNER_ONLY_MOBILE' && (_this$state5 = this.state) !== null && _this$state5 !== void 0 && _this$state5.dimensions.isMobile) {
                 configStepKey = this.plannerConfig.opt ? setHandlerInstance.getConfigStepKeyOfOption(this.actSet(), this.plannerConfig.opt) : setHandlerInstance.getFirstConfigStep(this.actSet());
                 if (configStepKey) {
                   (_this$navigateToConfi = this.navigateToConfigStep) === null || _this$navigateToConfi === void 0 || _this$navigateToConfi.call(this, configStepKey, !this.plannerConfig.opt, true);
@@ -45177,7 +45681,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               if (doDefault) {
                 if (plannerMode == 'ProductList') {
                   (_this$navigateToTabGr3 = this.navigateToTabGroup) === null || _this$navigateToTabGr3 === void 0 || _this$navigateToTabGr3.call(this, 'PRODUCTS');
-                } else if ((_this$actSet6 = this.actSet()) !== null && _this$actSet6 !== void 0 && _this$actSet6.hasStaticRoomList) {
+                } else if ((_this$actSet5 = this.actSet()) !== null && _this$actSet5 !== void 0 && _this$actSet5.hasStaticRoomList) {
                   (_this$navigateToTabGr4 = this.navigateToTabGroup) === null || _this$navigateToTabGr4 === void 0 || _this$navigateToTabGr4.call(this, 'ROOMLIST', true);
                 } else {
                   (_this$navigateToTabGr5 = this.navigateToTabGroup) === null || _this$navigateToTabGr5 === void 0 || _this$navigateToTabGr5.call(this, this.getCurPlannerType(true), true);
@@ -45438,8 +45942,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getAlternateRenderingsForSummary",
     value: function getAlternateRenderingsForSummary() {
-      var _this$actSet7;
-      return (_this$actSet7 = this.actSet()) === null || _this$actSet7 === void 0 || (_this$actSet7 = _this$actSet7.CatalogData) === null || _this$actSet7 === void 0 ? void 0 : _this$actSet7.alternateRenderingsForSummary;
+      var _this$actSet6;
+      return (_this$actSet6 = this.actSet()) === null || _this$actSet6 === void 0 || (_this$actSet6 = _this$actSet6.CatalogData) === null || _this$actSet6 === void 0 ? void 0 : _this$actSet6.alternateRenderingsForSummary;
     }
   }, {
     key: "destroyWebPlanner",
@@ -45725,8 +46229,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "setDifferentOptions",
     value: function setDifferentOptions(options) {
-      var _this$actSet8;
-      (_this$actSet8 = this.actSet()) === null || _this$actSet8 === void 0 || _this$actSet8.setDifferentOptions(options);
+      var _this$actSet7;
+      (_this$actSet7 = this.actSet()) === null || _this$actSet7 === void 0 || _this$actSet7.setDifferentOptions(options);
     }
   }, {
     key: "checkMatchingProducts",
@@ -45773,8 +46277,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "updatePriceInView",
     value: function updatePriceInView() {
-      var _this$updatePrice, _this$actSet9;
-      (_this$updatePrice = this.updatePrice) === null || _this$updatePrice === void 0 || _this$updatePrice.call(this, setHandlerInstance.getTotalViewPrice(this.sets), this.actSet().getViewSetPrice(), setHandlerInstance.getTotalViewBruttoPrice(this.sets), undefined, (_this$actSet9 = this.actSet()) === null || _this$actSet9 === void 0 ? void 0 : _this$actSet9.getCustomDimensionsOfActSet());
+      var _this$updatePrice, _this$actSet8, _this$actSet9;
+      (_this$updatePrice = this.updatePrice) === null || _this$updatePrice === void 0 || _this$updatePrice.call(this, setHandlerInstance.getTotalViewPrice(this.sets), this.actSet().getViewSetPrice(), setHandlerInstance.getTotalViewBruttoPrice(this.sets), undefined, (_this$actSet8 = this.actSet()) === null || _this$actSet8 === void 0 ? void 0 : _this$actSet8.getCustomDimensionsOfActSet(), (_this$actSet9 = this.actSet()) === null || _this$actSet9 === void 0 ? void 0 : _this$actSet9.setHash);
     }
 
     /**
@@ -46066,6 +46570,127 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       if (!set) return;
       return setHandlerInstance.checkNotificationRules(set, targetArticles, visitedOptions, event);
     }
+  }, {
+    key: "generateAiImageWithReferenceImages",
+    value: function () {
+      var _generateAiImageWithReferenceImages = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee28(data, leadKey) {
+        var _this$state6;
+        return _regeneratorRuntime__default["default"].wrap(function _callee28$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
+            case 0:
+              _context28.next = 2;
+              return this.api.generateAiImageWithReferenceImages(_objectSpread$6(_objectSpread$6({}, data), {}, {
+                userId: (_this$state6 = this.state) === null || _this$state6 === void 0 || (_this$state6 = _this$state6.user) === null || _this$state6 === void 0 ? void 0 : _this$state6._id
+              }), leadKey);
+            case 2:
+              return _context28.abrupt("return", _context28.sent);
+            case 3:
+            case "end":
+              return _context28.stop();
+          }
+        }, _callee28, this);
+      }));
+      function generateAiImageWithReferenceImages(_x80, _x81) {
+        return _generateAiImageWithReferenceImages.apply(this, arguments);
+      }
+      return generateAiImageWithReferenceImages;
+    }()
+  }, {
+    key: "getUsageLimits",
+    value: function () {
+      var _getUsageLimits = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee29() {
+        var _this$state7, _this$state8;
+        var organizationId, userId;
+        return _regeneratorRuntime__default["default"].wrap(function _callee29$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
+            case 0:
+              organizationId = (_this$state7 = this.state) === null || _this$state7 === void 0 ? void 0 : _this$state7.organization._id;
+              userId = (_this$state8 = this.state) === null || _this$state8 === void 0 || (_this$state8 = _this$state8.user) === null || _this$state8 === void 0 ? void 0 : _this$state8._id;
+              if (!(!organizationId || !userId)) {
+                _context29.next = 4;
+                break;
+              }
+              throw new Error('Organization ID or User ID is not set');
+            case 4:
+              _context29.next = 6;
+              return this.api.getUsageLimits({
+                organizationId: organizationId,
+                userId: userId
+              });
+            case 6:
+              return _context29.abrupt("return", _context29.sent);
+            case 7:
+            case "end":
+              return _context29.stop();
+          }
+        }, _callee29, this);
+      }));
+      function getUsageLimits() {
+        return _getUsageLimits.apply(this, arguments);
+      }
+      return getUsageLimits;
+    }()
+  }, {
+    key: "getAiRoomRenderings",
+    value: function () {
+      var _getAiRoomRenderings = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee30() {
+        var _this$state9;
+        var organizationId;
+        return _regeneratorRuntime__default["default"].wrap(function _callee30$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
+            case 0:
+              organizationId = (_this$state9 = this.state) === null || _this$state9 === void 0 ? void 0 : _this$state9.organization._id;
+              _context30.next = 3;
+              return this.api.getAiRoomRenderings(organizationId);
+            case 3:
+              return _context30.abrupt("return", _context30.sent);
+            case 4:
+            case "end":
+              return _context30.stop();
+          }
+        }, _callee30, this);
+      }));
+      function getAiRoomRenderings() {
+        return _getAiRoomRenderings.apply(this, arguments);
+      }
+      return getAiRoomRenderings;
+    }()
+  }, {
+    key: "createLeadKey",
+    value: function () {
+      var _createLeadKey = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee31(email) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee31$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
+            case 0:
+              _context31.next = 2;
+              return this.api.createLeadKey(email);
+            case 2:
+              return _context31.abrupt("return", _context31.sent);
+            case 3:
+            case "end":
+              return _context31.stop();
+          }
+        }, _callee31, this);
+      }));
+      function createLeadKey(_x82) {
+        return _createLeadKey.apply(this, arguments);
+      }
+      return createLeadKey;
+    }()
+  }, {
+    key: "clearAiImageAsJpg",
+    value: function clearAiImageAsJpg() {
+      var set = this.actSet();
+      if (!set) return;
+      set.clearAiImageAsJpg();
+    }
+  }, {
+    key: "setAiImageAsJpg",
+    value: function setAiImageAsJpg(promptId, base64) {
+      var set = this.actSet();
+      if (!set) return;
+      set.setAiImageAsJpg(promptId, base64);
+    }
   }, {
     key: "checkBannerRules",
     value: function checkBannerRules(visitedOptions, event) {
@@ -46103,8 +46728,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
         }
       }
       if (plannerType == 'JUMP_OVER_PLANNER_ONLY_MOBILE') {
-        var _this$state4;
-        if ((_this$state4 = this.state) !== null && _this$state4 !== void 0 && _this$state4.dimensions.isMobile) {
+        var _this$state10;
+        if ((_this$state10 = this.state) !== null && _this$state10 !== void 0 && _this$state10.dimensions.isMobile) {
           plannerType = 'JUMP_OVER_PLANNER';
         } else {
           plannerType = 'PLANNER';
@@ -46259,11 +46884,11 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getAllowRTV",
     value: function getAllowRTV() {
-      var _this$state5, _this$actSet26, _this$state6, _this$actSet27;
+      var _this$state11, _this$actSet26, _this$state12, _this$actSet27;
       if (this.getEnableUnityRtvKombi()) return false;
-      if ((_this$state5 = this.state) !== null && _this$state5 !== void 0 && _this$state5.organization.settings.forceRTV) return true;
+      if ((_this$state11 = this.state) !== null && _this$state11 !== void 0 && _this$state11.organization.settings.forceRTV) return true;
       if ((_this$actSet26 = this.actSet()) !== null && _this$actSet26 !== void 0 && _this$actSet26.CatalogData.divaForceRTV) return true;
-      if ((_this$state6 = this.state) !== null && _this$state6 !== void 0 && _this$state6.organization.settings.enableRTV && (_this$actSet27 = this.actSet()) !== null && _this$actSet27 !== void 0 && _this$actSet27.CatalogData.divaArReady) return true;
+      if ((_this$state12 = this.state) !== null && _this$state12 !== void 0 && _this$state12.organization.settings.enableRTV && (_this$actSet27 = this.actSet()) !== null && _this$actSet27 !== void 0 && _this$actSet27.CatalogData.divaArReady) return true;
       return false;
     }
   }, {
@@ -46317,23 +46942,23 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getBasketDataWithEkText",
     value: function () {
-      var _getBasketDataWithEkText = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee28() {
-        return _regeneratorRuntime__default["default"].wrap(function _callee28$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+      var _getBasketDataWithEkText = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee32() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee32$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
             case 0:
-              _context28.t0 = this.divaBasketHandler;
-              _context28.t1 = this.divaBasketHandler.actDivaNr;
-              _context28.next = 4;
+              _context32.t0 = this.divaBasketHandler;
+              _context32.t1 = this.divaBasketHandler.actDivaNr;
+              _context32.next = 4;
               return setHandlerInstance.fillOrderLinesAndOrderSets(this.sets, this.divaBasketHandler, true, this.doAllowSetPlanner(), this.ReturnTo);
             case 4:
-              _context28.t2 = _context28.sent;
-              _context28.t0.setBasketData.call(_context28.t0, _context28.t1, _context28.t2);
-              return _context28.abrupt("return", this.divaBasketHandler.actBasket);
+              _context32.t2 = _context32.sent;
+              _context32.t0.setBasketData.call(_context32.t0, _context32.t1, _context32.t2);
+              return _context32.abrupt("return", this.divaBasketHandler.actBasket);
             case 7:
             case "end":
-              return _context28.stop();
+              return _context32.stop();
           }
-        }, _callee28, this);
+        }, _callee32, this);
       }));
       function getBasketDataWithEkText() {
         return _getBasketDataWithEkText.apply(this, arguments);
@@ -46359,7 +46984,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "addToBasket",
     value: function () {
-      var _addToBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee29(actBasket) {
+      var _addToBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee33(actBasket) {
         var _this$actions36,
           _this$actions37,
           _this$actions38,
@@ -46378,44 +47003,44 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           to,
           variants,
           products,
-          _args29 = arguments;
-        return _regeneratorRuntime__default["default"].wrap(function _callee29$(_context29) {
-          while (1) switch (_context29.prev = _context29.next) {
+          _args33 = arguments;
+        return _regeneratorRuntime__default["default"].wrap(function _callee33$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
             case 0:
-              event = _args29.length > 1 && _args29[1] !== undefined ? _args29[1] : 'onAddToBasket';
-              _context29.t0 = event;
-              _context29.next = _context29.t0 === 'onWebPlanerPrint' ? 4 : _context29.t0 === 'onWebPlanerSave' ? 6 : _context29.t0 === 'onWebPlanerShare' ? 8 : _context29.t0 === 'onRequestConsulation' ? 10 : _context29.t0 === 'onSave' ? 12 : _context29.t0 === 'onSendEmail' ? 14 : _context29.t0 === 'onSaveProduct' ? 19 : _context29.t0 === 'dontSaveBasket' ? 26 : _context29.t0 === 'onAddToBasket' ? 26 : 28;
+              event = _args33.length > 1 && _args33[1] !== undefined ? _args33[1] : 'onAddToBasket';
+              _context33.t0 = event;
+              _context33.next = _context33.t0 === 'onWebPlanerPrint' ? 4 : _context33.t0 === 'onWebPlanerSave' ? 6 : _context33.t0 === 'onWebPlanerShare' ? 8 : _context33.t0 === 'onRequestConsulation' ? 10 : _context33.t0 === 'onSave' ? 12 : _context33.t0 === 'onSendEmail' ? 14 : _context33.t0 === 'onSaveProduct' ? 19 : _context33.t0 === 'dontSaveBasket' ? 26 : _context33.t0 === 'onAddToBasket' ? 26 : 28;
               break;
             case 4:
               (_this$actions36 = this.actions) === null || _this$actions36 === void 0 || _this$actions36.onEvent({
                 type: 'onWebPlanerPrint',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 30);
+              return _context33.abrupt("break", 30);
             case 6:
               (_this$actions37 = this.actions) === null || _this$actions37 === void 0 || _this$actions37.onEvent({
                 type: 'onWebPlanerSave',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 30);
+              return _context33.abrupt("break", 30);
             case 8:
               (_this$actions38 = this.actions) === null || _this$actions38 === void 0 || _this$actions38.onEvent({
                 type: 'onWebPlanerShare',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 30);
+              return _context33.abrupt("break", 30);
             case 10:
               (_this$actions39 = this.actions) === null || _this$actions39 === void 0 || _this$actions39.onEvent({
                 type: 'onRequestConsulation',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 30);
+              return _context33.abrupt("break", 30);
             case 12:
               (_this$actions40 = this.actions) === null || _this$actions40 === void 0 || _this$actions40.onEvent({
                 type: 'onSave',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 30);
+              return _context33.abrupt("break", 30);
             case 14:
               emailConfig = (_this$divaBasketHandl4 = this.divaBasketHandler.emailConfig) !== null && _this$divaBasketHandl4 !== void 0 ? _this$divaBasketHandl4 : this.getEmailConfig(); //reset the emailConfig
               this.divaBasketHandler.emailConfig = undefined;
@@ -46450,43 +47075,43 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 30);
+              return _context33.abrupt("break", 30);
             case 19:
               this.actSet().CatalogData;
-              _context29.next = 22;
+              _context33.next = 22;
               return this.api.saveAsProduct(this.sets, actBasket);
             case 22:
-              products = _context29.sent;
+              products = _context33.sent;
               (_this$actions42 = this.actions) === null || _this$actions42 === void 0 || _this$actions42.onEvent({
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
               if (!products) {
-                _context29.next = 26;
+                _context33.next = 26;
                 break;
               }
-              return _context29.abrupt("return", products[0]);
+              return _context33.abrupt("return", products[0]);
             case 26:
               (_this$actions43 = this.actions) === null || _this$actions43 === void 0 || _this$actions43.onEvent({
                 type: 'onAddToBasket',
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 30);
+              return _context33.abrupt("break", 30);
             case 28:
               (_this$actions44 = this.actions) === null || _this$actions44 === void 0 || _this$actions44.onEvent({
                 type: event,
                 data: actBasket.getAsJson()
               });
-              return _context29.abrupt("break", 30);
+              return _context33.abrupt("break", 30);
             case 30:
-              return _context29.abrupt("return");
+              return _context33.abrupt("return");
             case 31:
             case "end":
-              return _context29.stop();
+              return _context33.stop();
           }
-        }, _callee29, this);
+        }, _callee33, this);
       }));
-      function addToBasket(_x80) {
+      function addToBasket(_x83) {
         return _addToBasket.apply(this, arguments);
       }
       return addToBasket;
@@ -46541,28 +47166,28 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getCurrentBasket",
     value: function () {
-      var _getCurrentBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee30(event, force, returnTo, dontGoToSummary, hideLoading) {
+      var _getCurrentBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee34(event, force, returnTo, dontGoToSummary, hideLoading) {
         var _this$actSet35, _this$divaBasketHandl5, _this$onClickAddToBas3;
-        return _regeneratorRuntime__default["default"].wrap(function _callee30$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee34$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
               if (!(this.divaBasketHandler.basketWasSavedWithCurrentDocVersion && ((_this$actSet35 = this.actSet()) === null || _this$actSet35 === void 0 ? void 0 : _this$actSet35.setHash) === ((_this$divaBasketHandl5 = this.divaBasketHandler.actBasket) === null || _this$divaBasketHandl5 === void 0 || (_this$divaBasketHandl5 = _this$divaBasketHandl5.OrderSets) === null || _this$divaBasketHandl5 === void 0 ? void 0 : _this$divaBasketHandl5[0].SetHash) && !(returnTo !== null && returnTo !== void 0 && returnTo.includes('OPEN')))) {
-                _context30.next = 2;
+                _context34.next = 2;
                 break;
               }
-              return _context30.abrupt("return", 'BASKET_ALREADY_SAVED');
+              return _context34.abrupt("return", 'BASKET_ALREADY_SAVED');
             case 2:
-              _context30.next = 4;
+              _context34.next = 4;
               return (_this$onClickAddToBas3 = this.onClickAddToBasket) === null || _this$onClickAddToBas3 === void 0 ? void 0 : _this$onClickAddToBas3.call(this, undefined, event, force, returnTo, dontGoToSummary, hideLoading);
             case 4:
-              return _context30.abrupt("return", !!_context30.sent);
+              return _context34.abrupt("return", !!_context34.sent);
             case 5:
             case "end":
-              return _context30.stop();
+              return _context34.stop();
           }
-        }, _callee30, this);
+        }, _callee34, this);
       }));
-      function getCurrentBasket(_x81, _x82, _x83, _x84, _x85) {
+      function getCurrentBasket(_x84, _x85, _x86, _x87, _x88) {
         return _getCurrentBasket.apply(this, arguments);
       }
       return getCurrentBasket;
@@ -46784,9 +47409,9 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     key: "initApiForLogicOnly",
     value: //just for testing purposes
     function () {
-      var _initApiForLogicOnly = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee31(organization, lang, getSessionGuid, handler, applicationEnvironment, apiKey, jwt) {
-        return _regeneratorRuntime__default["default"].wrap(function _callee31$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+      var _initApiForLogicOnly = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee35(organization, lang, getSessionGuid, handler, applicationEnvironment, apiKey, jwt) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee35$(_context35) {
+          while (1) switch (_context35.prev = _context35.next) {
             case 0:
               //empty services
               this.api = new DivaApiHandler(_objectSpread$6(_objectSpread$6({}, this.plannerConfig), {}, {
@@ -46799,17 +47424,17 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 jwt: jwt,
                 apiKey: apiKey
               }), handler);
-              _context31.next = 3;
+              _context35.next = 3;
               return this.divaBasketHandler.initWWSClient(this.api.getWWSClient());
             case 3:
               this.plannerHandler = new DivaPlannerHandler(true);
             case 4:
             case "end":
-              return _context31.stop();
+              return _context35.stop();
           }
-        }, _callee31, this);
+        }, _callee35, this);
       }));
-      function initApiForLogicOnly(_x86, _x87, _x88, _x89, _x90, _x91, _x92) {
+      function initApiForLogicOnly(_x89, _x90, _x91, _x92, _x93, _x94, _x95) {
         return _initApiForLogicOnly.apply(this, arguments);
       }
       return initApiForLogicOnly;
@@ -46822,16 +47447,16 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "loadBasket",
     value: function () {
-      var _loadBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee32() {
-        return _regeneratorRuntime__default["default"].wrap(function _callee32$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+      var _loadBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee36() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee36$(_context36) {
+          while (1) switch (_context36.prev = _context36.next) {
             case 0:
-              return _context32.abrupt("return", this.divaBasketHandler.initializeBasket(this.api));
+              return _context36.abrupt("return", this.divaBasketHandler.initializeBasket(this.api));
             case 1:
             case "end":
-              return _context32.stop();
+              return _context36.stop();
           }
-        }, _callee32, this);
+        }, _callee36, this);
       }));
       function loadBasket() {
         return _loadBasket.apply(this, arguments);
@@ -46846,39 +47471,39 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "initBasket",
     value: function () {
-      var _initBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee33(init3D, ignoreFavorites) {
+      var _initBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee37(init3D, ignoreFavorites) {
         var initSetState, set, basket;
-        return _regeneratorRuntime__default["default"].wrap(function _callee33$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee37$(_context37) {
+          while (1) switch (_context37.prev = _context37.next) {
             case 0:
               this.divaNr = this.divaBasketHandler.actDivaNr;
               initSetState = this.getInitStateForSet(!init3D);
               this.plannerHandler.initPlanner(initSetState, this.getPlannerHandlerFunctions());
-              _context33.next = 5;
+              _context37.next = 5;
               return setHandlerInstance.initSetsByOrderSet(this.divaBasketHandler.getOrderSetsByDivaNr(this.divaNr), initSetState);
             case 5:
               //TODO check if when basket gets repaired the product match gets called
               set = this.actSet();
               setHandlerInstance.loadConfigStructureOfActSet(set, this.getCurPlannerType());
               if (!(favoritesHandlerInstance.FavoritesDefined(set) && !ignoreFavorites)) {
-                _context33.next = 10;
+                _context37.next = 10;
                 break;
               }
-              _context33.next = 10;
+              _context37.next = 10;
               return this.handleFavorites(init3D ? 'CALC' : 'REPAIR');
             case 10:
-              _context33.next = 12;
+              _context37.next = 12;
               return setHandlerInstance.fillOrderLinesAndOrderSets(this.sets, this.divaBasketHandler, !init3D, this.doAllowSetPlanner(), this.ReturnTo);
             case 12:
-              basket = _context33.sent;
-              return _context33.abrupt("return", basket);
+              basket = _context37.sent;
+              return _context37.abrupt("return", basket);
             case 14:
             case "end":
-              return _context33.stop();
+              return _context37.stop();
           }
-        }, _callee33, this);
+        }, _callee37, this);
       }));
-      function initBasket(_x93, _x94) {
+      function initBasket(_x96, _x97) {
         return _initBasket.apply(this, arguments);
       }
       return initBasket;
@@ -46892,21 +47517,21 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "getValidVariantsLength",
     value: function () {
-      var _getValidVariantsLength = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee34() {
+      var _getValidVariantsLength = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee38() {
         var set;
-        return _regeneratorRuntime__default["default"].wrap(function _callee34$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee38$(_context38) {
+          while (1) switch (_context38.prev = _context38.next) {
             case 0:
               set = this.actSet();
-              _context34.next = 3;
+              _context38.next = 3;
               return favoritesHandlerInstance.getValidVariants(set, true);
             case 3:
-              return _context34.abrupt("return", _context34.sent.length);
+              return _context38.abrupt("return", _context38.sent.length);
             case 4:
             case "end":
-              return _context34.stop();
+              return _context38.stop();
           }
-        }, _callee34, this);
+        }, _callee38, this);
       }));
       function getValidVariantsLength() {
         return _getValidVariantsLength.apply(this, arguments);
@@ -46916,46 +47541,46 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "handleFavorites",
     value: function () {
-      var _handleFavorites = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee35(mode) {
+      var _handleFavorites = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee39(mode) {
         var _this5 = this;
         var set, i;
-        return _regeneratorRuntime__default["default"].wrap(function _callee35$(_context35) {
-          while (1) switch (_context35.prev = _context35.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee39$(_context39) {
+          while (1) switch (_context39.prev = _context39.next) {
             case 0:
               set = this.actSet();
               i = 0;
             case 2:
               if (!favoritesHandlerInstance.IsCalcForSummary) {
-                _context35.next = 11;
+                _context39.next = 11;
                 break;
               }
-              _context35.next = 5;
+              _context39.next = 5;
               return DivaUtils__default["default"].Sleep(200);
             case 5:
               i++;
               if (!(i > 1000)) {
-                _context35.next = 9;
+                _context39.next = 9;
                 break;
               }
               LOG$1.error(new DivaUtils.DivaError('error on generating Variants of Summary'));
-              return _context35.abrupt("break", 11);
+              return _context39.abrupt("break", 11);
             case 9:
-              _context35.next = 2;
+              _context39.next = 2;
               break;
             case 11:
-              _context35.next = 13;
+              _context39.next = 13;
               return favoritesHandlerInstance.handleFavorites(set, mode, this.divaBasketHandler.actBasket, this.saveToBasketWrapper.bind(this), this.doConfigure.bind(this), function () {
                 return _this5.update2DGrid(set);
               }, this.actions);
             case 13:
-              return _context35.abrupt("return", _context35.sent);
+              return _context39.abrupt("return", _context39.sent);
             case 14:
             case "end":
-              return _context35.stop();
+              return _context39.stop();
           }
-        }, _callee35, this);
+        }, _callee39, this);
       }));
-      function handleFavorites(_x95) {
+      function handleFavorites(_x98) {
         return _handleFavorites.apply(this, arguments);
       }
       return handleFavorites;
@@ -46968,48 +47593,48 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "initSapOrderLinesFromBasket",
     value: function () {
-      var _initSapOrderLinesFromBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee36(divaNr, init3D, onlyLoadOldBakset) {
+      var _initSapOrderLinesFromBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee40(divaNr, init3D, onlyLoadOldBakset) {
         var result, oldBasket, basket;
-        return _regeneratorRuntime__default["default"].wrap(function _callee36$(_context36) {
-          while (1) switch (_context36.prev = _context36.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee40$(_context40) {
+          while (1) switch (_context40.prev = _context40.next) {
             case 0:
               if (divaNr) this.divaBasketHandler.updateDivaNrInBasket(divaNr);
-              _context36.next = 3;
+              _context40.next = 3;
               return this.loadBasket();
             case 3:
-              result = _context36.sent;
+              result = _context40.sent;
               if (!onlyLoadOldBakset) {
-                _context36.next = 6;
+                _context40.next = 6;
                 break;
               }
-              return _context36.abrupt("return", {
+              return _context40.abrupt("return", {
                 oldBasket: new basketModel.BasketData(JSON.parse(JSON.stringify(this.divaBasketHandler.actBasket))),
                 cache: {}
               });
             case 6:
               if (!(result === false)) {
-                _context36.next = 8;
+                _context40.next = 8;
                 break;
               }
               throw new Error('Could not load basket! ' + divaNr);
             case 8:
               oldBasket = new basketModel.BasketData(JSON.parse(JSON.stringify(this.divaBasketHandler.actBasket)));
-              _context36.next = 11;
+              _context40.next = 11;
               return this.initBasket(init3D);
             case 11:
-              basket = _context36.sent;
-              return _context36.abrupt("return", {
+              basket = _context40.sent;
+              return _context40.abrupt("return", {
                 basket: basket,
                 oldBasket: oldBasket,
                 cache: this.api.getJsonDataCache()
               });
             case 13:
             case "end":
-              return _context36.stop();
+              return _context40.stop();
           }
-        }, _callee36, this);
+        }, _callee40, this);
       }));
-      function initSapOrderLinesFromBasket(_x96, _x97, _x98) {
+      function initSapOrderLinesFromBasket(_x99, _x100, _x101) {
         return _initSapOrderLinesFromBasket.apply(this, arguments);
       }
       return initSapOrderLinesFromBasket;
@@ -65262,6 +65887,7 @@ var a$3 = {
       idmService: 'https://api-test.diva-portal.com/idm',
       constructorService: 'https://api-test.diva-portal.com/constructor',
       mediaService: 'https://api-test.diva-portal.com/media',
+      aiService: 'https://api-test.diva-portal.com/ai',
       baseUrl: 'https://api-test.diva-portal.com',
       baseCdnUrl: 'https://cdn-test.diva-portal.com',
       api2: {
@@ -65329,6 +65955,7 @@ var a$2 = {
       reportService: 'https://diva-api.pfister.ch/report',
       enricherService: 'https://diva-api.pfister.ch/enricher',
       idmService: 'https://diva-api.pfister.ch/idm',
+      aiService: 'https://diva-api.pfister.ch/ai',
       mediaService: 'https://diva-api.pfister.ch/media',
       //'http://localhost:3000',
       clientArticleService: 'https://diva-api.pfister.ch/pfister-article',
@@ -65387,6 +66014,7 @@ var a$1 = {
       mediaService: 'https://q-diva-api.pfister.ch/media',
       // 'http://localhost:3000',
       enricherService: 'https://q-diva-api.pfister.ch/enricher',
+      aiService: 'https://q-diva-api.pfister.ch/ai',
       idmService: 'https://q-diva-api.pfister.ch/idm',
       clientArticleService: 'https://q-diva-api.pfister.ch/pfister-article',
       baseUrl: 'https://q-diva-api.pfister.ch',