@configuratorware/configurator-admingui 1.27.3-beta.1 → 1.27.3-beta.5

package/src/Screens/Creator/Reducers/ConfigurationReducer.js

@@ -18,6 +18,10 @@ import {
     CONFIGURATION_REDUCER_NAME,
     CONFIGURATION_SET_OVERWRITE_COMPONENT_ORDER,
     CONFIGURATION_SHOW_OPTION_PRICE_EDITOR,
+    CONFIGURATION_SHOW_DESIGNER_PREVIEW_ERROR,
+    CONFIGURATION_SHOW_CREATOR_PREVIEW_ERROR,
+    CONFIGURATION_HIDE_DESIGNER_PREVIEW_ERROR,
+    CONFIGURATION_HIDE_CREATOR_PREVIEW_ERROR,
 } from './ConfigurationActions';
 
 import { getDefaultEntityState, defaultEntityReducer } from '../../../App/Reducers/Entity/Reducer';
@@ -74,6 +78,8 @@ const initialState = {
     baseConfiguration: null,
     baseConfigurationState: null,
     showConfigurator: false,
+    showOpenDesignerPreviewError: false,
+    showOpenCreatorPreviewError: false,
 };
 
 export const baseConfigurationData = createFeatureReducer(
@@ -94,7 +100,7 @@ export const baseConfigurationData = createFeatureReducer(
                     const selectableOptions = action.data.data;
                     return {
                         ...state,
-                        selectableOptions,
+                        selectableOptions: _.sortBy(selectableOptions, ['sequencenumber']),
                     };
                 }
 
@@ -223,6 +229,34 @@ export const baseConfigurationData = createFeatureReducer(
                     baseConfigurationState: 'loading',
                 };
             }
+            
+            case CONFIGURATION_SHOW_DESIGNER_PREVIEW_ERROR: {
+                    return {
+                        ...state,
+                        showOpenDesignerPreviewError: true,
+                    };
+            }
+            
+            case CONFIGURATION_SHOW_CREATOR_PREVIEW_ERROR: {
+                    return {
+                        ...state,
+                        showOpenCreatorPreviewError: true,
+                    };
+            }
+
+            case CONFIGURATION_HIDE_DESIGNER_PREVIEW_ERROR: {
+                return {
+                    ...state,
+                    showOpenDesignerPreviewError: false,
+                };
+            }
+
+            case CONFIGURATION_HIDE_CREATOR_PREVIEW_ERROR: {
+                return {
+                    ...state,
+                    showOpenCreatorPreviewError: false,
+                };
+            }
 
             case CONFIGURATION_SHOW_CONFIGURATOR_ADMIN_MODE: {
                 return {

package/src/Screens/Creator/Translations.js

@@ -65,6 +65,11 @@ require('../../App/i18n').use(
                     addButtonLabel: 'Add price',
                 },
             },
+            openPreviewError: {
+                title: 'Missing data',
+                openDesignerPreviewError: 'Please go to designer > Product design settings and add a design area first.',
+                openCreatorPreviewError: 'Please go to creator > Product Configuration and add components and options as well as a default configuration first.',
+            },
         },
         de: {
             creator_data: 'Produkt-Konfiguration',
@@ -117,7 +122,7 @@ require('../../App/i18n').use(
                     state: {
                         not_available:
                             'Die Standardkonfiguration ist noch nicht definiert. Klicke auf den Button "Standardkonfiguration definieren", um eine zu erstellen.',
-                        loading: 'Standardkonfiguration werden geladen...',
+                        loading: 'Standardkonfiguration wird geladen...',
                         ready: '',
                         no_options_selected: 'Keine Optionen für die Standardkonfiguration definiert.',
                     },
@@ -132,6 +137,11 @@ require('../../App/i18n').use(
                     addButtonLabel: 'Preis hinzufügen',
                 },
             },
+            openPreviewError: {
+                title: 'Fehlende Daten',
+                openDesignerPreviewError: 'Bitte gehe zunächst zu designer > Produkt-Design-Einstellungen und füge eine Designfläche hinzu.',
+                openCreatorPreviewError: 'Bitte gehe zunächst zu creator > Produkt-Konfiguration und füge Komponenten und Optionen sowie eine Standardkonfiguration hinzu.',
+            },
         },
     },
     true

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

