@configuratorware/configurator-admingui 1.40.5 → 1.41.0

package/Components/FormFragments/Checkbox.js

@@ -13,10 +13,12 @@ var _FormControlLabel = _interopRequireDefault(require("../../UIComponents/FormC
 
 var _ErrorWrapper = _interopRequireDefault(require("./ErrorWrapper"));
 
+var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var checkbox = function checkbox(props) {
-  return /*#__PURE__*/_react["default"].createElement(_ErrorWrapper["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_ErrorWrapper["default"], {
     error: props.error
   }, /*#__PURE__*/_react["default"].createElement(_FormControlLabel["default"], {
     control: /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
@@ -27,7 +29,9 @@ var checkbox = function checkbox(props) {
       name: props.name
     }),
     label: props.label
-  }));
+  })), props.helperText && /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+    variant: 'caption'
+  }, props.helperText));
 };
 
 var _default = checkbox;

package/Screens/Channel/Containers/Edit.js

@@ -47,6 +47,14 @@ var formFields = [{
     label: 'Hide prices',
     type: 'checkbox'
   }]
+}, {
+  name: 'settings',
+  type: _SimpleNestedData["default"],
+  fields: [{
+    name: 'vatrate',
+    label: 'VAT rate',
+    type: 'number'
+  }]
 }, {
   name: 'globalDiscountPercentage',
   label: 'discountPercentage',

package/Screens/Channel/Reducers/Reducer.js

@@ -39,6 +39,9 @@ var initialState = _objectSpread({}, (0, _Reducer.getDefaultEntityState)({
     schema: {
       hidePrices: {
         value: false
+      },
+      vatrate: {
+        value: null
       }
     }
   }

package/Screens/Channel/Translations.js

@@ -13,6 +13,7 @@ require("../../App/i18n").use({
     },
     Identifier: 'Identifier',
     Currency: 'Währung',
-    discountPercentage: 'Prozentualer Rabatt'
+    discountPercentage: 'Prozentualer Rabatt',
+    'VAT rate': 'Mehrwertsteuersatz'
   }
 }, true);

package/Screens/Client/Components/ColorTextField.js

@@ -13,6 +13,10 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _i18n = require("../../../App/i18n");
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -30,7 +34,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var ColorTextField = function ColorTextField(_ref) {
-  var name = _ref.name,
+  var label = _ref.label,
+      name = _ref.name,
       value = _ref.value,
       _onChange = _ref.onChange,
       error = _ref.error;
@@ -40,9 +45,17 @@ var ColorTextField = function ColorTextField(_ref) {
       customError = _useState2[0],
       setCustomError = _useState2[1];
 
+  var _useState3 = (0, _react.useState)(null),
+      _useState4 = _slicedToArray(_useState3, 2),
+      customHelperText = _useState4[0],
+      setCustomHelperText = _useState4[1];
+
+  (0, _react.useEffect)(function () {
+    checkIfColorIsEqualToBackgroundColor(value);
+  }, [value]);
   (0, _react.useEffect)(function () {
     if (error) {
-      if (value === "" || value === undefined) {
+      if (value === '' || value === undefined) {
         setCustomError(error);
       } else {
         validateColor(value);
@@ -63,13 +76,21 @@ var ColorTextField = function ColorTextField(_ref) {
 
         setCustomError(null);
       } else {
-        setCustomError((0, _i18n.T)('themeColorError'));
+        setCustomError((0, _i18n.t)('themeColorError'));
       }
     }
   };
 
+  var checkIfColorIsEqualToBackgroundColor = function checkIfColorIsEqualToBackgroundColor(color) {
+    if (color.toUpperCase() === '#FFF' || color.toUpperCase() === '#FFFFFF') {
+      setCustomHelperText((0, _i18n.t)('highlightColorInfo'));
+    } else {
+      setCustomHelperText(null);
+    }
+  };
+
   return /*#__PURE__*/_react["default"].createElement(_core.TextField, {
-    label: (0, _i18n.t)("Theme - Highlight color"),
+    label: label || (0, _i18n.t)('Theme - Highlight color'),
     onChange: function onChange(evt) {
       _onChange(name, evt.target.value);
     },
@@ -80,11 +101,18 @@ var ColorTextField = function ColorTextField(_ref) {
       width: '100%'
     },
     error: customError,
-    helperText: customError,
-    value: value || "",
-    type: "text"
+    helperText: customError || customHelperText,
+    value: value || '',
+    type: 'text'
   });
 };
 
+ColorTextField.propTypes = {
+  value: _propTypes["default"].string,
+  error: _propTypes["default"].node,
+  onChange: _propTypes["default"].func.isRequired,
+  label: _propTypes["default"].node,
+  name: _propTypes["default"].string
+};
 var _default = ColorTextField;
 exports["default"] = _default;

package/Screens/Client/Components/PdfMarkdownField.js

@@ -21,8 +21,6 @@ var _FormControlLabel = _interopRequireDefault(require("../../../UIComponents/Fo
 
 var _styles = require("@material-ui/core/styles");
 
-var _debounce = _interopRequireDefault(require("lodash/debounce"));
-
 var _i18n = require("../../../App/i18n");
 
 var _ErrorWrapper = _interopRequireDefault(require("../../../Components/FormFragments/ErrorWrapper"));

package/Screens/Client/Translations.js

@@ -17,6 +17,7 @@ require("../../App/i18n").use({
     headerInfo: 'Please check your changes in a generated pdf to make sure it looks as expected',
     footerInfo: 'Please check your changes in a generated pdf to make sure it looks as expected',
     emailHint: 'separate multiple addresses with a semicolon',
+    highlightColorInfo: 'Highlight color is used for highlighting elements in the frontend. Make sure you use a color value that is visible, depending on the background color in your frontend.',
     clientFontMessage: 'For the font to be rendered correctly in the configuratorware frontend, make sure the filename does not contain any spaces and matches the fonts internal name.'
   },
   de: {
@@ -49,6 +50,7 @@ require("../../App/i18n").use({
     headerInfo: 'Bitte überprüfe Deine Änderungen in einem generierten PDF',
     footerInfo: 'Bitte überprüfe Deine Änderungen in einem generierten PDF',
     emailHint: 'trenne mehrere Adressen mit einem Semikolon',
+    highlightColorInfo: 'Die Highlight Farbe wird genutzt um Elemente im Frontend zu unterstreichen. Benutze einen Farbwert, der auf der Hintgrundfarbe des Frontends sichtbar ist.',
     clientFontMessage: 'Für eine korrekte Darstellung der Schrift im configuratorware Fronted darf der Dateiname keine Leerzeichen enthalten und muss dem internen Namen der Schriftart entsprechen.'
   }
 }, true);

package/Screens/Creator/Components/OptionclassificationEditor.js

@@ -49,7 +49,11 @@ var _OptionPriceEditor = _interopRequireDefault(require("./OptionPriceEditor"));
 
 require("../../Item/Components/Styles.scss");
 
-var _excluded = ["value", "priceEditEnabled"];
+var _Toggle = _interopRequireDefault(require("../../../Components/FormFragments/Toggle"));
+
+var _reactSortableHoc = require("react-sortable-hoc");
+
+var _excluded = ["value", "priceEditEnabled", "overrideOptionOrder", "setOverrideOptionOrder", "showOverrideOptionOrderSaveHint"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -155,6 +159,37 @@ var OptionclassificationEditorOptionTile = /*#__PURE__*/function (_React$Compone
   return OptionclassificationEditorOptionTile;
 }(_react["default"].Component);
 
+var SortableList = (0, _reactSortableHoc.SortableContainer)(function (props) {
+  return /*#__PURE__*/_react["default"].createElement("ul", null, props.children);
+});
+var SortableOptionTile = (0, _reactSortableHoc.SortableElement)(function (props) {
+  return /*#__PURE__*/_react["default"].createElement(OptionTile, {
+    option: props.value,
+    onRemoveOption: props.onRemoveOption,
+    onEditOption: props.onEditOption,
+    onEditPrice: props.onEditPrice,
+    priceEditEnabled: props.priceEditEnabled
+  });
+});
+
+var OptionTile = function OptionTile(_ref2) {
+  var option = _ref2.option,
+      priceEditEnabled = _ref2.priceEditEnabled,
+      onRemoveOption = _ref2.onRemoveOption,
+      onEditOption = _ref2.onEditOption,
+      onEditPrice = _ref2.onEditPrice;
+  return /*#__PURE__*/_react["default"].createElement("li", {
+    key: option.identifier,
+    className: "draggable-option-item"
+  }, /*#__PURE__*/_react["default"].createElement(OptionclassificationEditorOptionTile, {
+    option: option,
+    onRemoveOption: onRemoveOption,
+    onEditOption: onEditOption,
+    onEditPrice: onEditPrice,
+    priceEditEnabled: priceEditEnabled
+  }));
+};
+
 var OptionclassificationEditorItem = /*#__PURE__*/function (_React$Component2) {
   _inherits(OptionclassificationEditorItem, _React$Component2);
 
@@ -205,6 +240,19 @@ var OptionclassificationEditorItem = /*#__PURE__*/function (_React$Component2) {
       _this2.props.onEditOptionPrice(_this2.props.optionclassification, option);
     });
 
+    _defineProperty(_assertThisInitialized(_this2), "onSortEnd", function (_ref3) {
+      var oldIndex = _ref3.oldIndex,
+          newIndex = _ref3.newIndex;
+      var component = _this2.props.optionclassification;
+      var items = (0, _reactSortableHoc.arrayMove)(component.selectableOptions, oldIndex, newIndex);
+      component.selectableOptions = items.map(function (item, index) {
+        item.sequenceNumber = index + 1;
+        return item;
+      });
+
+      _this2.props.onChange(component);
+    });
+
     _this2.state = {
       open: false
     };
@@ -219,6 +267,7 @@ var OptionclassificationEditorItem = /*#__PURE__*/function (_React$Component2) {
       var _this$props2 = this.props,
           optionclassification = _this$props2.optionclassification,
           number = _this$props2.number,
+          sortable = _this$props2.sortable,
           priceEditEnabled = _this$props2.priceEditEnabled;
       var selectableOptions = optionclassification.selectableOptions;
       var open = this.state.open;
@@ -247,19 +296,34 @@ var OptionclassificationEditorItem = /*#__PURE__*/function (_React$Component2) {
         className: "optionclassificationEditor-addOption",
         color: "secondary",
         icon: /*#__PURE__*/_react["default"].createElement(_AddIcon["default"], null)
-      }), selectableOptions && /*#__PURE__*/_react["default"].createElement("div", {
+      }), selectableOptions && (sortable ? /*#__PURE__*/_react["default"].createElement("div", {
+        className: "options-wrapper"
+      }, /*#__PURE__*/_react["default"].createElement(SortableList, {
+        onSortEnd: this.onSortEnd,
+        axis: "x",
+        lockAxis: "x",
+        pressDelay: "150"
+      }, selectableOptions.map(function (option, index) {
+        return /*#__PURE__*/_react["default"].createElement(SortableOptionTile, {
+          key: option.id,
+          index: index,
+          value: option,
+          onRemoveOption: _this3.removeOption,
+          onEditOption: _this3.editOption,
+          onEditPrice: _this3.editOptionPrice,
+          priceEditEnabled: priceEditEnabled
+        });
+      }))) : /*#__PURE__*/_react["default"].createElement("div", {
         className: "options-wrapper"
       }, /*#__PURE__*/_react["default"].createElement("ul", null, selectableOptions.map(function (option) {
-        return /*#__PURE__*/_react["default"].createElement("li", {
-          key: option.identifier
-        }, /*#__PURE__*/_react["default"].createElement(OptionclassificationEditorOptionTile, {
+        return /*#__PURE__*/_react["default"].createElement(OptionTile, {
           option: option,
           onRemoveOption: _this3.removeOption,
           onEditOption: _this3.editOption,
           onEditPrice: _this3.editOptionPrice,
           priceEditEnabled: priceEditEnabled
-        }));
-      })))));
+        });
+      }))))));
     }
   }]);
 
