@configuratorware/configurator-admingui 1.38.7 → 1.39.1

package/src/Components/LocalizedPriceValue.js

@@ -2,9 +2,11 @@ import React from 'react';
 import { connect } from 'react-redux';
 import get from 'lodash/get';
 
-let LocalizedPriceValue = ({data = '', decimalSeparators, language, defaultSeparator}) => {
-    const localeSeparator = get(decimalSeparators, language, defaultSeparator );
-    return (data && localeSeparator !== defaultSeparator) ? data.replace(defaultSeparator, localeSeparator) : data;
+let LocalizedPriceValue = ({ data = '', decimalSeparators, language, defaultSeparator }) => {
+    const localeSeparator = get(decimalSeparators, language, defaultSeparator);
+    return data && localeSeparator !== defaultSeparator
+        ? `${data}`.replace(defaultSeparator, localeSeparator)
+        : data;
 };
 
 const mapStateToProps = ({ i18n, language }) => ({

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/ImageGallery/Containers/Edit.js

@@ -6,6 +6,8 @@ import EditorPopup from '../../ImageGallery/ImageTags/TagsEditorPopup';
 import connect from 'react-redux/es/connect/connect';
 import generateConnectedEdit from '../../../Components/DefaultConnectedForm';
 import { T } from '../../../App/i18n';
+import LocalizedPriceTextField from '../../../Components/LocalizedPriceTextField';
+import LocalizedPriceValue from '../../../Components/LocalizedPriceValue';
 
 const formFields = [
     {
@@ -38,7 +40,50 @@ const formFields = [
         showFileName: true,
         warningMessage: T('UploadFailureMessage', {
             url: `<a href="http://svg.enshrined.co.uk/"
-        target="_blank">http://svg.enshrined.co.uk/</a>`})
+        target="_blank">http://svg.enshrined.co.uk/</a>`,
+        }),
+    },
+    {
+        name: 'prices',
+        label: 'Prices',
+        type: 'dynSource',
+        sourceConfig: {
+            text: ({ identifier, currency }) => `${identifier} / ${currency.symbol} (${currency.iso})`,
+        },
+        dynSource: {
+            type: 'tabs',
+            reducerName: IMAGE_GALLERY_REDUCER_NAME,
+            dataSource: 'channels',
+        },
+        tabs: {
+            filterValues: (channel, value) => +channel.id === +value.channel,
+            assignTabValue: (tabValue, data) => (data.channel = tabValue),
+            name: 'prices',
+            type: 'array',
+            layout: 'groups',
+            className: 'table',
+            array: {
+                columns: null,
+                disableAdd: ({ value }) => {
+                    // limit to one price item, since "amount from" is not available
+                    return value.length > 0;
+                },
+                fields: [
+                    {
+                        name: 'price',
+                        label: 'price',
+                        type: LocalizedPriceTextField,
+                        renderValue: value => <LocalizedPriceValue data={value} />,
+                    },
+                    {
+                        name: 'priceNet',
+                        label: 'price Net',
+                        type: LocalizedPriceTextField,
+                        renderValue: value => <LocalizedPriceValue data={value} />,
+                    },
+                ],
+            },
+        },
     },
 ];
 

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

@@ -13,8 +13,25 @@ const initialState = {
             thumbUrl: '',
             texts: [],
             ...tagsDataStructure,
+            prices: {
+                value: [],
+                schema: {
+                    id: { value: null },
+                    price: { value: null, constraints: { presence: true, decimalPoint: true } },
+                    priceNet: { value: 0, constraints: { presence: true } },
+                    channel: { value: null, constraints: { presence: true } },
+                },
+            },
+        },
+        {
+            dependencies: [
+                {
+                    name: 'channels',
+                    dataKey: 'channels',
+                    source: 'channels',
+                },
+            ],
         },
-        null,
         IMAGE_GALLERY_DATA_KEY
     ),
     imageFile: null,

package/src/Screens/Item/DataStructures/Attributes/Editor.js

@@ -38,7 +38,6 @@ export default [
                                         property="translation"
                                         fallback={translated_value}
                                     />
-                                    <span> ({value})</span>
                                 </span>
                             ))}
                         </Join>