@@ -4,8 +4,10 @@ import generateConnectedEdit from '../../../Components/DefaultConnectedForm';
 import TextFields from '../../Client/Components/TextFields';
 import { withLoadAction } from '../../../Components/withLoadAction';
 import { t } from '../../../App/i18n';
+import { CallToActionField } from '../../../Components/CallToActionField';
+import PdfMarkDownField from '../../Client/Components/PdfMarkdownField';
 
-export const formFields = [
+const formFields = [
     {
         name: 'theme',
         type: SimpleNestedData,
@@ -32,6 +34,20 @@ export const formFields = [
             },
         ],
     },
+    {
+        name: 'pdfHeader',
+        label: 'PDF Header',
+        htmlField: 'pdfHeaderHtml',
+        type: PdfMarkDownField,
+        helperText: t('headerInfo'),
+    },
+    {
+        name: 'pdfFooter',
+        label: 'PDF Footer',
+        htmlField: 'pdfFooterHtml',
+        type: PdfMarkDownField,
+        helperText: t('footerInfo'),
+    },
     {
         name: 'contactName',
         label: 'Clientname / Shopname',
@@ -58,38 +74,38 @@ export const formFields = [
         type: 'text',
     },
     {
-        name: 'contactEmail',
-        label: 'E-mail (contact)',
+        name: 'toEmailAddresses',
+        label: 'E-Mail(s) receiver for request offer',
         type: 'text',
+        helperText: t('emailHint'),
     },
     {
-        name: 'callToAction',
-        label: 'callToAction.callToAction',
-        type: 'select',
-        sourceConfig: {
-            text: function text(_ref) {
-                const label = _ref.label;
-                return t(label);
-            },
-            value: 'value',
-        },
-        source: [
-            {
-                value: 'addToCart',
-                label: 'callToAction.addToCart',
-                id: 'addToCart',
-            },
-            {
-                value: 'requestOffer',
-                label: 'callToAction.requestOffer',
-                id: 'requestOffer',
-            },
+        name: 'fromEmailAddress',
+        label: 'E-Mail sender for request offer',
+        type: 'text',
+    },
+    {
+        name: 'ccEmailAddresses',
+        label: 'CC E-Mail(s) receiver for request offer',
+        type: 'text',
+        helperText: t('emailHint'),
+    },
+    {
+        name: 'bccEmailAddresses',
+        label: 'BCC E-Mail(s) receiver for request offer',
+        type: 'text',
+        helperText: t('emailHint'),
+    },
+    {
+        type: CallToActionField,
+        fields: [
             {
-                value: 'none',
-                label: 'callToAction.none',
-                id: 'none',
-            },
+                name: 'callToAction',
+                label: 'callToAction.callToAction',
+                type: 'select',
+            }
         ],
+        dynamicDefaultLabel: false
     },
     {
         type: TextFields,

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

@@ -16,12 +16,20 @@ const initialState = {
                     font: { value: '' },
                 },
             },
-            contactName: { value: '', constraints: { presence: true } },
-            contactStreet: { value: '', constraints: { presence: true } },
-            contactPostCode: { value: '', constraints: { presence: true } },
-            contactCity: { value: '', constraints: { presence: true } },
-            contactPhone: { value: '', constraints: { presence: true } },
-            contactEmail: { value: '', constraints: { presence: true } },
+            pdfHeaderText: { value: '' },
+            pdfHeaderHtml: { value: '' },
+            pdfFooterText: { value: '' },
+            pdfFooterHtml: { value: '' },
+            contactName: { value: '' },
+            contactStreet: { value: '' },
+            contactPostCode: { value: '' },
+            contactCity: { value: '' },
+            contactPhone: { value: '' },
+            contactEmail: { value: '' },
+            toEmailAddresses: { value: '' },
+            fromEmailAddress: { value: '' },
+            ccEmailAddresses: { value: '' },
+            bccEmailAddresses: { value: '' },
             callToAction: 'addToCart',
             customCss: '',
         },

package/src/Screens/Dashboard/Styles.scss

@@ -1,3 +1,3 @@
-.welcome {
-  color: red;
+.welcome {
+  color: red;
 }

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

@@ -1,8 +1,139 @@
 import Actions, { REDUCER_NAME } from '../Reducers/Actions';
 import generateConnectedEdit from '../../../Components/DefaultConnectedForm';
-import {withLoadAction} from "../../../Components/withLoadAction";
-import {formFields} from "../../CurrentClient/Containers/Edit";
+import { withLoadAction } from '../../../Components/withLoadAction';
+import SimpleNestedData from '../../../Components/FormFragments/SimpleNestedData';
+import { t, T } from '../../../App/i18n';
+import TextFields from '../../Client/Components/TextFields';
+import PdfMarkDownField from '../../Client/Components/PdfMarkdownField';
 
+const formFields = [
+    {
+        name: 'theme',
+        type: SimpleNestedData,
+        fields: [
+            {
+                name: 'highlightColor',
+                label: 'Theme - Highlight color',
+                type: 'text',
+            },
+            {
+                name: 'font',
+                label: 'Theme - Font',
+                type: 'file',
+                accept: '.ttf',
+                showFileName: true,
+                deleteEnabled: true,
+            },
+            {
+                name: 'logo',
+                label: 'Client logo',
+                type: 'file',
+                isPreviewRequired: true,
+                accept: '.bmp, .gif, .jpg, .png, .jpeg',
+            },
+        ],
+    },
+    {
+        name: 'pdfHeaderText',
+        label: 'PDF Header',
+        htmlField: 'pdfHeaderHtml',
+        type: PdfMarkDownField,
+        helperText: t('headerInfo'),
+    },
+    {
+        name: 'pdfFooterText',
+        label: 'PDF Footer',
+        htmlField: 'pdfFooterHtml',
+        type: PdfMarkDownField,
+        helperText: t('footerInfo'),
+    },
+    {
+        name: 'contactName',
+        label: 'Clientname / Shopname',
+        type: 'text',
+    },
+    {
+        name: 'contactStreet',
+        label: 'Street / no',
+        type: 'text',
+    },
+    {
+        name: 'contactPostCode',
+        label: 'Post code',
+        type: 'text',
+    },
+    {
+        name: 'contactCity',
+        label: 'City',
+        type: 'text',
+    },
+    {
+        name: 'contactPhone',
+        label: 'Phone',
+        type: 'text',
+    },
+    {
+        name: 'toEmailAddresses',
+        label: 'E-Mail(s) receiver for request offer',
+        type: 'text',
+        helperText: t('emailHint'),
+    },
+    {
+        name: 'fromEmailAddress',
+        label: 'E-Mail sender for request offer',
+        type: 'text',
+    },
+    {
+        name: 'ccEmailAddresses',
+        label: 'CC E-Mail(s) receiver for request offer',
+        type: 'text',
+        helperText: t('emailHint'),
+    },
+    {
+        name: 'bccEmailAddresses',
+        label: 'BCC E-Mail(s) receiver for request offer',
+        type: 'text',
+        helperText: t('emailHint'),
+    },
+    {
+        name: 'callToAction',
+        label: 'callToAction.callToAction',
+        type: 'select',
+        sourceConfig: {
+            text: function text(_ref) {
+                return T(_ref.label);
+            },
+            value: 'value',
+        },
+        source: [
+            {
+                value: 'addToCart',
+                label: 'callToAction.addToCart',
+                id: 'addToCart',
+            },
+            {
+                value: 'requestOffer',
+                label: 'callToAction.requestOffer',
+                id: 'requestOffer',
+            },
+            {
+                value: 'none',
+                label: 'callToAction.none',
+                id: 'none',
+            },
+        ],
+    },
+    {
+        type: TextFields,
+        name: 'texts',
+    },
+    {
+        name: 'customCss',
+        label: 'customCss',
+        type: 'codeEditor',
+        language: 'css',
+    },
+];
 
 const { setFieldData, postData, detailsAction } = Actions;
 

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

@@ -17,12 +17,20 @@ const initialState = {
                     font: { value: '' },
                 },
             },
-            contactName: { value: '', constraints: { presence: true } },
-            contactStreet: { value: '', constraints: { presence: true } },
-            contactPostCode: { value: '', constraints: { presence: true } },
-            contactCity: { value: '', constraints: { presence: true } },
-            contactPhone: { value: '', constraints: { presence: true } },
-            contactEmail: { value: '', constraints: { presence: true } },
+            pdfHeaderText: { value: '' },
+            pdfHeaderHtml: { value: '' },
+            pdfFooterText: { value: '' },
+            pdfFooterHtml: { value: '' },
+            contactName: { value: '' },
+            contactStreet: { value: '' },
+            contactPostCode: { value: '' },
+            contactCity: { value: '' },
+            contactPhone: { value: '' },
+            contactEmail: { value: '' },
+            toEmailAddresses: { value: '', constraints: { presence: true } },
+            fromEmailAddress: { value: '', constraints: { presence: true } },
+            ccEmailAddresses: { value: '', constraints: { presence: true } },
+            bccEmailAddresses: { value: '', constraints: { presence: true } },
             callToAction: 'addToCart',
             customCss: '',
         },