@@ -320,13 +384,24 @@ var OptionclassificationEditor = /*#__PURE__*/function (_React$Component3) {
       var _this$props3 = this.props,
           value = _this$props3.value,
           priceEditEnabled = _this$props3.priceEditEnabled,
+          overrideOptionOrder = _this$props3.overrideOptionOrder,
+          setOverrideOptionOrder = _this$props3.setOverrideOptionOrder,
+          showOverrideOptionOrderSaveHint = _this$props3.showOverrideOptionOrderSaveHint,
           otherProps = _objectWithoutProperties(_this$props3, _excluded);
 
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "optionclassificationEditor-wrapper"
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "optionclassificationEditor-info"
-      }, (0, _i18n.T)(value.length > 0 ? 'constructionPatterns.components.infoText' : 'constructionPatterns.components.noComponentsSelected')), value.map(function (oc, idx) {
+      }, (0, _i18n.T)(value.length > 0 ? 'constructionPatterns.option.sourceHeadline' : 'constructionPatterns.components.noComponentsSelected')), /*#__PURE__*/_react["default"].createElement(_Toggle["default"], {
+        label: (0, _i18n.T)('constructionPatterns.overrideOptionOrder'),
+        value: overrideOptionOrder,
+        onChange: function onChange(name, checked) {
+          return setOverrideOptionOrder(checked);
+        },
+        fullWidth: false,
+        error: showOverrideOptionOrderSaveHint ? (0, _i18n.T)('constructionPatterns.overrideOptionOrderHint') : null
+      }), value.map(function (oc, idx) {
         return /*#__PURE__*/_react["default"].createElement(OptionclassificationEditorItem, {
           key: oc.identifier,
           number: idx + 1,
@@ -335,7 +410,8 @@ var OptionclassificationEditor = /*#__PURE__*/function (_React$Component3) {
           onAddOption: _this5.addOption,
           onEditOption: _this5.editOption,
           onEditOptionPrice: _this5.editOptionPrice,
-          priceEditEnabled: priceEditEnabled
+          priceEditEnabled: priceEditEnabled,
+          sortable: overrideOptionOrder
         });
       }), /*#__PURE__*/_react["default"].createElement(OptionSelection, otherProps), /*#__PURE__*/_react["default"].createElement(OptionEditor, otherProps), /*#__PURE__*/_react["default"].createElement(_OptionPriceEditor["default"], otherProps));
     }
