npm - @crystaldesign/diva-seller - Versions diffs - 24.12.0-beta.9 → 24.13.0-beta.1 - Mend

@crystaldesign/diva-seller 24.12.0-beta.9 → 24.13.0-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (190) hide show

package/build/esm/index.js CHANGED Viewed

@@ -38,7 +38,7 @@ import AddCircleIcon from '@material-ui/icons/AddCircle';
 import RemoveIcon from '@material-ui/icons/Remove';
 import LocalOfferIcon from '@material-ui/icons/LocalOffer';
 import IconButton from '@material-ui/core/IconButton';
-import NumberFormat from 'react-number-format';
+import { NumericFormat } from 'react-number-format';
 import Divider from '@material-ui/core/Divider';
 import Form from '@crystaldesign/forms';
 import _typeof from '@babel/runtime/helpers/typeof';
@@ -55,6 +55,7 @@ import Input from '@material-ui/core/Input';
 import { ErrorBoundary } from 'react-error-boundary';
 import CloseIcon from '@material-ui/icons/Close';
 import classnames from 'classnames';
+import Tooltip from '@material-ui/core/Tooltip';
 import { useTranslation as useTranslation$1 } from 'react-i18next';
 import AddCircleOutlineOutlinedIcon from '@material-ui/icons/AddCircleOutlineOutlined';
 import AmbienteSelection from '@crystaldesign/room-selection';
@@ -72,6 +73,11 @@ import Carousel from 'react-material-ui-carousel';
 import Toolbar from '@material-ui/core/Toolbar';
 import { Swiper, SwiperSlide } from 'swiper/react';
 import { Autoplay, Thumbs, Pagination, FreeMode } from 'swiper/modules';
+import 'swiper/css';
+import 'swiper/css/pagination';
+import 'swiper/css/autoplay';
+import 'swiper/css/thumbs';
+import 'swiper/css/free-mode';
 import '@babel/runtime/helpers/objectDestructuringEmpty';
 import PropTypes from 'prop-types';
 import ProductsComponent, { useProductState as useProductState$1 } from '@crystaldesign/products-component';
@@ -80,12 +86,11 @@ import Tab$1 from '@material-ui/core/Tab';
 import Tabs$1 from '@material-ui/core/Tabs';
 import Autocomplete$1 from '@material-ui/lab/Autocomplete';
 import { TRANSLATED_FILEDS, ProductHandlerAbstract } from '@crystaldesign/product-handler';
-import { Editor } from '@tinymce/tinymce-react';
+import RTFEditor from '@crystaldesign/rtf-editor';
 import { Remove, Add, Delete } from '@material-ui/icons';
 import CardHeader$1 from '@material-ui/core/CardHeader';
 import CardContent$1 from '@material-ui/core/CardContent';
 import Menu from '@material-ui/core/Menu';
-import Tooltip from '@material-ui/core/Tooltip';
 import Collapse from '@material-ui/core/Collapse';
 import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
@@ -468,11 +473,11 @@ function breadcrumbCollection() {
   };
 }
