@crystaldesign/web-planner-logic 26.8.0-beta.6 → 26.8.0-beta.60

package/build/cjs/{index-3891c460.js → index-98d1cddd.js}

@@ -96,6 +96,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "actions", void 0);
     _defineProperty__default["default"](this, "state", void 0);
     _defineProperty__default["default"](this, "i18n", void 0);
+    _defineProperty__default["default"](this, "enricherErrorModalShown", false);
     _defineProperty__default["default"](this, "getSessionGuid", void 0);
     _defineProperty__default["default"](this, "useEkPrices", false);
     _defineProperty__default["default"](this, "smSupplierNr", undefined);
@@ -236,10 +237,12 @@ var DivaApiHandler = /*#__PURE__*/function () {
             case 38:
               _context.prev = 38;
               _context.t5 = _context["catch"](5);
+              // Check if this is a rate limiting error (429)
+              this.notifyEnricherError(url, dontLogError);
               throw Error('fetch failed! ' + url + ' Error: ' + _context.t5, {
                 cause: _context.t5 === null || _context.t5 === void 0 || (_e$response = _context.t5.response) === null || _e$response === void 0 || (_e$response = _e$response.data) === null || _e$response === void 0 ? void 0 : _e$response.error
               });
-            case 41:
+            case 42:
             case "end":
               return _context.stop();
           }
@@ -250,11 +253,57 @@ var DivaApiHandler = /*#__PURE__*/function () {
       }
       return fetchData;
     }()
+    /**
+     * Surface critical failures to the user. A hard failure of any enricher call (catalog / serie /
+     * items / decisions / features ...) leaves the planner unable to load, so give the user actionable
+     * feedback instead of a silently broken UI. Optional enricher calls (e.g. the catalog mask) pass
+     * `dontLogError` and are skipped. Only one modal is shown at a time to avoid stacking on parallel failures.
+     */
+  }, {
+    key: "notifyEnricherError",
+    value: function notifyEnricherError(url, dontLogError) {
+      var _this$apiConfig,
+        _this$apiConfig2,
+        _this$apiConfig3,
+        _this$apiConfig4,
+        _this$apiConfig5,
+        _this$actions,
+        _this$i18n,
+        _translate$t,
+        _translate$t2,
+        _translate$t3,
+        _this = this;
+      if (dontLogError || this.enricherErrorModalShown) return;
+      var services = [(_this$apiConfig = this.apiConfig) === null || _this$apiConfig === void 0 ? void 0 : _this$apiConfig.enricherService, (_this$apiConfig2 = this.apiConfig) === null || _this$apiConfig2 === void 0 ? void 0 : _this$apiConfig2.idmService, (_this$apiConfig3 = this.apiConfig) === null || _this$apiConfig3 === void 0 ? void 0 : _this$apiConfig3.api2["default"], (_this$apiConfig4 = this.apiConfig) === null || _this$apiConfig4 === void 0 ? void 0 : _this$apiConfig4.api2.web, (_this$apiConfig5 = this.apiConfig) === null || _this$apiConfig5 === void 0 ? void 0 : _this$apiConfig5.api2.ek];
+      if (!services.some(function (service) {
+        return service && url.startsWith(service);
+      })) return;
+      if (!((_this$actions = this.actions) !== null && _this$actions !== void 0 && _this$actions.openModal)) return;
+      this.enricherErrorModalShown = true;
+      var translate = (_this$i18n = this.i18n) === null || _this$i18n === void 0 ? void 0 : _this$i18n.call(this);
+      this.actions.openModal({
+        title: (_translate$t = translate === null || translate === void 0 ? void 0 : translate.t('modals.error_accured')) !== null && _translate$t !== void 0 ? _translate$t : 'An error occured. Please try again later.',
+        accept: (_translate$t2 = translate === null || translate === void 0 ? void 0 : translate.t('modals.reload_page')) !== null && _translate$t2 !== void 0 ? _translate$t2 : 'Reload',
+        reject: (_translate$t3 = translate === null || translate === void 0 ? void 0 : translate.t('modals.close')) !== null && _translate$t3 !== void 0 ? _translate$t3 : 'Close',
+        callback: function callback(accepted) {
+          _this.enricherErrorModalShown = false;
+          if (accepted === true) {
+            if (_this.getApplicationEnvironment() === 'WEB' && typeof window !== 'undefined') window.location.reload();
+          } else if (accepted === false) {
+            var _this$actions2, _this$actions3;
+            (_this$actions2 = _this.actions) === null || _this$actions2 === void 0 || _this$actions2.onEvent({
+              type: 'onWebPlanerClose'
+            });
+            (_this$actions3 = _this.actions) === null || _this$actions3 === void 0 || _this$actions3.closeComponentInFullscreen();
+          }
+        }
+      });
+    }
   }, {
     key: "getDataWithoutCache",
     value: function () {
       var _getDataWithoutCache = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(queryString, init, useWebServiceApi) {
-        var _this$apiConfig, _this$apiConfig2, api2Url;
+        var _this$apiConfig6, _this$apiConfig7, api2Url;
         return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -296,8 +345,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
               _context2.next = 24;
               break;
             case 14:
-              api2Url = (_this$apiConfig = this.apiConfig) === null || _this$apiConfig === void 0 ? void 0 : _this$apiConfig.api2["default"];
-              if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig2 = this.apiConfig) !== null && _this$apiConfig2 !== void 0 && _this$apiConfig2.api2.web) {
+              api2Url = (_this$apiConfig6 = this.apiConfig) === null || _this$apiConfig6 === void 0 ? void 0 : _this$apiConfig6.api2["default"];
+              if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig7 = this.apiConfig) !== null && _this$apiConfig7 !== void 0 && _this$apiConfig7.api2.web) {
                 api2Url = this.apiConfig.api2.web;
               }
               _context2.t0 = _objectSpread$q;
@@ -332,7 +381,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
     value: function () {
       var _getDataCache = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(queryString, cacheMD5, accountSessionGuid, useWebServiceApi, method, data, dontLogError) {
         var _this$divaWebConfigDa, _this$divaWebConfigDa2;
-        var myQS, url, init, addSession, cacheHit, _this$apiConfig3, _this$apiConfig4, api2Url, resolvedSessionGuid, result, _this$divaWebConfigDa3;
+        var myQS, url, init, addSession, cacheHit, _this$apiConfig8, _this$apiConfig9, api2Url, resolvedSessionGuid, result, _this$divaWebConfigDa3;
         return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -400,8 +449,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
               _context3.next = 35;
               break;
             case 25:
-              api2Url = (_this$apiConfig3 = this.apiConfig) === null || _this$apiConfig3 === void 0 ? void 0 : _this$apiConfig3.api2["default"];
-              if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig4 = this.apiConfig) !== null && _this$apiConfig4 !== void 0 && _this$apiConfig4.api2.web) {
+              api2Url = (_this$apiConfig8 = this.apiConfig) === null || _this$apiConfig8 === void 0 ? void 0 : _this$apiConfig8.api2["default"];
+              if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig9 = this.apiConfig) !== null && _this$apiConfig9 !== void 0 && _this$apiConfig9.api2.web) {
                 api2Url = this.apiConfig.api2.web;
               }
               this.apiCallCount += 1;
@@ -487,6 +536,10 @@ var DivaApiHandler = /*#__PURE__*/function () {
       }
       return saveAsProduct;
     }()