@@ -523,9 +599,9 @@ var OptionEditor = /*#__PURE__*/function (_React$Component5) {
   return OptionEditor;
 }(_react["default"].Component);
 
-function mapStateToProps(_ref2) {
-  var baseConfigurationData = _ref2.baseConfigurationData,
-      creatorData = _ref2.creatorData;
+function mapStateToProps(_ref4) {
+  var baseConfigurationData = _ref4.baseConfigurationData,
+      creatorData = _ref4.creatorData;
   return {
     showOptionSelectionDialog: baseConfigurationData.showOptionSelectionDialog,
     selectedComponent: baseConfigurationData.selectedComponent,
@@ -534,6 +610,7 @@ function mapStateToProps(_ref2) {
     selectedOption: baseConfigurationData.selectedOption,
     options: baseConfigurationData.selectableOptions,
     product: creatorData.source,
+    showOverrideOptionOrderSaveHint: baseConfigurationData.showOverrideOptionOrderSaveHint,
     priceEditEnabled: _lodash["default"].get(baseConfigurationData, 'dataSources.settings.calculationMethod') === 'deltaprices'
   };
 }

package/Screens/Creator/Containers/Edit.js

@@ -413,7 +413,8 @@ var ConfigurationDataFormBase = /*#__PURE__*/function (_Component2) {
 
       var _this$props2 = this.props,
           entityState = _this$props2.entityState,
-          setOverwriteComponentOrder = _this$props2.setOverwriteComponentOrder;
+          setOverwriteComponentOrder = _this$props2.setOverwriteComponentOrder,
+          setOverrideOptionOrder = _this$props2.setOverrideOptionOrder;
 
       var source = _lodash["default"].get(entityState, 'dataSources.selectableComponents.data');
 
@@ -470,7 +471,9 @@ var ConfigurationDataFormBase = /*#__PURE__*/function (_Component2) {
             return /*#__PURE__*/_react["default"].createElement("div", null, headLine, /*#__PURE__*/_react["default"].createElement(_OptionclassificationEditor["default"], {
               name: "selectableComponents",
               value: value,
-              onChange: this.onChange
+              onChange: this.onChange,
+              overrideOptionOrder: Boolean(_lodash["default"].get(entityState, 'data.item.value.overrideOptionOrder')),
+              setOverrideOptionOrder: setOverrideOptionOrder
             }));
           }
 
@@ -514,12 +517,13 @@ var ConfigurationDataFormBase = /*#__PURE__*/function (_Component2) {
   return ConfigurationDataFormBase;
 }(_react.Component);
 
-function withOverwriteComponentOrder(Component) {
+function withOverwriteOrder(Component) {
   return (0, _reactRedux.connect)(function () {
     return {};
   }, {
-    setOverwriteComponentOrder: _ConfigurationActions.setOverwriteComponentOrder
+    setOverwriteComponentOrder: _ConfigurationActions.setOverwriteComponentOrder,
+    setOverrideOptionOrder: _ConfigurationActions.setOverrideOptionOrder
   })(Component);
 }
 
-var ConfigurationDataForm = (0, _DefaultConnectedForm.connectDefault)(withOverwriteComponentOrder(ConfigurationDataFormBase), _ConfigurationActions.CONFIGURATION_REDUCER_NAME, _ConfigurationActions["default"].setFieldData, _ConfigurationActions["default"].postData);
+var ConfigurationDataForm = (0, _DefaultConnectedForm.connectDefault)(withOverwriteOrder(ConfigurationDataFormBase), _ConfigurationActions.CONFIGURATION_REDUCER_NAME, _ConfigurationActions["default"].setFieldData, _ConfigurationActions["default"].postData);

package/Screens/Creator/Reducers/ConfigurationActions.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setOverwriteComponentOrder = exports.getAdminModeHash = exports.showConfiguratorAdminMode = exports.hideOpenCreatorPreviewError = exports.hideOpenDesignerPreviewError = exports.showOpenCreatorPreviewError = exports.showOpenDesignerPreviewError = exports.saveConfigurationSuccess = exports.saveConstructionPattern = exports.commitOptionData = exports.setOptionData = exports.showConfigurator = exports.fetchBaseConfiguration = exports.showOptionPriceEditor = exports.showOptionEditor = exports.commitOptions = exports.setOptions = exports.fetchOptions = exports.invalidateOptions = exports.showOptionSelection = exports.CONFIGURATION_SET_OVERWRITE_COMPONENT_ORDER = exports.CONFIGURATION_SHOW_CONFIGURATOR_ADMIN_MODE = exports.CONFIGURATION_HIDE_CREATOR_PREVIEW_ERROR = exports.CONFIGURATION_HIDE_DESIGNER_PREVIEW_ERROR = exports.CONFIGURATION_SHOW_CREATOR_PREVIEW_ERROR = exports.CONFIGURATION_SHOW_DESIGNER_PREVIEW_ERROR = exports.CONFIGURATION_GET_ADMIN_MODE_HASH = exports.CONFIGURATION_ADMIN_MODE_HASH_URL = exports.CONFIGURATION_ADMIN_MODE_HASH_KEY = exports.CONFIGURATION_SAVE_CONFIGURATION_SUCCESS = exports.CONFIGURATION_SAVE_ITEM = exports.CONFIGURATION_SAVE_CONFIGURATION = exports.CONFIGURATION_LOAD_BASE_CONFIGURATION = exports.CONFIGURATION_INVALIDATE_OPTIONS = exports.CONFIGURATION_SHOW_CONFIGURATOR = exports.CONFIGURATION_SHOW_OPTION_PRICE_EDITOR = exports.CONFIGURATION_SHOW_OPTION_EDITOR = exports.CONFIGURATION_SHOW_OPTION_SELECTION = exports["default"] = exports.CONFIGURATION_COMMIT_OPTION_DATA = exports.CONFIGURATION_SET_OPTION_DATA = exports.CONFIGURATION_BASE_CONFIGURATION_KEY = exports.CONFIGURATION_COMMIT_OPTIONS = exports.CONFIGURATION_SET_OPTIONS = exports.CONFIGURATION_OPTIONS_KEY = exports.CONFIGURATION_POST_URL = exports.CONFIGURATION_REDUCER_NAME = exports.CONFIGURATION_DATA_KEY = exports.CONFIGURATION_LIST_KEY = void 0;
+exports.setOverrideOptionOrder = exports.setOverwriteComponentOrder = exports.getAdminModeHash = exports.showConfiguratorAdminMode = exports.hideOpenCreatorPreviewError = exports.hideOpenDesignerPreviewError = exports.showOpenCreatorPreviewError = exports.showOpenDesignerPreviewError = exports.saveConfigurationSuccess = exports.saveConstructionPattern = exports.commitOptionData = exports.setOptionData = exports.showConfigurator = exports.fetchBaseConfiguration = exports.showOptionPriceEditor = exports.showOptionEditor = exports.commitOptions = exports.setOptions = exports.fetchOptions = exports.invalidateOptions = exports.showOptionSelection = exports.CONFIGURATION_SET_OVERRIDE_OPTION_ORDER = exports.CONFIGURATION_SET_OVERWRITE_COMPONENT_ORDER = exports.CONFIGURATION_SHOW_CONFIGURATOR_ADMIN_MODE = exports.CONFIGURATION_HIDE_CREATOR_PREVIEW_ERROR = exports.CONFIGURATION_HIDE_DESIGNER_PREVIEW_ERROR = exports.CONFIGURATION_SHOW_CREATOR_PREVIEW_ERROR = exports.CONFIGURATION_SHOW_DESIGNER_PREVIEW_ERROR = exports.CONFIGURATION_GET_ADMIN_MODE_HASH = exports.CONFIGURATION_ADMIN_MODE_HASH_URL = exports.CONFIGURATION_ADMIN_MODE_HASH_KEY = exports.CONFIGURATION_SAVE_CONFIGURATION_SUCCESS = exports.CONFIGURATION_SAVE_ITEM = exports.CONFIGURATION_SAVE_CONFIGURATION = exports.CONFIGURATION_LOAD_BASE_CONFIGURATION = exports.CONFIGURATION_INVALIDATE_OPTIONS = exports.CONFIGURATION_SHOW_CONFIGURATOR = exports.CONFIGURATION_SHOW_OPTION_PRICE_EDITOR = exports.CONFIGURATION_SHOW_OPTION_EDITOR = exports.CONFIGURATION_SHOW_OPTION_SELECTION = exports["default"] = exports.CONFIGURATION_COMMIT_OPTION_DATA = exports.CONFIGURATION_SET_OPTION_DATA = exports.CONFIGURATION_BASE_CONFIGURATION_KEY = exports.CONFIGURATION_COMMIT_OPTIONS = exports.CONFIGURATION_SET_OPTIONS = exports.CONFIGURATION_OPTIONS_KEY = exports.CONFIGURATION_POST_URL = exports.CONFIGURATION_REDUCER_NAME = exports.CONFIGURATION_DATA_KEY = exports.CONFIGURATION_LIST_KEY = void 0;
 
 var _get = _interopRequireDefault(require("lodash/get"));
 
@@ -17,7 +17,8 @@ var _Actions3 = require("../../../App/Reducers/Frame/Actions");
 
 var _i18n = require("../../../App/i18n");
 
-var _excluded = ["stock"];
+var _excluded = ["stock"],
+    _excluded2 = ["stock"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -96,6 +97,8 @@ var CONFIGURATION_SHOW_CONFIGURATOR_ADMIN_MODE = 'CONFIGURATION_SHOW_CONFIGURATO
 exports.CONFIGURATION_SHOW_CONFIGURATOR_ADMIN_MODE = CONFIGURATION_SHOW_CONFIGURATOR_ADMIN_MODE;
 var CONFIGURATION_SET_OVERWRITE_COMPONENT_ORDER = 'CONFIGURATION_SET_OVERWRITE_COMPONENT_ORDER';
 exports.CONFIGURATION_SET_OVERWRITE_COMPONENT_ORDER = CONFIGURATION_SET_OVERWRITE_COMPONENT_ORDER;
+var CONFIGURATION_SET_OVERRIDE_OPTION_ORDER = 'CONFIGURATION_SET_OVERRIDE_OPTION_ORDER';
+exports.CONFIGURATION_SET_OVERRIDE_OPTION_ORDER = CONFIGURATION_SET_OVERRIDE_OPTION_ORDER;
 
 var showOptionSelection = function showOptionSelection() {
   var show = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -440,4 +443,80 @@ var setOverwriteComponentOrder = function setOverwriteComponentOrder(value) {
   }();
 };
 
-exports.setOverwriteComponentOrder = setOverwriteComponentOrder;
+exports.setOverwriteComponentOrder = setOverwriteComponentOrder;
+
+var setOverrideOptionOrder = function setOverrideOptionOrder(value) {
+  return /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(dispatch, getState) {
+      var entityState, item, stock, itemData, data, url;
+      return regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              entityState = getState()[CONFIGURATION_REDUCER_NAME];
+              _context3.next = 3;
+              return dispatch({
+                type: CONFIGURATION_SET_OVERRIDE_OPTION_ORDER,
+                value: value
+              });
+
+            case 3:
+              item = (0, _get["default"])(entityState, 'data.item.value');
+
+              if (!item) {
+                _context3.next = 9;
+                break;
+              }
+
+              stock = item.stock, itemData = _objectWithoutProperties(item, _excluded2);
+              data = _objectSpread(_objectSpread({}, itemData), {}, {
+                overrideOptionOrder: value
+              });
+              url = "items";
+              return _context3.abrupt("return", dispatch((0, _Actions2.postData)({
+                url: url
+              }, data, CONFIGURATION_SAVE_ITEM)).then(function (apiAction) {
+                switch (apiAction.type) {
+                  case _Helpers.RECEIVE_DATA:
+                    {
+                      dispatch((0, _Actions3.showInfoMessage)((0, _i18n.t)('entity.saveOk')));
+                      dispatch(saveConfigurationSuccess(apiAction.data));
+                      return true;
+                    }
+
+                  case _Helpers.NETWORK_ERROR:
+                    {
+                      var state = getState();
+                      var source = state.dataBySource[apiAction.key];
+
+                      if (source.isPosted) {
+                        // data is saved
+                        dispatch((0, _Actions3.showErrorMessage)((0, _i18n.t)('entity.saveError'), apiAction.error));
+                      } else {
+                        dispatch((0, _Actions3.showErrorMessage)((0, _i18n.t)('entity.loadError'), apiAction.error));
+                      }
+
+                      dispatch({
+                        type: CONFIGURATION_SET_OVERRIDE_OPTION_ORDER,
+                        value: !value
+                      });
+                      return false;
+                    }
+                }
+              }));
+
+            case 9:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee3);
+    }));
+
+    return function (_x4, _x5) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+};
+
+exports.setOverrideOptionOrder = setOverrideOptionOrder;

package/Screens/Creator/Reducers/ConfigurationReducer.js

@@ -78,7 +78,8 @@ var initialState = _objectSpread(_objectSpread({}, (0, _Reducer.getDefaultEntity
   baseConfigurationState: null,
   showConfigurator: false,
   showOpenDesignerPreviewError: false,
-  showOpenCreatorPreviewError: false
+  showOpenCreatorPreviewError: false,
+  showOverrideOptionOrderSaveHint: false
 });
 
 var baseConfigurationData = (0, _FeatureReducers.createFeatureReducer)(_ConfigurationActions.CONFIGURATION_REDUCER_NAME, function () {
@@ -127,6 +128,12 @@ var baseConfigurationData = (0, _FeatureReducers.createFeatureReducer)(_Configur
           });
         }
 
+        if (action.key === _ConfigurationActions.CONFIGURATION_DATA_KEY) {
+          return _objectSpread(_objectSpread({}, state), {}, {
+            showOverrideOptionOrderSaveHint: false
+          });
+        }
+
         return state;
       }
 
@@ -314,6 +321,51 @@ var baseConfigurationData = (0, _FeatureReducers.createFeatureReducer)(_Configur
         });
       }
 