-function ownKeys$F(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$F(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$F(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$F(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$G(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$G(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$G(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$G(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var reducer$1 = function reducer(state, action) {
   if (action.type == 'update') {
-    var newState = _objectSpread$F({}, state);
+    var newState = _objectSpread$G({}, state);
     action.payload.forEach(function (p) {
       if (p.field == 'basketState') {
         if (p.value) {
@@ -979,24 +984,18 @@ function apiLoadBasket(_x8) {
 }
 function _apiLoadBasket() {
   _apiLoadBasket = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8(_ref8) {
-    var divaNr, apiConfig, customProductId, jwt, fullUrl, _divaNr$split, _divaNr$split2, DivaNrAndDoc, variantId, _DivaNrAndDoc$split, _DivaNrAndDoc$split2, _onlyDivaNr, _version, _divaNr$split3, _divaNr$split4, onlyDivaNr, version, response, basket, key, value, _response, result, _basket;
+    var divaNr, apiConfig, customProductId, jwt, fullUrl, _divaNr$split, _divaNr$split2, onlyDivaNr, version, response, basket, key, value, _response, result, _basket;
     return _regeneratorRuntime.wrap(function _callee8$(_context8) {
       while (1) switch (_context8.prev = _context8.next) {
         case 0:
           divaNr = _ref8.divaNr, apiConfig = _ref8.apiConfig, customProductId = _ref8.customProductId, jwt = _ref8.jwt;
           if (!divaNr) {
-            _context8.next = 12;
+            _context8.next = 11;
             break;
           }
-          //if divaNr is a variant of a divaNr (saves with favorites) divaNr looks like: "Diva-123456_0001". Here we got do build the querystring differently
-          if (divaNr.includes('_') && divaNr.substring(divaNr.indexOf('_') + 1).length == 4) {
-            _divaNr$split = divaNr.split('_'), _divaNr$split2 = _slicedToArray(_divaNr$split, 2), DivaNrAndDoc = _divaNr$split2[0], variantId = _divaNr$split2[1];
-            _DivaNrAndDoc$split = DivaNrAndDoc.split('-'), _DivaNrAndDoc$split2 = _slicedToArray(_DivaNrAndDoc$split, 3), _onlyDivaNr = _DivaNrAndDoc$split2[1], _version = _DivaNrAndDoc$split2[2];
-            fullUrl = apiConfig.basketService + '/baskets/configuration?divaNr=' + 'DIVA-' + _onlyDivaNr + (_version ? '&version=' + _version : '') + ('&variantId=' + Number(variantId));
-          }
-          _divaNr$split3 = divaNr.split('-'), _divaNr$split4 = _slicedToArray(_divaNr$split3, 3), onlyDivaNr = _divaNr$split4[1], version = _divaNr$split4[2];
+          _divaNr$split = divaNr.split('-'), _divaNr$split2 = _slicedToArray(_divaNr$split, 3), onlyDivaNr = _divaNr$split2[1], version = _divaNr$split2[2];
           fullUrl = apiConfig.basketService + '/baskets/configuration?divaNr=' + 'DIVA-' + onlyDivaNr + (version ? '&version=' + version : '');
-          _context8.next = 7;
+          _context8.next = 6;
           return fetch(fullUrl, {
             headers: {
               Authorization: 'Bearer ' + jwt
@@ -1004,7 +1003,7 @@ function _apiLoadBasket() {
           }).then(function (res) {
             return res.json();
           });
-        case 7:
+        case 6:
           response = _context8.sent;
           basket = new BasketData(response.basket);
           return _context8.abrupt("return", {
@@ -1012,15 +1011,15 @@ function _apiLoadBasket() {
             newestDocumentVersion: Number(response.newestDocumentVersion),
             sourceOrganization: response.sourceOrganization
           });
-        case 12:
+        case 11:
           if (!customProductId) {
-            _context8.next = 26;
+            _context8.next = 25;
             break;
           }
           key = 'customData.SAP_MARA_MATNR.value';
           value = customProductId;
           fullUrl = apiConfig.catalogService + "/v1/products/basket?key=".concat(key, "&value=").concat(value, "&repair=true");
-          _context8.next = 18;
+          _context8.next = 17;
           return fetch(fullUrl, {
             method: 'POST',
             headers: {
@@ -1029,11 +1028,11 @@ function _apiLoadBasket() {
             },
             body: JSON.stringify({})
           });
-        case 18:
+        case 17:
           _response = _context8.sent;
-          _context8.next = 21;
+          _context8.next = 20;
           return _response.json();
-        case 21:
+        case 20:
           result = _context8.sent;
           _basket = new BasketData(result.basket);
           return _context8.abrupt("return", {
@@ -1041,9 +1040,9 @@ function _apiLoadBasket() {
             newestDocumentVersion: Number(result.newestDocumentVersion),
             sourceOrganization: result.sourceOrganization
           });
-        case 26:
+        case 25:
           throw new Error('apiLoadBasket was called without any information to load basket');
-        case 27:
+        case 26:
         case "end":
           return _context8.stop();
       }
@@ -1679,8 +1678,8 @@ var _excluded$e = ["collectionId"],
 function _createForOfIteratorHelper$5(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$5(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$5(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$5(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$5(r, a) : void 0; } }
 function _arrayLikeToArray$5(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function ownKeys$E(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$E(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$E(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$E(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$F(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$F(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$F(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$F(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$f = getLogger('Seller', 'SellerStateData');
 function useSellerStateData(_ref) {
   var sessionGuid = _ref.sessionGuid,
@@ -1810,7 +1809,7 @@ function useSellerStateData(_ref) {
               }]
             });
           case 7:
-            return _context.abrupt("return", processData(_objectSpread$E(_objectSpread$E({}, props), {}, {
+            return _context.abrupt("return", processData(_objectSpread$F(_objectSpread$F({}, props), {}, {
               data: collections
             })));
           case 10:
@@ -1874,7 +1873,7 @@ function useSellerStateData(_ref) {
             updateAcountLogo((_state$collections = state.collections) === null || _state$collections === void 0 || (_state$collections = _state$collections.find(function (c) {
               return c.id == collectionId;
             })) === null || _state$collections === void 0 ? void 0 : _state$collections.accountLogo);
-            return _context2.abrupt("return", processData(_objectSpread$E(_objectSpread$E({}, props), {}, {
+            return _context2.abrupt("return", processData(_objectSpread$F(_objectSpread$F({}, props), {}, {
               data: catalogs || []
             })));
           case 14:
@@ -2261,8 +2260,8 @@ function useSellerStateData(_ref) {
             _context7.next = 22;
             return apiLoadBasket({
               divaNr: divaNr,
-              apiConfig: _objectSpread$E(_objectSpread$E({}, apiConfig), {}, {
-                api2: _objectSpread$E(_objectSpread$E({}, apiConfig.api2), {}, {
+              apiConfig: _objectSpread$F(_objectSpread$F({}, apiConfig), {}, {
+                api2: _objectSpread$F(_objectSpread$F({}, apiConfig.api2), {}, {
                   "default": state.firstLoginApiUrl
                 })
               }),
@@ -2593,7 +2592,7 @@ function useSellerStateData(_ref) {
               }]
             });
           case 24:
-            return _context9.abrupt("return", processData(_objectSpread$E(_objectSpread$E({}, props), {}, {
+            return _context9.abrupt("return", processData(_objectSpread$F(_objectSpread$F({}, props), {}, {
               data: articles || []
             })));
           case 27:
@@ -2725,8 +2724,8 @@ function useSellerStateData(_ref) {
 }
 var _excluded$d = ["state", "setFirstLoginApiUrl", "updateBasketState", "setPlannerParams", "setReturnTo", "setOriginProductId", "setProductCategories", "resetState", "resetForCache"];
-function ownKeys$D(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$D(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$D(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$D(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$E(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$E(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$E(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$E(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$e = getLogger('Seller', 'SellerStateProvider');
 var SellerStateProvider = function SellerStateProvider(_ref) {
   var children = _ref.children,
@@ -3090,7 +3089,7 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
               _context4.next = 8;
               break;
             }
-            params = _objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D({
+            params = _objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E({
               catalogCodex: catalogCodex
             }, accountId ? {
               accountId: accountId
@@ -3105,13 +3104,13 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
             } : {}), retailArticleNr ? {
               retailArticleNr: retailArticleNr
             } : {});
-            internal = _objectSpread$D(_objectSpread$D({}, forceReload ? {
+            internal = _objectSpread$E(_objectSpread$E({}, forceReload ? {
               forceReload: forceReload
             } : {}), {}, {
               accountSessionGuid: accountSessionGuid,
               basketData: basketData
             });
-            setPlannerParams(_objectSpread$D(_objectSpread$D({}, params), {}, {
+            setPlannerParams(_objectSpread$E(_objectSpread$E({}, params), {}, {
               internal: internal
             }));
             openComponent({
@@ -3143,7 +3142,7 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
                       updateBasketState({
                         concat: true
                       });
-                      var _params = _objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D({}, catalogCodex ? {
+                      var _params = _objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E({}, catalogCodex ? {
                         catalogCodex: catalogCodex
                       } : {}), accountId ? {
                         accountId: accountId
@@ -3160,12 +3159,12 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
                       } : {}), productId ? {
                         productId: productId
                       } : {});
-                      var _internal = _objectSpread$D(_objectSpread$D({}, forceReload ? {
+                      var _internal = _objectSpread$E(_objectSpread$E({}, forceReload ? {
                         forceReload: forceReload
                       } : {}), {}, {
                         accountSessionGuid: accountSessionGuid
                       });
-                      setPlannerParams(_objectSpread$D(_objectSpread$D({}, _params), {}, {
+                      setPlannerParams(_objectSpread$E(_objectSpread$E({}, _params), {}, {
                         internal: _internal
                       }));
                       openComponent({
@@ -3198,7 +3197,7 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
                 });
               }
             } else {
-              _params2 = _objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D({}, catalogCodex ? {
+              _params2 = _objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E({}, catalogCodex ? {
                 catalogCodex: catalogCodex
               } : {}), accountId ? {
                 accountId: accountId
@@ -3213,12 +3212,12 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
               } : {}), retailArticleNr ? {
                 retailArticleNr: retailArticleNr
               } : {});
-              _internal2 = _objectSpread$D(_objectSpread$D({}, forceReload ? {
+              _internal2 = _objectSpread$E(_objectSpread$E({}, forceReload ? {
                 forceReload: forceReload
               } : {}), {}, {
                 accountSessionGuid: accountSessionGuid
               });
-              setPlannerParams(_objectSpread$D(_objectSpread$D({}, _params2), {}, {
+              setPlannerParams(_objectSpread$E(_objectSpread$E({}, _params2), {}, {
                 internal: _internal2
               }));
               openComponent({
@@ -3254,7 +3253,7 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
               divaNr: divaNr,
               returnTo: returnTo
             };
-            setPlannerParams(_objectSpread$D(_objectSpread$D({}, _params3), {}, {
+            setPlannerParams(_objectSpread$E(_objectSpread$E({}, _params3), {}, {
               internal: {
                 basketData: basketData,
                 forceReload: forceReload
@@ -3302,7 +3301,7 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
       step: null,
       assignNewDivaNr: false
     });
-    var params = _objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D({}, catalogCodex ? {
+    var params = _objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E({}, catalogCodex ? {
       catalogCodex: catalogCodex
     } : {}), accountId ? {
       accountId: accountId
@@ -3317,12 +3316,12 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
     } : {}), retailArticleNr ? {
       retailArticleNr: retailArticleNr
     } : {});
-    var internal = _objectSpread$D(_objectSpread$D({}, forceReload ? {
+    var internal = _objectSpread$E(_objectSpread$E({}, forceReload ? {
       forceReload: forceReload
     } : {}), {}, {
       accountSessionGuid: accountSessionGuid
     });
-    setPlannerParams(_objectSpread$D(_objectSpread$D({}, params), {}, {
+    setPlannerParams(_objectSpread$E(_objectSpread$E({}, params), {}, {
       internal: internal
     }));
     openComponent({
@@ -3370,7 +3369,7 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
               case 'toPlanner':
                 {
                   if (plannerParams) {
-                    var params = _objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D({}, plannerParams.catalogCodex ? {
+                    var params = _objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E({}, plannerParams.catalogCodex ? {
                       catalogCodex: plannerParams.catalogCodex
                     } : {}), plannerParams.accountId ? {
                       accountId: plannerParams.accountId
@@ -3383,12 +3382,12 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
                     } : {}), plannerParams.retailArticleNr ? {
                       retailArticleNr: plannerParams.retailArticleNr
                     } : {});
-                    var internal = _objectSpread$D(_objectSpread$D({}, plannerParams.forceReload ? {
+                    var internal = _objectSpread$E(_objectSpread$E({}, plannerParams.forceReload ? {
                       forceReload: plannerParams.forceReload
                     } : {}), {}, {
                       accountSessionGuid: plannerParams.accountSessionGuid
                     });
-                    setPlannerParams(_objectSpread$D(_objectSpread$D({}, params), {}, {
+                    setPlannerParams(_objectSpread$E(_objectSpread$E({}, params), {}, {
                       internal: internal
                     }));
                     openComponent({
@@ -3415,8 +3414,8 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
             _context5.next = 2;
             return apiLoadBasket({
               divaNr: divaNr,
-              apiConfig: _objectSpread$D(_objectSpread$D({}, apiConfig), {}, {
-                api2: _objectSpread$D(_objectSpread$D({}, apiConfig.api2), {}, {
+              apiConfig: _objectSpread$E(_objectSpread$E({}, apiConfig), {}, {
+                api2: _objectSpread$E(_objectSpread$E({}, apiConfig.api2), {}, {
                   "default": state.firstLoginApiUrl
                 })
               }),
@@ -3485,7 +3484,7 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
       originProductId: state.originProductId,
       productCategories: state.productCategories
     },
-    actions: _objectSpread$D(_objectSpread$D({}, stateFunctions), {}, {
+    actions: _objectSpread$E(_objectSpread$E({}, stateFunctions), {}, {
       openComponent: openComponent,
       openModal: openModal,
       openPlanner: openPlanner,
@@ -3509,13 +3508,13 @@ var useSellerState = function useSellerState() {
 };
 function Badge3D() {
-  var classes = useStyles$7();
+  var classes = useStyles$9();
   return /*#__PURE__*/jsx("span", {
     className: classes.root,
     children: "3D"
   });
 }
-var useStyles$7 = makeStyles(function () {
+var useStyles$9 = makeStyles(function () {
   return createStyles({
     root: {
       position: 'absolute',
@@ -3533,8 +3532,8 @@ var useStyles$7 = makeStyles(function () {
   });
 });
-function ownKeys$C(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$C(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$C(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$C(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$D(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$D(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$D(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$D(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function Title(_ref) {
   var text = _ref.text,
     children = _ref.children,
@@ -3544,7 +3543,7 @@ function Title(_ref) {
       variant: "h4",
       component: "h2",
       children: text
-    }), help && /*#__PURE__*/jsx(HelpButton, _objectSpread$C({}, help)), /*#__PURE__*/jsx("div", {
+    }), help && /*#__PURE__*/jsx(HelpButton, _objectSpread$D({}, help)), /*#__PURE__*/jsx("div", {
       style: {
         flex: 1
       }
@@ -3562,8 +3561,8 @@ function getImageOrFallbackUrl(url) {
   return url || 'https://cdn.diva-portal.com/static/images/image_placeholder-landscape-short.png';
 }
-function ownKeys$B(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$B(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$B(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$B(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$C(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$C(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$C(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$C(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$d = getLogger('SellerCatalogs', 'Catalogs');
 function Catalogs(_ref) {
   var _configurationData$an, _configurationData$ca5, _configurationData$an3, _configurationData$an4;
@@ -3693,7 +3692,7 @@ function Catalogs(_ref) {
             if (configurationData !== null && configurationData !== void 0 && (_configurationData$ca = configurationData.catalogs) !== null && _configurationData$ca !== void 0 && _configurationData$ca.onOpen) {
               action = configurationData === null || configurationData === void 0 || (_configurationData$ca2 = configurationData.catalogs) === null || _configurationData$ca2 === void 0 ? void 0 : _configurationData$ca2.onOpen;
               if (!action.url) {
-                action = _objectSpread$B({}, action);
+                action = _objectSpread$C({}, action);
                 parameters = {};
                 Object.entries(action.parameters || {}).forEach(function (_ref4) {
                   var _ref5 = _slicedToArray(_ref4, 2),
@@ -3709,7 +3708,7 @@ function Catalogs(_ref) {
             } else {
               openComponent({
                 type: 'SELLER',
-                parameters: _objectSpread$B({
+                parameters: _objectSpread$C({
                   module: 'Info',
                   catalogCodex: item.codex
                 }, item.accountId ? {
@@ -4116,7 +4115,9 @@ function Collections() {
           },
           variant: "subtitle1",
           color: "textSecondary",
-          children: [t("data.".concat(row.values['type']), row.values['type']), " (", row.subRows.length, ")"]
+          children: [t("data.".concat(row.values['type']), {
+            defaultValue: row.values['type']
+          }), " (", row.subRows.length, ")"]
         })
       })
     });
@@ -4535,8 +4536,8 @@ function Header(_ref) {
   });
 }
-function ownKeys$A(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$A(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$A(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$A(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$B(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$B(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$B(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$B(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function MenuListComposition(_ref) {
   var setId = _ref.setId,
     visibile = _ref.visibile,
@@ -4616,7 +4617,7 @@ function MenuListComposition(_ref) {
         children: function children(_ref2) {
           var TransitionProps = _ref2.TransitionProps,
             placement = _ref2.placement;
-          return /*#__PURE__*/jsx(Grow, _objectSpread$A(_objectSpread$A({}, TransitionProps), {}, {
+          return /*#__PURE__*/jsx(Grow, _objectSpread$B(_objectSpread$B({}, TransitionProps), {}, {
             style: {
               transformOrigin: placement === 'bottom' ? 'right top' : 'right bottom'
             },
@@ -4697,8 +4698,8 @@ function Images(_ref) {
   });
 }
-function ownKeys$z(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$z(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$z(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$z(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$A(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$A(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$A(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$A(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var OpvImage = function OpvImage(_ref) {
   var src = _ref.src;
   var _useHover = useHover({
@@ -4716,15 +4717,15 @@ var OpvImage = function OpvImage(_ref) {
     layerProps = _useLayer.layerProps,
     triggerProps = _useLayer.triggerProps;
   return /*#__PURE__*/jsxs(Fragment, {
-    children: [/*#__PURE__*/jsx("img", _objectSpread$z(_objectSpread$z(_objectSpread$z({}, triggerProps), hoverProps), {}, {
+    children: [/*#__PURE__*/jsx("img", _objectSpread$A(_objectSpread$A(_objectSpread$A({}, triggerProps), hoverProps), {}, {
       src: src,
       style: {
         width: '20px'
       }
-    })), isOpen && (renderLayer === null || renderLayer === void 0 ? void 0 : renderLayer(/*#__PURE__*/jsx("img", _objectSpread$z(_objectSpread$z({
+    })), isOpen && (renderLayer === null || renderLayer === void 0 ? void 0 : renderLayer(/*#__PURE__*/jsx("img", _objectSpread$A(_objectSpread$A({
       src: src.replace('_gal.', '.')
     }, layerProps), {}, {
-      style: _objectSpread$z({
+      style: _objectSpread$A({
         width: '300px'
       }, layerProps.style)
     }))))]
@@ -4737,7 +4738,7 @@ function SetTable(_ref) {
     visibile = _ref.visibile;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var classes = useStyles$6();
+  var classes = useStyles$8();
   var _useSellerState = useSellerState(),
     _useSellerState$state = _useSellerState.state,
     doShowPrices = _useSellerState$state.doShowPrices,
@@ -5048,7 +5049,7 @@ function SetTable(_ref) {
     })
   });
 }
-var useStyles$6 = makeStyles({
+var useStyles$8 = makeStyles({
   table: {
     minWidth: 650
   }
@@ -5132,8 +5133,8 @@ function Set$1(_ref) {
 }
 var _excluded$c = ["onValueChange", "value"];
-function ownKeys$y(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$y(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$y(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$y(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$z(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$z(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$z(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$z(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function DiscountField (_ref) {
   var _ref2;
   var updateDiscount = _ref.updateDiscount,
@@ -5148,7 +5149,7 @@ function DiscountField (_ref) {
       display: 'flex',
       justifyContent: 'flex-end'
     },
-    children: [/*#__PURE__*/jsx(ControlledNumberFormat$1, {
+    children: [/*#__PURE__*/jsx(NumericFormat, {
       style: {
         marginRight: 10
       },
@@ -5219,7 +5220,7 @@ function ControlledNumberFormat$1(_ref3) {
   useEffect(function () {
     setValue(origValue);
   }, [origValue]);
-  return /*#__PURE__*/jsx(NumberFormat, _objectSpread$y(_objectSpread$y({}, props), {}, {
+  return /*#__PURE__*/jsx(NumericFormat, _objectSpread$z(_objectSpread$z({}, props), {}, {
     placeholder: props.suffix,
     value: value === 0 ? undefined : value,
     customInput: StyledTextFiled$1,
@@ -5244,8 +5245,8 @@ var StyledTextFiled$1 = withStyles({
 })(TextField);
 var _excluded$b = ["onValueChange", "value"];
-function ownKeys$x(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$x(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$x(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$x(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$y(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$y(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$y(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$y(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function AdditionalPriceField (_ref) {
   var updatePrice = _ref.updatePrice,
     price = _ref.price,
@@ -5323,7 +5324,7 @@ function ControlledNumberFormat(_ref2) {
   useEffect(function () {
     setValue(origValue);
   }, [origValue]);
-  return /*#__PURE__*/jsx(NumberFormat, _objectSpread$x(_objectSpread$x({}, props), {}, {
+  return /*#__PURE__*/jsx(NumericFormat, _objectSpread$y(_objectSpread$y({}, props), {}, {
     placeholder: '0 ' + DivaUtils$1.defaultPriceFormat.currency,
     value: value,
     customInput: StyledTextFiled,
@@ -5787,7 +5788,8 @@ function Step2ClientData(_ref) {
 function StatusMenu(_ref) {
   var visibleStatus = _ref.visibleStatus,
     status = _ref.status,
-    setStatus = _ref.setStatus;
+    setStatus = _ref.setStatus,
+    productSaved = _ref.productSaved;
   var handleClick = function handleClick(item) {
     setStatus(item);
   };
@@ -5812,6 +5814,7 @@ function StatusMenu(_ref) {
           onClick: function onClick() {
             return handleClick(item);
           },
+          disabled: productSaved && item !== 'BASE_CONFIGURATION',
           children: t('data.' + item, item)
         }, item);
       })
@@ -5819,7 +5822,7 @@ function StatusMenu(_ref) {
   });
 }
-var useStyles$5 = makeStyles$1(function (theme) {
+var useStyles$7 = makeStyles$1(function (theme) {
   return createStyles$1({
     margin: {
       margin: theme.spacing(1)
@@ -5838,7 +5841,7 @@ function SaveButtonsGroup(_ref) {
     userInfoPresent = _ref.userInfoPresent;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var classes = useStyles$5();
+  var classes = useStyles$7();
   return /*#__PURE__*/jsxs("div", {
     style: {
       marginTop: '0.4rem',
@@ -6233,8 +6236,8 @@ function styleInject(css, ref) {
 }
 var variantsTable = "variants-table-vIkjW";
-var css_248z$f = ".variants-table-vIkjW {\n  border-right: 1px solid rgb(224, 224, 224);\n  overflow: auto;\n  flex: 0 0 400px;\n}\n";
-styleInject(css_248z$f);
+var css_248z$e = ".variants-table-vIkjW {\n  border-right: 1px solid rgb(224, 224, 224);\n  overflow: auto;\n  flex: 0 0 400px;\n}\n";
+styleInject(css_248z$e);
 function VariantSelector (_ref) {
   var variantData = _ref.variantData,
@@ -6298,8 +6301,8 @@ var clickable = "clickable-lAXv5";
 var hover = "hover-9MJo5";
 var overlay = "overlay-TnuQb";
 var buttons = "buttons-w-i7W";
-var css_248z$e = ".detail-wrapper-ZaJ9i {\n  display: flex;\n  flex-direction: column;\n  width: calc(100% - 10px);\n  margin: 5px;\n  padding: 25px;\n  gap: 25px;\n  position: absolute;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  background: white;\n  z-index: 10;\n  box-sizing: border-box;\n  transition: transform 0.3s ease-in-out;\n  transform: translateX(100%);\n  overflow: auto;\n}\n\n.detail-wrapper-ZaJ9i.active-38NMv {\n  transform: translateX(0);\n}\n\n.package-list--Q1qI {\n  display: flex;\n  gap: 10px;\n  flex-wrap: wrap;\n}\n\n.single-package-gsVlm {\n  width: 110px;\n  height: 110px;\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  align-items: center;\n  background-color: #f2f2f2;\n}\n\n.single-package-gsVlm.selectable-8EkQV:hover {\n  background-color: #dee0e4;\n  cursor: pointer;\n}\n\n.single-package-gsVlm.selected-OUbog {\n  background-color: var(--diva-theme-palette-primary-light);\n  border: solid 1px var(--diva-theme-palette-primary-main);\n}\n\n.single-package-gsVlm.selectable-8EkQV.selected-OUbog:hover {\n  background-color: var(--diva-theme-palette-primary-main);\n  color: var(--diva-theme-palette-secondary-contrast-text);\n}\n\n.single-package-gsVlm span {\n  text-align: center;\n  font-style: normal;\n  font-weight: 500;\n  font-size: 10px;\n  line-height: 12px;\n  max-width: 80%;\n  min-height: 25px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n}\n\n.single-package-gsVlm img {\n  height: 50px;\n}\n\n.package-description-Io9dZ {\n  margin: 10px;\n  width: 440px;\n  background: #f8f8f8;\n  border-radius: 3px;\n  display: flex;\n  align-items: center;\n}\n\n.package-description-Io9dZ span {\n  margin: 30px;\n  font-style: normal;\n  font-weight: 400;\n  font-size: 13px;\n  line-height: 16px;\n}\n\n.form-wrapper-sQf4D {\n  display: flex;\n  flex-direction: column;\n  gap: 10px;\n}\n\n.text-field-rkPSE {\n  width: 400px;\n}\n\n.element-title-nfKUg {\n  font-style: normal;\n  font-weight: 300;\n  font-size: 22px;\n}\n\n.preview-list-Uu0Gx {\n  display: flex;\n  flex-wrap: wrap;\n  gap: 10px;\n}\n\n.preview-box-2K6lV {\n  position: relative;\n  display: flex;\n  flex-direction: column;\n  min-width: 110px;\n  background: #f2f2f2;\n  border-radius: 4px;\n}\n\n.preview-box-2K6lV.clickable-lAXv5:hover {\n  cursor: pointer;\n  box-shadow: 0px 2px 4px -1px rgba(0, 0, 0, 0.2), 0px 4px 5px 0px rgba(0, 0, 0, 0.14), 0px 1px 10px 0px rgba(0, 0, 0, 0.12);\n}\n\n.preview-box-2K6lV img {\n  height: 100px;\n  margin: 5px auto;\n  padding: 0 5px;\n}\n\n.preview-box-2K6lV span {\n  font-style: normal;\n  font-weight: 500;\n  font-size: 12px;\n  line-height: 14px;\n  text-align: center;\n  margin: 5px;\n}\n\n.preview-box-2K6lV button {\n  margin: 5px;\n  height: 25px;\n  font-size: 12px;\n}\n\n.preview-box-2K6lV .MuiButton-containedPrimary.hover-9MJo5 {\n  background-color: var(--diva-theme-palette-primary-dark);\n  text-decoration: none;\n}\n\n.preview-box-2K6lV .MuiButton-containedSecondary.hover-9MJo5 {\n  background-color: var(--diva-theme-palette-secondary-dark);\n  text-decoration: none;\n}\n\n.preview-box-2K6lV .overlay-TnuQb {\n  position: absolute;\n  top: 5px;\n  right: 5px;\n  left: 5px;\n  height: 100px;\n  background: rgba(250, 250, 250, 0.6);\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  float: right;\n}\n\n.buttons-w-i7W {\n  display: flex;\n  gap: 10px;\n  justify-content: flex-end;\n  margin: auto 20px 5px;\n}\n\n.buttons-w-i7W button {\n  width: 400px;\n}\n";
-styleInject(css_248z$e);
+var css_248z$d = ".detail-wrapper-ZaJ9i {\n  display: flex;\n  flex-direction: column;\n  width: calc(100% - 10px);\n  margin: 5px;\n  padding: 25px;\n  gap: 25px;\n  position: absolute;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  background: white;\n  z-index: 10;\n  box-sizing: border-box;\n  transition: transform 0.3s ease-in-out;\n  transform: translateX(100%);\n  overflow: auto;\n}\n\n.detail-wrapper-ZaJ9i.active-38NMv {\n  transform: translateX(0);\n}\n\n.package-list--Q1qI {\n  display: flex;\n  gap: 10px;\n  flex-wrap: wrap;\n}\n\n.single-package-gsVlm {\n  width: 110px;\n  height: 110px;\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  align-items: center;\n  background-color: #f2f2f2;\n}\n\n.single-package-gsVlm.selectable-8EkQV:hover {\n  background-color: #dee0e4;\n  cursor: pointer;\n}\n\n.single-package-gsVlm.selected-OUbog {\n  background-color: var(--diva-theme-palette-primary-light);\n  border: solid 1px var(--diva-theme-palette-primary-main);\n}\n\n.single-package-gsVlm.selectable-8EkQV.selected-OUbog:hover {\n  background-color: var(--diva-theme-palette-primary-main);\n  color: var(--diva-theme-palette-secondary-contrast-text);\n}\n\n.single-package-gsVlm span {\n  text-align: center;\n  font-style: normal;\n  font-weight: 500;\n  font-size: 10px;\n  line-height: 12px;\n  max-width: 80%;\n  min-height: 25px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n}\n\n.single-package-gsVlm img {\n  height: 50px;\n}\n\n.package-description-Io9dZ {\n  margin: 10px;\n  width: 440px;\n  background: #f8f8f8;\n  border-radius: 3px;\n  display: flex;\n  align-items: center;\n}\n\n.package-description-Io9dZ span {\n  margin: 30px;\n  font-style: normal;\n  font-weight: 400;\n  font-size: 13px;\n  line-height: 16px;\n}\n\n.form-wrapper-sQf4D {\n  display: flex;\n  flex-direction: column;\n  gap: 10px;\n}\n\n.text-field-rkPSE {\n  width: 400px;\n}\n\n.element-title-nfKUg {\n  font-style: normal;\n  font-weight: 300;\n  font-size: 22px;\n}\n\n.preview-list-Uu0Gx {\n  display: flex;\n  flex-wrap: wrap;\n  gap: 10px;\n}\n\n.preview-box-2K6lV {\n  position: relative;\n  display: flex;\n  flex-direction: column;\n  min-width: 110px;\n  background: #f2f2f2;\n  border-radius: 4px;\n}\n\n.preview-box-2K6lV.clickable-lAXv5:hover {\n  cursor: pointer;\n  box-shadow: 0px 2px 4px -1px rgba(0, 0, 0, 0.2), 0px 4px 5px 0px rgba(0, 0, 0, 0.14), 0px 1px 10px 0px rgba(0, 0, 0, 0.12);\n}\n\n.preview-box-2K6lV img {\n  height: 100px;\n  margin: 5px auto;\n  padding: 0 5px;\n}\n\n.preview-box-2K6lV span {\n  font-style: normal;\n  font-weight: 500;\n  font-size: 12px;\n  line-height: 14px;\n  text-align: center;\n  margin: 5px;\n}\n\n.preview-box-2K6lV button {\n  margin: 5px;\n  height: 25px;\n  font-size: 12px;\n}\n\n.preview-box-2K6lV .MuiButton-containedPrimary.hover-9MJo5 {\n  background-color: var(--diva-theme-palette-primary-dark);\n  text-decoration: none;\n}\n\n.preview-box-2K6lV .MuiButton-containedSecondary.hover-9MJo5 {\n  background-color: var(--diva-theme-palette-secondary-dark);\n  text-decoration: none;\n}\n\n.preview-box-2K6lV .overlay-TnuQb {\n  position: absolute;\n  top: 5px;\n  right: 5px;\n  left: 5px;\n  height: 100px;\n  background: rgba(250, 250, 250, 0.6);\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  float: right;\n}\n\n.buttons-w-i7W {\n  display: flex;\n  gap: 10px;\n  justify-content: flex-end;\n  margin: auto 20px 5px;\n}\n\n.buttons-w-i7W button {\n  width: 400px;\n}\n";
+styleInject(css_248z$d);
 function DetailPage(_ref) {
   var isActive = _ref.isActive,
@@ -6354,8 +6357,8 @@ function SingePackage(_ref) {
   });
 }
-function ownKeys$w(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$w(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$w(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$w(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$x(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$x(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$x(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$x(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function PackageList(_ref) {
   var packages = _ref.packages,
     onSelect = _ref.onSelect,
@@ -6367,10 +6370,10 @@ function PackageList(_ref) {
   if (packages.length > 0) {
     return /*#__PURE__*/jsxs("div", {
       className: packageList,
-      children: [edit && /*#__PURE__*/jsx(SingePackage, _objectSpread$w(_objectSpread$w({}, packages[selected]), {}, {
+      children: [edit && /*#__PURE__*/jsx(SingePackage, _objectSpread$x(_objectSpread$x({}, packages[selected]), {}, {
         selected: true
       }), selected), !edit && packages.map(function (p, i) {
-        return /*#__PURE__*/jsx(SingePackage, _objectSpread$w(_objectSpread$w({}, p), {}, {
+        return /*#__PURE__*/jsx(SingePackage, _objectSpread$x(_objectSpread$x({}, p), {}, {
           selected: selected == i,
           onSelect: edit ? undefined : function () {
             return onSelect(i);
@@ -6392,13 +6395,15 @@ var hqIcon = "data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%2
 var arIcon = "data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M7%209.43L12.1%2013.02M7%209.43L12.1%206L17.2%209.43M7%209.43V14.58L12.1%2018.17M12.1%2013.02L17.2%209.43M12.1%2013.02V18.17M17.2%209.43V14.58L12.1%2018.17%22%20stroke%3D%22%234F4F4F%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%2F%3E%3C%2Fsvg%3E";
+var masterIcon = "data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M7%209.43L12.1%2013.02M7%209.43L12.1%206L17.2%209.43M7%209.43V14.58L12.1%2018.17M12.1%2013.02L17.2%209.43M12.1%2013.02V18.17M17.2%209.43V14.58L12.1%2018.17%22%20stroke%3D%22%234F4F4F%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%2F%3E%3C%2Fsvg%3E";
 var ambienteIcon = "data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M3%2017.04L11.57%2013.98L20.14%2017.04M11.57%2013.99V6%22%20stroke%3D%22%237B7B7B%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%2F%3E%3Cpath%20d%3D%22M17.4702%2011.8608L11.5702%2013.6708M17.4702%2011.8608V15.9708M17.4702%2011.8608L11.5702%209.80078L5.67017%2011.8608M11.5602%2013.6708L5.66016%2011.8608V15.9708M11.5702%2013.6808V17.8108%22%20stroke%3D%22%234F4F4F%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%2F%3E%3C%2Fsvg%3E";
 function _createForOfIteratorHelper$4(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$4(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$4(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$4(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$4(r, a) : void 0; } }
 function _arrayLikeToArray$4(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function ownKeys$v(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$v(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$v(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$v(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$w(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$w(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$w(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$w(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function useRenderjobDetail (_ref) {
   var renderJobs = _ref.renderJobs,
     onSave = _ref.onSave,
@@ -6407,8 +6412,6 @@ function useRenderjobDetail (_ref) {
   var _useDivaCore = useDivaCore(),
     organization = _useDivaCore.state.organization,
     openModal = _useDivaCore.actions.openModal;
-  var _useSellerState = useSellerState(),
-    currentBasketState = _useSellerState.state.currentBasketState;
   var _useTranslation = useTranslation$1(),
     t = _useTranslation.t;
   var packages = useMemo(function () {
@@ -6421,6 +6424,14 @@ function useRenderjobDetail (_ref) {
         job: 'HQ',
         viewPoint: 'start'
       }
+    }, {
+      id: 'master',
+      name: 'renderjob.detail.package.master.name',
+      icon: masterIcon,
+      description: 'renderjob.detail.package.master.description',
+      settings: {
+        job: 'MASTER'
+      }
     }, {
       id: 'ar',
       name: 'renderjob.detail.package.ar.name',
@@ -6473,40 +6484,44 @@ function useRenderjobDetail (_ref) {
     } else {
       setSelected(0);
       setCampaign('');
-      setPackageContent([_objectSpread$v({}, packages[0].settings)]);
+      setPackageContent([_objectSpread$w({}, packages[0].settings)]);
     }
   }, [renderJobs]);
   var onSelectPackage = useCallback(function (index) {
     setSelected(index);
-    setPackageContent([_objectSpread$v({}, packages[index].settings)]);
+    setPackageContent([_objectSpread$w({}, packages[index].settings)]);
   }, []);
-  var getDiva3DProject = function getDiva3DProject(product) {
-    var d3dps;
-    if (product.variantId !== undefined) {
-      var _currentBasketState$b;
-      d3dps = currentBasketState === null || currentBasketState === void 0 || (_currentBasketState$b = currentBasketState.basket) === null || _currentBasketState$b === void 0 || (_currentBasketState$b = _currentBasketState$b.OrderSets[0]) === null || _currentBasketState$b === void 0 || (_currentBasketState$b = _currentBasketState$b.ConfigVariants) === null || _currentBasketState$b === void 0 || (_currentBasketState$b = _currentBasketState$b.find(function (variant) {
-        return variant.VariantID === product.variantId;
-      })) === null || _currentBasketState$b === void 0 ? void 0 : _currentBasketState$b.Diva3DProject;
-    }
-    if (!d3dps) {
-      var _currentBasketState$b2;
-      d3dps = currentBasketState === null || currentBasketState === void 0 || (_currentBasketState$b2 = currentBasketState.basket) === null || _currentBasketState$b2 === void 0 ? void 0 : _currentBasketState$b2.Diva3DProject;
+  var canOrderRenderjob = function canOrderRenderjob() {
+    if (renderJobs.length) {
+      var _product$configuratio, _product$configuratio2;
+      if (renderJobs.length > 1) throw new Error('Only one job can be edited at a time');
+      var firstJob = renderJobs[0];
+      var product = selectedVariants.find(function (product) {
+        return product._id === firstJob.product;
+      });
+      var d3dps = (_product$configuratio = product.configuration) === null || _product$configuratio === void 0 || (_product$configuratio = _product$configuratio.OrderSets[0]) === null || _product$configuratio === void 0 ? void 0 : _product$configuratio.Diva3DProject;
+      var hqr = (_product$configuratio2 = product.configuration) === null || _product$configuratio2 === void 0 || (_product$configuratio2 = _product$configuratio2.OrderSets[0]) === null || _product$configuratio2 === void 0 ? void 0 : _product$configuratio2.HQRenderScript;
+      if (d3dps && hqr) return true;else return false;
+    } else {
+      var missing = false;
+      selectedVariants.forEach(function (product) {
+        var _product$configuratio3, _product$configuratio4;
+        var d3dps = (_product$configuratio3 = product.configuration) === null || _product$configuratio3 === void 0 || (_product$configuratio3 = _product$configuratio3.OrderSets[0]) === null || _product$configuratio3 === void 0 ? void 0 : _product$configuratio3.Diva3DProject;
+        var hqr = (_product$configuratio4 = product.configuration) === null || _product$configuratio4 === void 0 || (_product$configuratio4 = _product$configuratio4.OrderSets[0]) === null || _product$configuratio4 === void 0 ? void 0 : _product$configuratio4.HQRenderScript;
+        if (!d3dps || !hqr) missing = true;
+      });
+      if (missing) return false;else return true;
     }
+  };
+  var getDiva3DProject = function getDiva3DProject(product) {
+    var _product$configuratio5;
+    var d3dps = (_product$configuratio5 = product.configuration) === null || _product$configuratio5 === void 0 || (_product$configuratio5 = _product$configuratio5.OrderSets[0]) === null || _product$configuratio5 === void 0 ? void 0 : _product$configuratio5.Diva3DProject;
     if (!d3dps) throw new Error('cant order renderjob without diva3dproject');
     return atob(d3dps);
   };
   var getHqRenderScript = function getHqRenderScript(product) {
-    var hqRenderScript;
-    if (product.variantId !== undefined) {
-      var _currentBasketState$b3;
-      hqRenderScript = currentBasketState === null || currentBasketState === void 0 || (_currentBasketState$b3 = currentBasketState.basket) === null || _currentBasketState$b3 === void 0 || (_currentBasketState$b3 = _currentBasketState$b3.OrderSets[0]) === null || _currentBasketState$b3 === void 0 || (_currentBasketState$b3 = _currentBasketState$b3.ConfigVariants) === null || _currentBasketState$b3 === void 0 || (_currentBasketState$b3 = _currentBasketState$b3.find(function (variant) {
-        return variant.VariantID === product.variantId;
-      })) === null || _currentBasketState$b3 === void 0 ? void 0 : _currentBasketState$b3.HQRenderScript;
-    }
-    if (!hqRenderScript) {
-      var _currentBasketState$b4;
-      hqRenderScript = currentBasketState === null || currentBasketState === void 0 || (_currentBasketState$b4 = currentBasketState.basket) === null || _currentBasketState$b4 === void 0 ? void 0 : _currentBasketState$b4.HQRenderScript;
-    }
+    var _product$hqRenderScri, _product$configuratio6;
+    var hqRenderScript = (_product$hqRenderScri = product.hqRenderScript) !== null && _product$hqRenderScri !== void 0 ? _product$hqRenderScri : (_product$configuratio6 = product.configuration) === null || _product$configuratio6 === void 0 || (_product$configuratio6 = _product$configuratio6.OrderSets[0]) === null || _product$configuratio6 === void 0 ? void 0 : _product$configuratio6.HQRenderScript;
     if (!hqRenderScript) throw new Error('cant order renderjob without hqrenderscript');
     return hqRenderScript;
   };
@@ -6547,15 +6562,14 @@ function useRenderjobDetail (_ref) {
   }
   var createJobs = function createJobs(state) {
     if (renderJobs.length) {
-      var _currentBasketState$b5, _firstJob$diva3DProje;
+      var _firstJob$diva3DProje;
       if (renderJobs.length > 1) throw new Error('Only one job can be edited at a time');
-      if (!(currentBasketState !== null && currentBasketState !== void 0 && (_currentBasketState$b5 = currentBasketState.basket) !== null && _currentBasketState$b5 !== void 0 && _currentBasketState$b5.Diva3DProject)) throw new Error('cant order renderjob without diva3dproject');
       var firstJob = renderJobs[0];
       var product = selectedVariants.find(function (product) {
         return product._id === firstJob.product;
       });
       var d3dps = getDiva3DProject(product);
-      return [_objectSpread$v(_objectSpread$v(_objectSpread$v(_objectSpread$v({}, firstJob), packages[selected].settings), packageContent[0]), {}, {
+      return [_objectSpread$w(_objectSpread$w(_objectSpread$w(_objectSpread$w({}, firstJob), packages[selected].settings), packageContent[0]), {}, {
         state: state,
         group: campaign,
         diva3DProject: d3dps,
@@ -6565,7 +6579,7 @@ function useRenderjobDetail (_ref) {
     } else {
       var jobs = packageContent.flatMap(function (content) {
         return selectedVariants.map(function (product) {
-          return _objectSpread$v(_objectSpread$v(_objectSpread$v({}, packages[selected].settings), content), {}, {
+          return _objectSpread$w(_objectSpread$w(_objectSpread$w({}, packages[selected].settings), content), {}, {
             state: state,
             group: campaign,
             organization: organization._id,
@@ -6598,17 +6612,11 @@ function useRenderjobDetail (_ref) {
   };
   var onOrderRenderPackage = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(renderPackage, state) {
-      var _currentBasketState$b6, _renderPackage$preset, nrOfAmbRenderingsNeeded, nrAmbrenderingsSelected, promises;
+      var _renderPackage$preset, nrOfAmbRenderingsNeeded, nrAmbrenderingsSelected, promises;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.prev = 0;
-            if (currentBasketState !== null && currentBasketState !== void 0 && (_currentBasketState$b6 = currentBasketState.basket) !== null && _currentBasketState$b6 !== void 0 && _currentBasketState$b6.Diva3DProject) {
-              _context.next = 3;
-              break;
-            }
-            throw new Error('cant order renderjob without diva3dproject');
-          case 3:
             nrOfAmbRenderingsNeeded = (_renderPackage$preset = renderPackage.presets) === null || _renderPackage$preset === void 0 ? void 0 : _renderPackage$preset.filter(function (p) {
               return p.job === 'AMBIENTE';
             }).length;
@@ -6616,7 +6624,7 @@ function useRenderjobDetail (_ref) {
               return p.renderScene;
             }).length;
             if (!(nrOfAmbRenderingsNeeded !== nrAmbrenderingsSelected)) {
-              _context.next = 8;
+              _context.next = 6;
               break;
             }
             openModal({
@@ -6625,7 +6633,7 @@ function useRenderjobDetail (_ref) {
               text: t('backoffice.table.renderpackages.order.errornrofamb')
             });
             throw new Error('Please select all ambiente renderings');
-          case 8:
+          case 6:
             promises = selectedVariants.map(function (product) {
               var d3dps = getDiva3DProject(product);
               var productParams = {
@@ -6643,20 +6651,20 @@ function useRenderjobDetail (_ref) {
               };
               return onSaveRenderPackage(renderPackage, productParams);
             });
-            _context.next = 11;
+            _context.next = 9;
             return Promise.all(promises);
-          case 11:
-            _context.next = 16;
+          case 9:
+            _context.next = 14;
             break;
-          case 13:
-            _context.prev = 13;
+          case 11:
+            _context.prev = 11;
             _context.t0 = _context["catch"](0);
             console.error(_context.t0);
-          case 16:
+          case 14:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 13]]);
+      }, _callee, null, [[0, 11]]);
     }));
     return function onOrderRenderPackage(_x, _x2) {
       return _ref2.apply(this, arguments);
@@ -6673,7 +6681,8 @@ function useRenderjobDetail (_ref) {
     onAddtoCardCarderjob: onAddtoCardCarderjob,
     onOrderRenderjob: onOrderRenderjob,
     onEditRenderjob: onEditRenderjob,
-    onOrderRenderPackage: onOrderRenderPackage
+    onOrderRenderPackage: onOrderRenderPackage,
+    canOrderRenderjob: canOrderRenderjob
   };
 }
@@ -6838,8 +6847,8 @@ function AmbienteRendering(_ref) {
   });
 }
-function ownKeys$u(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$u(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$u(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$u(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$v(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$v(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$v(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$v(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function HQMedium(_ref) {
   var setPackageContent = _ref.setPackageContent,
     edit = _ref.edit,
@@ -6910,7 +6919,7 @@ function HQMedium(_ref) {
 }
 function getActiveViewpoints(packageContent, viewPoints) {
   return viewPoints.map(function (vp) {
-    return _objectSpread$u(_objectSpread$u({}, vp), {}, {
+    return _objectSpread$v(_objectSpread$v({}, vp), {}, {
       selected: packageContent.some(function (p) {
         return p.viewPoint === vp.id;
       })
@@ -6920,12 +6929,21 @@ function getActiveViewpoints(packageContent, viewPoints) {
 var _excluded$a = ["edit", "config"];
 getLogger('Seller', 'SingleRenderJobDetail');
+var useStyles$6 = makeStyles(function (theme) {
+  return {
+    customFont: {
+      fontSize: 15
+    }
+  };
+});
 function SingleRenderJobDetail(_ref) {
   var edit = _ref.edit,
     config = _ref.config,
     props = _objectWithoutProperties(_ref, _excluded$a);
   var _useTranslation = useTranslation$1(),
     t = _useTranslation.t;
+  var _useDivaCore = useDivaCore();
+    _useDivaCore.actions.userHasPermission;
   var _useRenderjobDetail = useRenderjobDetail(props),
     packages = _useRenderjobDetail.packages,
     selected = _useRenderjobDetail.selected,
@@ -6936,7 +6954,10 @@ function SingleRenderJobDetail(_ref) {
     setPackageContent = _useRenderjobDetail.setPackageContent,
     onAddtoCardCarderjob = _useRenderjobDetail.onAddtoCardCarderjob,
     onOrderRenderjob = _useRenderjobDetail.onOrderRenderjob,
-    onEditRenderjob = _useRenderjobDetail.onEditRenderjob;
+    onEditRenderjob = _useRenderjobDetail.onEditRenderjob,
+    canOrderRenderjob = _useRenderjobDetail.canOrderRenderjob;
+  var canOR = canOrderRenderjob();
+  var classes = useStyles$6();
   return /*#__PURE__*/jsxs(Fragment, {
     children: [/*#__PURE__*/jsx(Typography$1, {
       gutterBottom: true,
@@ -6976,13 +6997,22 @@ function SingleRenderJobDetail(_ref) {
             return onAddtoCardCarderjob();
           },
           children: t('renderjob.detail.action.addToCard')
-        }), /*#__PURE__*/jsx(Button, {
-          variant: "contained",
-          color: "primary",
-          onClick: function onClick() {
-            return onOrderRenderjob();
+        }), /*#__PURE__*/jsx(Tooltip, {
+          title: !canOR ? t('renderjob.detail.action.cantorder') : '',
+          classes: {
+            tooltip: classes.customFont
           },
-          children: t('renderjob.detail.action.order')
+          children: /*#__PURE__*/jsx("span", {
+            children: /*#__PURE__*/jsx(Button, {
+              variant: "contained",
+              color: "primary",
+              onClick: function onClick() {
+                return onOrderRenderjob();
+              },
+              disabled: !canOR,
+              children: t('renderjob.detail.action.order')
+            })
+          })
         })]
       }), edit && /*#__PURE__*/jsx(Button, {
         variant: "contained",
@@ -7031,9 +7061,16 @@ var _excluded$9 = ["edit", "resetRenderJobMode", "config"];
 function _createForOfIteratorHelper$3(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$3(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$3(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$3(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$3(r, a) : void 0; } }
 function _arrayLikeToArray$3(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function ownKeys$t(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$t(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$t(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$t(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$u(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$u(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$u(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$u(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 getLogger('Seller', 'SingleRenderJobDetail');
+var useStyles$5 = makeStyles(function (theme) {
+  return {
+    customFont: {
+      fontSize: 15
+    }
+  };
+});
 function SelectRenderPackage(_ref) {
   var _renderPackages$selec;
   var edit = _ref.edit,
@@ -7047,10 +7084,12 @@ function SelectRenderPackage(_ref) {
     setPackageContent = _useRenderjobDetail.setPackageContent,
     packageContent = _useRenderjobDetail.packageContent,
     setCampaign = _useRenderjobDetail.setCampaign,
-    campaign = _useRenderjobDetail.campaign;
+    campaign = _useRenderjobDetail.campaign,
+    canOrderRenderjob = _useRenderjobDetail.canOrderRenderjob;
   var _useDivaCore = useDivaCore(),
     mediaHandler = _useDivaCore.handler.mediaHandler,
     organization = _useDivaCore.state.organization;
+    _useDivaCore.actions.userHasPermission;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     renderPackages = _useState2[0],
@@ -7064,6 +7103,8 @@ function SelectRenderPackage(_ref) {
       if (res.data) setRenderPackages(res.data);
     });
   }, []);
+  var canOR = canOrderRenderjob();
+  var classes = useStyles$5();
   return /*#__PURE__*/jsxs(Fragment, {
     children: [/*#__PURE__*/jsx(Typography$1, {
       gutterBottom: true,
@@ -7106,14 +7147,23 @@ function SelectRenderPackage(_ref) {
               resetRenderJobMode();
             },
             children: t('renderjob.detail.action.addToCard')
-          }), /*#__PURE__*/jsx(Button, {
-            variant: "contained",
-            color: "primary",
-            onClick: function onClick() {
-              onOrderRenderPackage(renderPackages[selected], 1);
-              resetRenderJobMode();
+          }), /*#__PURE__*/jsx(Tooltip, {
+            title: !canOR ? t('renderjob.detail.action.cantorder') : '',
+            classes: {
+              tooltip: classes.customFont
             },
-            children: t('renderjob.detail.action.order')
+            children: /*#__PURE__*/jsx("span", {
+              children: /*#__PURE__*/jsx(Button, {
+                variant: "contained",
+                color: "primary",
+                onClick: function onClick() {
+                  onOrderRenderPackage(renderPackages[selected], 1);
+                  resetRenderJobMode();
+                },
+                disabled: !canOR,
+                children: t('renderjob.detail.action.order')
+              })
+            })
           })]
         })
       })]
@@ -7139,7 +7189,7 @@ function Presets(_ref2) {
           var configViewpoint = configuration.viewPoints.filter(function (vp) {
             return vp.id === hqPresets[i].viewPoint;
           });
-          hqViewPoints.push(_objectSpread$t(_objectSpread$t({}, configViewpoint[0]), {}, {
+          hqViewPoints.push(_objectSpread$u(_objectSpread$u({}, configViewpoint[0]), {}, {
             selected: true
           }));
         };
@@ -7259,8 +7309,8 @@ function Presets(_ref2) {
 }
 var _excluded$8 = ["active", "edit", "onClose", "config"];
-function ownKeys$s(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$s(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$s(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$s(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$t(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$t(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$t(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$t(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$a = getLogger('Seller', 'RenderJobDetail');
 function RenderJobDetail(_ref) {
   var isActive = _ref.active,
@@ -7295,10 +7345,10 @@ function RenderJobDetail(_ref) {
           "aria-label": "justified",
           children: "PACKAGE"
         })]
-      }), renderJobMode === 'SINGLE' && /*#__PURE__*/jsx(SingleRenderJobDetail, _objectSpread$s({
+      }), renderJobMode === 'SINGLE' && /*#__PURE__*/jsx(SingleRenderJobDetail, _objectSpread$t({
         edit: edit,
         config: config
-      }, props)), renderJobMode === 'PACKAGE' && !edit && /*#__PURE__*/jsx(SelectRenderPackage, _objectSpread$s({
+      }, props)), renderJobMode === 'PACKAGE' && !edit && /*#__PURE__*/jsx(SelectRenderPackage, _objectSpread$t({
         resetRenderJobMode: function resetRenderJobMode() {
           return setRenderJobMode('SINGLE');
         },
@@ -7317,7 +7367,7 @@ function RenderJobDetail$1 (props) {
       props.onError('Could not open RenderJobDetail. Please try again.');
       props.onClose();
     },
-    children: /*#__PURE__*/jsx(RenderJobDetail, _objectSpread$s({}, props))
+    children: /*#__PURE__*/jsx(RenderJobDetail, _objectSpread$t({}, props))
   });
 }
@@ -7334,7 +7384,8 @@ function Table(_ref) {
     _useDivaCore$state = _useDivaCore.state,
     apiConfig = _useDivaCore$state.apiConfig,
     organization = _useDivaCore$state.organization,
-    jwt = _useDivaCore$state.jwt;
+    jwt = _useDivaCore$state.jwt,
+    userHasPermission = _useDivaCore.actions.userHasPermission;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t,
     i18n = _useTranslation.i18n;
@@ -7463,6 +7514,9 @@ function Table(_ref) {
       onClick: function onClick(item, rowId, updateData) {
         onOrder(item, updateData);
       },
+      disabled: function disabled(item) {
+        return !userHasPermission('orderhqmedia');
+      },
       hide: function hide(item) {
         return item.state != 0;
       }
@@ -7529,6 +7583,9 @@ function useRenderjobs$1(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     renderDetailJobState = _useState4[0],
     setRenderDetailJobState = _useState4[1];
+  useEffect(function () {
+    setSelected(hasVariants ? [] : [baseData]);
+  }, [baseData]);
   var onNewRenderjob = function onNewRenderjob(onSuccess) {
     if (saved) {
       setRenderDetailJobState({
@@ -7883,8 +7940,8 @@ function logError(e, t, onError) {
 var wrapper$8 = "wrapper-7n8yS";
 var dataTable$1 = "data-table-oVyKo";
-var css_248z$d = ".wrapper-7n8yS {\n  display: flex;\n  height: 100%;\n  border-bottom: 1px solid rgb(224, 224, 224);\n}\n\n.data-table-oVyKo {\n  position: relative;\n  height: 100%;\n  flex-grow: 1;\n  overflow: hidden;\n}\n";
-styleInject(css_248z$d);
+var css_248z$c = ".wrapper-7n8yS {\n  display: flex;\n  height: 100%;\n  border-bottom: 1px solid rgb(224, 224, 224);\n}\n\n.data-table-oVyKo {\n  position: relative;\n  height: 100%;\n  flex-grow: 1;\n  overflow: hidden;\n}\n";
+styleInject(css_248z$c);
 function RenderJobTable (props) {
   var _useRenderjobs = useRenderjobs$1(props),
@@ -7933,30 +7990,32 @@ function RenderJobTable (props) {
   });
 }
+function ownKeys$s(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$s(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$s(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$s(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function useProduct(basket) {
   var _useState = useState(undefined),
     _useState2 = _slicedToArray(_useState, 2),
     currentProduct = _useState2[0],
     setCurrentProduct = _useState2[1];
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    saved = _useState4[0],
-    setSaved = _useState4[1];
   var _useDivaCore = useDivaCore(),
     productHandler = _useDivaCore.handler.productHandler;
   var loadProduct = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var _myProduct$baseData$p;
       var myProduct;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
             return productHandler.loadProducts({
-              basket: new BasketData(basket)
+              basket: new BasketData(basket),
+              divaNr: basket.DivaNr
             });
           case 2:
             myProduct = _context.sent;
-            setCurrentProduct(myProduct.baseData);
+            setCurrentProduct(_objectSpread$s(_objectSpread$s({}, myProduct.baseData), {}, {
+              parent: (_myProduct$baseData$p = myProduct.baseData.parent) !== null && _myProduct$baseData$p !== void 0 ? _myProduct$baseData$p : myProduct.baseData._id
+            }));
             return _context.abrupt("return", myProduct);
           case 5:
           case "end":
@@ -7973,29 +8032,30 @@ function useProduct(basket) {
   }, [basket]);
   var saveProduct = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(favourite) {
+      var _myproduct$0$parent;
       var myproduct;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
-            return productHandler.saveBasketAndProducts({
-              products: [currentProduct],
-              basket: !saved ? new BasketData(basket) : undefined
+            return productHandler.saveProducts({
+              products: [currentProduct]
             });
           case 2:
             myproduct = _context2.sent;
-            setCurrentProduct(myproduct[0]);
-            setSaved(true);
+            setCurrentProduct(_objectSpread$s(_objectSpread$s({}, myproduct[0]), {}, {
+              parent: (_myproduct$0$parent = myproduct[0].parent) !== null && _myproduct$0$parent !== void 0 ? _myproduct$0$parent : myproduct[0]._id
+            }));
             if (!favourite) {
-              _context2.next = 8;
+              _context2.next = 7;
               break;
             }
-            _context2.next = 8;
+            _context2.next = 7;
             return productHandler.apiSetCustomFlag(currentProduct._id, 'isFavourite', basket.OrganizationId, 'activate');
-          case 8:
+          case 7:
             setCurrentProduct(currentProduct);
             basket.DocumentVersion = basket.DocumentVersion + 1;
-          case 10:
+          case 9:
           case "end":
             return _context2.stop();
         }
@@ -8016,8 +8076,8 @@ var paperContainer = "paperContainer-9grpT";
 var hqMediaHeaderContainer = "hqMediaHeaderContainer-PlXdo";
 var hqmediaContainer = "hqmediaContainer-sBjym";
 var hqMediaTitle = "hqMediaTitle-ugda8";
-var css_248z$c = ".paperContainer-9grpT {\n  height: 68vh;\n  margin-left: 50px;\n  margin-right: 50px;\n  margin-top: 10px;\n}\n\n.hqMediaHeaderContainer-PlXdo {\n  display: flex;\n  justify-content: space-between;\n  padding-left: 15px;\n}\n\n.hqmediaContainer-sBjym {\n  height: 90%;\n  border: 1px solid rgb(224, 224, 224);\n}\n.hqMediaTitle-ugda8 {\n  font-size: 20px;\n  font-weight: normal;\n  color: #333;\n  padding: 10px 0;\n}\n";
-styleInject(css_248z$c);
+var css_248z$b = ".paperContainer-9grpT {\n  height: 68vh;\n  margin-left: 50px;\n  margin-right: 50px;\n  margin-top: 10px;\n}\n\n.hqMediaHeaderContainer-PlXdo {\n  display: flex;\n  justify-content: space-between;\n  padding-left: 15px;\n}\n\n.hqmediaContainer-sBjym {\n  height: 90%;\n  border: 1px solid rgb(224, 224, 224);\n}\n.hqMediaTitle-ugda8 {\n  font-size: 20px;\n  font-weight: normal;\n  color: #333;\n  padding: 10px 0;\n}\n";
+styleInject(css_248z$b);
 function ownKeys$r(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$r(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$r(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$r(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -8041,10 +8101,12 @@ function CheckOut(_ref) {
     setIsSaving = _useState2[1];
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    showRenderJobs = _useState4[0],
-    setShowRenderJobs = _useState4[1];
-  //const [currentProduct, setCurrentProduct] = useState<any>(undefined);
+    isSaved = _useState4[0],
+    setIsSaved = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    showRenderJobs = _useState6[0],
+    setShowRenderJobs = _useState6[1];
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var _useSellerState = useSellerState(),
@@ -8126,7 +8188,7 @@ function CheckOut(_ref) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             if (!(status === 'BASE_CONFIGURATION')) {
-              _context3.next = 12;
+              _context3.next = 13;
               break;
             }
             if (!hqMedia) {
@@ -8150,8 +8212,9 @@ function CheckOut(_ref) {
               text: t('basket.checkout.productsavedtext')
             });
           case 11:
+            setIsSaved(true);
             return _context3.abrupt("return");
-          case 12:
+          case 13:
             if (!isSaving) {
               setIsSaving(true);
               onClickSave(openPDF, sendMail).then(function (p) {
@@ -8160,7 +8223,7 @@ function CheckOut(_ref) {
                 return setIsSaving(false);
               });
             }
-          case 13:
+          case 14:
           case "end":
             return _context3.stop();
         }
@@ -8214,7 +8277,8 @@ function CheckOut(_ref) {
       }), /*#__PURE__*/jsx(StatusMenu, {
         visibleStatus: statusArray,
         status: status,
-        setStatus: setStatus
+        setStatus: setStatus,
+        productSaved: isSaved
       })]
     }), /*#__PURE__*/jsxs("div", {
       children: [showRenderJobs && /*#__PURE__*/jsxs(Paper$1, {
@@ -8238,8 +8302,10 @@ function CheckOut(_ref) {
             baseData: currentProduct,
             basketData: basket,
             onSave: function onSave() {
-              return productHandler.saveBasketAndProducts({
+              return productHandler.saveProducts({
                 products: [currentProduct]
+              }).then(function (r) {
+                return !!r.length;
               });
             },
             saved: true,
@@ -9635,8 +9701,8 @@ var descriptionContainer$1 = "description-container-k1vLT";
 var modelTitle = "model-title-Sgm-0";
 var description = "description-GyPZq";
 var pdf = "pdf-oNnao";
-var css_248z$b = ".wrapper-fSL18 {\n  display: flex;\n  flex-direction: column;\n  padding: 0 12px;\n  max-height: calc(100% - 42px);\n}\n\n.title-iTDPA {\n  padding: 16px 8px;\n  font-size: 36px;\n}\n\n.subTitle-4-0PW {\n  padding: 12px 18px;\n  font-size: 28px;\n}\n\n.description-container-k1vLT {\n  display: flex;\n  flex-direction: column;\n  background-color: #f8f8f8;\n  padding: 18px;\n  gap: 12px;\n  height: calc(100% - 164px);\n}\n\n.model-title-Sgm-0 {\n  font-size: 24px;\n  font-weight: 600;\n}\n.description-GyPZq {\n  font-size: 16px;\n  overflow: auto;\n  flex-grow: 3;\n}\n\n.pdf-oNnao {\n  display: 'flex';\n  flex: 1 1 10px;\n}\n\n.pdf-oNnao svg {\n  margin-right: 10px;\n}\n";
-styleInject(css_248z$b);
+var css_248z$a = ".wrapper-fSL18 {\n  display: flex;\n  flex-direction: column;\n  padding: 0 12px;\n  max-height: calc(100% - 42px);\n}\n\n.title-iTDPA {\n  padding: 16px 8px;\n  font-size: 36px;\n}\n\n.subTitle-4-0PW {\n  padding: 12px 18px;\n  font-size: 28px;\n}\n\n.description-container-k1vLT {\n  display: flex;\n  flex-direction: column;\n  background-color: #f8f8f8;\n  padding: 18px;\n  gap: 12px;\n  height: calc(100% - 164px);\n}\n\n.model-title-Sgm-0 {\n  font-size: 24px;\n  font-weight: 600;\n}\n.description-GyPZq {\n  font-size: 16px;\n  overflow: auto;\n  flex-grow: 3;\n}\n\n.pdf-oNnao {\n  display: 'flex';\n  flex: 1 1 10px;\n}\n\n.pdf-oNnao svg {\n  margin-right: 10px;\n}\n";
+styleInject(css_248z$a);
 var _excluded$7 = ["data", "text"];
 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; }
@@ -9692,8 +9758,8 @@ var button = "button-NXyWV";
 var navBack = "nav-back-AzU6X";
 var icon$1 = "icon-0h-39";
 var text = "text-55Zpw";
-var css_248z$a = ".wrapper-oUrTP {\n  right: 10px;\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  z-index: 500;\n  background-color: #fff;\n  position: absolute;\n  bottom: 0;\n  width: 83%;\n}\n\n.container-Sr3pC {\n  display: flex;\n  gap: 12px;\n  width: 50%;\n  justify-content: flex-end;\n  padding: 8px;\n}\n\n.button-NXyWV {\n  height: 50px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  background-color: var(--diva-theme-palette-primary-main);\n  border-radius: 2px;\n  border-color: var(--diva-theme-palette-primary-main);\n  border-style: solid;\n  border-width: 1.5px;\n  flex-grow: 1;\n  cursor: pointer;\n}\n\n.nav-back-AzU6X {\n  width: 50px;\n  height: 50px;\n  border-radius: 2px;\n  border-color: var(--diva-theme-palette-primary-main);\n  border-style: solid;\n  border-width: 1.5px;\n  background-color: #fff;\n  background-image: url(\"data:image/svg+xml,%3Csvg width%3D%2210%22 height%3D%2218%22 viewBox%3D%220 0 10 18%22 fill%3D%22none%22 xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath d%3D%22M9 1L1 9L9 17%22 stroke%3D%22%23713434%22 stroke-width%3D%221.5%22 stroke-linecap%3D%22round%22 stroke-linejoin%3D%22round%22%2F%3E%3C%2Fsvg%3E\");\n  background-size: 27%;\n  background-repeat: no-repeat;\n  background-position: center center;\n  cursor: pointer;\n}\n\n.icon-0h-39 {\n  width: 24px;\n  height: 24px;\n  background-size: contain;\n  background-repeat: no-repeat;\n  background-position: center center;\n}\n\n.text-55Zpw {\n  text-align: center;\n  /* flex-basis: 100%; */\n  color: white;\n}\n";
-styleInject(css_248z$a);
+var css_248z$9 = ".wrapper-oUrTP {\n  right: 10px;\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  z-index: 500;\n  background-color: #fff;\n  position: absolute;\n  bottom: 0;\n  width: 83%;\n}\n\n.container-Sr3pC {\n  display: flex;\n  gap: 12px;\n  width: 50%;\n  justify-content: flex-end;\n  padding: 8px;\n}\n\n.button-NXyWV {\n  height: 50px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  background-color: var(--diva-theme-palette-primary-main);\n  border-radius: 2px;\n  border-color: var(--diva-theme-palette-primary-main);\n  border-style: solid;\n  border-width: 1.5px;\n  flex-grow: 1;\n  cursor: pointer;\n}\n\n.nav-back-AzU6X {\n  width: 50px;\n  height: 50px;\n  border-radius: 2px;\n  border-color: var(--diva-theme-palette-primary-main);\n  border-style: solid;\n  border-width: 1.5px;\n  background-color: #fff;\n  background-image: url(\"data:image/svg+xml,%3Csvg width%3D%2210%22 height%3D%2218%22 viewBox%3D%220 0 10 18%22 fill%3D%22none%22 xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath d%3D%22M9 1L1 9L9 17%22 stroke%3D%22%23713434%22 stroke-width%3D%221.5%22 stroke-linecap%3D%22round%22 stroke-linejoin%3D%22round%22%2F%3E%3C%2Fsvg%3E\");\n  background-size: 27%;\n  background-repeat: no-repeat;\n  background-position: center center;\n  cursor: pointer;\n}\n\n.icon-0h-39 {\n  width: 24px;\n  height: 24px;\n  background-size: contain;\n  background-repeat: no-repeat;\n  background-position: center center;\n}\n\n.text-55Zpw {\n  text-align: center;\n  /* flex-basis: 100%; */\n  color: white;\n}\n";
+styleInject(css_248z$9);
 var _excluded$6 = ["navigateBack", "buttons"];
 function ownKeys$n(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; }
@@ -9742,10 +9808,7 @@ var favPlanning = "fav-planning-R8cxS";
 var setPlanning = "set-planning-1AQNC";
 var articleList = "article-list-uOn26";
 var analyticsIcon = "analytics-icon-kCv53";
-var css_248z$9 = ".layout-NhUpB {\n  display: grid;\n  grid-template-columns: repeat(12, 1fr);\n  grid-template-rows: repeat(10, 1fr);\n  grid-column-gap: 0px;\n  grid-row-gap: 0px;\n  overflow: auto;\n  height: 100%;\n}\n\n.info-9St01 {\n  grid-area: 1 / 1 / 11 / 3;\n  z-index: 100;\n}\n\n.right-side-64-Yz {\n  grid-area: 1 / 3 / 11 / 13;\n  width: 100%;\n  display: flex;\n  flex-direction: column;\n  position: relative;\n}\n\n.scroller-container-TAsAz {\n  overflow: auto;\n  height: calc(100% - 70px);\n}\n\n.catalog-images-jJGqW {\n  padding: 12px 12px 0 12px;\n  height: calc(50% - 12px);\n}\n.products-hidden-T6mTt .catalog-images-jJGqW {\n  height: calc(100% - 12px);\n}\n.products-QxoIf {\n  height: 50%;\n}\n.footer-1ONIt {\n  bottom: 0;\n  right: 8px;\n}\n\n.empty-planning-BZTrr {\n  background-image: url(\"data:image/svg+xml,%3Csvg width%3D%2224%22 height%3D%2224%22 viewBox%3D%220 0 24 24%22 fill%3D%22none%22 xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath d%3D%22M4 16L3.57574 15.5757C3.46321 15.6883 3.4 15.8409 3.4 16H4ZM17 3L17.4243 2.57574C17.1899 2.34142 16.8101 2.34142 16.5757 2.57574L17 3ZM21 7L21.4243 7.42426C21.6586 7.18995 21.6586 6.81005 21.4243 6.57574L21 7ZM8 20V20.6C8.15913 20.6 8.31174 20.5368 8.42426 20.4243L8 20ZM4 20H3.4C3.4 20.3314 3.66863 20.6 4 20.6V20ZM12 19.4C11.6686 19.4 11.4 19.6686 11.4 20C11.4 20.3314 11.6686 20.6 12 20.6V19.4ZM20.5 20.6C20.8314 20.6 21.1 20.3314 21.1 20C21.1 19.6686 20.8314 19.4 20.5 19.4V20.6ZM4.42426 16.4243L17.4243 3.42426L16.5757 2.57574L3.57574 15.5757L4.42426 16.4243ZM16.5757 3.42426L20.5757 7.42426L21.4243 6.57574L17.4243 2.57574L16.5757 3.42426ZM20.5757 6.57574L7.57574 19.5757L8.42426 20.4243L21.4243 7.42426L20.5757 6.57574ZM8 19.4H4V20.6H8V19.4ZM4.6 20V16H3.4V20H4.6ZM13.5757 6.42426L17.5757 10.4243L18.4243 9.57574L14.4243 5.57574L13.5757 6.42426ZM12 20.6H20.5V19.4H12V20.6Z%22 fill%3D%22white%22%2F%3E%3C%2Fsvg%3E\");\n}\n\n.fav-planning-R8cxS {\n  background-image: url(\"data:image/svg+xml,%3Csvg width%3D%2224%22 height%3D%2224%22 viewBox%3D%220 0 24 24%22 fill%3D%22none%22 xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath d%3D%22M4.3314 12.0474L12 20L19.6686 12.0474C20.5211 11.1633 21 9.96429 21 8.71405C21 6.11055 18.9648 4 16.4543 4C15.2487 4 14.0925 4.49666 13.24 5.38071L12 6.66667L10.76 5.38071C9.90749 4.49666 8.75128 4 7.54569 4C5.03517 4 3 6.11055 3 8.71405C3 9.96429 3.47892 11.1633 4.3314 12.0474Z%22 stroke%3D%22white%22 stroke-width%3D%221.5%22 stroke-linecap%3D%22round%22 stroke-linejoin%3D%22round%22%2F%3E%3C%2Fsvg%3E\");\n}\n\n.set-planning-1AQNC {\n  background-image: url(\"data:image/svg+xml,%3Csvg width%3D%2224%22 height%3D%2224%22 viewBox%3D%220 0 24 24%22 fill%3D%22none%22 xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath d%3D%22M7.11164 16.5938L3.8061 18.9095C3.46519 19.1412 3 18.9011 3 18.4934V5.5064C3 5.12726 3.4083 4.88294 3.75042 5.05738L7.1021 6.77004M12.1193 16.7346V9.76989C12.1193 9.49058 12.3494 9.26416 12.6332 9.26416H16.1086C16.3924 9.26416 16.6225 9.49058 16.6225 9.76989V16.7346M7.46741 16.7346H19.486C19.7699 16.7346 20 16.5081 20 16.2288V7.12577C20 6.84647 19.7699 6.62004 19.486 6.62004H7.46741C7.18356 6.62004 6.95346 6.84647 6.95346 7.12577V16.2288C6.95346 16.5081 7.18356 16.7346 7.46741 16.7346Z%22 stroke%3D%22white%22 stroke-width%3D%221.5%22%2F%3E%3C%2Fsvg%3E\");\n}\n\n.article-list-uOn26 {\n  background-image: url(\"data:image/svg+xml,%3Csvg xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22 viewBox%3D%220 0 24 24%22 %3E  %3Cpath   fill%3D%22white%22 d%3D%22M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z%22%2F%3E%3C%2Fsvg%3E\");\n}\n\n.analytics-icon-kCv53 {\n  background-image: url(\"data:image/svg+xml,%3Csvg xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22 stroke%3D%22%23fff%22  fill%3D%22%23fff%22 stroke-width%3D%222px%22 height%3D%2248%22 width%3D%2248%22%3E%3Cpath d%3D%22M7.3 40.7v-2.1l1.1-1.1v3.2Zm8.1 0V30.6l1.1-1.1v11.2Zm8.05 0V29.5l1.1 1.15V40.7Zm8.1 0V30.65l1.1-1.1V40.7Zm8.05 0V22.6l1.1-1.1v19.2ZM7.3 28.05v-1.5L20 13.85l8 8 12.7-12.7v1.55L28 23.4l-8-8Z%22%2F%3E%3C%2Fsvg%3E\");\n}\n";
-styleInject(css_248z$9);
-var css_248z$8 = "#diva-catalog-images .swiper {\n  margin-left: auto;\n  margin-right: auto;\n  position: relative;\n  overflow: hidden;\n  list-style: none;\n  padding: 0;\n  /* Fix of Webkit flickering */\n  z-index: 1;\n  display: block;\n}\n#diva-catalog-images .swiper-vertical > .swiper-wrapper {\n  flex-direction: column;\n}\n#diva-catalog-images .swiper-wrapper {\n  position: relative;\n  width: 100%;\n  height: 100%;\n  z-index: 1;\n  display: flex;\n  transition-property: transform;\n  transition-timing-function: initial;\n  transition-timing-function: var(--swiper-wrapper-transition-timing-function, initial);\n  box-sizing: content-box;\n}\n#diva-catalog-images .swiper-android .swiper-slide,\n#diva-catalog-images .swiper-ios .swiper-slide,\n#diva-catalog-images .swiper-wrapper {\n  transform: translate3d(0px, 0, 0);\n}\n#diva-catalog-images .swiper-horizontal {\n  touch-action: pan-y;\n}\n#diva-catalog-images .swiper-vertical {\n  touch-action: pan-x;\n}\n#diva-catalog-images .swiper-slide {\n  flex-shrink: 0;\n  width: 100%;\n  height: 100%;\n  position: relative;\n  transition-property: transform;\n  display: block;\n}\n#diva-catalog-images .swiper-slide-invisible-blank {\n  visibility: hidden;\n}\n/* Auto Height */\n#diva-catalog-images .swiper-autoheight,\n#diva-catalog-images .swiper-autoheight .swiper-slide {\n  height: auto;\n}\n#diva-catalog-images .swiper-autoheight .swiper-wrapper {\n  align-items: flex-start;\n  transition-property: transform, height;\n}\n#diva-catalog-images .swiper-backface-hidden .swiper-slide {\n  transform: translateZ(0);\n  backface-visibility: hidden;\n}\n/* 3D Effects */\n#diva-catalog-images .swiper-3d.swiper-css-mode .swiper-wrapper {\n  perspective: 1200px;\n}\n#diva-catalog-images .swiper-3d .swiper-wrapper {\n  transform-style: preserve-3d;\n}\n#diva-catalog-images .swiper-3d {\n  perspective: 1200px;\n}\n#diva-catalog-images .swiper-3d .swiper-slide,\n#diva-catalog-images .swiper-3d .swiper-cube-shadow {\n  transform-style: preserve-3d;\n}\n/* CSS Mode */\n#diva-catalog-images .swiper-css-mode > .swiper-wrapper {\n  overflow: auto;\n  scrollbar-width: none;\n  /* For Firefox */\n  -ms-overflow-style: none;\n  /* For Internet Explorer and Edge */\n}\n#diva-catalog-images .swiper-css-mode > .swiper-wrapper::-webkit-scrollbar {\n  display: none;\n}\n#diva-catalog-images .swiper-css-mode > .swiper-wrapper > .swiper-slide {\n  scroll-snap-align: start start;\n}\n#diva-catalog-images .swiper-css-mode.swiper-horizontal > .swiper-wrapper {\n  scroll-snap-type: x mandatory;\n}\n#diva-catalog-images .swiper-css-mode.swiper-vertical > .swiper-wrapper {\n  scroll-snap-type: y mandatory;\n}\n#diva-catalog-images .swiper-css-mode.swiper-free-mode > .swiper-wrapper {\n  scroll-snap-type: none;\n}\n#diva-catalog-images .swiper-css-mode.swiper-free-mode > .swiper-wrapper > .swiper-slide {\n  scroll-snap-align: none;\n}\n#diva-catalog-images .swiper-css-mode.swiper-centered > .swiper-wrapper::before {\n  content: '';\n  flex-shrink: 0;\n  order: 9999;\n}\n#diva-catalog-images .swiper-css-mode.swiper-centered > .swiper-wrapper > .swiper-slide {\n  scroll-snap-align: center center;\n  scroll-snap-stop: always;\n}\n[dir=\"ltr\"] #diva-catalog-images .swiper-css-mode.swiper-centered.swiper-horizontal > .swiper-wrapper > .swiper-slide:first-child {\n  margin-left: var(--swiper-centered-offset-before);\n}\n[dir=\"rtl\"] #diva-catalog-images .swiper-css-mode.swiper-centered.swiper-horizontal > .swiper-wrapper > .swiper-slide:first-child {\n  margin-right: var(--swiper-centered-offset-before);\n}\n#diva-catalog-images .swiper-css-mode.swiper-centered.swiper-horizontal > .swiper-wrapper::before {\n  height: 100%;\n  min-height: 1px;\n  width: var(--swiper-centered-offset-after);\n}\n#diva-catalog-images .swiper-css-mode.swiper-centered.swiper-vertical > .swiper-wrapper > .swiper-slide:first-child {\n  margin-top: var(--swiper-centered-offset-before);\n}\n#diva-catalog-images .swiper-css-mode.swiper-centered.swiper-vertical > .swiper-wrapper::before {\n  width: 100%;\n  min-width: 1px;\n  height: var(--swiper-centered-offset-after);\n}\n/* Slide styles start */\n/* 3D Shadows */\n#diva-catalog-images .swiper-3d .swiper-slide-shadow,\n#diva-catalog-images .swiper-3d .swiper-slide-shadow-left,\n#diva-catalog-images .swiper-3d .swiper-slide-shadow-right,\n#diva-catalog-images .swiper-3d .swiper-slide-shadow-top,\n#diva-catalog-images .swiper-3d .swiper-slide-shadow-bottom,\n#diva-catalog-images .swiper-3d .swiper-slide-shadow,\n#diva-catalog-images .swiper-3d .swiper-slide-shadow-left,\n#diva-catalog-images .swiper-3d .swiper-slide-shadow-right,\n#diva-catalog-images .swiper-3d .swiper-slide-shadow-top,\n#diva-catalog-images .swiper-3d .swiper-slide-shadow-bottom {\n  position: absolute;\n  left: 0;\n  top: 0;\n  width: 100%;\n  height: 100%;\n  pointer-events: none;\n  z-index: 10;\n}\n#diva-catalog-images .swiper-3d .swiper-slide-shadow {\n  background: rgba(0, 0, 0, 0.15);\n}\n#diva-catalog-images .swiper-3d .swiper-slide-shadow-left {\n  background-image: linear-gradient(to left, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));\n}\n#diva-catalog-images .swiper-3d .swiper-slide-shadow-right {\n  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));\n}\n#diva-catalog-images .swiper-3d .swiper-slide-shadow-top {\n  background-image: linear-gradient(to top, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));\n}\n#diva-catalog-images .swiper-3d .swiper-slide-shadow-bottom {\n  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));\n}\n#diva-catalog-images .swiper-lazy-preloader {\n  width: 42px;\n  height: 42px;\n  position: absolute;\n  left: 50%;\n  top: 50%;\n  margin-left: -21px;\n  margin-top: -21px;\n  z-index: 10;\n  transform-origin: 50%;\n  box-sizing: border-box;\n  border: 4px solid var(--swiper-theme-color);\n  border: 4px solid var(--swiper-preloader-color, var(--swiper-theme-color));\n  border-radius: 50%;\n  border-top-color: transparent;\n}\n#diva-catalog-images .swiper:not(.swiper-watch-progress) .swiper-lazy-preloader,\n#diva-catalog-images .swiper-watch-progress .swiper-slide-visible .swiper-lazy-preloader {\n  animation: swiper-preloader-spin 1s infinite linear;\n}\n#diva-catalog-images .swiper-lazy-preloader-white {\n  --swiper-preloader-color: #fff;\n}\n#diva-catalog-images .swiper-lazy-preloader-black {\n  --swiper-preloader-color: #000;\n}\n@keyframes swiper-preloader-spin {\n  0% {\n    transform: rotate(0deg);\n  }\n  100% {\n    transform: rotate(360deg);\n  }\n}\n/* Slide styles end */\n\n/* Pagination */\n\n#diva-catalog-images .swiper-pagination {\n  position: absolute;\n  text-align: center;\n  transition: 300ms opacity;\n  transform: translate3d(0, 0, 0);\n  z-index: 10;\n}\n#diva-catalog-images .swiper-pagination.swiper-pagination-hidden {\n  opacity: 0;\n}\n#diva-catalog-images .swiper-pagination-disabled > .swiper-pagination,\n#diva-catalog-images .swiper-pagination.swiper-pagination-disabled {\n  display: none !important;\n}\n/* Common Styles */\n#diva-catalog-images .swiper-pagination-fraction,\n#diva-catalog-images .swiper-pagination-custom,\n#diva-catalog-images .swiper-horizontal > .swiper-pagination-bullets,\n#diva-catalog-images .swiper-pagination-bullets.swiper-pagination-horizontal {\n  bottom: 8px;\n  bottom: var(--swiper-pagination-bottom, 8px);\n  top: auto;\n  top: var(--swiper-pagination-top, auto);\n  left: 0;\n  width: 100%;\n}\n/* Bullets */\n#diva-catalog-images .swiper-pagination-bullets-dynamic {\n  overflow: hidden;\n  font-size: 0;\n}\n#diva-catalog-images .swiper-pagination-bullets-dynamic .swiper-pagination-bullet {\n  transform: scale(0.33);\n  position: relative;\n}\n#diva-catalog-images .swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active {\n  transform: scale(1);\n}\n#diva-catalog-images .swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-main {\n  transform: scale(1);\n}\n#diva-catalog-images .swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-prev {\n  transform: scale(0.66);\n}\n#diva-catalog-images .swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-prev-prev {\n  transform: scale(0.33);\n}\n#diva-catalog-images .swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-next {\n  transform: scale(0.66);\n}\n#diva-catalog-images .swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-next-next {\n  transform: scale(0.33);\n}\n#diva-catalog-images .swiper-pagination-bullet {\n  width: 8px;\n  width: var(--swiper-pagination-bullet-width, var(--swiper-pagination-bullet-size, 8px));\n  height: 8px;\n  height: var(--swiper-pagination-bullet-height, var(--swiper-pagination-bullet-size, 8px));\n  display: inline-block;\n  border-radius: 50%;\n  border-radius: var(--swiper-pagination-bullet-border-radius, 50%);\n  background: #000;\n  background: var(--swiper-pagination-bullet-inactive-color, #000);\n  opacity: 0.2;\n  opacity: var(--swiper-pagination-bullet-inactive-opacity, 0.2);\n}\n#diva-catalog-images button.swiper-pagination-bullet {\n  border: none;\n  margin: 0;\n  padding: 0;\n  box-shadow: none;\n  -webkit-appearance: none;\n  -moz-appearance: none;\n       appearance: none;\n}\n#diva-catalog-images .swiper-pagination-clickable .swiper-pagination-bullet {\n  cursor: pointer;\n}\n#diva-catalog-images .swiper-pagination-bullet:only-child {\n  display: none !important;\n}\n#diva-catalog-images .swiper-pagination-bullet-active {\n  opacity: 1;\n  opacity: var(--swiper-pagination-bullet-opacity, 1);\n  background: var(--swiper-theme-color);\n  background: var(--swiper-pagination-color, var(--swiper-theme-color));\n}\n#diva-catalog-images .swiper-vertical > .swiper-pagination-bullets,\n#diva-catalog-images .swiper-pagination-vertical.swiper-pagination-bullets {\n  right: 8px;\n  right: var(--swiper-pagination-right, 8px);\n  left: auto;\n  left: var(--swiper-pagination-left, auto);\n  top: 50%;\n  transform: translate3d(0px, -50%, 0);\n}\n#diva-catalog-images .swiper-vertical > .swiper-pagination-bullets .swiper-pagination-bullet,\n#diva-catalog-images .swiper-pagination-vertical.swiper-pagination-bullets .swiper-pagination-bullet {\n  margin: 6px 0;\n  margin: var(--swiper-pagination-bullet-vertical-gap, 6px) 0;\n  display: block;\n}\n#diva-catalog-images .swiper-vertical > .swiper-pagination-bullets.swiper-pagination-bullets-dynamic,\n#diva-catalog-images .swiper-pagination-vertical.swiper-pagination-bullets.swiper-pagination-bullets-dynamic {\n  top: 50%;\n  transform: translateY(-50%);\n  width: 8px;\n}\n#diva-catalog-images .swiper-vertical > .swiper-pagination-bullets.swiper-pagination-bullets-dynamic .swiper-pagination-bullet,\n#diva-catalog-images .swiper-pagination-vertical.swiper-pagination-bullets.swiper-pagination-bullets-dynamic .swiper-pagination-bullet {\n  display: inline-block;\n  transition: 200ms transform, 200ms top;\n}\n#diva-catalog-images .swiper-horizontal > .swiper-pagination-bullets .swiper-pagination-bullet,\n#diva-catalog-images .swiper-pagination-horizontal.swiper-pagination-bullets .swiper-pagination-bullet {\n  margin: 0 4px;\n  margin: 0 var(--swiper-pagination-bullet-horizontal-gap, 4px);\n}\n#diva-catalog-images .swiper-horizontal > .swiper-pagination-bullets.swiper-pagination-bullets-dynamic,\n#diva-catalog-images .swiper-pagination-horizontal.swiper-pagination-bullets.swiper-pagination-bullets-dynamic {\n  left: 50%;\n  transform: translateX(-50%);\n  white-space: nowrap;\n}\n#diva-catalog-images .swiper-horizontal > .swiper-pagination-bullets.swiper-pagination-bullets-dynamic .swiper-pagination-bullet,\n#diva-catalog-images .swiper-pagination-horizontal.swiper-pagination-bullets.swiper-pagination-bullets-dynamic .swiper-pagination-bullet {\n  transition: 200ms transform, 200ms left;\n}\n#diva-catalog-images .swiper-horizontal.swiper-rtl > .swiper-pagination-bullets-dynamic .swiper-pagination-bullet {\n  transition: 200ms transform, 200ms right;\n}\n/* Fraction */\n#diva-catalog-images .swiper-pagination-fraction {\n  color: inherit;\n  color: var(--swiper-pagination-fraction-color, inherit);\n}\n/* Progress */\n#diva-catalog-images .swiper-pagination-progressbar {\n  background: rgba(0, 0, 0, 0.25);\n  background: var(--swiper-pagination-progressbar-bg-color, rgba(0, 0, 0, 0.25));\n  position: absolute;\n}\n#diva-catalog-images .swiper-pagination-progressbar .swiper-pagination-progressbar-fill {\n  background: var(--swiper-theme-color);\n  background: var(--swiper-pagination-color, var(--swiper-theme-color));\n  position: absolute;\n  left: 0;\n  top: 0;\n  width: 100%;\n  height: 100%;\n  transform: scale(0);\n  transform-origin: left top;\n}\n#diva-catalog-images .swiper-rtl .swiper-pagination-progressbar .swiper-pagination-progressbar-fill {\n  transform-origin: right top;\n}\n#diva-catalog-images .swiper-horizontal > .swiper-pagination-progressbar,\n#diva-catalog-images .swiper-pagination-progressbar.swiper-pagination-horizontal,\n#diva-catalog-images .swiper-vertical > .swiper-pagination-progressbar.swiper-pagination-progressbar-opposite,\n#diva-catalog-images .swiper-pagination-progressbar.swiper-pagination-vertical.swiper-pagination-progressbar-opposite {\n  width: 100%;\n  height: 4px;\n  height: var(--swiper-pagination-progressbar-size, 4px);\n  left: 0;\n  top: 0;\n}\n#diva-catalog-images .swiper-vertical > .swiper-pagination-progressbar,\n#diva-catalog-images .swiper-pagination-progressbar.swiper-pagination-vertical,\n#diva-catalog-images .swiper-horizontal > .swiper-pagination-progressbar.swiper-pagination-progressbar-opposite,\n#diva-catalog-images .swiper-pagination-progressbar.swiper-pagination-horizontal.swiper-pagination-progressbar-opposite {\n  width: 4px;\n  width: var(--swiper-pagination-progressbar-size, 4px);\n  height: 100%;\n  left: 0;\n  top: 0;\n}\n#diva-catalog-images .swiper-pagination-lock {\n  display: none;\n}\n\n/* Free Mode */\n\n#diva-catalog-images .swiper-free-mode > .swiper-wrapper {\n  transition-timing-function: ease-out;\n  margin: 0 auto;\n}\n";
+var css_248z$8 = ".layout-NhUpB {\n  display: grid;\n  grid-template-columns: repeat(12, 1fr);\n  grid-template-rows: repeat(10, 1fr);\n  grid-column-gap: 0px;\n  grid-row-gap: 0px;\n  overflow: auto;\n  height: 100%;\n}\n\n.info-9St01 {\n  grid-area: 1 / 1 / 11 / 3;\n  z-index: 100;\n}\n\n.right-side-64-Yz {\n  grid-area: 1 / 3 / 11 / 13;\n  width: 100%;\n  display: flex;\n  flex-direction: column;\n  position: relative;\n}\n\n.scroller-container-TAsAz {\n  overflow: auto;\n  height: calc(100% - 70px);\n}\n\n.catalog-images-jJGqW {\n  padding: 12px 12px 0 12px;\n  height: calc(50% - 12px);\n}\n.products-hidden-T6mTt .catalog-images-jJGqW {\n  height: calc(100% - 12px);\n}\n.products-QxoIf {\n  height: 50%;\n}\n.footer-1ONIt {\n  bottom: 0;\n  right: 8px;\n}\n\n.empty-planning-BZTrr {\n  background-image: url(\"data:image/svg+xml,%3Csvg width%3D%2224%22 height%3D%2224%22 viewBox%3D%220 0 24 24%22 fill%3D%22none%22 xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath d%3D%22M4 16L3.57574 15.5757C3.46321 15.6883 3.4 15.8409 3.4 16H4ZM17 3L17.4243 2.57574C17.1899 2.34142 16.8101 2.34142 16.5757 2.57574L17 3ZM21 7L21.4243 7.42426C21.6586 7.18995 21.6586 6.81005 21.4243 6.57574L21 7ZM8 20V20.6C8.15913 20.6 8.31174 20.5368 8.42426 20.4243L8 20ZM4 20H3.4C3.4 20.3314 3.66863 20.6 4 20.6V20ZM12 19.4C11.6686 19.4 11.4 19.6686 11.4 20C11.4 20.3314 11.6686 20.6 12 20.6V19.4ZM20.5 20.6C20.8314 20.6 21.1 20.3314 21.1 20C21.1 19.6686 20.8314 19.4 20.5 19.4V20.6ZM4.42426 16.4243L17.4243 3.42426L16.5757 2.57574L3.57574 15.5757L4.42426 16.4243ZM16.5757 3.42426L20.5757 7.42426L21.4243 6.57574L17.4243 2.57574L16.5757 3.42426ZM20.5757 6.57574L7.57574 19.5757L8.42426 20.4243L21.4243 7.42426L20.5757 6.57574ZM8 19.4H4V20.6H8V19.4ZM4.6 20V16H3.4V20H4.6ZM13.5757 6.42426L17.5757 10.4243L18.4243 9.57574L14.4243 5.57574L13.5757 6.42426ZM12 20.6H20.5V19.4H12V20.6Z%22 fill%3D%22white%22%2F%3E%3C%2Fsvg%3E\");\n}\n\n.fav-planning-R8cxS {\n  background-image: url(\"data:image/svg+xml,%3Csvg width%3D%2224%22 height%3D%2224%22 viewBox%3D%220 0 24 24%22 fill%3D%22none%22 xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath d%3D%22M4.3314 12.0474L12 20L19.6686 12.0474C20.5211 11.1633 21 9.96429 21 8.71405C21 6.11055 18.9648 4 16.4543 4C15.2487 4 14.0925 4.49666 13.24 5.38071L12 6.66667L10.76 5.38071C9.90749 4.49666 8.75128 4 7.54569 4C5.03517 4 3 6.11055 3 8.71405C3 9.96429 3.47892 11.1633 4.3314 12.0474Z%22 stroke%3D%22white%22 stroke-width%3D%221.5%22 stroke-linecap%3D%22round%22 stroke-linejoin%3D%22round%22%2F%3E%3C%2Fsvg%3E\");\n}\n\n.set-planning-1AQNC {\n  background-image: url(\"data:image/svg+xml,%3Csvg width%3D%2224%22 height%3D%2224%22 viewBox%3D%220 0 24 24%22 fill%3D%22none%22 xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath d%3D%22M7.11164 16.5938L3.8061 18.9095C3.46519 19.1412 3 18.9011 3 18.4934V5.5064C3 5.12726 3.4083 4.88294 3.75042 5.05738L7.1021 6.77004M12.1193 16.7346V9.76989C12.1193 9.49058 12.3494 9.26416 12.6332 9.26416H16.1086C16.3924 9.26416 16.6225 9.49058 16.6225 9.76989V16.7346M7.46741 16.7346H19.486C19.7699 16.7346 20 16.5081 20 16.2288V7.12577C20 6.84647 19.7699 6.62004 19.486 6.62004H7.46741C7.18356 6.62004 6.95346 6.84647 6.95346 7.12577V16.2288C6.95346 16.5081 7.18356 16.7346 7.46741 16.7346Z%22 stroke%3D%22white%22 stroke-width%3D%221.5%22%2F%3E%3C%2Fsvg%3E\");\n}\n\n.article-list-uOn26 {\n  background-image: url(\"data:image/svg+xml,%3Csvg xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22 viewBox%3D%220 0 24 24%22 %3E  %3Cpath   fill%3D%22white%22 d%3D%22M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z%22%2F%3E%3C%2Fsvg%3E\");\n}\n\n.analytics-icon-kCv53 {\n  background-image: url(\"data:image/svg+xml,%3Csvg xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22 stroke%3D%22%23fff%22  fill%3D%22%23fff%22 stroke-width%3D%222px%22 height%3D%2248%22 width%3D%2248%22%3E%3Cpath d%3D%22M7.3 40.7v-2.1l1.1-1.1v3.2Zm8.1 0V30.6l1.1-1.1v11.2Zm8.05 0V29.5l1.1 1.15V40.7Zm8.1 0V30.65l1.1-1.1V40.7Zm8.05 0V22.6l1.1-1.1v19.2ZM7.3 28.05v-1.5L20 13.85l8 8 12.7-12.7v1.55L28 23.4l-8-8Z%22%2F%3E%3C%2Fsvg%3E\");\n}\n";
 styleInject(css_248z$8);
 var wrapper$5 = "wrapper-D5Cmc";
@@ -9777,7 +9840,7 @@ var CatalogImages = function CatalogImages(_ref) {
       modules: [Autoplay, Thumbs, Pagination],
       spaceBetween: 10,
       thumbs: {
-        swiper: thumbsSwiper
+        swiper: thumbsSwiper && !thumbsSwiper.destroyed ? thumbsSwiper : null
       },
       style: {
         height: '100%',
@@ -9797,9 +9860,7 @@ var CatalogImages = function CatalogImages(_ref) {
         }, index);
       })
     }), /*#__PURE__*/jsx(Swiper, {
-      onSwiper: function onSwiper(swiper) {
-        return setThumbsSwiper(swiper);
-      },
+      onSwiper: setThumbsSwiper,
       spaceBetween: 10,
       slidesPerView: props.showProducts ? 4 : 10,
       freeMode: true,
@@ -11218,27 +11279,14 @@ var TechnicalDescription = function TechnicalDescription(_ref) {
 var AdvertisingText = function AdvertisingText(_ref) {
   var getProductValue = _ref.getProductValue,
     update = _ref.update;
-  var _useDivaCore = useDivaCore(),
-    tinyMceApiKey = _useDivaCore.state.tinyMceApiKey;
   return /*#__PURE__*/jsx(Card$1, {
     style: {
       marginBottom: '10px'
     },
     children: /*#__PURE__*/jsx(CardContent, {
-      children: /*#__PURE__*/jsx(Editor, {
-        apiKey: tinyMceApiKey,
-        value: getProductValue('info'),
-        init: {
-          height: 500,
-          menubar: false,
-          plugins: ['advlist autolink lists link table paste'],
-          contextmenu: '',
-          resize: false,
-          statusbar: false,
-          toolbar: 'undo redo | formatselect | ' + 'bold italic backcolor | alignleft aligncenter ' + 'alignright alignjustify | bullist numlist outdent indent | table ',
-          content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:14px }'
-        },
-        onEditorChange: function onEditorChange(value) {
+      children: /*#__PURE__*/jsx(RTFEditor, {
+        initialValue: getProductValue('info'),
+        onChange: function onChange(value) {
           return update('info', value);
         }
       })
@@ -11958,7 +12006,6 @@ function ClassificationDataForm (_ref) {
     settings = _ref.settings;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-    _useTranslation.i18n;
   var getOptField = function getOptField(optMap, className, value) {
     if (value) {
       var optField = optFields.find(function (opt) {
@@ -12076,11 +12123,9 @@ function ClassField(_ref2) {
 function Buttons (_ref) {
   var editBasketDisabled = _ref.editBasketDisabled,
     onOpenPlanner = _ref.onOpenPlanner,
-    onAddBasket = _ref.onAddBasket,
     onSave = _ref.onSave,
     onCancel = _ref.onCancel,
-    saveDisabled = _ref.saveDisabled,
-    allowAdd = _ref.allowAdd;
+    saveDisabled = _ref.saveDisabled;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var _React$useState = React.useState(null),
@@ -12108,7 +12153,7 @@ function Buttons (_ref) {
         color: "primary",
         disabled: editBasketDisabled,
         onClick: function onClick(e) {
-          return allowAdd ? setAnchorEl(e.currentTarget) : onOpenPlanner();
+          return onOpenPlanner();
         },
         children: t('productcreator.edit')
       }), /*#__PURE__*/jsx(Button, {
@@ -12152,7 +12197,6 @@ function Buttons (_ref) {
         }), /*#__PURE__*/jsx(MenuItem, {
           disabled: editBasketDisabled,
           onClick: function onClick() {
-            onAddBasket();
             handleClose();
           },
           children: t('productcreator.add')
@@ -13225,7 +13269,7 @@ function useClassification () {
 }
 var _excluded$2 = ["isNew"],
-  _excluded2 = ["isNew", "baseChanged"],
+  _excluded2 = ["isNew", "baseChanged", "catalogData"],
   _excluded3 = ["shortDescription"];
 function _createForOfIteratorHelper$1(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$1(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$1(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$1(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$1(r, a) : void 0; } }
@@ -13233,7 +13277,7 @@ function _arrayLikeToArray$1(r, a) { (null == a || a > r.length) && (a = r.lengt
 function ownKeys$5(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$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$3 = getLogger('Seller', 'ProductState');
-function useProductState (basket, divaNr, checkBasket, editedBasket) {
+function useProductState (basket, divaNr) {
   var _useSellerState = useSellerState(),
     _useSellerState$state = _useSellerState.state,
     catalogData = _useSellerState$state.catalogData,
@@ -13244,12 +13288,10 @@ function useProductState (basket, divaNr, checkBasket, editedBasket) {
     productCategories = _useSellerState$state.productCategories,
     originProductId = _useSellerState$state.originProductId,
     _useSellerState$actio = _useSellerState.actions,
-    openBasket = _useSellerState$actio.openBasket,
-    fetchBasket = _useSellerState$actio.fetchBasket,
-    updateBasketState = _useSellerState$actio.updateBasketState,
-    loadUniqueDivaNr = _useSellerState$actio.loadUniqueDivaNr;
-    _useSellerState$actio.saveBasket;
-    var resetBasketState = _useSellerState$actio.resetBasketState,
+    openBasket = _useSellerState$actio.openBasket;
+    _useSellerState$actio.fetchBasket;
+    var updateBasketState = _useSellerState$actio.updateBasketState,
+    resetBasketState = _useSellerState$actio.resetBasketState,
     clearOriginProductId = _useSellerState$actio.clearOriginProductId;
   var _useDivaCore = useDivaCore(),
     _useDivaCore$state = _useDivaCore.state,
@@ -13435,7 +13477,6 @@ function useProductState (basket, divaNr, checkBasket, editedBasket) {
     });
   }, [dispatch]);
   var sortVariantRows = useCallback(function (from, to, sortedVariantIds) {
-    setSaved(false);
     dispatch({
       type: 'sortVariantRows',
       from: from,
@@ -13451,118 +13492,27 @@ function useProductState (basket, divaNr, checkBasket, editedBasket) {
       subCategory: currentCategories.subCategory
     }));
   }, [updateCategoriesInternal, state]);
-  var addBasket = useCallback(/*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(divaNr) {
-      var _state$baseData$artic, _state$variantData, baskets, newBasket, _currentBasketState$b;
+  var save = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      var _state$classification, data, params, _productHandler$close, _productHandler$close2, _productHandler$close3, savedProducts;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            setSaved(false);
-            _context2.prev = 1;
-            baskets = [];
-            _context2.next = 5;
-            return fetchBasket(divaNr);
-          case 5:
-            newBasket = _context2.sent;
-            if (state !== null && state !== void 0 && (_state$baseData$artic = state.baseData.articles) !== null && _state$baseData$artic !== void 0 && _state$baseData$artic.some(function (art) {
-              return art.catalogCodex == newBasket.OrderSets[0].CatalogCodex;
-            })) {
-              _context2.next = 9;
+            if (state) {
+              _context2.next = 2;
               break;
             }
-            openModal({
-              title: 'Planung nicht gültig',
-              text: "Die Planung mit der Nummer ".concat(divaNr, " kann nicht zu diesen Produkt hinzugef\xFCgt werden."),
-              accept: true
-            });
             return _context2.abrupt("return");
-          case 9:
-            baskets.push(newBasket);
-            //if there are no variants the current basedata must become a varinat as well
-            if (state !== null && state !== void 0 && (_state$variantData = state.variantData) !== null && _state$variantData !== void 0 && _state$variantData.length) {
-              _context2.next = 20;
-              break;
-            }
-            if (!((_currentBasketState$b = currentBasketState === null || currentBasketState === void 0 ? void 0 : currentBasketState.basket) !== null && _currentBasketState$b !== void 0)) {
-              _context2.next = 15;
-              break;
-            }
-            _context2.t0 = _currentBasketState$b;
-            _context2.next = 18;
-            break;
-          case 15:
-            _context2.next = 17;
-            return fetchBasket(state === null || state === void 0 ? void 0 : state.baseData.divaNr);
-          case 17:
-            _context2.t0 = _context2.sent;
-          case 18:
-            newBasket = _context2.t0;
-            baskets.unshift(newBasket);
-          case 20:
-            dispatch({
-              type: 'addBasket',
-              data: baskets
-            });
-            openModal({
-              title: 'Planung hinzugefügt',
-              text: "Die Planung mit der Nummer ".concat(divaNr, " wurde als variante hinzugef\xFCgt."),
-              accept: true
-            });
-            _context2.next = 28;
-            break;
-          case 24:
-            _context2.prev = 24;
-            _context2.t1 = _context2["catch"](1);
-            LOG$3.error(new DivaError("Basket with divaNr ".concat(divaNr, " not found"), {
-              code: 'SELLER_0002',
-              cause: _context2.t1
-            }));
+          case 2:
+            _context2.prev = 2;
             openModal({
-              title: 'Planung existiert nicht',
-              text: "Die Planung mit der Nummer ".concat(divaNr, " existiert nicht."),
-              accept: true
+              progress: 0.05,
+              title: t('productcreator.savebasket'),
+              dontRenderForm: true
             });
-          case 28:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2, null, [[1, 24]]);
-    }));
-    return function (_x) {
-      return _ref.apply(this, arguments);
-    };
-  }(), [dispatch, state, openModal, fetchBasket]);
-  var save = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-      var _state$variantData2, _state$classification, isNewBasket, _currentBasketState$b2, data, params, _productHandler$close, _productHandler$close2, _productHandler$close3, savedProducts, _currentBasketState$b3;
-      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            if (state) {
-              _context3.next = 2;
-              break;
-            }
-            return _context3.abrupt("return");
-          case 2:
-            _context3.prev = 2;
-            isNewBasket = (currentBasketState === null || currentBasketState === void 0 ? void 0 : currentBasketState.basket) && !(currentBasketState !== null && currentBasketState !== void 0 && currentBasketState.saved);
-            if (isNewBasket) {
-              currentBasketState === null || currentBasketState === void 0 || (_currentBasketState$b2 = currentBasketState.basket) === null || _currentBasketState$b2 === void 0 || _currentBasketState$b2.saveNow();
-              openModal({
-                progress: 0.05,
-                title: t('productcreator.savebasket'),
-                dontRenderForm: true
-              });
-            }
-            if (currentBasketState !== null && currentBasketState !== void 0 && currentBasketState.basket) {
-              _context3.next = 7;
-              break;
-            }
-            throw Error('Basket is undefined');
-          case 7:
-            (_state$variantData2 = state.variantData) === null || _state$variantData2 === void 0 ? void 0 : _state$variantData2.length;
-            _context3.next = 10;
+            _context2.next = 6;
             return productHandler.prepareData({
+              basket: basket,
               baseData: state.baseData,
               classificationData: state.classificationData,
               variantData: state.variantData,
@@ -13580,150 +13530,122 @@ function useProductState (basket, divaNr, checkBasket, editedBasket) {
               optMap: state.optClassMap,
               originProductId: originProductId
             });
-          case 10:
-            data = _context3.sent;
+          case 6:
+            data = _context2.sent;
             setIsNew(false);
             if (!(originProductId || sendProductsToExternalService)) {
-              _context3.next = 38;
+              _context2.next = 34;
               break;
             }
             params = {
-              basket: currentBasketState === null || currentBasketState === void 0 ? void 0 : currentBasketState.basket,
               products: data.products,
               removedProductIds: data.removedProducts,
               parentProductId: originProductId ? originProductId : undefined
             };
             if (!(clientArticleHandler !== null && clientArticleHandler !== void 0 && clientArticleHandler.clientArticleService)) {
-              _context3.next = 33;
+              _context2.next = 29;
               break;
             }
-            _context3.prev = 15;
-            _context3.next = 18;
-            return clientArticleHandler.saveBasketProductsSMArticles(params, clientArticleHandler.clientArticleService, organization._id);
-          case 18:
+            _context2.prev = 11;
+            _context2.next = 14;
+            return clientArticleHandler.saveProductsSMArticles(params, clientArticleHandler.clientArticleService, organization._id);
+          case 14:
             (_productHandler$close = productHandler.closeModal) === null || _productHandler$close === void 0 || _productHandler$close.call(productHandler);
-            _context3.next = 21;
+            _context2.next = 17;
             return reset(currentBasketState === null || currentBasketState === void 0 ? void 0 : currentBasketState.basket, []);
-          case 21:
+          case 17:
             if (originProductId) clearOriginProductId();
-            return _context3.abrupt("return", true);
-          case 25:
-            _context3.prev = 25;
-            _context3.t0 = _context3["catch"](15);
+            return _context2.abrupt("return", true);
+          case 21:
+            _context2.prev = 21;
+            _context2.t0 = _context2["catch"](11);
             (_productHandler$close2 = productHandler.closeModal) === null || _productHandler$close2 === void 0 || _productHandler$close2.call(productHandler);
-            _context3.next = 30;
+            _context2.next = 26;
             return reset(currentBasketState === null || currentBasketState === void 0 ? void 0 : currentBasketState.basket);
-          case 30:
-            throw new Error(_context3.t0.message);
-          case 31:
-            _context3.next = 38;
+          case 26:
+            throw new Error(_context2.t0.message);
+          case 27:
+            _context2.next = 34;
             break;
-          case 33:
+          case 29:
             (_productHandler$close3 = productHandler.closeModal) === null || _productHandler$close3 === void 0 || _productHandler$close3.call(productHandler);
             if (originProductId) clearOriginProductId();
             LOG$3.error(new DivaError("Articles cannot be saved - ClientArticleService or JWT not set"));
             setError(t('modal.general_error') + ' ' + t('modal.errorcode') + ':' + DivaUtils.getCurrentTraceId() + ' ' + DivaUtils.formatDate(new Date(), true, undefined, true));
-            return _context3.abrupt("return", false);
-          case 38:
-            _context3.next = 40;
-            return productHandler.saveBasketAndProducts(_objectSpread$5(_objectSpread$5({}, data), {}, {
-              basket: isNewBasket ? currentBasketState === null || currentBasketState === void 0 ? void 0 : currentBasketState.basket : undefined,
+            return _context2.abrupt("return", false);
+          case 34:
+            _context2.next = 36;
+            return productHandler.saveProducts(_objectSpread$5(_objectSpread$5({}, data), {}, {
               awaitPDF: undefined
             }));
-          case 40:
-            savedProducts = _context3.sent;
-            if (isNewBasket) {
-              updateBasketState({
-                saved: true
-              });
-              currentBasketState === null || currentBasketState === void 0 || (_currentBasketState$b3 = currentBasketState.basket) === null || _currentBasketState$b3 === void 0 || _currentBasketState$b3.setDocumentVersion((currentBasketState === null || currentBasketState === void 0 ? void 0 : currentBasketState.basket.getDocumentVersion()) + 1);
-            }
-            _context3.next = 44;
+          case 36:
+            savedProducts = _context2.sent;
+            _context2.next = 39;
             return reset(currentBasketState === null || currentBasketState === void 0 ? void 0 : currentBasketState.basket, savedProducts);
-          case 44:
-            return _context3.abrupt("return", true);
-          case 47:
-            _context3.prev = 47;
-            _context3.t1 = _context3["catch"](2);
+          case 39:
+            return _context2.abrupt("return", true);
+          case 42:
+            _context2.prev = 42;
+            _context2.t1 = _context2["catch"](2);
             LOG$3.error(new DivaError("Error saving product", {
               code: 'PROD_0002',
-              cause: _context3.t1
+              cause: _context2.t1
             }));
-            if (Number(_context3.t1.message) === 413) {
+            if (Number(_context2.t1.message) === 413) {
               setError(t('modal.error_payload_to_big'));
             } else {
               setError(t('modal.general_error') + ' ' + t('modal.errorcode') + ':' + DivaUtils.getCurrentTraceId() + ' ' + DivaUtils.formatDate(new Date(), true, undefined, true));
             }
-            if (!_context3.t1.message.includes('PRODSM_0001')) {
-              _context3.next = 56;
+            if (!_context2.t1.message.includes('PRODSM_0001')) {
+              _context2.next = 51;
               break;
             }
             openModal({
               title: t('productcreator.errorsavingsmarticle', 'Error saving SM-Article'),
-              text: _context3.t1.message,
+              text: _context2.t1.message,
               accept: true
             });
-            return _context3.abrupt("return", false);
-          case 56:
+            return _context2.abrupt("return", false);
+          case 51:
             openModal({
               title: t('errorcodes._source.labels.error.SELLER_0002'),
               text: t('grid.error'),
               accept: true
             });
-            return _context3.abrupt("return", false);
-          case 58:
+            return _context2.abrupt("return", false);
+          case 53:
           case "end":
-            return _context3.stop();
+            return _context2.stop();
         }
-      }, _callee3, null, [[2, 47], [15, 25]]);
+      }, _callee2, null, [[2, 42], [11, 21]]);
     }));
     return function save() {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
   var reset = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(basket, productData) {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(basket, productData) {
       var _configurationData$Pr;
-      var updateBasket, usedCatalogData, basketSaved, _yield$openBasket, openedBasket, openedCatalogData, _saved, _yield$productHandler, isNew, resetState;
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      var _yield$productHandler, isNew, resetState;
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            usedCatalogData = catalogData;
-            if (!basket) {
-              _context4.next = 5;
-              break;
-            }
-            updateBasket = basket;
-            _context4.next = 15;
-            break;
-          case 5:
-            resetBasketState();
-            _context4.next = 8;
-            return openBasket(undefined, divaNr);
-          case 8:
-            _yield$openBasket = _context4.sent;
-            openedBasket = _yield$openBasket.basket;
-            openedCatalogData = _yield$openBasket.catalogData;
-            _saved = _yield$openBasket.saved;
-            updateBasket = openedBasket;
-            usedCatalogData = openedCatalogData;
-            basketSaved = _saved;
-          case 15:
-            _context4.next = 17;
+            if (!basket) resetBasketState();
+            _context3.next = 3;
             return productHandler.loadProducts({
-              basket: updateBasket,
-              catalogData: usedCatalogData,
+              basket: basket,
+              divaNr: divaNr,
+              catalogData: catalogData,
               productData: productData,
               classificationFields: state === null || state === void 0 ? void 0 : state.classificationFields,
               fieldConfiguration: configurationData === null || configurationData === void 0 || (_configurationData$Pr = configurationData.ProductCreator) === null || _configurationData$Pr === void 0 ? void 0 : _configurationData$Pr.fields,
               customBaseFields: additionalBaseFields,
               classificationConfig: classificationConfig,
               availableLanguages: availableLanguages,
-              currentLang: language,
-              editedBasket: editedBasket
+              currentLang: language
             });
-          case 17:
-            _yield$productHandler = _context4.sent;
+          case 3:
+            _yield$productHandler = _context3.sent;
             isNew = _yield$productHandler.isNew;
             resetState = _objectWithoutProperties(_yield$productHandler, _excluded$2);
             dispatch({
@@ -13734,91 +13656,75 @@ function useProductState (basket, divaNr, checkBasket, editedBasket) {
                 classificationFields: state === null || state === void 0 ? void 0 : state.classificationFields
               })
             });
-            setSaved(!isNew && !!basketSaved);
+            setSaved(!isNew);
             setError(undefined);
             setWarning(undefined);
-          case 24:
+          case 10:
           case "end":
-            return _context4.stop();
+            return _context3.stop();
         }
-      }, _callee4);
+      }, _callee3);
     }));
-    return function reset(_x2, _x3) {
-      return _ref3.apply(this, arguments);
+    return function reset(_x, _x2) {
+      return _ref2.apply(this, arguments);
     };
   }();
   useEffect(function () {
     var init = /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-        var _yield$openBasket2, updateBasket, catalogData, basketSaved, newDivaNr, _affiliates, _Object$keys$map2, _configurationData$Pr2, _optClassMap, _initState, _yield$loadCategories, classificationFields, newCurrentData, additional, _additionalBaseFields, newLivingArea, _yield$productHandler2, _isNew, baseChanged, initState, currentCategories, differingOptFields, optMapEntries, missingOptFields, accountlogourl, logofile, _initState$baseData$m, newlogofile, _initState$baseData$m2;
-        return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+        var _ref4, updateBasket, catalogData, _affiliates, _Object$keys$map2, _configurationData$Pr2, _optClassMap, _catalogs$, _initState, _yield$loadCategories, classificationFields, newCurrentData, additional, _additionalBaseFields, newLivingArea, _yield$productHandler2, _isNew, baseChanged, catalogs, initState, currentCategories, differingOptFields, optMapEntries, missingOptFields, accountlogourl, logofile, _initState$baseData$m, newlogofile, _initState$baseData$m2;
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context5.next = 2;
-              return openBasket(undefined, divaNr, checkBasket, basket);
-            case 2:
-              _yield$openBasket2 = _context5.sent;
-              updateBasket = _yield$openBasket2.basket;
-              catalogData = _yield$openBasket2.catalogData;
-              basketSaved = _yield$openBasket2.saved;
-              toggleLoading('ProductDataInit');
-              updateBasketState({
-                overwriteStates: ['BASE_CONFIGURATION']
-              });
-              _context5.prev = 8;
-              if (!(updateBasket.Status != 'BASE_CONFIGURATION')) {
-                _context5.next = 16;
+              if (!basket) {
+                _context4.next = 6;
                 break;
               }
-              _context5.next = 12;
-              return loadUniqueDivaNr();
-            case 12:
-              newDivaNr = _context5.sent;
-              updateBasket.convertToBaseConfiguration(newDivaNr);
-              basketSaved = false;
+              _context4.next = 3;
+              return openBasket(undefined, divaNr, undefined, basket);
+            case 3:
+              _context4.t0 = _context4.sent;
+              _context4.next = 7;
+              break;
+            case 6:
+              _context4.t0 = {};
+            case 7:
+              _ref4 = _context4.t0;
+              updateBasket = _ref4.basket;
+              catalogData = _ref4.catalogData;
+              toggleLoading('ProductDataInit');
               updateBasketState({
-                saved: false
+                overwriteStates: ['BASE_CONFIGURATION']
               });
-            case 16:
-              _context5.next = 21;
-              break;
-            case 18:
-              _context5.prev = 18;
-              _context5.t0 = _context5["catch"](8);
-              LOG$3.error(new DivaError("Error updating basket", {
-                code: 'SELLER_0002',
-                cause: _context5.t0
-              }));
-            case 21:
               if (!userHasPermission('productcreator_affiliate')) {
-                _context5.next = 32;
+                _context4.next = 23;
                 break;
               }
-              _context5.prev = 22;
-              _context5.next = 25;
+              _context4.prev = 13;
+              _context4.next = 16;
               return apiGetAffiliates({
                 serviceUrl: apiConfig.authService,
                 organizationId: organization._id,
                 jwt: jwt
               });
-            case 25:
-              _affiliates = _context5.sent;
+            case 16:
+              _affiliates = _context4.sent;
               setAffiliates(_affiliates);
-              _context5.next = 32;
+              _context4.next = 23;
               break;
-            case 29:
-              _context5.prev = 29;
-              _context5.t1 = _context5["catch"](22);
+            case 20:
+              _context4.prev = 20;
+              _context4.t1 = _context4["catch"](13);
               LOG$3.error(new DivaError("Error loading affiliates", {
                 code: 'SELLER_0002',
-                cause: _context5.t1
+                cause: _context4.t1
               }));
-            case 32:
-              _context5.prev = 32;
-              _context5.next = 35;
+            case 23:
+              _context4.prev = 23;
+              _context4.next = 26;
               return loadCategories();
-            case 35:
-              _yield$loadCategories = _context5.sent;
+            case 26:
+              _yield$loadCategories = _context4.sent;
               classificationFields = _yield$loadCategories.classificationFields;
               newCurrentData = _yield$loadCategories.newCurrentData;
               additional = _yield$loadCategories.additional;
@@ -13841,22 +13747,23 @@ function useProductState (basket, divaNr, checkBasket, editedBasket) {
                 });
                 newCurrentData.livingAreas = _objectSpread$5({}, newLivingArea);
               }
-              _context5.next = 43;
+              _context4.next = 34;
               return productHandler.loadProducts({
                 basket: updateBasket,
+                divaNr: divaNr,
                 catalogData: catalogData,
                 classificationFields: !customFormData ? classificationFields : undefined,
                 fieldConfiguration: configurationData === null || configurationData === void 0 || (_configurationData$Pr2 = configurationData.ProductCreator) === null || _configurationData$Pr2 === void 0 ? void 0 : _configurationData$Pr2.fields,
                 customBaseFields: !customFormData ? _additionalBaseFields : undefined,
                 classificationConfig: !customFormData ? newCurrentData : undefined,
                 availableLanguages: availableLanguages,
-                currentLang: language,
-                editedBasket: editedBasket
+                currentLang: language
               });
-            case 43:
-              _yield$productHandler2 = _context5.sent;
+            case 34:
+              _yield$productHandler2 = _context4.sent;
               _isNew = _yield$productHandler2.isNew;
               baseChanged = _yield$productHandler2.baseChanged;
+              catalogs = _yield$productHandler2.catalogData;
               initState = _objectWithoutProperties(_yield$productHandler2, _excluded2);
               setIsNew(_isNew);
               currentCategories = updateCategoriesInternal(initState.baseData.livingArea ? initState.baseData.livingArea : returnTo === 'toAssortmentManager' ? productCategories === null || productCategories === void 0 ? void 0 : productCategories.livingArea : undefined, initState.baseData.mainCategory ? initState.baseData.mainCategory : returnTo === 'toAssortmentManager' ? productCategories === null || productCategories === void 0 ? void 0 : productCategories.mainCategory : undefined, initState.baseData.subCategory ? initState.baseData.subCategory : returnTo === 'toAssortmentManager' ? productCategories === null || productCategories === void 0 ? void 0 : productCategories.subCategory : undefined, newCurrentData);
@@ -13883,7 +13790,7 @@ function useProductState (basket, divaNr, checkBasket, editedBasket) {
                   return (_opt$title = opt.title) !== null && _opt$title !== void 0 ? _opt$title : opt.field;
                 }).join(', ')));
               }
-              accountlogourl = catalogData === null || catalogData === void 0 ? void 0 : catalogData[0].accountLogo;
+              accountlogourl = catalogs === null || catalogs === void 0 || (_catalogs$ = catalogs[0]) === null || _catalogs$ === void 0 ? void 0 : _catalogs$.accountLogo;
               if (accountlogourl) {
                 logofile = new DivaFile({
                   jwt: jwt,
@@ -13925,26 +13832,26 @@ function useProductState (basket, divaNr, checkBasket, editedBasket) {
                 title: t('productcreator.configurationchanged.title'),
                 text: t('productcreator.configurationchanged.text')
               });
-              setSaved(!_isNew && !!basketSaved);
-              _context5.next = 68;
+              setSaved(!_isNew);
+              _context4.next = 60;
               break;
-            case 65:
-              _context5.prev = 65;
-              _context5.t2 = _context5["catch"](32);
+            case 57:
+              _context4.prev = 57;
+              _context4.t2 = _context4["catch"](23);
               LOG$3.error(new DivaError("Error initalization", {
                 code: 'SELLER_0002',
-                cause: _context5.t2
+                cause: _context4.t2
               }));
-            case 68:
+            case 60:
               toggleLoading('ProductDataInit');
-            case 69:
+            case 61:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
-        }, _callee5, null, [[8, 18], [22, 29], [32, 65]]);
+        }, _callee4, null, [[13, 20], [23, 57]]);
       }));
       return function init() {
-        return _ref4.apply(this, arguments);
+        return _ref3.apply(this, arguments);
       };
     }();
     init();
@@ -13953,40 +13860,46 @@ function useProductState (basket, divaNr, checkBasket, editedBasket) {
     return _checkAndSetCustomForm.apply(this, arguments);
   }
   function _checkAndSetCustomForm() {
-    _checkAndSetCustomForm = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
+    _checkAndSetCustomForm = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
       var _state$baseData$custo;
       var productCreatorConfig;
-      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            _context7.next = 2;
-            return getCustomFormConfig();
+            if (!window.location.href.includes('assortment')) {
+              _context6.next = 2;
+              break;
+            }
+            return _context6.abrupt("return");
           case 2:
-            productCreatorConfig = _context7.sent;
+            _context6.next = 4;
+            return getCustomFormConfig();
+          case 4:
+            productCreatorConfig = _context6.sent;
             if (productCreatorConfig && !smArticleModalShowed && !originProductId && !(state !== null && state !== void 0 && (_state$baseData$custo = state.baseData.customData) !== null && _state$baseData$custo !== void 0 && (_state$baseData$custo = _state$baseData$custo.SMArticleId) !== null && _state$baseData$custo !== void 0 && _state$baseData$custo.value)) {
               openModal({
                 accept: true,
                 reject: true,
                 text: t('productcreator.modal.createsmarticle'),
                 callback: function () {
-                  var _callback = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6(accepted) {
+                  var _callback = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(accepted) {
                     var customFormDataLoaded;
-                    return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-                      while (1) switch (_context6.prev = _context6.next) {
+                    return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+                      while (1) switch (_context5.prev = _context5.next) {
                         case 0:
                           toggleLoading('loadCustomForm');
                           if (!accepted) {
-                            _context6.next = 8;
+                            _context5.next = 8;
                             break;
                           }
-                          _context6.next = 4;
+                          _context5.next = 4;
                           return loadCustomForm(productCreatorConfig);
                         case 4:
-                          customFormDataLoaded = _context6.sent;
+                          customFormDataLoaded = _context5.sent;
                           if (customFormDataLoaded) {
                             setCustomFormData(customFormDataLoaded);
                           }
-                          _context6.next = 9;
+                          _context5.next = 9;
                           break;
                         case 8:
                           setCustomFormData(undefined);
@@ -13995,22 +13908,22 @@ function useProductState (basket, divaNr, checkBasket, editedBasket) {
                           toggleLoading('loadCustomForm');
                         case 11:
                         case "end":
-                          return _context6.stop();
+                          return _context5.stop();
                       }
-                    }, _callee6);
+                    }, _callee5);
                   }));
-                  function callback(_x4) {
+                  function callback(_x3) {
                     return _callback.apply(this, arguments);
                   }
                   return callback;
                 }()
               });
             }
-          case 4:
+          case 6:
           case "end":
-            return _context7.stop();
+            return _context6.stop();
         }
-      }, _callee7);
+      }, _callee6);
     }));
     return _checkAndSetCustomForm.apply(this, arguments);
   }
@@ -14038,10 +13951,10 @@ function useProductState (basket, divaNr, checkBasket, editedBasket) {
     removeMedia: removeMedia,
     sortMedia: sortMedia,
     sortVariantRows: sortVariantRows,
-    addBasket: addBasket,
     save: save,
     reset: reset,
-    updateOptMap: dispatchUpdateOptMap
+    updateOptMap: dispatchUpdateOptMap,
+    setSaved: setSaved
   };
 }
 function reducer(state, action) {
@@ -14052,7 +13965,9 @@ function reducer(state, action) {
       if (newState.modified.variantData.some(function (mod) {
         return mod[field.field];
       })) {
-        newState.initialSelectedFields.push(field);
+        if (!newState.initialSelectedFields.find(function (f) {
+          return f.field == field.field;
+        })) newState.initialSelectedFields.push(field);
       }
     });
     return newState;
@@ -14093,162 +14008,14 @@ function reducer(state, action) {
     var _newState7 = state;
     _newState7 = sortVariantRows(_newState7, action.from, action.to, action.sortedVariantIds);
     return _newState7;
-  } else if (action.type == 'addBasket') {
+  } else if (action.type == 'updateOptMap') {
     var _newState8 = state;
-    action.data.forEach(function (d) {
-      if (d.DivaNr == _newState8.baseData.divaNr) {
-        //if on basketdata is from the current basedata, pass the product as well
-        _newState8 = addBasket(_newState8, d, _newState8.baseData);
-      } else {
-        _newState8 = addBasket(_newState8, d);
-      }
-    });
+    _newState8 = updateOptMap(_newState8, action.data, action.mediaService, action.jwt);
     return _newState8;
-  } else if (action.type == 'updateOptMap') {
-    var _newState9 = state;
-    _newState9 = updateOptMap(_newState9, action.data, action.mediaService, action.jwt);
-    return _newState9;
   }
   return state;
 }
-/**
- * Adds a basketdata as variant to the current product
- *
- * @param prevState the previouse state object
- * @param basket a basket data to be added as variant
- * @param productData an existing product data
- * @returns the updated state object
- */
-function addBasket(prevState, basket, productData) {
-  var _orderSet$OrderLines$, _orderSet$SetVariantB;
-  var baseData = prevState.baseData;
-  var orderSet = basket === null || basket === void 0 ? void 0 : basket.OrderSets[0];
-  var dockingPoints = orderSet.getDockingPointInfo();
-  var newVariantData = prevState.variantData ? _toConsumableArray(prevState.variantData) : [];
-  var newVariant;
-  if (productData) {
-    //if basedata is turned into a varinat, the current product data is used
-    //and the media is removed from the base data, because if there are variants, only the variants should have media
-    newVariant = _objectSpread$5(_objectSpread$5({}, productData), {}, {
-      _id: nanoid(),
-      variantId: newVariantData.length,
-      originDivaNr: basket === null || basket === void 0 ? void 0 : basket.DivaNr
-    });
-    baseData = _objectSpread$5(_objectSpread$5({}, prevState.baseData), {}, {
-      media: []
-    });
-  } else {
-    var _orderSet$BBox, _orderSet$BBox2, _orderSet$BBox3;
-    newVariant = {
-      _id: nanoid(),
-      divaNr: prevState.baseData.divaNr,
-      modelName: prevState.baseData.modelName,
-      shortDescription: prevState.baseData.shortDescription,
-      info: prevState.baseData.info,
-      technicalDescription: orderSet === null || orderSet === void 0 ? void 0 : orderSet.VariantDescription,
-      orderDescription: orderSet === null || orderSet === void 0 ? void 0 : orderSet.VariantDescription,
-      width: orderSet === null || orderSet === void 0 || (_orderSet$BBox = orderSet.BBox) === null || _orderSet$BBox === void 0 ? void 0 : _orderSet$BBox.X,
-      height: orderSet === null || orderSet === void 0 || (_orderSet$BBox2 = orderSet.BBox) === null || _orderSet$BBox2 === void 0 ? void 0 : _orderSet$BBox2.Z,
-      depth: orderSet === null || orderSet === void 0 || (_orderSet$BBox3 = orderSet.BBox) === null || _orderSet$BBox3 === void 0 ? void 0 : _orderSet$BBox3.Y,
-      calculatedPrice: orderSet === null || orderSet === void 0 ? void 0 : orderSet.SetPrice,
-      addedPrice: orderSet === null || orderSet === void 0 ? void 0 : orderSet.SetPrice,
-      articles: orderSet === null || orderSet === void 0 ? void 0 : orderSet.OrderLines.map(function (ol) {
-        var _ol$VariantBasketData;
-        return {
-          articleCodex: ol.ArticleCodex,
-          catalogCodex: orderSet.CatalogCodex,
-          variantValues: (_ol$VariantBasketData = ol.VariantBasketDatas) === null || _ol$VariantBasketData === void 0 ? void 0 : _ol$VariantBasketData.map(function (vb) {
-            return {
-              OPT: vb.OPT,
-              OPV: vb.OPV
-            };
-          })
-        };
-      }),
-      image: orderSet === null || orderSet === void 0 ? void 0 : orderSet.SetImage,
-      image2D: orderSet === null || orderSet === void 0 ? void 0 : orderSet.Set2DImage,
-      catalogId: [orderSet === null || orderSet === void 0 ? void 0 : orderSet.CatalogGUID],
-      collection: [orderSet === null || orderSet === void 0 ? void 0 : orderSet.AccountName],
-      collectionId: [orderSet === null || orderSet === void 0 ? void 0 : orderSet.CollectionGUID],
-      catCodex: [orderSet.CatalogCodex],
-      livingArea: prevState.baseData.livingArea,
-      mainCategory: prevState.baseData.mainCategory,
-      subCategory: prevState.baseData.subCategory,
-      dockingPoints: dockingPoints,
-      variantId: newVariantData.length,
-      originDivaNr: basket === null || basket === void 0 ? void 0 : basket.DivaNr
-    };
-  }
-  var optFields = prevState.optFields ? _toConsumableArray(prevState.optFields) : [];
-  var initialSelectedFields = prevState.initialSelectedFields ? _toConsumableArray(prevState.initialSelectedFields) : [];
-  //get optFields and initaliSelectedFileds
-  //if optField is not yet preset in the list of opts, add it
-  //if it is present, check if it is not yet in the list of initial selected fields and if now there are varinats with differences in this OPV
-  //if so add it it initalSelectedFields
-  var basketId = (_orderSet$OrderLines$ = orderSet.OrderLines.find(function (ol) {
-    return !ol.RelatedToBasketID;
-  })) === null || _orderSet$OrderLines$ === void 0 ? void 0 : _orderSet$OrderLines$.BasketID;
-  orderSet === null || orderSet === void 0 || (_orderSet$SetVariantB = orderSet.SetVariantBasketDatas) === null || _orderSet$SetVariantB === void 0 || _orderSet$SetVariantB.filter(function (vb) {
-    return !vb.IsDescribingState;
-  }).forEach(function (v) {
-    var _prevState$variantDat;
-    //if this opt is already set do nothing
-    if (newVariant[v.OPT]) {
-      return;
-    }
-    //if the same OPT existis multiple times, use the one of the main article
-    var variantsWithSameOPT = orderSet.SetVariantBasketDatas.filter(function (v2) {
-      return v2.OPT == v.OPT;
-    });
-    if (variantsWithSameOPT.length > 1) {
-      v = variantsWithSameOPT.find(function (v2) {
-        return v2.BasketID == basketId;
-      }) || v;
-    }
-    newVariant[v.OPT] = v.OPVName || v.OPV;
-    var field = {
-      field: v.OPT,
-      type: 'string',
-      title: v.OPTName || v.OPT,
-      readOnly: true,
-      fieldType: 'OPT'
-    };
-    if (!optFields.find(function (f) {
-      return f.field == v.OPT;
-    })) {
-      optFields.push(field);
-    } else if (!initialSelectedFields.find(function (f) {
-      return f.field == v.OPT;
-    }) && (_prevState$variantDat = prevState.variantData) !== null && _prevState$variantDat !== void 0 && _prevState$variantDat.some(function (vd) {
-      return vd[v.OPT] != newVariant[v.OPT];
-    })) {
-      initialSelectedFields.push(field);
-    }
-  });
-  //add classification values to the variant
-  Object.entries(prevState.classificationData).forEach(function (_ref7) {
-    var _ref8 = _slicedToArray(_ref7, 2),
-      key = _ref8[0],
-      value = _ref8[1];
-    return newVariant[key] = value;
-  });
-  var newModifiedData = prevState.modified.variantData ? _toConsumableArray(prevState.modified.variantData) : [];
-  newModifiedData.push({});
-  newVariantData.push(newVariant);
-  return _objectSpread$5(_objectSpread$5({}, prevState), {}, {
-    baseData: baseData,
-    variantData: newVariantData,
-    optFields: optFields,
-    initialSelectedFields: initialSelectedFields,
-    modified: _objectSpread$5(_objectSpread$5({}, prevState.modified), {}, {
-      variantData: newModifiedData
-    })
-  });
-}
 /**
  * Updates all variant data
  *
@@ -14263,10 +14030,10 @@ function updateVariants(prevState, currentState, configurationData, baseDataFiel
   if (baseDataFields.some(function (field) {
     return field.manualFields && field.field == 'customData';
   }) && currentState.baseData.customData) {
-    var manualFields = Object.entries(currentState.baseData.customData).filter(function (_ref9) {
-      var _ref10 = _slicedToArray(_ref9, 2);
-        _ref10[0];
-        var valueObj = _ref10[1];
+    var manualFields = Object.entries(currentState.baseData.customData).filter(function (_ref7) {
+      var _ref8 = _slicedToArray(_ref7, 2);
+        _ref8[0];
+        var valueObj = _ref8[1];
       return valueObj === null || valueObj === void 0 ? void 0 : valueObj.manual;
     });
     for (var i = 0; i < manualFields.length; i++) {
@@ -14552,10 +14319,10 @@ function updateOptMap(currentState, optMap, mediaService, jwt) {
         LOG$3.debug("Product ".concat(product._id, " has no class mapping for OPT ").concat(optField.field));
         return;
       }
-      var className = (_optMapEntries$find = optMapEntries.find(function (_ref11) {
-        var _ref12 = _slicedToArray(_ref11, 2);
-          _ref12[0];
-          var optValueField = _ref12[1];
+      var className = (_optMapEntries$find = optMapEntries.find(function (_ref9) {
+        var _ref10 = _slicedToArray(_ref9, 2);
+          _ref10[0];
+          var optValueField = _ref10[1];
         return (optValueField === null || optValueField === void 0 ? void 0 : optValueField.field) == optField.field;
       })) === null || _optMapEntries$find === void 0 ? void 0 : _optMapEntries$find[0];
       if (!className) {
@@ -14676,9 +14443,9 @@ function removeMedia(currentState, data, variants) {
       return m.url == data.url;
     });
     if (product.media && index != undefined) {
-      var _ref13;
+      var _ref11;
       var deleted = product.media.splice(index, 1);
-      (_ref13 = newState.removedMedia).push.apply(_ref13, _toConsumableArray(deleted));
+      (_ref11 = newState.removedMedia).push.apply(_ref11, _toConsumableArray(deleted));
     }
   });
   return newState;
@@ -15033,6 +14800,9 @@ function RenderJobForm (_ref) {
       children: [/*#__PURE__*/jsx(MenuItem, {
         value: "HQ",
         children: "HQ"
+      }), /*#__PURE__*/jsx(MenuItem, {
+        value: "MASTER",
+        children: "MASTER"
       }), /*#__PURE__*/jsx(MenuItem, {
         value: "SPIN",
         children: "SPIN"
@@ -15220,9 +14990,8 @@ function useRenderjobs (_ref) {
   var hasVariants = _ref.hasVariants,
     baseData = _ref.baseData,
     onError = _ref.onError;
-  var _useSellerState = useSellerState(),
-    currentBasketState = _useSellerState.state.currentBasketState;
-  var basket = currentBasketState === null || currentBasketState === void 0 ? void 0 : currentBasketState.basket;
+  var _useSellerState = useSellerState();
+    _useSellerState.state.currentBasketState;
   var _useState = useState(hasVariants ? [] : [baseData]),
     _useState2 = _slicedToArray(_useState, 2),
     selected = _useState2[0],
@@ -15287,60 +15056,42 @@ function useRenderjobs (_ref) {
     setSelectionData();
   }, [selected, renderJobFormState]);
   function setSelectionData() {
-    if (!basket) {
-      throw new Error("can't order renderjobs without basket");
-    }
     if (hasVariants) {
-      var _iterator = _createForOfIteratorHelper(basket === null || basket === void 0 ? void 0 : basket.OrderSets),
-        _step;
-      try {
-        var _loop = function _loop() {
-          var _oS$ConfigVariants;
-          var oS = _step.value;
-          var selectedConfigVariants = (_oS$ConfigVariants = oS.ConfigVariants) === null || _oS$ConfigVariants === void 0 ? void 0 : _oS$ConfigVariants.filter(function (cV, idx) {
-            return selected.some(function (s, selIdx) {
-              var _s$variantId, _cV$VariantID;
-              return ((_s$variantId = s.variantId) !== null && _s$variantId !== void 0 ? _s$variantId : selIdx) == ((_cV$VariantID = cV.VariantID) !== null && _cV$VariantID !== void 0 ? _cV$VariantID : idx);
-            });
-          });
-          if (!selectedConfigVariants) {
-            throw new Error('no selected configVariants');
-          }
-          var d3dps = [];
-          var hqrs = [];
-          selectedConfigVariants.forEach(function (cV) {
-            d3dps.push(JSON.parse(atob(cV.Diva3DProject)));
-            hqrs.push(cV.HQRenderScript);
-          });
-          setDiva3DProjects(d3dps);
-          setInitialDiva3DProject(d3dps[0]);
-          setHQRenderScripts(hqrs);
-          getHQRenderScript(hqrs[0]).then(function (res) {
-            var _res$data;
-            return res.data[0] && res.data[0].hqRenderscript && setCurrentHQRenderScript((_res$data = res.data) === null || _res$data === void 0 || (_res$data = _res$data[0]) === null || _res$data === void 0 ? void 0 : _res$data.hqRenderscript);
-          });
-        };
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          _loop();
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
+      var selectedConfigVariants = selected.filter(function (v) {
+        return !!v.configuration;
+      }).map(function (v) {
+        return v.configuration;
+      });
+      if (!selectedConfigVariants) {
+        throw new Error('no selected configVariants');
       }
+      var d3dps = [];
+      var hqrs = [];
+      selectedConfigVariants.forEach(function (cV) {
+        var set = cV === null || cV === void 0 ? void 0 : cV.OrderSets[0];
+        if (set !== null && set !== void 0 && set.Diva3DProject) d3dps.push(JSON.parse(atob(set.Diva3DProject)));
+        if (set !== null && set !== void 0 && set.HQRenderScript) hqrs.push(set.HQRenderScript);
+      });
+      setDiva3DProjects(d3dps);
+      setInitialDiva3DProject(d3dps[0]);
+      setHQRenderScripts(hqrs);
+      getHQRenderScript(hqrs[0]).then(function (res) {
+        var _res$data;
+        return res.data[0] && res.data[0].hqRenderscript && setCurrentHQRenderScript((_res$data = res.data) === null || _res$data === void 0 || (_res$data = _res$data[0]) === null || _res$data === void 0 ? void 0 : _res$data.hqRenderscript);
+      });
     } else {
-      if (!basket.Diva3DProject) {
-        throw new Error('basket has no Diva3DProject');
+      var _selected$0$configura;
+      var orderSet = (_selected$0$configura = selected[0].configuration) === null || _selected$0$configura === void 0 ? void 0 : _selected$0$configura.OrderSets[0];
+      if (!orderSet || !orderSet.HQRenderScript || !orderSet.Diva3DProject) {
+        throw new Error('HQRenderScript or Diva3DProject missing in product');
       }
-      getHQRenderScript(basket.OrderSets[0].HQRenderScript).then(function (res) {
+      getHQRenderScript(orderSet.HQRenderScript).then(function (res) {
         var _res$data2;
         return res.data[0] && res.data[0].hqRenderscript && setCurrentHQRenderScript((_res$data2 = res.data) === null || _res$data2 === void 0 || (_res$data2 = _res$data2[0]) === null || _res$data2 === void 0 ? void 0 : _res$data2.hqRenderscript);
       });
-      setDiva3DProjects([JSON.parse(atob(basket.Diva3DProject))]);
-      setInitialDiva3DProject(JSON.parse(atob(basket.Diva3DProject)));
-      setHQRenderScripts(basket.OrderSets.map(function (os) {
-        return os.HQRenderScript;
-      }));
+      setDiva3DProjects([JSON.parse(atob(orderSet.Diva3DProject))]);
+      setInitialDiva3DProject(JSON.parse(atob(orderSet.Diva3DProject)));
+      setHQRenderScripts([orderSet.HQRenderScript]);
     }
   }
   function reducerRenderJobForm(state, action) {
@@ -15370,11 +15121,11 @@ function useRenderjobs (_ref) {
       for (var elIdx = 0; elIdx < initSet.ELE.length; elIdx++) {
         var initEl = initSet.ELE[elIdx];
         var changedCFG = changedSet.ELE[elIdx].CFG;
-        var _iterator2 = _createForOfIteratorHelper(initEl.CFG),
-          _step2;
+        var _iterator = _createForOfIteratorHelper(initEl.CFG),
+          _step;
         try {
-          var _loop2 = function _loop2() {
-              var initOption = _step2.value;
+          var _loop = function _loop() {
+              var initOption = _step.value;
               if (!changedCFG.find(function (option) {
                 return option.OPT == initOption.OPT && option.OPV == initOption.OPV;
               })) {
@@ -15384,14 +15135,14 @@ function useRenderjobs (_ref) {
               }
             },
             _ret;
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            _ret = _loop2();
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            _ret = _loop();
             if (_ret) return _ret.v;
           }
         } catch (err) {
-          _iterator2.e(err);
+          _iterator.e(err);
         } finally {
-          _iterator2.f();
+          _iterator.f();
         }
       }
     }
@@ -15414,7 +15165,7 @@ function useRenderjobs (_ref) {
             i = 0;
           case 5:
             if (!(i < selected.length)) {
-              _context.next = 26;
+              _context.next = 24;
               break;
             }
             selectedProduct = selected[i];
@@ -15456,43 +15207,37 @@ function useRenderjobs (_ref) {
             if (newJob.fileName && newJob.fileName.includes(';') && variantId) {
               newJob.fileName = newJob.fileName.split(';')[Number(variantId)];
             }
-            if (basket) {
-              _context.next = 16;
-              break;
-            }
-            throw Error('cant order renderjob without basket');
-          case 16:
             if (!diva3DProjects[i]) {
-              _context.next = 22;
+              _context.next = 20;
               break;
             }
             newJob.diva3DProject = JSON.stringify(diva3DProjects[i]);
             jobs.push(newJob);
-            return _context.abrupt("continue", 23);
-          case 22:
+            return _context.abrupt("continue", 21);
+          case 20:
             throw Error('cant order renderjob without diva3dproject');
-          case 23:
+          case 21:
             i++;
             _context.next = 5;
             break;
-          case 26:
-            _context.next = 28;
+          case 24:
+            _context.next = 26;
             return apiSaveRenderJobs({
               serviceUrl: apiConfig.mediaService,
               jwt: jwt,
               jobs: jobs
             });
-          case 28:
+          case 26:
             jobs = _context.sent;
             // reset diva3dproject and hqrenderscript by resetting it
             setSelectionData();
             jobs.forEach(function (j) {
               return onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(j);
             });
-            _context.next = 37;
+            _context.next = 35;
             break;
-          case 33:
-            _context.prev = 33;
+          case 31:
+            _context.prev = 31;
             _context.t0 = _context["catch"](0);
             LOG$2.error(new DivaError('Coud not created renderjobs', {
               cause: _context.t0
@@ -15504,11 +15249,11 @@ function useRenderjobs (_ref) {
             } else {
               onError(t('modal.general_error') + ' ' + t('modal.errorcode') + ':' + DivaUtils$1.getCurrentTraceId() + ' ' + DivaUtils$1.formatDate(new Date(), true, undefined, true));
             }
-          case 37:
+          case 35:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 33]]);
+      }, _callee, null, [[0, 31]]);
     }));
     return function createRenderJob(_x) {
       return _ref3.apply(this, arguments);
@@ -16238,24 +15983,36 @@ function RenderJobTableLegacy (_ref) {
       customRenderer: function customRenderer(value) {
         switch (Number(value)) {
           case 0:
-            return t('productcreator.fields.renderjob.userstate.created');
+            return /*#__PURE__*/jsx(Fragment, {
+              children: t('productcreator.fields.renderjob.userstate.created')
+            });
           case 1:
           case 2:
           case 3:
-            return t('productcreator.fields.renderjob.userstate.ordered');
+            return /*#__PURE__*/jsx(Fragment, {
+              children: t('productcreator.fields.renderjob.userstate.ordered')
+            });
           case 4:
           case 5:
           case 6:
           case 7:
           case 9:
           case 11:
-            return t('productcreator.fields.renderjob.userstate.inProduction');
+            return /*#__PURE__*/jsx(Fragment, {
+              children: t('productcreator.fields.renderjob.userstate.inProduction')
+            });
           case 8:
-            return t('productcreator.fields.renderjob.userstate.renderFinished');
+            return /*#__PURE__*/jsx(Fragment, {
+              children: t('productcreator.fields.renderjob.userstate.renderFinished')
+            });
           case 10:
-            return t('productcreator.fields.renderjob.userstate.canceled');
+            return /*#__PURE__*/jsx(Fragment, {
+              children: t('productcreator.fields.renderjob.userstate.canceled')
+            });
           case 12:
-            return t('productcreator.fields.renderjob.userstate.finished');
+            return /*#__PURE__*/jsx(Fragment, {
+              children: t('productcreator.fields.renderjob.userstate.finished')
+            });
         }
         return /*#__PURE__*/jsx(Fragment, {});
       }
@@ -16627,11 +16384,9 @@ function RenderJobTableLegacy (_ref) {
 }
 function ProductCreator (_ref) {
-  var _state$variantData, _state$variantData2, _state$variantData$fi, _state$variantData3, _state$baseData$custo2, _configurationData$Pr6, _configurationData$Pr7, _state$baseData$custo3, _configurationData$Pr8, _configurationData$Pr9;
+  var _state$variantData, _state$variantData2, _state$variantData$fi, _state$variantData3, _state$baseData$custo2, _currentBasket$DivaNr, _configurationData$Pr6, _state$baseData$custo3, _configurationData$Pr7, _configurationData$Pr8, _currentBasket$OrderS;
   var basket = _ref.basket,
-    divaNr = _ref.divaNr,
-    checkBasket = _ref.checkBasket,
-    editedBasket = _ref.editedBasket;
+    divaNr = _ref.divaNr;
   var _useSellerState = useSellerState(),
     _useSellerState$actio = _useSellerState.actions,
     openPlanner = _useSellerState$actio.openPlanner,
@@ -16647,7 +16402,7 @@ function ProductCreator (_ref) {
     userHasPermission = _useDivaCore.actions.userHasPermission;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var _useProductState = useProductState(basket, divaNr, checkBasket, editedBasket),
+  var _useProductState = useProductState(basket, divaNr),
     state = _useProductState.state,
     baseDataFields = _useProductState.baseDataFields,
     currentBasket = _useProductState.basket,
@@ -16671,8 +16426,8 @@ function ProductCreator (_ref) {
     sortMedia = _useProductState.sortMedia,
     sortVariantRows = _useProductState.sortVariantRows,
     removeMedia = _useProductState.removeMedia,
-    addBasket = _useProductState.addBasket,
     save = _useProductState.save,
+    setSaved = _useProductState.setSaved,
     reset = _useProductState.reset,
     updateOptMap = _useProductState.updateOptMap;
   var _useState = useState(),
@@ -16758,61 +16513,49 @@ function ProductCreator (_ref) {
         label: 'productcreator.acceptBaseconfigData',
         key: 'BASECONFIG'
       }];
+      setSaved(false);
       setTabs(_tabs2);
       setTab('BASECONFIG');
     }
   }, [state]);
+  useEffect(function () {
+    if (basket) setSaved(false);
+  }, [basket]);
   useEffect(function () {
     var _state$initialSelecte;
     //reset selection if new data is loaded
     setSelectedFields((_state$initialSelecte = state === null || state === void 0 ? void 0 : state.initialSelectedFields) !== null && _state$initialSelecte !== void 0 ? _state$initialSelecte : []);
   }, [state === null || state === void 0 ? void 0 : state.initialSelectedFields]);
   var onOpenPlanner = function onOpenPlanner() {
+    var basketToInit = new BasketData(state === null || state === void 0 ? void 0 : state.baseData.configuration);
+    basketToInit.OrderSets[0].TinyVariantConfiguration = state === null || state === void 0 ? void 0 : state.variantData.map(function (v) {
+      return v.configuration;
+    });
     if (currentBasket !== null && currentBasket !== void 0 && currentBasket.SetPlannerInfos) {
       openPlanner({
-        basketData: currentBasket,
-        divaNr: currentBasket === null || currentBasket === void 0 ? void 0 : currentBasket.DivaNr,
+        basketData: basketToInit,
+        divaNr: state === null || state === void 0 ? void 0 : state.baseData.divaNr,
         returnTo: 'SETPLANNER_OPEN_SELLER_PRODUCTCREATOR',
         forceReload: '1'
       });
     } else if (showVarinats) {
       openPlanner({
-        setId: currentBasket === null || currentBasket === void 0 ? void 0 : currentBasket.OrderSets[0].SetID,
-        basketData: currentBasket,
-        divaNr: currentBasket === null || currentBasket === void 0 ? void 0 : currentBasket.DivaNr,
+        setId: basketToInit.OrderSets[0].SetID,
+        basketData: basketToInit,
+        divaNr: state === null || state === void 0 ? void 0 : state.baseData.divaNr,
         returnTo: 'FAVORITS_OPEN_SELLER_PRODUCTCREATOR',
         forceReload: '1'
       });
     } else {
       openPlanner({
-        setId: currentBasket === null || currentBasket === void 0 ? void 0 : currentBasket.OrderSets[0].SetID,
-        basketData: currentBasket,
-        divaNr: currentBasket === null || currentBasket === void 0 ? void 0 : currentBasket.DivaNr,
+        setId: basketToInit.OrderSets[0].SetID,
+        basketData: basketToInit,
+        divaNr: state === null || state === void 0 ? void 0 : state.baseData.divaNr,
         returnTo: 'OPEN_SELLER_PRODUCTCREATOR',
         forceReload: '1'
       });
     }
   };
-  var onAddBasket = function onAddBasket() {
-    openModal({
-      accept: true,
-      reject: true,
-      title: 'Planung hinzufügen',
-      text: 'Geben Sie die DivaNr der Planung ein, die Sie zu diesem Produkt hinzufügen wollen.' + ' Die Plannung muss vom selben Katalog sein und muss die selben Artikel enthalten. ',
-      content: /*#__PURE__*/jsx(Fragment, {
-        children: /*#__PURE__*/jsx(TextField$1, {
-          label: "DivaNr",
-          name: "DivaNr"
-        })
-      }),
-      callback: function callback(d) {
-        if (d instanceof FormData) {
-          var _d$get;
-          addBasket((_d$get = d.get('DivaNr')) === null || _d$get === void 0 ? void 0 : _d$get.trim());
-        }
-      }
-    });
-  };
   var onSave = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var success, _opener, _state$variantData$fi2, _state$variantData4, variantId, _configurationData$Pr2, _configurationData$Pr3;
@@ -16831,7 +16574,6 @@ function ProductCreator (_ref) {
             _context.next = 8;
             break;
           case 7:
-            //nothing changed, so we skip saving
             success = true;
           case 8:
             if (success) {
@@ -16990,9 +16732,7 @@ function ProductCreator (_ref) {
   var ButtonsElement = /*#__PURE__*/jsx(Buttons, {
     saveDisabled: missingMandatoryFields || missingMandatoryCustomFields,
     editBasketDisabled: editBasketDisabled,
-    allowAdd: configurationData === null || configurationData === void 0 || (_configurationData$Pr6 = configurationData.ProductCreator) === null || _configurationData$Pr6 === void 0 ? void 0 : _configurationData$Pr6.allowAddBasket,
     onSave: onSave,
-    onAddBasket: onAddBasket,
     onOpenPlanner: onOpenPlanner,
     onCancel: onCancel
   });
@@ -17005,7 +16745,7 @@ function ProductCreator (_ref) {
       height: '100%'
     },
     children: [/*#__PURE__*/jsx(Title, {
-      text: "".concat(t('productcreator.title'), " - ").concat(currentBasket === null || currentBasket === void 0 ? void 0 : currentBasket.DivaNr)
+      text: "".concat(t('productcreator.title'), " - ").concat((_currentBasket$DivaNr = currentBasket === null || currentBasket === void 0 ? void 0 : currentBasket.DivaNr) !== null && _currentBasket$DivaNr !== void 0 ? _currentBasket$DivaNr : state.baseData.divaNr)
     }), /*#__PURE__*/jsxs("div", {
       style: {
         position: 'relative',
@@ -17023,7 +16763,6 @@ function ProductCreator (_ref) {
             return setTab(v);
           },
           indicatorColor: "primary",
-          textColor: "primary",
           children: [tabs.map(function (tab) {
             return /*#__PURE__*/jsx(Tab$1, {
               style: {
@@ -17085,20 +16824,20 @@ function ProductCreator (_ref) {
         }), tab == 'RENDERJOBLEGACY' && /*#__PURE__*/jsx(RenderJobTableLegacy, {
           variantData: validVariantData,
           baseData: state.baseData,
-          configuration: configurationData === null || configurationData === void 0 || (_configurationData$Pr7 = configurationData.ProductCreator) === null || _configurationData$Pr7 === void 0 || (_configurationData$Pr7 = _configurationData$Pr7.renderjobs) === null || _configurationData$Pr7 === void 0 ? void 0 : _configurationData$Pr7.ambienteSelection,
+          configuration: configurationData === null || configurationData === void 0 || (_configurationData$Pr6 = configurationData.ProductCreator) === null || _configurationData$Pr6 === void 0 || (_configurationData$Pr6 = _configurationData$Pr6.renderjobs) === null || _configurationData$Pr6 === void 0 ? void 0 : _configurationData$Pr6.ambienteSelection,
           basketData: currentBasket,
           onSave: save,
           saved: !isNew,
           onError: setError,
           children: !(state !== null && state !== void 0 && (_state$baseData$custo3 = state.baseData.customData) !== null && _state$baseData$custo3 !== void 0 && (_state$baseData$custo3 = _state$baseData$custo3.SMArticleId) !== null && _state$baseData$custo3 !== void 0 && _state$baseData$custo3.value) && ButtonsElement
-        }), (configurationData === null || configurationData === void 0 || (_configurationData$Pr8 = configurationData.ProductCreator) === null || _configurationData$Pr8 === void 0 ? void 0 : _configurationData$Pr8.renderjobs) && tab == 'RENDERJOB' && /*#__PURE__*/jsx(RenderJobTable, {
+        }), (configurationData === null || configurationData === void 0 || (_configurationData$Pr7 = configurationData.ProductCreator) === null || _configurationData$Pr7 === void 0 ? void 0 : _configurationData$Pr7.renderjobs) && tab == 'RENDERJOB' && /*#__PURE__*/jsx(RenderJobTable, {
           variantData: validVariantData,
           baseData: state.baseData,
           basketData: currentBasket,
           onSave: save,
           saved: !isNew,
           onError: setError,
-          config: configurationData === null || configurationData === void 0 || (_configurationData$Pr9 = configurationData.ProductCreator) === null || _configurationData$Pr9 === void 0 ? void 0 : _configurationData$Pr9.renderjobs
+          config: configurationData === null || configurationData === void 0 || (_configurationData$Pr8 = configurationData.ProductCreator) === null || _configurationData$Pr8 === void 0 ? void 0 : _configurationData$Pr8.renderjobs
         }), tab == 'MEDIA' && /*#__PURE__*/jsx(MediaTable, {
           variantData: validVariantData,
           baseData: state.baseData,
@@ -17123,7 +16862,7 @@ function ProductCreator (_ref) {
           isBaseConfig: customFormData ? true : false,
           children: ButtonsElement
         }), tab == 'CLASS' && /*#__PURE__*/jsx(ClassificationDataForm, {
-          orderDescription: currentBasket.OrderSets[0].VariantDescription,
+          orderDescription: (_currentBasket$OrderS = currentBasket === null || currentBasket === void 0 ? void 0 : currentBasket.OrderSets[0].VariantDescription) !== null && _currentBasket$OrderS !== void 0 ? _currentBasket$OrderS : state.baseData.technicalDescription,
           classificationData: state === null || state === void 0 ? void 0 : state.classificationData,
           classificationFields: state === null || state === void 0 ? void 0 : state.classificationFields,
           updateClassification: updateClassifications,
@@ -17439,7 +17178,6 @@ function ModuleComponent(_ref) {
     activeDivaNr = _ref.activeDivaNr,
     activeBasket = _ref.activeBasket,
     activeAccountId = _ref.activeAccountId,
-    editedBasket = _ref.editedBasket,
     checkBasket = _ref.checkBasket;
   var _useSellerState2 = useSellerState(),
     configurationData = _useSellerState2.state.configurationData;
@@ -17480,9 +17218,7 @@ function ModuleComponent(_ref) {
     case 'PCreator':
       return /*#__PURE__*/jsx(ProductCreator, {
         basket: activeBasket,
-        divaNr: activeDivaNr,
-        checkBasket: checkBasket,
-        editedBasket: editedBasket
+        divaNr: activeDivaNr
       });
     default:
       throw Error("Unknown Module: ".concat(activeModule));
@@ -17578,7 +17314,6 @@ var Main = function Main(_ref) {
         activeCollectionId: parameters === null || parameters === void 0 ? void 0 : parameters.collectionId,
         activeDivaNr: (parameters === null || parameters === void 0 ? void 0 : parameters.DivaNR) || (parameters === null || parameters === void 0 ? void 0 : parameters.divaNr) || (parameters === null || parameters === void 0 ? void 0 : parameters.divanr),
         activeBasket: internal === null || internal === void 0 ? void 0 : internal.basketData,
-        editedBasket: internal === null || internal === void 0 ? void 0 : internal.edited,
         activeAccountId: parameters === null || parameters === void 0 ? void 0 : parameters.accountId,
         checkBasket: parameters === null || parameters === void 0 ? void 0 : parameters.check
       })