+    /**
+     * to run service on localhost
+     * diva3dRenderGroup :MYCCMEDIA
+     */
   }, {
     key: "initalizeWebConfigData",
     value: function initalizeWebConfigData(plannerConfig) {
@@ -561,38 +614,38 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getReportServiceUrl",
     value: function getReportServiceUrl() {
-      var _this$apiConfig$repor, _this$apiConfig5;
-      return (_this$apiConfig$repor = (_this$apiConfig5 = this.apiConfig) === null || _this$apiConfig5 === void 0 ? void 0 : _this$apiConfig5.reportService) !== null && _this$apiConfig$repor !== void 0 ? _this$apiConfig$repor : '';
+      var _this$apiConfig$repor, _this$apiConfig10;
+      return (_this$apiConfig$repor = (_this$apiConfig10 = this.apiConfig) === null || _this$apiConfig10 === void 0 ? void 0 : _this$apiConfig10.reportService) !== null && _this$apiConfig$repor !== void 0 ? _this$apiConfig$repor : '';
     }
   }, {
     key: "getDivaSupportServiceUrl",
     value: function getDivaSupportServiceUrl() {
-      var _this$apiConfig$suppo, _this$apiConfig6;
-      return (_this$apiConfig$suppo = (_this$apiConfig6 = this.apiConfig) === null || _this$apiConfig6 === void 0 ? void 0 : _this$apiConfig6.supportService) !== null && _this$apiConfig$suppo !== void 0 ? _this$apiConfig$suppo : '';
+      var _this$apiConfig$suppo, _this$apiConfig11;
+      return (_this$apiConfig$suppo = (_this$apiConfig11 = this.apiConfig) === null || _this$apiConfig11 === void 0 ? void 0 : _this$apiConfig11.supportService) !== null && _this$apiConfig$suppo !== void 0 ? _this$apiConfig$suppo : '';
     }
   }, {
     key: "getDivaMediaServiceUrl",
     value: function getDivaMediaServiceUrl() {
-      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 : '';
+      var _this$apiConfig$media, _this$apiConfig12;
+      return (_this$apiConfig$media = (_this$apiConfig12 = this.apiConfig) === null || _this$apiConfig12 === void 0 ? void 0 : _this$apiConfig12.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 : '';
+      var _this$apiConfig$aiSer, _this$apiConfig13;
+      return (_this$apiConfig$aiSer = (_this$apiConfig13 = this.apiConfig) === null || _this$apiConfig13 === void 0 ? void 0 : _this$apiConfig13.aiService) !== null && _this$apiConfig$aiSer !== void 0 ? _this$apiConfig$aiSer : '';
     }
   }, {
     key: "getConstructorServiceUrl",
     value: function getConstructorServiceUrl() {
-      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 : '';
+      var _this$apiConfig$const, _this$apiConfig14;
+      return (_this$apiConfig$const = (_this$apiConfig14 = this.apiConfig) === null || _this$apiConfig14 === void 0 ? void 0 : _this$apiConfig14.constructorService) !== null && _this$apiConfig$const !== void 0 ? _this$apiConfig$const : '';
     }
   }, {
     key: "getDivaBasketServiceUrl",
     value: function getDivaBasketServiceUrl() {
-      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 : '';
+      var _this$apiConfig$baske, _this$apiConfig15;
+      return (_this$apiConfig$baske = (_this$apiConfig15 = this.apiConfig) === null || _this$apiConfig15 === void 0 ? void 0 : _this$apiConfig15.basketService) !== null && _this$apiConfig$baske !== void 0 ? _this$apiConfig$baske : '';
     }
   }, {
     key: "getLoadProductBasketParams",
@@ -603,8 +656,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "get3DServerUrl",
     value: function get3DServerUrl() {
-      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 : '';
+      var _this$apiConfig$host, _this$apiConfig16;
+      return (_this$apiConfig$host = (_this$apiConfig16 = this.apiConfig) === null || _this$apiConfig16 === void 0 ? void 0 : _this$apiConfig16.host3d) !== null && _this$apiConfig$host !== void 0 ? _this$apiConfig$host : '';
     }
   }, {
     key: "doCheckForProductsPrice",
@@ -673,9 +726,9 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getBaseUrl",
     value: function getBaseUrl() {
-      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) {
+      var _this$apiConfig17, _this$apiConfig18;
+      var url = (_this$apiConfig17 = this.apiConfig) === null || _this$apiConfig17 === void 0 ? void 0 : _this$apiConfig17.api2["default"];
+      if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig18 = this.apiConfig) !== null && _this$apiConfig18 !== void 0 && _this$apiConfig18.api2.web) {
         url = this.apiConfig.api2.web;
       }
       if (!url) throw new Error('No API2 defined');
@@ -791,14 +844,14 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getI18n",
     value: function getI18n() {
-      var _this$i18n;
-      return (_this$i18n = this.i18n) === null || _this$i18n === void 0 ? void 0 : _this$i18n.call(this);
+      var _this$i18n2;
+      return (_this$i18n2 = this.i18n) === null || _this$i18n2 === void 0 ? void 0 : _this$i18n2.call(this);
     }
   }, {
     key: "setAccountSessionGuid",
     value: function () {
       var _setAccountSessionGuid = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(_ref) {
-        var os, accountGuid, catalogGuid, response, _this$actions, _this$state$navigatio, _this$state;
+        var os, accountGuid, catalogGuid, response, _this$actions4, _this$state$navigatio, _this$state;
         return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -837,7 +890,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
               break;
             case 16:
               if (this.applicationEnvironment == 'SELLER') {
-                (_this$actions = this.actions) === null || _this$actions === void 0 || _this$actions.openComponent((_this$state$navigatio = (_this$state = this.state) === null || _this$state === void 0 || (_this$state = _this$state.navigationConfiguration) === null || _this$state === void 0 ? void 0 : _this$state.logoAction) !== null && _this$state$navigatio !== void 0 ? _this$state$navigatio : {
+                (_this$actions4 = this.actions) === null || _this$actions4 === void 0 || _this$actions4.openComponent((_this$state$navigatio = (_this$state = this.state) === null || _this$state === void 0 || (_this$state = _this$state.navigationConfiguration) === null || _this$state === void 0 ? void 0 : _this$state.logoAction) !== null && _this$state$navigatio !== void 0 ? _this$state$navigatio : {
                   type: 'SELLER',
                   parameters: {
                     module: 'Collections'
@@ -936,39 +989,39 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "apiUrl",
     value: function apiUrl(queryString, useWebServiceApi) {
-      var _this$apiConfig24, _this$apiConfig25, _this$apiConfig26;
+      var _this$apiConfig29, _this$apiConfig30, _this$apiConfig31;
       if (useWebServiceApi == 'catalog') {
-        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;
+        var _this$apiConfig19, _this$apiConfig20;
+        if (!((_this$apiConfig19 = this.apiConfig) !== null && _this$apiConfig19 !== void 0 && _this$apiConfig19.catalogService)) throw new Error('No catalog Service defined');
+        return ((_this$apiConfig20 = this.apiConfig) === null || _this$apiConfig20 === void 0 ? void 0 : _this$apiConfig20.catalogService) + queryString;
       }
       if (useWebServiceApi == 'basket') {
-        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;
+        var _this$apiConfig21, _this$apiConfig22;
+        if (!((_this$apiConfig21 = this.apiConfig) !== null && _this$apiConfig21 !== void 0 && _this$apiConfig21.basketService)) throw new Error('No basket Service defined');
+        return ((_this$apiConfig22 = this.apiConfig) === null || _this$apiConfig22 === void 0 ? void 0 : _this$apiConfig22.basketService) + queryString;
       }
       if (useWebServiceApi == 'report') {
-        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;
+        var _this$apiConfig23, _this$apiConfig24;
+        if (!((_this$apiConfig23 = this.apiConfig) !== null && _this$apiConfig23 !== void 0 && _this$apiConfig23.reportService)) throw new Error('No report Service defined');
+        return ((_this$apiConfig24 = this.apiConfig) === null || _this$apiConfig24 === void 0 ? void 0 : _this$apiConfig24.reportService) + queryString;
       }
       if (useWebServiceApi == 'enricher') {
-        var _this$apiConfig22, _this$apiConfig23;
+        var _this$apiConfig27, _this$apiConfig28;
         if (this.useIDMService) {
-          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;
+          var _this$apiConfig25, _this$apiConfig26;
+          if (!((_this$apiConfig25 = this.apiConfig) !== null && _this$apiConfig25 !== void 0 && _this$apiConfig25.idmService)) throw new Error('No report Service defined');
+          return ((_this$apiConfig26 = this.apiConfig) === null || _this$apiConfig26 === void 0 ? void 0 : _this$apiConfig26.idmService) + 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;
+        if (!((_this$apiConfig27 = this.apiConfig) !== null && _this$apiConfig27 !== void 0 && _this$apiConfig27.enricherService)) throw new Error('No report Service defined');
+        return ((_this$apiConfig28 = this.apiConfig) === null || _this$apiConfig28 === void 0 ? void 0 : _this$apiConfig28.enricherService) + queryString;
       }
-      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) {
+      var url = (_this$apiConfig29 = this.apiConfig) === null || _this$apiConfig29 === void 0 ? void 0 : _this$apiConfig29.api2["default"];
+      if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig30 = this.apiConfig) !== null && _this$apiConfig30 !== void 0 && _this$apiConfig30.api2.web) {
         url = this.apiConfig.api2.web;
       }
-      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 (this.useEkPrices && (_this$apiConfig31 = this.apiConfig) !== null && _this$apiConfig31 !== void 0 && _this$apiConfig31.api2.ek) {
+        var _this$apiConfig32;
+        url = (_this$apiConfig32 = this.apiConfig) === null || _this$apiConfig32 === void 0 ? void 0 : _this$apiConfig32.api2.ek;
       }
       if (!url) throw new Error('No API2 defined');
       return url + '?' + queryString;
@@ -1160,7 +1213,14 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getIDMItems",
     value: function getIDMItems(packageId, serieId, serieNo, typeNos) {
-      return this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/series/' + (this.useIDMService ? serieId : serieNo) + '/items' + (typeNos !== null && typeNos !== void 0 && typeNos.length ? '?filter=' + typeNos.map(function (t) {
+      var base = this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/series/' + (this.useIDMService ? serieId : serieNo) + '/items';
+
+      // The seller/configurator endpoint is purpose-built: a dedicated typeNos param instead of a generic filter,
+      // and a fixed field set server-side instead of an explicit fields= list.
+      if (this.isSeller) {
+        return base + (typeNos !== null && typeNos !== void 0 && typeNos.length ? '?typeNos=' + typeNos.join(';') : '');
+      }
+      return base + (typeNos !== null && typeNos !== void 0 && typeNos.length ? '?filter=' + typeNos.map(function (t) {
         return encodeURIComponent('typeNo==' + t);
       }).join(' || ') : '?fields=properties;serieNo;featureClassRefNo;priceTypeRef;itemIdentification;catalogPage;weightBrutto;weightNetto;volume;minimumDeliveryTime;widthBasicShapeNominalValue;widthBasicShapeFrom;widthBasicShapeTo;widthBasicShapeStepSize;heightBasicShapeNominalValue;heightBasicShapeFrom;heightBasicShapeTo;heightBasicShapeStepSize;depthBasicShapeNominalValue;depthBasicShapeFrom;depthBasicShapeTo;depthBasicShapeStepSize;typeKey;eClassNo;detailInfoRefs;detailInfos;partListExclusive;partListRef;decisionRefs;typeNo;sequenceNo;edpNumber;eanNumber;shortText;fullText;planningAdvice;salesNumber;avrFilter;avlFilter');
     }
@@ -1174,6 +1234,11 @@ var DivaApiHandler = /*#__PURE__*/function () {
     value: function getIDMDecisions(packageId, decisions) {
       return this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/decisions' + '?decisionNos=' + decisions.join(';') + (this.smSupplierNr ? '&supplierNo=' + this.smSupplierNr : '');
     }
+  }, {
+    key: "getIDMDecisionsQueryUrl",
+    value: function getIDMDecisionsQueryUrl(packageId) {
+      return this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/decisions/query' + (this.smSupplierNr ? '?supplierNo=' + this.smSupplierNr : '');
+    }
   }, {
     key: "getIDMDetailInfos",
     value: function getIDMDetailInfos(packageId, detailinfos) {
@@ -1184,14 +1249,26 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getIDMFeatureClass",
     value: function getIDMFeatureClass(packageId, featureclasses) {
-      return this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/featureclasses' + '?filter=' + featureclasses.map(function (f) {
+      var base = this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/featureclasses';
+
+      // The seller/configurator endpoint is purpose-built: a dedicated featureClassNos param instead of a generic filter.
+      if (this.isSeller) {
+        return base + '?featureClassNos=' + featureclasses.join(';');
+      }
+      return base + '?filter=' + featureclasses.map(function (f) {
         return encodeURIComponent('featureClassNo==' + f);
       }).join(' || ');
     }
   }, {
     key: "getIDMPriceFeatureGroups",
     value: function getIDMPriceFeatureGroups(packageId, pricefeaturegroups) {
-      return this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/pricefeaturegroups' + '?filter=' + pricefeaturegroups.map(function (p) {
+      var base = this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/pricefeaturegroups';
+
+      // The seller/configurator endpoint is purpose-built: a dedicated priceFeatureGroupNos param instead of a generic filter.
+      if (this.isSeller) {
+        return base + '?priceFeatureGroupNos=' + pricefeaturegroups.join(';');
+      }
+      return base + '?filter=' + pricefeaturegroups.map(function (p) {
         return encodeURIComponent('priceFeatureGroupNo==' + p);
       }).join(' || ');
     }
@@ -1515,12 +1592,12 @@ var DivaApiHandler = /*#__PURE__*/function () {
     key: "getDimensionbyId",
     value: function () {
       var _getDimensionbyId = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee15(id, iln, catalogCodex, plannedOptions) {
-        var _this$apiConfig28;
+        var _this$apiConfig33;
         var fullUrl, res, headers;
         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$apiConfig28 = this.apiConfig) === null || _this$apiConfig28 === void 0 ? void 0 : _this$apiConfig28.useDebugUrl);
+              fullUrl = this.getConstructorServiceUrl() + '/dimension/' + id + '?iln=' + iln + '&catalogCodex=' + catalogCodex + '&debug=' + ((_this$apiConfig33 = this.apiConfig) === null || _this$apiConfig33 === void 0 ? void 0 : _this$apiConfig33.useDebugUrl);
               headers = {};
               if (this.jwt) headers = {
                 Authorization: 'Bearer ' + this.jwt
@@ -16526,6 +16603,11 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
     get: function get() {
       return this.opv.material;
     }
+  }, {
+    key: "properties",
+    get: function get() {
+      return this.opv.property;
+    }
   }, {
     key: "isOPVG",
     get: function get() {
@@ -16892,6 +16974,9 @@ var CatalogArticleData = /*#__PURE__*/function () {
         case 'ACCESSOIRE_POS_PRIO':
           this._catalogArticle.accPosPrio = Number(prop.Value);
           break;
+        case 'ADD_AS_ZKAT':
+          this._catalogArticle.addAsZKAT = prop.Value === 'true' || prop.Value === '1';
+          break;
         case 'HEIGHTGRIDUSED':
           this._catalogArticle.heightGridUsed = Number(prop.Value);
           break;
@@ -16964,6 +17049,12 @@ var CatalogArticleData = /*#__PURE__*/function () {
         case 'OPTIONS_FOR_PRINT':
           this.catalogArticle.optionsForPrint = prop.Value.split(';');
           break;
+        case 'TABGROUP':
+          if (!this._catalogArticle.tabGroup) this._catalogArticle.tabGroup = prop.Value;
+          break;
+        case 'TABGROUP_OPTIONS':
+          if (!this._catalogArticle.tabGroupOption) this._catalogArticle.tabGroupOption = prop.Value;
+          break;
         default:
           if (_key.includes('__')) break;
           var values = prop.Value.split(';');
@@ -17353,6 +17444,11 @@ var CatalogArticleData = /*#__PURE__*/function () {
     get: function get() {
       return this._catalogArticle.accPosPrio;
     }
+  }, {
+    key: "addAsZKAT",
+    get: function get() {
+      return this._catalogArticle.addAsZKAT;
+    }
   }, {
     key: "overwriteParentWidth",
     get: function get() {
@@ -18000,18 +18096,18 @@ function getCatalogOptionValueDataType(codex, jsonOPV, catalogData) {
 }
 function initCatalogPlannerArticleView$1(catalogData, catPlanArticle, catalogProps, plannerPaletteViewInfo) {
   //Hier muss es dann reingespeichert werden catalogPlannerArticlesView;
-  var getFilterType = function getFilterType(hasArticleRelation, AVLFilter, AVRFilter, catalogProps) {
+  var getFilterType = function getFilterType(hasArticleRelation, hasAVL, hasAVR, catalogProps) {
     var ret;
     if (hasArticleRelation) {
       if (!catalogProps.showAllItemsInPlanner && !catalogProps.showAccOnDpOnly) plannerPaletteViewInfo.filterType['Accessoire'] = true;
       ret = 'Accessoire';
-    } else if (AVLFilter.length > 0 && AVRFilter.length > 0) {
+    } else if (hasAVL && hasAVR) {
       if (!catalogProps.showAllItemsInPlanner) plannerPaletteViewInfo.filterType['DockLR'] = true;
       ret = 'DockLR';
-    } else if (AVLFilter.length > 0) {
+    } else if (hasAVL) {
       if (!catalogProps.showAllItemsInPlanner) plannerPaletteViewInfo.filterType['DockR'] = true;
       ret = 'DockR';
-    } else if (AVRFilter.length > 0) {
+    } else if (hasAVR) {
       if (!catalogProps.showAllItemsInPlanner) plannerPaletteViewInfo.filterType['DockL'] = true;
       ret = 'DockL';
     } else {
@@ -18105,12 +18201,9 @@ function initCatalogPlannerArticleView$1(catalogData, catPlanArticle, catalogPro
         if (catalogProps.diva3dPlanerShowArticleAsSvg && topSvg.SVG) {
           image = getSVGUrl(topSvg.SVG, mediaUrl);
         }
-        if (topSvg.HasAVL && catPlanArticle.avlFilter.length == 0) {
-          catPlanArticle.avlFilter = ['ALWAYS_DOCKABLE'];
-        }
-        if (topSvg.HasAVR && catPlanArticle.avrFilter.length == 0) {
-          catPlanArticle.avrFilter = ['ALWAYS_DOCKABLE'];
-        }
+
+        // An empty AVL/AVR filter means "no connector restriction" and is treated as a match by the
+        // docking/palette comparison (see checkDPFilterDoMatch / checkDPAV*FilterDoMatch). No sentinel needed.
 
         //Wäre für Rofl Benz gedacht um die Information zu speichern welche Artikel in welcher Ausrichtung ausmultipliziert werden
         if (topSvg.JsFormula.includes('202_LI')) {
@@ -18118,7 +18211,7 @@ function initCatalogPlannerArticleView$1(catalogData, catPlanArticle, catalogPro
         } else if (topSvg.JsFormula.includes('202_RE')) {
           elementName = elementName + ' (Rechts)';
         }
-        var filterType = getFilterType(catPlanArticle.isArticleRelation, topSvg.HasAVL ? catPlanArticle.avlFilter : [], topSvg.HasAVR ? catPlanArticle.avrFilter : [], catalogProps);
+        var filterType = getFilterType(catPlanArticle.isArticleRelation, !!topSvg.HasAVL, !!topSvg.HasAVR, catalogProps);
         catPlanArticle.filterType = filterType;
         //ausmultiplizierte Elemente (über meherere SVGs)
         var catPlanArtView = {
@@ -18171,7 +18264,7 @@ function initCatalogPlannerArticleView$1(catalogData, catPlanArticle, catalogPro
   }
   if (!catPlanArticle.hasTopSvgsWithFormula || catPlanArticle.topSvgsWithFormula.length == 1) {
     var _catalogArticle$artic2;
-    var _filterType = getFilterType(catPlanArticle.isArticleRelation, catPlanArticle.topHasAVL ? catPlanArticle.avlFilter : [], catPlanArticle.topHasAVR ? catPlanArticle.avrFilter : [], catalogProps);
+    var _filterType = getFilterType(catPlanArticle.isArticleRelation, !!catPlanArticle.topHasAVL, !!catPlanArticle.topHasAVR, catalogProps);
     catPlanArticle.filterType = _filterType;
     //Artikelbild ist abh�ngig von DIVA3DPlanerShowArticleAsSvg das SVG des Elements
     if (catalogProps.diva3dPlanerShowArticleAsSvg && (catPlanArticle.hasTopSvg || catPlanArticle.hasTopSvgsWithFormula)) {
@@ -18609,6 +18702,11 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
     get: function get() {
       return this.opv.catalogOPV.value;
     }
+  }, {
+    key: "properties",
+    get: function get() {
+      return this.opv.catalogOPV.properties;
+    }
   }, {
     key: "metaData",
     get: function get() {
@@ -19714,7 +19812,15 @@ function _loadMoreFromIDMArticles() {
           }).map(function (a) {
             return a.featureClassRefNo;
           })));
-          promises = [set.api.getDataCache(set.api.getIDMFeatureClass(set.CatalogData.accountGuid, toLoadFeatureClassRefNo), undefined, undefined, 'enricher'), toLoadPFGroups.length ? set.api.getDataCache(set.api.getIDMPriceFeatureGroups(set.CatalogData.accountGuid, toLoadPFGroups), undefined, undefined, 'enricher') : undefined, toLoadDecisionIds.length ? set.api.getDataCache(set.api.getIDMDecisions(set.CatalogData.accountGuid, toLoadDecisionIds), undefined, undefined, 'enricher') : undefined];
+          promises = [set.api.getDataCache(set.api.getIDMFeatureClass(set.CatalogData.accountGuid, toLoadFeatureClassRefNo), undefined, undefined, 'enricher'), toLoadPFGroups.length ? set.api.getDataCache(set.api.getIDMPriceFeatureGroups(set.CatalogData.accountGuid, toLoadPFGroups), undefined, undefined, 'enricher') : undefined, toLoadDecisionIds.length ? function () {
+            var getUrl = set.api.getIDMDecisions(set.CatalogData.accountGuid, toLoadDecisionIds);
+            if (getUrl.length > 2000) {
+              return set.api.getDataCache(set.api.getIDMDecisionsQueryUrl(set.CatalogData.accountGuid), undefined, undefined, 'enricher', 'POST', {
+                decisionNos: toLoadDecisionIds.join(';')
+              });
+            }
+            return set.api.getDataCache(getUrl, undefined, undefined, 'enricher');
+          }() : undefined];
           _context5.next = 16;
           return Promise.all(promises);
         case 16:
@@ -19749,7 +19855,7 @@ function _loadMoreFromIDMArticles() {
             catalogArticleData = catalogArticleDatas[_i6];
             catalogArticleData.articleIDMDecisions = sortDecisions(set.CatalogData.getDecisionsByNo(_toConsumableArray__default["default"](new Set([].concat(_toConsumableArray__default["default"](set.CatalogData.globalDecisions.map(function (g) {
               return g.decisionNo;
-            })), _toConsumableArray__default["default"]((_catalogArticleData$d2 = catalogArticleData.decisionsRefs) !== null && _catalogArticleData$d2 !== void 0 ? _catalogArticleData$d2 : []))))));
+            })), _toConsumableArray__default["default"](set.CatalogData.serieDecisionRefs), _toConsumableArray__default["default"]((_catalogArticleData$d2 = catalogArticleData.decisionsRefs) !== null && _catalogArticleData$d2 !== void 0 ? _catalogArticleData$d2 : []))))));
           }
           featureClasses.map(function (fc) {
             return set.CatalogData.loadedFeatureClasses.push(fc);
@@ -19918,7 +20024,7 @@ var getToLoadDecisionIds = function getToLoadDecisionIds(catalogArticleDatas, se
   }
   var neededDecisionsIds = _toConsumableArray__default["default"](new Set([].concat(_toConsumableArray__default["default"](set.CatalogData.globalDecisions.map(function (g) {
     return g.decisionNo;
-  })), _toConsumableArray__default["default"](allArticleDecisions))));
+  })), _toConsumableArray__default["default"](set.CatalogData.serieDecisionRefs), _toConsumableArray__default["default"](allArticleDecisions))));
   var toLoadDecisionIds = [];
   for (var _i = 0; _i < neededDecisionsIds.length; _i++) {
     var found = set.CatalogData.getDecisionByNo(neededDecisionsIds[_i]);
@@ -19981,15 +20087,14 @@ var getPriceFeatureGroups = function getPriceFeatureGroups(catalogArticleDatas,
 };
 var initializeDecision = function initializeDecision(decision, idmOptionGroups) {
   var _decision$optionCombi;
+  // optionCombinations already arrive sorted by sequence from the backend.
   var optionCombinations = (_decision$optionCombi = decision.optionCombinations) === null || _decision$optionCombi === void 0 ? void 0 : _decision$optionCombi.map(function (c) {
     return _objectSpread$p(_objectSpread$p({}, c), {}, {
       projectOptionsSetRefs: parseOptionSetRef(c.projectOptionsSetRefs, idmOptionGroups)
     });
   });
   return _objectSpread$p(_objectSpread$p({}, decision), {}, {
-    optionCombinations: optionCombinations === null || optionCombinations === void 0 ? void 0 : optionCombinations.sort(function (a, b) {
-      return a.sequence - b.sequence;
-    })
+    optionCombinations: optionCombinations
   });
 };
 var initializePriceFeatureGroups = function initializePriceFeatureGroups(priceFeatureGroup, idmOptionGroups) {
@@ -20088,7 +20193,7 @@ var initFeature = function initFeature(feature, catalogArticleData, set) {
   catalogArticleData.articleOptions[newArticleFeature.codex] = newArticleFeature;
 };
 function getCatalogFeatureType(feature, catalogArticleData, set) {
-  var _set$CatalogData$cata, _set$CatalogData$cata2, _set$CatalogData$cata3, _feature$detailInfos, _properties$find, _properties$find2, _ref, _properties$find3, _feature$options$, _optionMask$hidden;
+  var _set$CatalogData$cata, _set$CatalogData$cata2, _set$CatalogData$cata3, _feature$detailInfos, _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());
@@ -20105,17 +20210,9 @@ function getCatalogFeatureType(feature, catalogArticleData, set) {
     headerPosVariationType: feature.headerPosVariationType,
     measureKey: feature.measureParameter,
     sequenceNo: feature.sequenceNo,
-    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',
+    sendToPIM: feature.sendToPim,
+    isMultiselect: feature.isMultiselect,
+    layout: feature.layout,
     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: {}
@@ -20179,12 +20276,9 @@ function getCatalogOptionType(option, set) {
     origName: name,
     name_locales: option.optionText,
     property: properties,
-    image: getLowResUrl((_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),
-    images: (_option$detailInfos2 = option.detailInfos) === null || _option$detailInfos2 === void 0 || (_option$detailInfos2 = _option$detailInfos2.filter(function (d) {
-      return d.functionType == 'OPV';
-    })) === null || _option$detailInfos2 === void 0 ? void 0 : _option$detailInfos2.map(function (o) {
+    // detailInfos is already limited to "OPV" entries by the backend.
+    image: getLowResUrl((_option$detailInfos = option.detailInfos) === null || _option$detailInfos === void 0 || (_option$detailInfos = _option$detailInfos[0]) === null || _option$detailInfos === void 0 ? void 0 : _option$detailInfos.url),
+    images: (_option$detailInfos2 = option.detailInfos) === null || _option$detailInfos2 === void 0 ? void 0 : _option$detailInfos2.map(function (o) {
       var _getLowResUrl, _option$detailInfoRef, _option$detailInfoRef2;
       return {
         detailInfoNo: o.detailInfoNo,
@@ -20194,7 +20288,7 @@ function getCatalogOptionType(option, set) {
         })) !== null && _option$detailInfoRef !== void 0 ? _option$detailInfoRef : []
       };
     }),
-    hexColor: rgbToHex(option.materialColorR, option.materialColorG, option.materialColorB),
+    hexColor: option.materialColorHex,
     description: DivaUtils__default["default"].getLocals(option.optionCommentText, set.api.getLanguageLowercase()),
     description_locales: option.optionCommentText,
     isTexture: false,
@@ -20265,20 +20359,12 @@ function getArticleOption(set, option, catalogOption, feature, catalogArticleDat
   };
   return opv;
 }
-function componentToHex(c) {
-  var hex = c.toString(16);
-  return hex.length == 1 ? '0' + hex : hex;
-}
-function rgbToHex(r, g, b) {
-  if (r === undefined || g === undefined || b === undefined) return undefined;
-  return '#' + componentToHex(r) + componentToHex(g) + componentToHex(b);
-}
 
 function ownKeys$o(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$o(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$o(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$o(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$k = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 function initIDMCatalogData(serie, orderSet, api) {
-  var _serie$decisions, _serie$decisions2;
+  var _serie$decisions, _serie$decisions2, _serie$decisionRefs;
   var catalog = serie.catalogData;
   var catalogData = {
     accountGuid: orderSet.AccountGUID,
@@ -20304,6 +20390,7 @@ function initIDMCatalogData(serie, orderSet, api) {
     loadedDecisions: _toConsumableArray__default["default"](((_serie$decisions2 = serie.decisions) !== null && _serie$decisions2 !== void 0 ? _serie$decisions2 : []).map(function (d) {
       return initializeDecision(d, catalog.optionGroups);
     })),
+    serieDecisionRefs: (_serie$decisionRefs = serie.decisionRefs) !== null && _serie$decisionRefs !== void 0 ? _serie$decisionRefs : [],
     //TODO zu klären mit Philipp
     //brandName: '',
     //additionalCatalogPrice: json.AdditionalCatalogPrice,
@@ -20343,9 +20430,12 @@ function initIDMArticles(jsonItems, catalogData) {
   }
 }
 function getCatalogArticle(article, catalogData) {
-  var _catalogData$catalogM, _article$typeKey, _article$salesNumber, _ref, _articleMask$name, _article$fullText, _article$fullText2, _article$fullText3, _articleMask$properti, _article$depthBasicSh, _article$depthBasicSh2, _article$depthBasicSh3, _article$widthBasicSh, _article$widthBasicSh2, _article$widthBasicSh3, _article$heightBasicS, _article$heightBasicS2, _article$heightBasicS3, _article$weightNetto, _article$detailInfos, _article$detailInfos2, _article$detailInfos3, _articleMask$groupnam, _articleMask$groupnam2;
+  var _catalogData$catalogM, _article$typeKey, _article$salesNumber, _articleMask$name, _articleMask$properti, _article$depthBasicSh, _article$depthBasicSh2, _article$depthBasicSh3, _article$widthBasicSh, _article$widthBasicSh2, _article$widthBasicSh3, _article$heightBasicS, _article$heightBasicS2, _article$heightBasicS3, _article$weightNetto, _article$detailInfos, _article$detailInfos2, _article$detailInfos3, _articleMask$groupnam, _articleMask$groupnam2;
   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[article.typeNo];
   var lang = catalogData.api.getLanguageLowercase();
+  // empty locale objects ({} or only empty strings) are truthy, so ?? alone doesn't fall back
+  var fullText = hasLocaleText(article.fullText) ? article.fullText : article.shortText;
+  var shortText = hasLocaleText(article.shortText) ? article.shortText : article.fullText;
   var featureProperties = convertProperties(article.properties, lang, 'featureNos');
   var optionProperties = convertProperties(article.properties, lang, 'optionKeys');
   return {
@@ -20368,14 +20458,14 @@ function getCatalogArticle(article, catalogData) {
     hasArticleRelations: false,
     hasPartlistArticle: !!article.partListRef,
     hasType1Dependencies: false,
-    name: DivaUtils__default["default"].getLocals((_ref = (_articleMask$name = articleMask === null || articleMask === void 0 ? void 0 : articleMask.name) !== null && _articleMask$name !== void 0 ? _articleMask$name : article.fullText) !== null && _ref !== void 0 ? _ref : article.shortText, lang),
-    longDescription: DivaUtils__default["default"].getLocals((_article$fullText = article.fullText) !== null && _article$fullText !== void 0 ? _article$fullText : article.shortText, lang),
-    longDescription_locales: (_article$fullText2 = article.fullText) !== null && _article$fullText2 !== void 0 ? _article$fullText2 : article.shortText,
+    name: DivaUtils__default["default"].getLocals((_articleMask$name = articleMask === null || articleMask === void 0 ? void 0 : articleMask.name) !== null && _articleMask$name !== void 0 ? _articleMask$name : fullText, lang),
+    longDescription: DivaUtils__default["default"].getLocals(fullText, lang),
+    longDescription_locales: fullText,
     isHidden: !!(articleMask !== null && articleMask !== void 0 && articleMask.hidden),
-    origName: DivaUtils__default["default"].getLocals((_article$fullText3 = article.fullText) !== null && _article$fullText3 !== void 0 ? _article$fullText3 : article.shortText, lang),
-    shortName: DivaUtils__default["default"].getLocals(article.shortText, lang),
-    origShortName: DivaUtils__default["default"].getLocals(article.shortText, lang),
-    shortName_locales: article.shortText,
+    origName: DivaUtils__default["default"].getLocals(fullText, lang),
+    shortName: DivaUtils__default["default"].getLocals(shortText, lang),
+    origShortName: DivaUtils__default["default"].getLocals(shortText, lang),
+    shortName_locales: shortText,
     properties: [].concat(_toConsumableArray__default["default"](convertProperties(article.properties, lang)), _toConsumableArray__default["default"]((_articleMask$properti = articleMask === null || articleMask === void 0 ? void 0 : articleMask.properties) !== null && _articleMask$properti !== void 0 ? _articleMask$properti : [])),
     optionProperties: optionProperties,
     featureProperties: featureProperties,
@@ -20435,6 +20525,11 @@ function getCatalogArticle(article, catalogData) {
     modelName3D: jsonArticle.ModelName3D && jsonArticle.ModelName3D != '' ? jsonArticle.ModelName3D : undefined,
 */
 
+function hasLocaleText(locales) {
+  return !!locales && Object.values(locales).some(function (v) {
+    return !!(v !== null && v !== void 0 && v.trim());
+  });
+}
 function getLowResUrl(url) {
   return url === null || url === void 0 ? void 0 : url.replace('.jpg', '_low.jpg').replace('.jpeg', '_low.jpeg').replace('.png', '_low.png');
 }
@@ -20675,6 +20770,8 @@ var DivaCatalogData = /*#__PURE__*/function () {
       //
       ignoreLayerAVNAVS: false,
       //
+      ignoreDockingNumber: false,
+      //                                  ignoriert die Nummern-Regel beim Andocken (z.B. AVU1 darf an AVO2). Die Nummer dient dann nur der Identifikation, nicht als Zuordnungsschlüssel.
       checkCollisionForDifferentLayers: [],
       //
 
@@ -20727,6 +20824,9 @@ var DivaCatalogData = /*#__PURE__*/function () {
       //                                         ergänzt einen Übersetzbaren string am Ende des Names
       dontShowAccStep: false,
       useTypeNrAsArticleNrEKText: false,
+      hideSubPosArticleCodexEKText: false,
+      addPosInvisibilityToOL: false,
+      //                               PosInvisibility wird nur in die Orderlines übernommen wenn der MetaTag ADD_POS_INVISIBILITY_TO_OL == 1 ist
       addNewLineBeforRuleDesc: false,
       //                              für Kirchner neue zeile im Checkout vor der Klanner und der RuleCes von den Partlistarticles
       useEdoArticlesOnOpvs: [],
@@ -20974,6 +21074,12 @@ var DivaCatalogData = /*#__PURE__*/function () {
     get: function get() {
       return this.catalogData.globalDecisions;
     }
+  }, {
+    key: "serieDecisionRefs",
+    get: function get() {
+      var _this$catalogData$ser;
+      return (_this$catalogData$ser = this.catalogData.serieDecisionRefs) !== null && _this$catalogData$ser !== void 0 ? _this$catalogData$ser : [];
+    }
   }, {
     key: "loadedFeatureClasses",
     get: function get() {
@@ -21220,6 +21326,24 @@ var DivaCatalogData = /*#__PURE__*/function () {
         return _ret;
       }
     }
+
+    /**
+     * Default dock filter applied when nothing is selected (e.g. after a deselect or when adding a new element).
+     * When completeness warnings are hidden, any element may start a planning, so every dock type the catalog
+     * actually has is shown. Otherwise the catalog's configured start filter (startFilterParams / available
+     * start types) is used.
+     */
+  }, {
+    key: "defaultDockFilter",
+    get: function get() {
+      if (this.doHideCompletenessWarning) {
+        var filterType = this.plannerPaletteViewInfo.filterType;
+        return Object.keys(filterType).filter(function (key) {
+          return filterType[key];
+        });
+      }
+      return this.getStartFilter;
+    }
   }, {
     key: "dontHideOption",
     get: function get() {
@@ -21418,6 +21542,11 @@ var DivaCatalogData = /*#__PURE__*/function () {
     get: function get() {
       return this.catalogProps.useTypeNrAsArticleNrEKText;
     }
+  }, {
+    key: "hideSubPosArticleCodexEKText",
+    get: function get() {
+      return this.catalogProps.hideSubPosArticleCodexEKText;
+    }
   }, {
     key: "hasAlternateRenderings",
     get: function get() {
@@ -21700,6 +21829,11 @@ var DivaCatalogData = /*#__PURE__*/function () {
     get: function get() {
       return this.catalogProps.dontShowAccStep;
     }
+  }, {
+    key: "addPosInvisibilityToOL",
+    get: function get() {
+      return this.catalogProps.addPosInvisibilityToOL;
+    }
 
     //Planner configurations
   }, {
@@ -21709,6 +21843,7 @@ var DivaCatalogData = /*#__PURE__*/function () {
         ignoreLayerAVC: this.catalogProps.ignoreLayerAVC,
         ignoreLayerAVOAVU: this.catalogProps.ignoreLayerAVOAVU,
         ignoreLayerAVNAVS: this.catalogProps.ignoreLayerAVNAVS,
+        ignoreDockingNumber: this.catalogProps.ignoreDockingNumber,
         showAccOnDpOnly: this.catalogProps.showAccOnDpOnly,
         dockAccOnAvoOnly: this.catalogProps.dockAccOnAvoOnly,
         hideAccessoriesInPlanner: this.catalogProps.accessorieStepAsPlanner,
@@ -21868,6 +22003,9 @@ var DivaCatalogData = /*#__PURE__*/function () {
           case 'IGNORELAYERAVNAVS':
             _this4.catalogProps.ignoreLayerAVNAVS = item.Value == '1';
             break;
+          case 'IGNOREDOCKINGNUMBER':
+            _this4.catalogProps.ignoreDockingNumber = item.Value == '1';
+            break;
           case 'CHECK_COLLISION_DIFFERENT_LAYERS':
             _this4.catalogProps.checkCollisionForDifferentLayers = item.Value.split(';').map(function (t) {
               return parseInt(t);
@@ -21986,6 +22124,12 @@ var DivaCatalogData = /*#__PURE__*/function () {
           case 'USE_TYPENR_AS_ARTICLENR_EKTEXT':
             _this4.catalogProps.useTypeNrAsArticleNrEKText = '1' == item.Value;
             break;
+          case 'HIDE_SUBPOS_ARTICLECODEX_EKTEXT':
+            _this4.catalogProps.hideSubPosArticleCodexEKText = '1' == item.Value;
+            break;
+          case 'ADD_POS_INVISIBILITY_TO_OL':
+            _this4.catalogProps.addPosInvisibilityToOL = '1' == item.Value;
+            break;
           case 'ADD_NEW_LINE_BEFOR_RULEDESC':
             _this4.catalogProps.addNewLineBeforRuleDesc = '1' == item.Value;
             break;
@@ -22324,11 +22468,12 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
     key: "loadDivaCatalog",
     value: function () {
       var _loadDivaCatalog = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(state, catalogCodex, orderSet) {
+        var _orderSet$OrderLines;
         var promises, _yield$Promise$all, _yield$Promise$all2, catalogApiData, catalogArticleListData, catalogArticlePlannerListData, additionalModelInfos, mask, _state$catalogMask, catalogData;
         return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              promises = [state.api.getDataCache(state.api.getCatalogDataQS(catalogCodex), state.api.getCatalogDataCacheKey(catalogCodex), orderSet.AccountSessionGUID), state.api.getDataCache(state.api.getJsonArticleListQS(catalogCodex), state.api.getJsonArticleListCacheKey(catalogCodex), orderSet.AccountSessionGUID), state.api.getDataCache(state.api.getJsonPlannerElementsQS(catalogCodex), state.api.getJsonPlannerElementsCacheKey(catalogCodex), orderSet.AccountSessionGUID)].concat([this.loadAdditionalModelInfos(state, orderSet.AccountGUID, orderSet.CatalogGUID)], _toConsumableArray__default["default"](state.onlyRunLogic ? [] : _toConsumableArray__default["default"](new Map(orderSet.OrderLines.filter(function (ol) {
+              promises = [state.api.getDataCache(state.api.getCatalogDataQS(catalogCodex), state.api.getCatalogDataCacheKey(catalogCodex), orderSet.AccountSessionGUID), state.api.getDataCache(state.api.getJsonArticleListQS(catalogCodex), state.api.getJsonArticleListCacheKey(catalogCodex), orderSet.AccountSessionGUID), state.api.getDataCache(state.api.getJsonPlannerElementsQS(catalogCodex), state.api.getJsonPlannerElementsCacheKey(catalogCodex), orderSet.AccountSessionGUID)].concat([this.loadAdditionalModelInfos(state, orderSet.AccountGUID, orderSet.CatalogGUID)], _toConsumableArray__default["default"](state.onlyRunLogic ? [] : _toConsumableArray__default["default"](new Map(((_orderSet$OrderLines = orderSet.OrderLines) !== null && _orderSet$OrderLines !== void 0 ? _orderSet$OrderLines : []).filter(function (ol) {
                 var _ol$VariantBasketData;
                 return ((_ol$VariantBasketData = ol.VariantBasketDatas) === null || _ol$VariantBasketData === void 0 ? void 0 : _ol$VariantBasketData.length) && ol.ArticleType === 'OPTIONTREE';
               }).map(function (os) {
@@ -22359,7 +22504,8 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
                 break;
               }
               _context2.next = 16;
-              return state.api.getDataCache(state.api.getCatalogMaskQS(catalogApiData.GUID, state.api.OrganizationId), undefined, undefined, 'enricher');
+              return state.api.getDataCache(state.api.getCatalogMaskQS(catalogApiData.GUID, state.api.OrganizationId), undefined, undefined, 'enricher', undefined, undefined, true // optional call - failure is swallowed below, so don't surface the enricher error modal
+              );
             case 16:
               mask = _context2.sent;
             case 17:
@@ -23534,45 +23680,19 @@ var DivaEngine = /*#__PURE__*/function () {
     value: function updateIDMSpecificFeature(ops) {
       var _ops$option$idmVarian, _ops$option$idmVarian2, _ops$option$idmVarian3, _ops$option$idmVarian4, _ops$option$idmVarian5;
       if (!this.article.parentHasSameOption(ops.optionCodex)) return;
+      // The OPV codex embeds the option codex as a prefix: "OPV<body>_<connector>" (e.g. "OPV1090_CT500"),
+      // while ops.optionCodex is "OPT<body>". Strip that prefix so the filter holds the bare connector codex.
+      var toConnectorCodex = function toConnectorCodex(value) {
+        var prefix = 'OPV' + ops.optionCodex.substring(3) + '_';
+        return value.codex.startsWith(prefix) ? value.codex.substring(prefix.length) : value.codex;
+      };
       if ([90, 1090].includes((_ops$option$idmVarian = ops.option.idmVariantenArt) !== null && _ops$option$idmVarian !== void 0 ? _ops$option$idmVarian : 0)) {
         //R (Anschlusstyp R) - AVR
-        var newAVRFilter = [],
-          visibleOPVs = ops.visibleOptionValues;
-        var _iterator5 = _createForOfIteratorHelper$c(visibleOPVs),
-          _step5;
-        try {
-          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-            var _step5$value = _slicedToArray__default["default"](_step5.value, 2),
-              key = _step5$value[0],
-              value = _step5$value[1];
-            newAVRFilter.push(value.codex.substring(3));
-          }
-        } catch (err) {
-          _iterator5.e(err);
-        } finally {
-          _iterator5.f();
-        }
-        this.article.newPossibleAVRFilters = newAVRFilter;
+        this.article.newPossibleAVRFilters = Array.from(ops.visibleOptionValues.values()).map(toConnectorCodex);
       }
       if ([89, 1089].includes((_ops$option$idmVarian2 = ops.option.idmVariantenArt) !== null && _ops$option$idmVarian2 !== void 0 ? _ops$option$idmVarian2 : 0)) {
         //L (Anschlusstyp L) - AVL
-        var newAVLFilter = [],
-          _visibleOPVs = ops.visibleOptionValues;
-        var _iterator6 = _createForOfIteratorHelper$c(_visibleOPVs),
-          _step6;
-        try {
-          for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-            var _step6$value = _slicedToArray__default["default"](_step6.value, 2),
-              _key = _step6$value[0],
-              _value = _step6$value[1];
-            newAVLFilter.push(_value.codex.substring(3));
-          }
-        } catch (err) {
-          _iterator6.e(err);
-        } finally {
-          _iterator6.f();
-        }
-        this.article.newPossibleAVLFilters = newAVLFilter;
+        this.article.newPossibleAVLFilters = Array.from(ops.visibleOptionValues.values()).map(toConnectorCodex);
       }
       //beim article abspeichern. Das Planungselement kann es sich per Funktion von dort dann holen
       if ([97, 1097].includes((_ops$option$idmVarian3 = ops.option.idmVariantenArt) !== null && _ops$option$idmVarian3 !== void 0 ? _ops$option$idmVarian3 : 0)) {
@@ -23801,18 +23921,18 @@ var DivaEngine = /*#__PURE__*/function () {
         myDecisions[_i].disableHistory = [];
         myDecisions[_i].activeCombination = undefined;
       }
-      var _iterator7 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
-        _step7;
+      var _iterator5 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
+        _step5;
       try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var ops = _step7.value;
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var ops = _step5.value;
           ops.updateVisibleOptionValues(ops.option.articleOptionValues);
           ops.definedBySetFeatureFixed = false;
         }
       } catch (err) {
-        _iterator7.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator7.f();
+        _iterator5.f();
       }
       this.catalogDecisionsByNumber = new Map(this.article.catalogArticle.articleDecisions.map(function (d) {
         return [d.Number, d];
@@ -23943,11 +24063,11 @@ var DivaEngine = /*#__PURE__*/function () {
     key: "updateIDMSpecificFeatures",
     value: function updateIDMSpecificFeatures() {
       //updaten idm planner specific options
-      var _iterator8 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
-        _step8;
+      var _iterator6 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
+        _step6;
       try {
-        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-          var ops = _step8.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var ops = _step6.value;
           //when an option has no decisions the first visible optionValue has to be selected per default
           if (ops.val === undefined && ops.visibleCount && !this.article.CatalogData.useDiomexConfigLogic) {
             this.assignOptionValue(ops.optionCodex, ops.visibleOPVKeys[0]);
@@ -23968,9 +24088,9 @@ var DivaEngine = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator8.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator8.f();
+        _iterator6.f();
       }
     }
   }, {
@@ -24204,21 +24324,21 @@ var DivaEngine = /*#__PURE__*/function () {
                     var negatedValues = new Set(myDoc.Row[OPT].map(function (v) {
                       return v.slice(1);
                     })); // remove the '!' from the value
-                    var _iterator9 = _createForOfIteratorHelper$c(ops.visibleOptionValues),
-                      _step9;
+                    var _iterator7 = _createForOfIteratorHelper$c(ops.visibleOptionValues),
+                      _step7;
                     try {
-                      for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-                        var _step9$value = _slicedToArray__default["default"](_step9.value, 2),
-                          opvKey = _step9$value[0],
-                          _opv = _step9$value[1];
+                      for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+                        var _step7$value = _slicedToArray__default["default"](_step7.value, 2),
+                          opvKey = _step7$value[0],
+                          _opv = _step7$value[1];
                         if (!negatedValues.has(opvKey)) {
                           validOPVs[OPT].set(opvKey, _opv);
                         }
                       }
                     } catch (err) {
-                      _iterator9.e(err);
+                      _iterator7.e(err);
                     } finally {
-                      _iterator9.f();
+                      _iterator7.f();
                     }
                   } else {
                     validOPVs[OPT] = new Map(ops.visibleOptionValues);
@@ -24346,11 +24466,11 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "evalShowOnlyWhenHasPrice",
     value: function evalShowOnlyWhenHasPrice() {
-      var _iterator10 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
-        _step10;
+      var _iterator8 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
+        _step8;
       try {
-        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-          var ops = _step10.value;
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var ops = _step8.value;
           for (var jKey in ops.visibleOptionValues) {
             var opv = ops.visibleOptionValues.get(jKey);
             if (opv.showOnlyWhenHasPrice && opv.price == 0) {
@@ -24362,9 +24482,9 @@ var DivaEngine = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator10.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator10.f();
+        _iterator8.f();
       }
     }
 
@@ -24838,12 +24958,12 @@ var DivaEngine = /*#__PURE__*/function () {
       }
 
       //mengen und größenabhängige Preisberechungn.
-      var _iterator11 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
-        _step11;
+      var _iterator9 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
+        _step9;
       try {
-        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
           var _ops$addToMeasure;
-          var ops = _step11.value;
+          var ops = _step9.value;
           var OP = ops.optionCodex;
           var mUnit = ops.measureUnit;
           var pUnit = ops.priceUnit;
@@ -24926,15 +25046,15 @@ var DivaEngine = /*#__PURE__*/function () {
         }
         //jetzt nochmal prozentuelle Preise mit TargetOption berechnen
       } catch (err) {
-        _iterator11.e(err);
+        _iterator9.e(err);
       } finally {
-        _iterator11.f();
+        _iterator9.f();
       }
-      var _iterator12 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
-        _step12;
+      var _iterator10 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
+        _step10;
       try {
-        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-          var _ops4 = _step12.value;
+        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+          var _ops4 = _step10.value;
           var targetPPGPrefixes = _ops4.targetPPGPrefixes;
           if (!targetPPGPrefixes) continue;
           var _loop7 = function _loop7() {
@@ -24954,9 +25074,9 @@ var DivaEngine = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator12.e(err);
+        _iterator10.e(err);
       } finally {
-        _iterator12.f();
+        _iterator10.f();
       }
       for (var _i5 = 0; _i5 < this.article.priceRefs.length; _i5++) {
         var basePriceRef = this.article.priceRefs[_i5];
@@ -24968,19 +25088,19 @@ var DivaEngine = /*#__PURE__*/function () {
             return item.PPG && item.PPG.split('_')[0] == targetPrefix;
           });
           if (!priceRef) {
-            var _iterator13 = _createForOfIteratorHelper$c(_this5.article.articleOptionStates.values()),
-              _step13;
+            var _iterator11 = _createForOfIteratorHelper$c(_this5.article.articleOptionStates.values()),
+              _step11;
             try {
-              for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-                var ops = _step13.value;
+              for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+                var ops = _step11.value;
                 if (ops.ppg && ops.ppg.split('_')[0] == targetPrefix) {
                   myArtOpv = ops;
                 }
               }
             } catch (err) {
-              _iterator13.e(err);
+              _iterator11.e(err);
             } finally {
-              _iterator13.f();
+              _iterator11.f();
             }
           }
 
@@ -25006,36 +25126,36 @@ var DivaEngine = /*#__PURE__*/function () {
         myArticleBasePrice += priceRef.Price ? DivaUtils__default["default"].decimalAdjust('round', (_priceRef$calcPrice = priceRef.calcPrice) !== null && _priceRef$calcPrice !== void 0 ? _priceRef$calcPrice : priceRef.Price, digits) : 0.0;
       }
       var articleUsedCalcPrice = myArticleBasePrice;
-      var _iterator14 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
-        _step14;
+      var _iterator12 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
+        _step12;
       try {
-        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-          var tmpOps = _step14.value;
+        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+          var tmpOps = _step12.value;
           articleUsedCalcPrice = this.getOptionPrice(articleUsedCalcPrice, tmpOps.option, digits);
         }
 
         //jetzt nochmal prozentuelle Preise mit GLOBAL tarbetoption berechnen
         /* TODO ABklären mit Franz - ops hat nie die Optionen - targetPPGPrefixes - ich glaube hier sollte article.priceRefs durchlaufen werden. */
       } catch (err) {
-        _iterator14.e(err);
+        _iterator12.e(err);
       } finally {
-        _iterator14.f();
+        _iterator12.f();
       }
-      var _iterator15 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
-        _step15;
+      var _iterator13 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
+        _step13;
       try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
           var _ops5$targetPPGPrefix, _ops5$targetPPGPrefix2;
-          var _ops5 = _step15.value;
+          var _ops5 = _step13.value;
           var targetOption = (_ops5$targetPPGPrefix = (_ops5$targetPPGPrefix2 = _ops5.targetPPGPrefixes) === null || _ops5$targetPPGPrefix2 === void 0 ? void 0 : _ops5$targetPPGPrefix2[0]) !== null && _ops5$targetPPGPrefix !== void 0 ? _ops5$targetPPGPrefix : _ops5.targetOption;
           if (_ops5.isPercentage && targetOption == 'GLOBAL') {
             articleUsedCalcPrice = articleUsedCalcPrice * (1 + _ops5.calcPrice);
           }
         }
       } catch (err) {
-        _iterator15.e(err);
+        _iterator13.e(err);
       } finally {
-        _iterator15.f();
+        _iterator13.f();
       }
       for (var _i7 = 0; _i7 < this.article.priceRefs.length; _i7++) {
         var _priceRef = this.article.priceRefs[_i7];
@@ -25177,11 +25297,11 @@ var DivaEngine = /*#__PURE__*/function () {
               if (a[i].trim() != '') {
                 var searchOpt = 'OPT' + a[i].trim();
                 //Optionsbaum des Artikels durchsuchen
-                var _iterator16 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
-                  _step16;
+                var _iterator14 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
+                  _step14;
                 try {
-                  for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-                    var _ops6 = _step16.value;
+                  for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+                    var _ops6 = _step14.value;
                     if (_ops6.ocd == searchOpt || _ops6.optionCodex == searchOpt) {
                       if (_ops6 && _ops6.price > 0) {
                         myPercBasePrice += _ops6.price * _ops6.quantity;
@@ -25190,9 +25310,9 @@ var DivaEngine = /*#__PURE__*/function () {
                     }
                   }
                 } catch (err) {
-                  _iterator16.e(err);
+                  _iterator14.e(err);
                 } finally {
-                  _iterator16.f();
+                  _iterator14.f();
                 }
               }
             }
@@ -25238,18 +25358,18 @@ var DivaEngine = /*#__PURE__*/function () {
       }
 
       // this functions updates the images of OPVs that depend on rules
-      var _iterator17 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
-        _step17;
+      var _iterator15 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
+        _step15;
       try {
-        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
-          var ops = _step17.value;
-          var _iterator18 = _createForOfIteratorHelper$c(ops.visibleOptionValues),
-            _step18;
+        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+          var ops = _step15.value;
+          var _iterator16 = _createForOfIteratorHelper$c(ops.visibleOptionValues),
+            _step16;
           try {
-            for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-              var _step18$value = _slicedToArray__default["default"](_step18.value, 2),
-                jKey = _step18$value[0],
-                opv = _step18$value[1];
+            for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+              var _step16$value = _slicedToArray__default["default"](_step16.value, 2),
+                jKey = _step16$value[0],
+                opv = _step16$value[1];
               if (opv.images) {
                 var imageFound = false;
                 for (var _i10 = 0; _i10 < opv.images.length; _i10++) {
@@ -25268,18 +25388,18 @@ var DivaEngine = /*#__PURE__*/function () {
               }
             }
           } catch (err) {
-            _iterator18.e(err);
+            _iterator16.e(err);
           } finally {
-            _iterator18.f();
+            _iterator16.f();
           }
         }
 
         // this function calculates an Svg to the current configuration if neccessary (SVG Tausch)
         // if the Article has no SVG Tausch nothing is done
       } catch (err) {
-        _iterator17.e(err);
+        _iterator15.e(err);
       } finally {
-        _iterator17.f();
+        _iterator15.f();
       }
       var newSVGFile = null;
       var svgChangedViaSvgTausch = false;
@@ -25910,7 +26030,7 @@ var IDMEngine = /*#__PURE__*/function () {
             } else if (!_ops4.valCodex) {
               LOG$g.warn('evalSetFeature(featureRef) decision ' + decision.decisionNo + ': referenced source feature ' + action.featureRef.featureNo + ' has no selected value (valCodex undefined) - target feature ' + action.featureNo + ' will NOT be set (price relevant)');
             } else if (!targetHasSourceValue) {
-              LOG$g.warn('evalSetFeature(featureRef) decision ' + decision.decisionNo + ': target feature ' + action.featureNo + " does not have source feature " + action.featureRef.featureNo + "'s value '" + _ops4.valCodex + "' among its visible option values - assignOptionValue will be a no-op (price relevant). Target visible values: " + (targetOps ? Array.from(targetOps.visibleOptionValues.keys()).join(', ') : '<no target>'));
+              LOG$g.warn('evalSetFeature(featureRef) decision ' + decision.decisionNo + ': target feature ' + action.featureNo + ' does not have source feature ' + action.featureRef.featureNo + "'s value '" + _ops4.valCodex + "' among its visible option values - assignOptionValue will be a no-op (price relevant). Target visible values: " + (targetOps ? Array.from(targetOps.visibleOptionValues.keys()).join(', ') : '<no target>'));
             }
             if (_ops4 !== null && _ops4 !== void 0 && _ops4.valCodex) this.assignOptionValue(action.featureNo.toString(), _ops4.valCodex, isFixed ? 'fix' : 'set');
           } else if (action.optionRef) {
@@ -26008,7 +26128,7 @@ var IDMEngine = /*#__PURE__*/function () {
         this.logPrice(priceFeatureGroup, index);
         if (index !== undefined) {
           var _this$article$catalog, _this$article$catalog4, _priceFeatureGroup$fe, _priceFeatureGroup$fe2;
-          var matichingFinish = priceFeatureGroup.finishes[index];
+          var matichingFinish = priceFeatureGroup.projectFinishes[index];
           var priceKey = 'PRFG' + priceFeatureGroup.priceFeatureGroupNo + '_' + matichingFinish.supplierPriceGroup;
           if (((_this$article$catalog = this.article.catalogArticle.idmPrices) === null || _this$article$catalog === void 0 ? void 0 : _this$article$catalog.prices[priceKey]) === undefined) {
             var _this$article$catalog2, _this$article$catalog3;
@@ -26506,13 +26626,18 @@ var IDMEngine = /*#__PURE__*/function () {
     value: function updateIDMSpecificFeature(myArtOPS) {
       var _myArtOPS$option$idmV, _myArtOPS$option$idmV2, _myArtOPS$option$idmV3, _myArtOPS$option$idmV4, _myArtOPS$option$idmV5;
       if (!this.article.parentHasSameOption(myArtOPS.optionCodex)) return;
+      // The OPV key embeds the option codex as a prefix: "<optionCodex>_<connector>" (e.g. "1089_CT20").
+      // Strip the codex AND the separator so the filter holds the bare connector codex ("CT20").
+      var toConnectorCodex = function toConnectorCodex(key) {
+        return key.startsWith(myArtOPS.optionCodex + '_') ? key.substring(myArtOPS.optionCodex.length + 1) : key;
+      };
       if ([90, 1090].includes((_myArtOPS$option$idmV = myArtOPS.option.idmVariantenArt) !== null && _myArtOPS$option$idmV !== void 0 ? _myArtOPS$option$idmV : 0)) {
         //R (Anschlusstyp R) - AVR
-        this.article.newPossibleAVRFilters = myArtOPS.visibleOPVKeys;
+        this.article.newPossibleAVRFilters = myArtOPS.visibleOPVKeys.map(toConnectorCodex);
       }
       if ([89, 1089].includes((_myArtOPS$option$idmV2 = myArtOPS.option.idmVariantenArt) !== null && _myArtOPS$option$idmV2 !== void 0 ? _myArtOPS$option$idmV2 : 0)) {
         //L (Anschlusstyp L) - AVL
-        this.article.newPossibleAVLFilters = myArtOPS.visibleOPVKeys;
+        this.article.newPossibleAVLFilters = myArtOPS.visibleOPVKeys.map(toConnectorCodex);
       }
       if ([97, 1097].includes((_myArtOPS$option$idmV3 = myArtOPS.option.idmVariantenArt) !== null && _myArtOPS$option$idmV3 !== void 0 ? _myArtOPS$option$idmV3 : 0)) {
         try {
@@ -26876,6 +27001,7 @@ var DivaArticle = /*#__PURE__*/function () {
       partlistDecisionNo: initParams.partlistDecisionNo,
       partListParentArticle: initParams.parentArticle,
       partlistArticleVisibleInTree: initParams.partlistArticleVisibleInTree,
+      posInvisibility: initParams.posInvisibility,
       partlistArticleStandalone: initParams.partlistArticleStandalone,
       partlistGroupPrefix: initParams.partlistGroupPrefix,
       hasPartlistArticle: initParams.hasPartlistArticle ? initParams.hasPartlistArticle : false,
@@ -27028,6 +27154,11 @@ var DivaArticle = /*#__PURE__*/function () {
     get: function get() {
       return this.article.partlistArticleVisibleInTree && this.hasOptionsThatParentDoesNotHave;
     }
+  }, {
+    key: "posInvisibility",
+    get: function get() {
+      return this.article.posInvisibility;
+    }
   }, {
     key: "partlistArticleStandalone",
     get: function get() {
@@ -27951,6 +28082,11 @@ var DivaArticle = /*#__PURE__*/function () {
     get: function get() {
       return this.catalogArticle.bundleRules;
     }
+  }, {
+    key: "addAsZKAT",
+    get: function get() {
+      return this.catalogArticle.addAsZKAT;
+    }
   }, {
     key: "hasPartlistArticleVisibleInTree",
     get: function get() {
@@ -29555,7 +29691,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-acc07376.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-2694fa00.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -29828,7 +29964,7 @@ var DivaArticle = /*#__PURE__*/function () {
       var opv;
       var opt;
       if (ops.val) {
-        var _ops$option$ocd, _ops$option$ocd2, _ops$val$ocd3;
+        var _ops$option$ocd, _ops$option$ocd2, _ops$val$ocd3, _ops$val$properties;
         opt = (this.CatalogData.isIDMFormat ? 'OPT' : '') + ((_ops$option$ocd = ops.option.ocd) !== null && _ops$option$ocd !== void 0 ? _ops$option$ocd : ops.optionCodex);
         opv = (this.CatalogData.isIDMFormat ? 'OPV' + ((_ops$option$ocd2 = ops.option.ocd) !== null && _ops$option$ocd2 !== void 0 ? _ops$option$ocd2 : ops.optionCodex) + '_' : '') + ((_ops$val$ocd3 = ops.val.ocd) !== null && _ops$val$ocd3 !== void 0 ? _ops$val$ocd3 : ops.val.codex);
         if (this.CatalogData.isIDM3DCat && ops.val.vCodex) opv = 'OPV' + ops.idmVariantenArt + '_' + ops.val.vCodex;
@@ -29844,14 +29980,26 @@ var DivaArticle = /*#__PURE__*/function () {
             OPV: ops.freeText
           });
         }
-        if (ops.val.isTexture) {
+        var divaDataEngineMat = (_ops$val$properties = ops.val.properties) === null || _ops$val$properties === void 0 ? void 0 : _ops$val$properties.find(function (prop) {
+          return prop.Codex == "TEXTURENAME";
+        });
+        if (!ret.MAT) {
+          ret.MAT = [];
+        }
+        if (divaDataEngineMat) {
           var _ops$val$name;
-          if (!ret.MAT) {
-            ret.MAT = [];
-          }
           ret.MAT.push({
             OPT: partlistPrefix ? 'OPT' + partlistPrefix + opt.substring(3) : opt,
             N: DivaUtils__default["default"].removeSpecialChars((_ops$val$name = ops.val.name) !== null && _ops$val$name !== void 0 ? _ops$val$name : ''),
+            T: divaDataEngineMat.Name,
+            M: divaDataEngineMat.Value
+          });
+        }
+        if (ops.val.isTexture) {
+          var _ops$val$name2;
+          ret.MAT.push({
+            OPT: partlistPrefix ? 'OPT' + partlistPrefix + opt.substring(3) : opt,
+            N: DivaUtils__default["default"].removeSpecialChars((_ops$val$name2 = ops.val.name) !== null && _ops$val$name2 !== void 0 ? _ops$val$name2 : ''),
             T: ops.val.textureName,
             M: ops.val.material
           });
@@ -31341,6 +31489,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
         supplierOrderCodex: doLoadItem.SupplierOrderCodex,
         initDecisions: doLoadItem.initDecisions,
         partlistArticleVisibleInTree: doLoadItem.PosInvisibility === 0,
+        posInvisibility: doLoadItem.PosInvisibility,
         partlistArticleStandalone: doLoadItem.ConfigurationMode,
         partlistGroupPrefix: doLoadItem.partlistGroupPrefix,
         optionsForPrint: doLoadItem.optionsForPrint,
@@ -31723,6 +31872,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           ArticleCodex: article.articleCodex,
           ConfigArticleCodex: article.configArticleCodex,
           UseTypeNrAsArticleNrEKText: catalogData.useTypeNrAsArticleNrEKText,
+          HideSubPosArticleCodexEKText: catalogData.hideSubPosArticleCodexEKText,
           TypeNr: article.typeNr,
           ArticleEAN: article.articleEAN,
           ArticleGUID: article.articleGUID,
@@ -31762,6 +31912,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           IsPlannerElement: article.hasCatalogPlannerArticle,
           HasPartlistArticle: article.hasPartlistArticle,
           PartlistArticleInvisibility: !article.partlistArticleVisibleInTree && !article.optionsForPrint && !article.partlistArticleStandalone,
+          PosInvisibility: catalogData.addPosInvisibilityToOL ? article.posInvisibility : undefined,
           SendToSAP: article.sendToSap,
           ShelfPlandata: article.shelfPlanner ? DivaUtils__default["default"].encodeBasketJson((_article$shelfPlanner3 = (_article$shelfPlanner4 = article.shelfPlanner) === null || _article$shelfPlanner4 === void 0 ? void 0 : _article$shelfPlanner4.generateShelfPlandata()) !== null && _article$shelfPlanner3 !== void 0 ? _article$shelfPlanner3 : (_article$doorPlanner = article.doorPlanner) === null || _article$doorPlanner === void 0 ? void 0 : _article$doorPlanner.getMovedData(article.basketId)) : undefined,
           MetaData: !hasFavorites ? article.MetaData : undefined,
@@ -34764,7 +34915,7 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
                   if (targetArticle[opt] && !variantValues[opt]) variantValues[opt] = targetArticle[opt];
                 }
               }
-              configVariant = new basketModel.ConfigVariantData(variant.id, set.setName, set.setName_locales, setImage, (_hQRenderScript = hQRenderScript) === null || _hQRenderScript === void 0 ? void 0 : _hQRenderScript._id, DivaUtils__default["default"].encodeBase64(set.plannerHandler.getProject3D(set.getSetId())), set.getVariantsDescription(), set.SetArticleNr, set.getSetPrice(), set.setHash, 1, set.getVariantBasketData(), articleHandlerInstance.getCompactOrderLine(_objectSpread$g(_objectSpread$g({}, set.getDivaArticles()), set.getPartlistArticlesOfSet())), variantValues, summaryHandlerInstance.convertSummaryItemsToSummaryInfo(set), plannerData != undefined ? DivaUtils__default["default"].encodeBase64(JSON.stringify(plannerData)) : '', urlToPlanning2D, setHandlerInstance.getBBoxObject(set, dimensions), set.getBruttoSetPrice(), undefined, undefined, set.MetaData, set.MetaData_locales, DivaUtils__default["default"].stripTagsFromDict(set.getVariantsDescription_locales()), (_basket$OrderSets$set = basket.OrderSets[setindex].ConfigVariants) === null || _basket$OrderSets$set === void 0 || (_basket$OrderSets$set = _basket$OrderSets$set[set.basketConfigVariants.length]) === null || _basket$OrderSets$set === void 0 ? void 0 : _basket$OrderSets$set.SetOrderText, (_basket$OrderSets$set2 = basket.OrderSets[setindex].ConfigVariants) === null || _basket$OrderSets$set2 === void 0 || (_basket$OrderSets$set2 = _basket$OrderSets$set2[set.basketConfigVariants.length]) === null || _basket$OrderSets$set2 === void 0 ? void 0 : _basket$OrderSets$set2.SetOrderText_locales);
+              configVariant = new basketModel.ConfigVariantData(variant.id, set.setName, set.setName_locales, setImage, (_hQRenderScript = hQRenderScript) === null || _hQRenderScript === void 0 ? void 0 : _hQRenderScript._id, DivaUtils__default["default"].encodeBase64(set.plannerHandler.getProject3D(set.getSetId()), set.CatalogData.isIDM3DCat), set.getVariantsDescription(), set.SetArticleNr, set.getSetPrice(), set.setHash, 1, set.getVariantBasketData(), articleHandlerInstance.getCompactOrderLine(_objectSpread$g(_objectSpread$g({}, set.getDivaArticles()), set.getPartlistArticlesOfSet())), variantValues, summaryHandlerInstance.convertSummaryItemsToSummaryInfo(set), plannerData != undefined ? DivaUtils__default["default"].encodeBase64(JSON.stringify(plannerData), set.CatalogData.isIDM3DCat) : '', urlToPlanning2D, setHandlerInstance.getBBoxObject(set, dimensions), set.getBruttoSetPrice(), undefined, undefined, set.MetaData, set.MetaData_locales, DivaUtils__default["default"].stripTagsFromDict(set.getVariantsDescription_locales()), (_basket$OrderSets$set = basket.OrderSets[setindex].ConfigVariants) === null || _basket$OrderSets$set === void 0 || (_basket$OrderSets$set = _basket$OrderSets$set[set.basketConfigVariants.length]) === null || _basket$OrderSets$set === void 0 ? void 0 : _basket$OrderSets$set.SetOrderText, (_basket$OrderSets$set2 = basket.OrderSets[setindex].ConfigVariants) === null || _basket$OrderSets$set2 === void 0 || (_basket$OrderSets$set2 = _basket$OrderSets$set2[set.basketConfigVariants.length]) === null || _basket$OrderSets$set2 === void 0 ? void 0 : _basket$OrderSets$set2.SetOrderText_locales);
               set.basketConfigVariants.push(configVariant);
             case 32:
             case "end":
@@ -35216,8 +35367,9 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       }
       var configInAccessoire = set.configAccessoiresInAccessoireStep;
       var configInAccessoireAndTree = set.CatalogData.configAccessoires && !article.isShelfAccessoire;
+      var isRelatedAccessoire = !!article.relatedToBasketId && !(article.isPartListArticle && article.partlistArticleVisibleInTree);
       //give this step a unique key so it is not merged with any option of te main article
-      if (configInAccessoire && !!(article !== null && article !== void 0 && article.relatedToBasketId)) {
+      if (configInAccessoire && isRelatedAccessoire) {
         if (configInAccessoireAndTree) {
           //remember old configStepKey to push basketId to its targetArticles anyways
           mainConfigStepKey = configStepKey;
@@ -35226,7 +35378,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       }
       var plaBasketIds = Object.keys(articles[basketId].getRecursivePartlistArticles(true, true));
       var singleOPVOnly = ops.visibleCount == 1 && !ops.isFreeText && !set.CatalogData.dontHideOption.includes(ops.option.codex) && !((_set$ViewConfig4 = set.ViewConfig) !== null && _set$ViewConfig4 !== void 0 && _set$ViewConfig4.showSingleOPVOnly);
-      var isAccessoire = !!article.relatedToBasketId ? article.articleCodex : false;
+      var isAccessoire = isRelatedAccessoire ? article.articleCodex : false;
       if (!configTree.getTabGroupByCodex(tabGroupCodex)) {
         var newTabGroup = this.createTabGroup(tabGroupCodex, tabGroupTitel, 'OPTION', configTree);
         configTree.addTabGroup(tabGroupCodex, newTabGroup);
@@ -37577,7 +37729,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context5.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-fa73b631.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-e8e8ec7c.js'); });
             case 3:
               _yield$import = _context5.sent;
               DoorPlanner = _yield$import["default"];
@@ -39103,7 +39255,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 }
               }
               if (!(from !== 'toDeleteShelf')) {
-                _context14.next = 15;
+                _context14.next = 16;
                 break;
               }
               set.addArticle(newArticle);
@@ -39111,7 +39263,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               return articleHandlerInstance.toDoAfterArticleLoaded(newArticle, defaultHeaderValues, {}, from, undefined, ignorePlanner);
             case 15:
               if (newArticle.relatedToBasketId) {
-                LOG$9.businessEvent('onClickAccesorie', 'Planner', 'Accesorie wurde geplant', {
+                LOG$9.businessEvent('onClickAccesorie', 'Planner', 'Accessoire wurde geplant', {
                   article: {
                     articleCodex: articleCodex,
                     articleName: newArticle.name
@@ -39125,6 +39277,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                   }
                 });
               }
+            case 16:
               return _context14.abrupt("return", newArticle);
             case 17:
             case "end":
@@ -41140,7 +41293,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               break;
             case 32:
               //fill diva3DProject for renderings & AR Converter
-              basketData.Diva3DProject = DivaUtils__default["default"].encodeBase64(set === null || set === void 0 ? void 0 : set.plannerHandler.getProject3D());
+              basketData.Diva3DProject = DivaUtils__default["default"].encodeBase64(set === null || set === void 0 ? void 0 : set.plannerHandler.getProject3D(), set === null || set === void 0 ? void 0 : set.CatalogData.isIDM3DCat);
               i = 0;
             case 34:
               if (!(i < ((_basketData$OrderSets = basketData.OrderSets) === null || _basketData$OrderSets === void 0 ? void 0 : _basketData$OrderSets.length))) {
@@ -41601,7 +41754,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 FavoriteAiRoomKeys: set.getAiImagesAsJpg().map(function (img) {
                   return img.promptId;
                 }),
-                SetPlanData: plannerData != undefined ? DivaUtils__default["default"].encodeBase64(JSON.stringify(plannerData)) : '',
+                SetPlanData: plannerData != undefined ? DivaUtils__default["default"].encodeBase64(JSON.stringify(plannerData), catalogData.isIDM3DCat) : '',
                 SetID: set.getSetId(),
                 SetName: set.setName,
                 SetName_locales: set.setName_locales,
@@ -43051,7 +43204,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context12.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-5ebc0e14.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-d566562f.js'); });
             case 5:
               _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -43059,7 +43212,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 9:
               _context12.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-7d16f2f9.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-bf59df95.js'); });
             case 11:
               _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -43067,7 +43220,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 15:
               _context12.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-7563aaa9.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-e037310e.js'); });
             case 17:
               _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -43075,7 +43228,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 21:
               _context12.next = 23;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-abd363ef.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-07940a73.js'); });
             case 23:
               _yield$import4 = _context12.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -44499,7 +44652,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-b0567441.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-b148cbae.js'); });
             case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -46185,7 +46338,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context5.next = 10;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-f389ef1a.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-732f9d86.js'); });
             case 10:
               _yield$import = _context5.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -46196,7 +46349,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context5.abrupt("break", 21);
             case 15:
               _context5.next = 17;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-2e2137f1.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-fc71667b.js'); });
             case 17:
               _yield$import2 = _context5.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -47340,7 +47493,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
         },
         updatePlannerMsgContainer: function updatePlannerMsgContainer() {}
       });
-      var setData = DivaUtils__default["default"].encodeBase64(JSON.stringify(set.plannerHandler.savePlanner(origSet.getSetId())));
+      var setData = DivaUtils__default["default"].encodeBase64(JSON.stringify(set.plannerHandler.savePlanner(origSet.getSetId())), set.CatalogData.isIDM3DCat);
       this.plannerList.forEach(function (v) {
         clone.plannerList.set(set.getSetId(), v.clonePlanner(set, _this6.plannerIDCount, setData));
         _this6.plannerIDCount++;
@@ -48159,12 +48312,14 @@ var DivaWebPlanner = /*#__PURE__*/function () {
             case 12:
               loadSuccessful = _context14.sent;
               if (this.plannerConfig.configuratorSessionId) {
-                //force new configurator session id - Landingpage case
+                // ID forced from outside (Landingpage, PDP, Planung-ändern)
                 DivaUtils__default["default"].businessMetrics.setConfiguratorSessionId(this.plannerConfig.configuratorSessionId);
-              } else {
-                // Only create a new configurator session if we don't already have one. This keeps the analytics
-                // session stable across re-inits (e.g. switching products inside the same catalog).
+              } else if (cache !== undefined) {
+                // Re-init with cache (Variant Select): keep existing session stable
                 DivaUtils__default["default"].businessMetrics.setConfiguratorSessionId(undefined, true);
+              } else {
+                // Fresh start (new catalog, archive basket, etc.): always new UUID
+                DivaUtils__default["default"].businessMetrics.setConfiguratorSessionId();
               }
               if (!loadSuccessful) {
                 _context14.next = 31;
@@ -50780,7 +50935,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           article_nested: articles
         }
       });
-      LOG$2.businessEvent('onActualBasketValue', 'Planner', 'Aktueller Basket Value:' + actualBasketvalue, {
+      LOG$2.businessEvent('onActualBasketValue', 'Planner', 'Aktueller Basket Value: ' + actualBasketvalue, {
         basketValue: actualBasketvalue,
         isInit: isInit
       });
@@ -50844,11 +50999,11 @@ var DivaWebPlanner = /*#__PURE__*/function () {
           }
         }
       }
-      LOG$2.businessEvent(action, 'Planner', 'Configurator wurde verändert', {
+      LOG$2.businessEvent(action, 'Planner', 'Konfigurator wurde verändert', {
         explicitlySetConfiguration: explicitlySetConfiguration,
         wholeConfiguration: finalConfiguration
       });
-      LOG$2.businessEvent('onActualBasketValue', 'Planner', 'Aktueller Basket Value:' + actualBasketvalue, {
+      LOG$2.businessEvent('onActualBasketValue', 'Planner', 'Aktueller Basket Value: ' + actualBasketvalue, {
         basketValue: actualBasketvalue,
         isInit: isInit
       });