+    case _ConfigurationActions.CONFIGURATION_SET_OVERRIDE_OPTION_ORDER:
+      {
+        var overrideOptionOrder = action.value;
+        var _nextState2 = state;
+        var showOverrideOptionOrderSaveHint = false;
+
+        if (!overrideOptionOrder) {
+          showOverrideOptionOrderSaveHint = true; // reset options seuqence number -> global sequence number will be used when loading in FE
+
+          var _state3 = state,
+              _data5 = _state3.data;
+          var _selectableComponents = _data5.selectableComponents;
+          var _currentOptionclassifications = _selectableComponents.value;
+
+          _currentOptionclassifications.forEach(function (optionClassification) {
+            return optionClassification.selectableOptions.forEach(function (option) {
+              return option.sequenceNumber = null;
+            });
+          });
+
+          _nextState2 = _objectSpread(_objectSpread({}, state), {}, {
+            data: _objectSpread(_objectSpread({}, _data5), {}, {
+              selectableComponents: _objectSpread(_objectSpread({}, _selectableComponents), {}, {
+                value: _currentOptionclassifications
+              })
+            })
+          });
+        }
+
+        var _nextState3 = _nextState2,
+            _data4 = _nextState3.data;
+        var _item = _data4.item;
+        var _value = _item.value;
+        return _objectSpread(_objectSpread({}, _nextState2), {}, {
+          showOverrideOptionOrderSaveHint: showOverrideOptionOrderSaveHint,
+          data: _objectSpread(_objectSpread({}, _data4), {}, {
+            item: _objectSpread(_objectSpread({}, _item), {}, {
+              value: _objectSpread(_objectSpread({}, _value), {}, {
+                overrideOptionOrder: overrideOptionOrder
+              })
+            })
+          })
+        });
+      }
+
     default:
       state = (0, _Reducer.defaultEntityReducer)(state, action, initialState);
 

