@configuratorware/configurator-admingui 1.39.0 → 1.39.1

package/Components/FormFragments/InputWithSource.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.sourceConfigPropType = exports.getInputItemKeyByConfig = exports.getInputItemParamsByConfig = exports.getInputValueByConfig = void 0;
+exports.nullToValue = exports.valueToNull = exports.sourceConfigPropType = exports.getInputItemKeyByConfig = exports.getInputItemParamsByConfig = exports.getInputValueByConfig = void 0;
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -65,4 +65,16 @@ var sourceConfigPropType = _propTypes["default"].shape({
   value: _propTypes["default"].string.isRequired
 });
 
-exports.sourceConfigPropType = sourceConfigPropType;
+exports.sourceConfigPropType = sourceConfigPropType;
+
+var valueToNull = function valueToNull(value) {
+  return value === 'null' ? null : value;
+};
+
+exports.valueToNull = valueToNull;
+
+var nullToValue = function nullToValue(value) {
+  return value === null ? 'null' : value;
+};
+
+exports.nullToValue = nullToValue;

package/Components/FormFragments/Select.js

@@ -22,7 +22,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var select = function select(props) {
-  var value = (0, _InputWithSource.getInputValueByConfig)(props);
+  var value = (0, _InputWithSource.nullToValue)((0, _InputWithSource.getInputValueByConfig)(props));
   return /*#__PURE__*/_react["default"].createElement(_SelectField["default"], {
     style: {
       width: '100%'
@@ -35,7 +35,7 @@ var select = function select(props) {
         var selectedObj = (0, _find2["default"])(props.source, _defineProperty({}, key, event.target.value));
         props.onChange(props.name, selectedObj);
       } else {
-        props.onChange(props.name, event.target.value);
+        props.onChange(props.name, (0, _InputWithSource.valueToNull)(event.target.value));
       }
     },
     onFocus: function onFocus() {
@@ -52,8 +52,10 @@ var select = function select(props) {
         value = _getInputItemParamsBy.value,
         text = _getInputItemParamsBy.text;
 
+    var _value = (0, _InputWithSource.nullToValue)(value);
+
     return /*#__PURE__*/_react["default"].createElement(_MenuItem["default"], {
-      value: value,
+      value: _value,
       key: idx
     }, text);
   }));

package/Screens/Attribute/Containers/Edit.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _Actions = require("../Reducers/Actions");
 
+var _i18n = require("../../../App/i18n");
+
 var _DefaultConnectedForm = _interopRequireDefault(require("../../../Components/DefaultConnectedForm"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -39,6 +41,11 @@ var formFields = [{
   label: 'Attribute data type',
   type: 'select',
   source: ['string', 'integer', 'number', 'boolean', 'text']
+}, {
+  name: 'writeProtected',
+  label: (0, _i18n.t)('attribute.writeProtected'),
+  type: 'checkbox',
+  helperText: (0, _i18n.t)('attribute.writeProtectedInfo')
 }];
 
 var _default = (0, _DefaultConnectedForm["default"])(formFields, _Actions.ATTRIBUTE_REDUCER_NAME, _Actions.setFieldData, _Actions.postData);

package/Screens/Attribute/Reducers/Reducer.js

@@ -31,7 +31,10 @@ var initialState = _objectSpread({}, (0, _Reducer.getDefaultEntityState)({
       presence: true
     }
   },
-  texts: []
+  texts: [],
+  writeProtected: {
+    value: ''
+  }
 }, null, _Actions.ATTRIBUTE_DATA_KEY));
 
 var attributeData = (0, _FeatureReducers.createFeatureReducer)(_Actions.ATTRIBUTE_REDUCER_NAME, function () {

package/Screens/Attribute/Translations.js

@@ -7,7 +7,9 @@ require("../../App/i18n").use({
     'Attribute data type': 'Attribute data type',
     Variants: 'Variants',
     attribute: {
-      addButtonLabel: 'Add Attribute'
+      addButtonLabel: 'Add Attribute',
+      writeProtected: 'Write protected',
+      writeProtectedInfo: 'Attribute won’t be deleted by the importer'
     }
   },
   de: {
@@ -16,7 +18,9 @@ require("../../App/i18n").use({
     'Attribute data type': 'Attributdatentyp',
     Variants: 'Varianten',
     attribute: {
-      addButtonLabel: 'Attribute hinzufügen'
+      addButtonLabel: 'Attribute hinzufügen',
+      writeProtected: 'Schreibgeschützt',
+      writeProtectedInfo: 'Das Attribut wird beim Import nicht gelöscht'
     }
   }
 }, true);

package/Screens/Client/Containers/Edit.js

@@ -137,6 +137,10 @@ var formFields = [{
   label: 'BCC E-Mail(s) receiver for request offer',
   type: 'text',
   helperText: (0, _i18n.t)('emailHint')
+}, {
+  name: 'sendOfferRequestMailToCustomer',
+  label: 'Send offer request email to customer',
+  type: 'checkbox'
 }, {
   type: _CallToActionField.CallToActionField,
   fields: [{

package/Screens/Client/Reducers/Reducer.js

@@ -110,6 +110,9 @@ var initialState = _objectSpread({}, (0, _Reducer.getDefaultEntityState)({
   bccEmailAddresses: {
     value: ''
   },
+  sendOfferRequestMailToCustomer: {
+    value: ''
+  },
   callToAction: '',
   channels: {
     value: []

package/Screens/Client/Translations.js

@@ -36,6 +36,7 @@ require("../../App/i18n").use({
     'E-Mail sender for request offer': 'Absender E-Mail für die Angebotsanfrage',
     'CC E-Mail(s) receiver for request offer': 'CC E-Mail(s) für die Angebotsanfrage',
     'BCC E-Mail(s) receiver for request offer': 'BCC E-Mail(s) für die Angebotsanfrage',
+    'Send offer request email to customer': 'Angebotsanfrage per E-Mail an den Kunden senden',
     'Client logo': 'Kunden Logo',
     Texts: 'Texte',
     themeColorError: 'Bitte gib einen hexadezimalen Farbwert ein (z.B. #0000ff)',

package/Screens/CurrentClient/Containers/Edit.js

@@ -100,6 +100,10 @@ var formFields = [{
   label: 'BCC E-Mail(s) receiver for request offer',
   type: 'text',
   helperText: (0, _i18n.t)('emailHint')
+}, {
+  name: 'sendOfferRequestMailToCustomer',
+  label: 'Send offer request email to customer',
+  type: 'checkbox'
 }, {
   type: _CallToActionField.CallToActionField,
   fields: [{

package/Screens/CurrentClient/Reducers/Reducer.js

@@ -83,6 +83,9 @@ var initialState = _objectSpread({}, (0, _Reducer.getDefaultEntityState)({
   bccEmailAddresses: {
     value: ''
   },
+  sendOfferRequestMailToCustomer: {
+    value: ''
+  },
   callToAction: 'addToCart',
   customCss: ''
 }, null, _Actions.DATA_KEY));

package/Screens/DefaultClient/Containers/Edit.js

@@ -98,6 +98,10 @@ var formFields = [{
   label: 'BCC E-Mail(s) receiver for request offer',
   type: 'text',
   helperText: (0, _i18n.t)('emailHint')
+}, {
+  name: 'sendOfferRequestMailToCustomer',
+  label: 'Send offer request email to customer',
+  type: 'checkbox'
 }, {
   name: 'callToAction',
   label: 'callToAction.callToAction',

package/Screens/DefaultClient/Reducers/Reducer.js

@@ -96,6 +96,9 @@ var initialState = _objectSpread({}, (0, _Reducer.getDefaultEntityState)({
       presence: true
     }
   },
+  sendOfferRequestMailToCustomer: {
+    value: ''
+  },
   callToAction: 'addToCart',
   customCss: ''
 }, null, _Actions.DATA_KEY));

package/Screens/Designer/SubScreens/Visualization/Containers/Edit/Edit.js

@@ -120,6 +120,8 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var styles = function styles(theme) {
+  var _visualizationRoot;
+
   var breakPoint = {
     max: "@media screen and (max-width:".concat(1144 + 2 * theme.spacing.unit, "px)")
   };
@@ -127,7 +129,9 @@ var styles = function styles(theme) {
     editorRoot: _defineProperty({
       display: 'flex',
       flexDirection: 'row',
-      height: 'calc(100vh - 180px)',
+      '&.fullHeight': {
+        height: 'calc(100vh - 180px)'
+      },
       '& > $header': _defineProperty({
         display: 'none'
       }, breakPoint.max, {
@@ -206,13 +210,16 @@ var styles = function styles(theme) {
     advancedEditor: {
       maxWidth: 600
     },
-    visualizationRoot: {
-      '& > $leftSide': _defineProperty({
-        width: '70%'
-      }, breakPoint.max, {
-        width: '100%'
-      })
-    },
+    visualizationRoot: (_visualizationRoot = {
+      display: 'flex',
+      flexDirection: 'row'
+    }, _defineProperty(_visualizationRoot, breakPoint.max, {
+      flexDirection: 'column'
+    }), _defineProperty(_visualizationRoot, '& > $leftSide', _defineProperty({
+      width: '70%'
+    }, breakPoint.max, {
+      width: '100%'
+    })), _visualizationRoot),
     visualizationContainer: {
       width: '100%',
       height: '39vw'
@@ -853,7 +860,7 @@ var VisualizationSettingsEdit = /*#__PURE__*/function (_Component) {
 
       if (isKindOf2D(mode)) {
         return /*#__PURE__*/_react["default"].createElement("div", {
-          className: [classes.editorRoot, classes.visualizationRoot].join(' ')
+          className: classes.visualizationRoot
         }, /*#__PURE__*/_react["default"].createElement("div", {
           className: classes.leftSide
         }, /*#__PURE__*/_react["default"].createElement(_VisualizationContainer["default"], {
@@ -913,7 +920,7 @@ var VisualizationSettingsEdit = /*#__PURE__*/function (_Component) {
       }
 
       return /*#__PURE__*/_react["default"].createElement("div", {
-        className: classes.editorRoot
+        className: "".concat(classes.editorRoot, " ").concat(isKindOf3D(mode) ? 'fullHeight' : '')
       }, loading && /*#__PURE__*/_react["default"].createElement(LoadingComponent, {
         fullSize: true
       }), isKindOf3D(mode) ? this.renderHeader3D(data) : this.renderHeader(), imageElement && /*#__PURE__*/_react["default"].createElement("div", {

package/Screens/PriceTypes/Containers/Edit.js

@@ -7,7 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _Actions = _interopRequireWildcard(require("../Reducers/Actions"));
+var _react = _interopRequireDefault(require("react"));
+
+var _i18n = require("../../../App/i18n");
 
 var _DefaultConnectedForm = _interopRequireDefault(require("../../../Components/DefaultConnectedForm"));
 
@@ -15,14 +17,14 @@ var _LocalizedPriceTextField = require("../../../Components/LocalizedPriceTextFi
 
 var _LocalizedPriceValue = _interopRequireDefault(require("../../../Components/LocalizedPriceValue"));
 
-var _react = _interopRequireDefault(require("react"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var _Actions = _interopRequireWildcard(require("../Reducers/Actions"));
 
 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; }
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
 var setFieldData = _Actions["default"].setFieldData,
     postData = _Actions["default"].postData;
 var formFields = [{
@@ -42,9 +44,33 @@ var formFields = [{
   label: 'selectable By User',
   type: 'toggle'
 }, {
-  name: 'imageDataDependent',
-  label: 'image Data Dependent',
-  type: 'toggle'
+  name: 'imageDependent',
+  label: 'imageDependent.label',
+  type: 'select',
+  sourceConfig: {
+    text: function text(_ref) {
+      var label = _ref.label;
+      return (0, _i18n.T)(label);
+    },
+    value: 'value'
+  },
+  source: [{
+    value: null,
+    label: 'imageDependent.no',
+    id: 'print'
+  }, {
+    value: 'image_data_dependent',
+    label: 'imageDependent.imageDataDependent',
+    id: 'image_data_dependent'
+  }, {
+    value: 'user_image_dependent',
+    label: 'imageDependent.userImageDependent',
+    id: 'user_image_dependent'
+  }, {
+    value: 'gallery_image_dependent',
+    label: 'imageDependent.galleryImageDependent',
+    id: 'gallery_image_dependent'
+  }]
 }, {
   name: 'texts',
   label: 'Title',
@@ -71,9 +97,9 @@ var formFields = [{
   },
   type: 'dynSource',
   sourceConfig: {
-    text: function text(_ref) {
-      var identifier = _ref.identifier,
-          currency = _ref.currency;
+    text: function text(_ref2) {
+      var identifier = _ref2.identifier,
+          currency = _ref2.currency;
       return "".concat(identifier, " / ").concat(currency.symbol, " (").concat(currency.iso, ")");
     }
   },

package/Screens/PriceTypes/Reducers/Reducer.js

@@ -34,8 +34,8 @@ var initialState = _objectSpread({}, (0, _Reducer.getDefaultEntityState)({
   selectableByUser: {
     value: true
   },
-  imageDataDependent: {
-    value: true
+  imageDependent: {
+    value: null
   },
   texts: [],
   prices: {

package/Screens/PriceTypes/Translations.js

@@ -15,6 +15,13 @@ require("../../App/i18n").use({
       prices: {
         addButtonLabel: 'Add Price'
       }
+    },
+    imageDependent: {
+      label: 'Depending on the image data',
+      no: 'No',
+      imageDataDependent: 'Image data dependent (uploaded + images from image gallery)',
+      userImageDependent: 'Uploaded Image Data Dependent',
+      galleryImageDependent: 'Image gallery Data Dependent'
     }
   },
   de: {
@@ -31,6 +38,13 @@ require("../../App/i18n").use({
       prices: {
         addButtonLabel: 'Preis hinzufügen'
       }
+    },
+    imageDependent: {
+      label: 'Abhängig von den Bilddaten',
+      no: 'Nein',
+      imageDataDependent: 'Abhängig von Bilddaten (hochgeladene + Bildern aus der Bildergalerie)',
+      userImageDependent: 'Abhängig von hochgeladenen Bildern',
+      galleryImageDependent: 'Abhängig von Bildern aus der Bildergalerie'
     }
   }
 }, true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.39.0",
+  "version": "1.39.1",
   "license": "UNLICENSED",
   "private": false,
   "dependencies": {
@@ -29,7 +29,7 @@
     "react-redux-i18n": "^1.9.3",
     "react-router": "^3.2.6",
     "react-sortable-hoc": "^1.11.0",
-    "redhotmagma-visualization": "1.39.0",
+    "redhotmagma-visualization": "1.39.1",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",
@@ -58,7 +58,7 @@
     "url-loader": "^1.1.2"
   },
   "scripts": {
-    "copy-public": "node ./scripts/cpFavicon.js",
+    "copy-public": "node ./scripts/cpPublic.js",
     "install": "npm run copy-public"
   },
   "readme": "# configurator-admingui\n\n## Setup for development\n1. Follow the \"preparation\", \"install\" and \"start development\" steps in frontend/README.md\n1. Open the core app in the browser: http://localhost:3000\n\n## Ready to build the artifacts\n- run `pnpm build` from project scope (does not build workspace dependencies automatically)\n- or run `pnpm build` from workspace root\n"

package/scripts/cpPublic.js

@@ -0,0 +1,32 @@
+/* eslint no-console: 0 */
+
+/**
+ * This script is made to copy the content of the public folder
+ * into the same destination in the client projects
+ *
+ * Runs only when installing this package as a dependency in client projects
+ *
+ * usage: node ./scripts/cpPublic.js
+ *
+ * @author boda@redhotmagma.de
+ */
+
+const path = require('path');
+
+const { cpDirDeep, testMatchers } = require('@configuratorware/scripts/utils/fileSystem');
+const { isDependency } = require('@configuratorware/scripts/utils/process');
+
+// keep existing files listed below
+const test = testMatchers.keepIfExists(/favicon\.ico$/);
+
+if (isDependency()) {
+    console.log(
+        '\x1b[37m\x1b[42m%s\x1b[0m',
+        'Copying public content into the public directory of the client project'
+    );
+
+    const src = path.resolve(__dirname, '../public');
+    const dst = path.resolve(__dirname, '../../../../public');
+
+    cpDirDeep(src, dst, { testFn: test });
+}

package/src/Components/FormFragments/InputWithSource.js

@@ -44,3 +44,6 @@ export const sourceConfigPropType = PropTypes.shape({
     text: PropTypes.oneOfType([PropTypes.string, PropTypes.func]).isRequired,
     value: PropTypes.string.isRequired,
 });
+
+export const valueToNull = value => (value === 'null' ? null : value);
+export const nullToValue = value => (value === null ? 'null' : value);

package/src/Components/FormFragments/Select.js

@@ -4,10 +4,15 @@ import find from 'lodash/find';
 import SelectField from '../../UIComponents/SelectField';
 import MenuItem from '../../UIComponents/MenuItem';
 
-import { getInputValueByConfig, getInputItemParamsByConfig } from './InputWithSource';
+import {
+    getInputValueByConfig,
+    getInputItemParamsByConfig,
+    valueToNull,
+    nullToValue,
+} from './InputWithSource';
 
 const select = props => {
-    const value = getInputValueByConfig(props);
+    const value = nullToValue(getInputValueByConfig(props));
     return (
         <SelectField
             style={{ width: '100%' }}
@@ -19,7 +24,7 @@ const select = props => {
                     const selectedObj = find(props.source, { [key]: event.target.value });
                     props.onChange(props.name, selectedObj);
                 } else {
-                    props.onChange(props.name, event.target.value);
+                    props.onChange(props.name, valueToNull(event.target.value));
                 }
             }}
             onFocus={() => props.source.length === 0 && this.props.loadSource && this.props.loadSource()}
@@ -32,8 +37,9 @@ const select = props => {
         >
             {props.source.map((item, idx) => {
                 const { value, text } = getInputItemParamsByConfig(item, props.sourceConfig);
+                const _value = nullToValue(value);
                 return (
-                    <MenuItem value={value} key={idx}>
+                    <MenuItem value={_value} key={idx}>
                         {text}
                     </MenuItem>
                 );

package/src/Screens/Attribute/Containers/Edit.js

@@ -6,6 +6,7 @@ import {
     ATTRIBUTE_LIST_KEY,
     ATTRIBUTE_LIST_URL,
 } from '../Reducers/Actions';
+import { t } from '../../../App/i18n';
 
 const formFields = [
     {
@@ -39,6 +40,12 @@ const formFields = [
         type: 'select',
         source: ['string', 'integer', 'number', 'boolean', 'text'],
     },
+    {
+        name: 'writeProtected',
+        label: t('attribute.writeProtected'),
+        type: 'checkbox',
+        helperText: t('attribute.writeProtectedInfo'),
+    },
 ];
 
 import generateConnectedEdit from '../../../Components/DefaultConnectedForm';

package/src/Screens/Attribute/Reducers/Reducer.js

@@ -9,6 +9,7 @@ const initialState = {
             identifier: { value: '', constraints: { identifier: true } },
             attributedatatype: { value: null, constraints: { presence: true } },
             texts: [],
+            writeProtected: { value: '' },
         },
         null,
         ATTRIBUTE_DATA_KEY

package/src/Screens/Attribute/Translations.js

@@ -7,6 +7,8 @@ require('../../App/i18n').use(
             Variants: 'Variants',
             attribute: {
                 addButtonLabel: 'Add Attribute',
+                writeProtected: 'Write protected',
+                writeProtectedInfo: 'Attribute won’t be deleted by the importer',
             },
         },
         de: {
@@ -16,6 +18,8 @@ require('../../App/i18n').use(
             Variants: 'Varianten',
             attribute: {
                 addButtonLabel: 'Attribute hinzufügen',
+                writeProtected: 'Schreibgeschützt',
+                writeProtectedInfo: 'Das Attribut wird beim Import nicht gelöscht',
             },
         },
     },

package/src/Screens/Client/Containers/Edit.js

@@ -54,7 +54,7 @@ const formFields = [
                 accept: '.ttf',
                 showFileName: true,
                 deleteEnabled: true,
-                warningMessage: T('clientFontMessage')
+                warningMessage: T('clientFontMessage'),
             },
             {
                 name: 'logo',
@@ -127,6 +127,11 @@ const formFields = [
         type: 'text',
         helperText: t('emailHint'),
     },
+    {
+        name: 'sendOfferRequestMailToCustomer',
+        label: 'Send offer request email to customer',
+        type: 'checkbox',
+    },
     {
         type: CallToActionField,
         fields: [
@@ -136,7 +141,7 @@ const formFields = [
                 type: 'select',
             },
         ],
-        dynamicDefaultLabel: false
+        dynamicDefaultLabel: false,
     },
     {
         name: 'texts',

package/src/Screens/Client/Reducers/Reducer.js

@@ -38,6 +38,7 @@ const initialState = {
             fromEmailAddress: { value: '' },
             ccEmailAddresses: { value: '' },
             bccEmailAddresses: { value: '' },
+            sendOfferRequestMailToCustomer: { value: '' },
             callToAction: '',
             channels: { value: [] },
             customCss: '',

package/src/Screens/Client/Translations.js

@@ -16,7 +16,8 @@ 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',
-            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.'
+            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: {
             clients: 'Klienten',
@@ -35,6 +36,7 @@ require('../../App/i18n').use(
             'E-Mail sender for request offer': 'Absender E-Mail für die Angebotsanfrage',
             'CC E-Mail(s) receiver for request offer': 'CC E-Mail(s) für die Angebotsanfrage',
             'BCC E-Mail(s) receiver for request offer': 'BCC E-Mail(s) für die Angebotsanfrage',
+            'Send offer request email to customer': 'Angebotsanfrage per E-Mail an den Kunden senden',
             'Client logo': 'Kunden Logo',
             Texts: 'Texte',
             themeColorError: 'Bitte gib einen hexadezimalen Farbwert ein (z.B. #0000ff)',
@@ -47,7 +49,8 @@ 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',
-            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.'
+            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/src/Screens/CurrentClient/Containers/Edit.js

@@ -2,7 +2,7 @@ import Actions, { REDUCER_NAME } from '../Reducers/Actions';
 import SimpleNestedData from '../../../Components/FormFragments/SimpleNestedData';
 import generateConnectedEdit from '../../../Components/DefaultConnectedForm';
 import { withLoadAction } from '../../../Components/withLoadAction';
-import {T, t } from '../../../App/i18n';
+import { T, t } from '../../../App/i18n';
 import { CallToActionField } from '../../../Components/CallToActionField';
 import PdfMarkDownField from '../../Client/Components/PdfMarkdownField';
 
@@ -23,7 +23,7 @@ const formFields = [
                 accept: '.ttf',
                 showFileName: true,
                 deleteEnabled: true,
-                warningMessage: T('clientFontMessage')
+                warningMessage: T('clientFontMessage'),
             },
             {
                 name: 'logo',
@@ -96,6 +96,11 @@ const formFields = [
         type: 'text',
         helperText: t('emailHint'),
     },
+    {
+        name: 'sendOfferRequestMailToCustomer',
+        label: 'Send offer request email to customer',
+        type: 'checkbox',
+    },
     {
         type: CallToActionField,
         fields: [
@@ -103,9 +108,9 @@ const formFields = [
                 name: 'callToAction',
                 label: 'callToAction.callToAction',
                 type: 'select',
-            }
+            },
         ],
-        dynamicDefaultLabel: false
+        dynamicDefaultLabel: false,
     },
     {
         name: 'texts',

package/src/Screens/CurrentClient/Reducers/Reducer.js

@@ -30,6 +30,7 @@ const initialState = {
             fromEmailAddress: { value: '' },
             ccEmailAddresses: { value: '' },
             bccEmailAddresses: { value: '' },
+            sendOfferRequestMailToCustomer: { value: '' },
             callToAction: 'addToCart',
             customCss: '',
         },

package/src/Screens/DefaultClient/Containers/Edit.js

@@ -22,7 +22,7 @@ const formFields = [
                 accept: '.ttf',
                 showFileName: true,
                 deleteEnabled: true,
-                warningMessage: T('clientFontMessage')
+                warningMessage: T('clientFontMessage'),
             },
             {
                 name: 'logo',
@@ -95,6 +95,11 @@ const formFields = [
         type: 'text',
         helperText: t('emailHint'),
     },
+    {
+        name: 'sendOfferRequestMailToCustomer',
+        label: 'Send offer request email to customer',
+        type: 'checkbox',
+    },
     {
         name: 'callToAction',
         label: 'callToAction.callToAction',

package/src/Screens/DefaultClient/Reducers/Reducer.js

@@ -31,6 +31,7 @@ const initialState = {
             fromEmailAddress: { value: '', constraints: { presence: true } },
             ccEmailAddresses: { value: '', constraints: { presence: true } },
             bccEmailAddresses: { value: '', constraints: { presence: true } },
+            sendOfferRequestMailToCustomer: { value: '' },
             callToAction: 'addToCart',
             customCss: '',
         },

package/src/Screens/Designer/SubScreens/Visualization/Containers/Edit/Edit.js

@@ -58,7 +58,9 @@ const styles = theme => {
         editorRoot: {
             display: 'flex',
             flexDirection: 'row',
-            height: 'calc(100vh - 180px)',
+            '&.fullHeight': {
+                height: 'calc(100vh - 180px)',
+            },
             '& > $header': {
                 display: 'none',
                 [breakPoint.max]: {
@@ -146,6 +148,11 @@ const styles = theme => {
             maxWidth: 600,
         },
         visualizationRoot: {
+            display: 'flex',
+            flexDirection: 'row',
+            [breakPoint.max]: {
+                flexDirection: 'column',
+            },
             '& > $leftSide': {
                 width: '70%',
                 [breakPoint.max]: {
@@ -634,7 +641,7 @@ export class VisualizationSettingsEdit extends Component {
         const { three } = this;
         if (isKindOf2D(mode)) {
             return (
-                <div className={[classes.editorRoot, classes.visualizationRoot].join(' ')}>
+                <div className={classes.visualizationRoot}>
                     <div className={classes.leftSide}>
                         <VisualizationContainer three={three} className={classes.visualizationContainer} />
                     </div>
@@ -688,7 +695,7 @@ export class VisualizationSettingsEdit extends Component {
         }
 
         return (
-            <div className={classes.editorRoot}>
+            <div className={`${classes.editorRoot} ${isKindOf3D(mode) ? 'fullHeight' : ''}`}>
                 {loading && <LoadingComponent fullSize />}
 
                 {isKindOf3D(mode) ? this.renderHeader3D(data) : this.renderHeader()}

package/src/Screens/PriceTypes/Containers/Edit.js

@@ -1,3 +1,8 @@
+import React from 'react';
+import { T } from '../../../App/i18n';
+import generateConnectedEdit from '../../../Components/DefaultConnectedForm';
+import { LocalizedPriceTextField } from '../../../Components/LocalizedPriceTextField';
+import LocalizedPriceValue from '../../../Components/LocalizedPriceValue';
 import Actions, { REDUCER_NAME } from '../Reducers/Actions';
 const { setFieldData, postData } = Actions;
 
@@ -23,9 +28,31 @@ const formFields = [
         type: 'toggle',
     },
     {
-        name: 'imageDataDependent',
-        label: 'image Data Dependent',
-        type: 'toggle',
+        name: 'imageDependent',
+        label: 'imageDependent.label',
+        type: 'select',
+        sourceConfig: {
+            text: ({ label }) => T(label),
+            value: 'value',
+        },
+        source: [
+            { value: null, label: 'imageDependent.no', id: 'print' },
+            {
+                value: 'image_data_dependent',
+                label: 'imageDependent.imageDataDependent',
+                id: 'image_data_dependent',
+            },
+            {
+                value: 'user_image_dependent',
+                label: 'imageDependent.userImageDependent',
+                id: 'user_image_dependent',
+            },
+            {
+                value: 'gallery_image_dependent',
+                label: 'imageDependent.galleryImageDependent',
+                id: 'gallery_image_dependent',
+            },
+        ],
     },
     {
         name: 'texts',
@@ -75,13 +102,13 @@ const formFields = [
                         name: 'price',
                         label: 'price',
                         type: LocalizedPriceTextField,
-                        renderValue: value => <LocalizedPriceValue data={value}/>,
+                        renderValue: value => <LocalizedPriceValue data={value} />,
                     },
                     {
                         name: 'priceNet',
                         label: 'price Net',
                         type: LocalizedPriceTextField,
-                        renderValue: value => <LocalizedPriceValue data={value}/>,
+                        renderValue: value => <LocalizedPriceValue data={value} />,
                     },
                 ],
             },
@@ -89,8 +116,4 @@ const formFields = [
     },
 ];
 
-import generateConnectedEdit from '../../../Components/DefaultConnectedForm';
-import {LocalizedPriceTextField} from "../../../Components/LocalizedPriceTextField";
-import LocalizedPriceValue from "../../../Components/LocalizedPriceValue";
-import React from "react";
 export default generateConnectedEdit(formFields, REDUCER_NAME, setFieldData, postData);

package/src/Screens/PriceTypes/Reducers/Reducer.js

@@ -10,7 +10,7 @@ const initialState = {
             itemAmountDependent: { value: true },
             bulkNameDependent: { value: true },
             selectableByUser: { value: true },
-            imageDataDependent: { value: true },
+            imageDependent: { value: null },
             texts: [],
             prices: {
                 value: [],

package/src/Screens/PriceTypes/Translations.js

@@ -15,6 +15,13 @@ require('../../App/i18n').use(
                     addButtonLabel: 'Add Price',
                 },
             },
+            imageDependent: {
+                label: 'Depending on the image data',
+                no: 'No',
+                imageDataDependent: 'Image data dependent (uploaded + images from image gallery)',
+                userImageDependent: 'Uploaded Image Data Dependent',
+                galleryImageDependent: 'Image gallery Data Dependent',
+            },
         },
         de: {
             designer_global_calculation_types: 'Globale Kalkulationsposten',
@@ -31,6 +38,13 @@ require('../../App/i18n').use(
                     addButtonLabel: 'Preis hinzufügen',
                 },
             },
+            imageDependent: {
+                label: 'Abhängig von den Bilddaten',
+                no: 'Nein',
+                imageDataDependent: 'Abhängig von Bilddaten (hochgeladene + Bildern aus der Bildergalerie)',
+                userImageDependent: 'Abhängig von hochgeladenen Bildern',
+                galleryImageDependent: 'Abhängig von Bildern aus der Bildergalerie',
+            },
         },
     },
     true

package/scripts/cpFavicon.js

@@ -1,28 +0,0 @@
-/* eslint no-console: 0 */
-
-/**
- * This script is made to copy the favicon from public folder
- * into the same destination in the client projects
- *
- * Runs only when installing this package as a dependency in client projects
- *
- * usage: node ./scripts/cpFavicon.js
- *
- */
-
-const path = require('path');
-const fs = require('fs');
-const { isDependency } = require('./utils/process');
-
-if (isDependency()) {
-    const dir = path.resolve(__dirname, '../../../../public');
-    if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir);
-    }
-    const src = path.resolve(__dirname, '../public/favicon.ico');
-    const dst = path.resolve(dir, 'favicon.ico');
-    // copy it only if there is no favicon.ico (which can be already a custom one) in the target location
-    if (!fs.existsSync(dst)) {
-        fs.createReadStream(src).pipe(fs.createWriteStream(dst));
-    }
-}