@@ -76,18 +75,17 @@ export default [
                     name: 'values',
                     label: 'Values',
                     type: 'dynSource',
-                    placeholderFocused: 'item.attributes.searchOrAddAttributeValue',
                     sourceConfig: {
                         value: 'value',
                         text: 'label',
                     },
                     dynSource: {
-                        type: 'chip',
+                        type: 'attributeValueChip',
                         listKey: 'attributevalues',
                         url: 'attributevalues',
                         autoLoad: false,
                         maxSearchResults: 25,
-                        mapItems: item => ({ ...item, label: `${item.translated_value} (${item.value})` }),
+                        mapItems: item => ({ ...item, label: item.value === item.translated_value ? item.translated_value : `${item.translated_value} (${item.value})` }),
                     },
                     openOnFocus: true,
                     addButton: isFeatureAvailable('attribute_values') && {

package/src/Screens/Item/Translations.js

@@ -40,7 +40,9 @@ require('../../App/i18n').use(
                     searchOrAddAttribute:
                         'Search for an existing attribute or add a new one by clicking on +',
                     searchOrAddAttributeValue:
-                        'Search for a existing value or add a new one by clicking on +',
+                        'Search for an existing value or add a new one by clicking on +',
+                    searchOrAddNumbericAttributeValue:
+                        'Search for an existing value or add a new with enter',
                 },
                 headline: 'This product is defined as follows:',
                 editorPopup: {
@@ -125,6 +127,8 @@ require('../../App/i18n').use(
                     addButtonLabel: 'Attribut hinzufügen',
                     searchOrAddAttribute: 'Suche ein vorhandenes Attribut oder lege ein neues mit dem + an',
                     searchOrAddAttributeValue: 'Suche einen Attributwert oder lege einen neuen mit dem + an',
+                    searchOrAddNumbericAttributeValue:
+                        'Suche einen Attributwert oder lege einen neuen mit der Eingabetaste an',
                 },
                 headline: 'Dieses Produkt ist folgendermaßen definiert:',
                 copyCreatorItemDialogTitle: 'Gewähltes Produkt kopieren',

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/src/UIComponents/ChipInput.js

@@ -30,6 +30,17 @@ const styles = theme => ({
     },
     inputRoot: {
         flexWrap: 'wrap',
+        '& input[type=number]': {
+            '-moz-appearance': 'textfield'
+        },
+        '& input[type=number]::-webkit-outer-spin-button': {
+            '-webkit-appearance': 'none',
+            margin: 0
+        },
+        '& input[type=number]::-webkit-inner-spin-button': {
+            '-webkit-appearance': 'none',
+            margin: 0
+        }
     },
     inputInput: {
         flexGrow: 1,
@@ -110,6 +121,9 @@ class ChipInput extends React.Component {
             onFocus,
             placeholder,
             filter,
+            onInputEnterKey,
+            resetOnInputEnterKey,
+            textFieldType,
         } = this.props;
         const { selectedItem, inputValue } = this.state;
         const textLabel = floatingLabelText;
@@ -143,6 +157,15 @@ class ChipInput extends React.Component {
                                     onFocus,
                                 }),
                                 classes,
+                                type: textFieldType,
+                                onKeyDown: (evt) => {
+                                    if (!highlightedIndex && onInputEnterKey && evt.keyCode === 13) {
+                                        onInputEnterKey(evt);
+                                        if (resetOnInputEnterKey) {
+                                            this.setState({ inputValue: '' });
+                                        }
+                                    }
+                                }
                             })}
 
                             {isOpen ? (

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));
-    }
-}