package/Screens/Creator/Translations.js

@@ -59,7 +59,9 @@ require("../../App/i18n").use({
         title: 'Delta prices',
         description: 'Option "%{option}" in Component "%{component}" by Product "%{product}"',
         addButtonLabel: 'Add price'
-      }
+      },
+      overrideOptionOrder: 'Edit option order for item</br>(when deactivated, the global option order is used)',
+      overrideOptionOrderHint: '</br></br>In order to see the options globally, you have to save your current changes.'
     },
     openPreviewError: {
       title: 'Missing data',
@@ -125,7 +127,9 @@ require("../../App/i18n").use({
         title: 'Aufpreise',
         description: 'Option "%{option}" in Komponente "%{component}" an Produkt "%{product}"',
         addButtonLabel: 'Preis hinzufügen'
-      }
+      },
+      overrideOptionOrder: 'Optionsreihenfolge auf Produktebene pflegen </br>(Wenn deaktiviert, greift die globale Optionsreihenfolge)',
+      overrideOptionOrderHint: '</br></br>Um die globale Sortierung der Optionen anzuwenden, speichere bitte deine aktuellen Änderungen.'
     },
     openPreviewError: {
       title: 'Fehlende Daten',

package/Screens/CurrentClient/Containers/Edit.js

@@ -21,6 +21,8 @@ var _CallToActionField = require("../../../Components/CallToActionField");
 
 var _PdfMarkdownField = _interopRequireDefault(require("../../Client/Components/PdfMarkdownField"));
 
+var _ColorTextField = _interopRequireDefault(require("../../Client/Components/ColorTextField"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -33,7 +35,7 @@ var formFields = [{
   fields: [{
     name: 'highlightColor',
     label: 'Theme - Highlight color',
-    type: 'text'
+    type: _ColorTextField["default"]
   }, {
     name: 'font',
     label: 'Theme - Font',

package/Screens/DefaultClient/Containers/Edit.js

@@ -19,6 +19,8 @@ var _i18n = require("../../../App/i18n");
 
 var _PdfMarkdownField = _interopRequireDefault(require("../../Client/Components/PdfMarkdownField"));
 
+var _ColorTextField = _interopRequireDefault(require("../../Client/Components/ColorTextField"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -31,7 +33,7 @@ var formFields = [{
   fields: [{
     name: 'highlightColor',
     label: 'Theme - Highlight color',
-    type: 'text'
+    type: _ColorTextField["default"]
   }, {
     name: 'font',
     label: 'Theme - Font',

package/Screens/DesignProductionMethods/Containers/Edit.js

@@ -62,7 +62,11 @@ var formFields = [{
   type: _SimpleNestedData["default"],
   fields: [{
     name: 'vectorsRequired',
-    label: 'Vectors Required',
+    label: 'vectorsRequired',
+    type: 'checkbox'
+  }, {
+    name: 'vectorizedLogoMandatory',
+    label: 'vectorizedLogoMandatory',
     type: 'checkbox'
   }, {
     name: 'visualizationEffect',