package/src/Screens/Designer/Components/ConfiguratorQuickView.js

@@ -3,13 +3,15 @@ import { connect } from 'react-redux';
 import get from 'lodash/get';
 import {
     CONFIGURATION_REDUCER_NAME,
+    hideOpenDesignerPreviewError,
     showConfiguratorAdminMode,
 } from '../../Creator/Reducers/ConfigurationActions';
 import ConfiguratorOverlay from '../../../Components/GeneralFragments/ConfiguratorOverlay';
 import { DESIGNER_REDUCER_NAME } from '../Reducers/Actions';
 import networkConfig from '../../../App/Config/network';
-import { T } from '../../../App/i18n';
+import { t, T } from '../../../App/i18n';
 import RaisedButton from '../../../UIComponents/RaisedButton';
+import ShowPreviewErrorDialog from '../../Creator/Components/ShowPreviewErrorDialog';
 
 const mapStateToProps = state => {
     const { i18n } = state;
@@ -20,6 +22,8 @@ const mapStateToProps = state => {
     const locale = i18n.locale.replace('-', '_');
     const configurationData = state[CONFIGURATION_REDUCER_NAME];
     const { adminModeHash } = configurationData;
+    const itemId = get(itemData, 'data.id.value');
+    const showOpenDesignerPreviewError = get(configurationData, 'showOpenDesignerPreviewError');
 
     const params = new URLSearchParams({
         _adminmode: 'quickView',
@@ -36,22 +40,44 @@ const mapStateToProps = state => {
     return {
         show: state[CONFIGURATION_REDUCER_NAME].showConfiguratorAdminMode,
         configuratorUrl,
+        itemId,
+        showOpenDesignerPreviewError,
     };
 };
 
 const mapDispatchToProps = dispatch => ({
     close: () => dispatch(showConfiguratorAdminMode(false)),
-    open: () => dispatch(showConfiguratorAdminMode(true)),
+    open: itemId => dispatch(showConfiguratorAdminMode(true, 'designer', itemId)),
+    hideOpenDesignerPreviewError: () => dispatch(hideOpenDesignerPreviewError()),
 });
 
-const ConfiguratorQuickView = ({ show, open, close, configuratorUrl, style, className }) => (
+const ConfiguratorQuickView = ({
+    show,
+    open,
+    close,
+    configuratorUrl,
+    style,
+    className,
+    itemId,
+    showOpenDesignerPreviewError,
+    hideOpenDesignerPreviewError,
+}) => (
     <div style={style} className={className}>
         <RaisedButton
             label={T('configuratorQuickView.buttonText')}
-            onClick={open}
+            onClick={() => open(itemId)}
             disabled={!configuratorUrl}
         />
         <ConfiguratorOverlay show={show} configuratorUrl={configuratorUrl} onClose={close} />
+        {showOpenDesignerPreviewError && 
+            <ShowPreviewErrorDialog
+                dialogTitle={T('openPreviewError.title')}
+                open={showOpenDesignerPreviewError}
+                onClose={hideOpenDesignerPreviewError}
+            >
+                <p>{T('openPreviewError.openDesignerPreviewError')}</p>
+            </ShowPreviewErrorDialog>
+        }
     </div>
 );
 

package/src/Screens/Designer/Components/DesignDataTransfer.js

@@ -190,7 +190,7 @@ class DesignDataTransfer extends React.Component {
 
     renderDesignDataTransfer = () => {
         const { classes, sourceItemId } = this.props;
-        const { transferSuccess, transferred, amountSelectedRows } = this.state;
+        const { transferSuccess, transferred } = this.state;
         return (
             <Dialog
                 title={T('designDataTransfer.dialogTitle')}

package/src/Screens/Designer/Components/TemplateDefaultList.js

@@ -278,8 +278,7 @@ export default class TemplateDefaultList extends Component {
                     </Grid>
 
                     <Grid container alignItems="center" justify="center" md={1}>
-                    {this.renderMoveButton()}
-
+                        {this.renderMoveButton()}
                     </Grid>
 
                     <Grid item xs={12} md={5}>

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

@@ -159,7 +159,11 @@ class DesignerForm extends Component {
                     <div className={classes.buttonsAlignment}>
                         <DesignDataTransfer sourceItemId={itemId} />
                         <ConfiguratorQuickView className="configuratorQuickView" />
-                        <CheckData itemIdentifier={item && item.identifier} area={'designer'} />
+                        <CheckData 
+                            itemIdentifier={item && item.identifier} 
+                            itemId={itemId}
+                            area={'designer'} 
+                        />
                     </div>
                 </div>
                 <div className={classes.root}>

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

@@ -23,11 +23,11 @@ const getGroupEntries = groupIdentifier => state => {
 
 const getChildEntries = () => state => {
     const childIdentifiers = [];
-    state.designerData.source.children.forEach(({id, identifier, title}) => {
-        childIdentifiers.push({id, identifier, title})
-    })
+    state.designerData.source.children.forEach(({ id, identifier, title }) => {
+        childIdentifiers.push({ id, identifier, title });
+    });
     return childIdentifiers;
-}
+};
 
 const FileInput = withStyles({
     root: {
@@ -91,11 +91,7 @@ const FileInput = withStyles({
     const uploadInProgress = get(viewImages && viewImages[itemIdentifier], `uploadInProgress`, false);
     return (
         <div key={key} className={classes.root}>
-            <File
-                {...props}
-                value={value}
-                onChange={(name, value) => onChange(`${name}.${key}`, value)}
-            />
+            <File {...props} value={value} onChange={(name, value) => onChange(`${name}.${key}`, value)} />
             {uploadInProgress && <CircularProgress size={24} className={classes.progress} />}
         </div>
     );

package/src/Screens/Designer/Translations.js

@@ -46,7 +46,7 @@ require('../../App/i18n').use(
             designer: {
                 itemStatus: 'Status',
             },
-            Hint: 'Hinweis'
+            Hint: 'Hinweis',
         },
     },
     true