@configuratorware/configurator-admingui 1.40.2 → 1.40.4

package/Components/List.js

@@ -243,7 +243,8 @@ var List = /*#__PURE__*/function (_Component) {
 
           _this.props.onRowSelection(rows, event);
         },
-        selected: _this.selectedRows
+        selected: _this.selectedRows,
+        isRowSelectable: _this.props.isRowSelectable
       }, /*#__PURE__*/_react["default"].createElement(_Table.TableHead, {
         showCheckbox: showCheckboxes
       }, _this.renderPaginationWithTools(), /*#__PURE__*/_react["default"].createElement(_Table.TableRow, null, columns.map(function (column, i) {
@@ -266,9 +267,7 @@ var List = /*#__PURE__*/function (_Component) {
       }, data.map(function (row, index) {
         return /*#__PURE__*/_react["default"].createElement(_Table.TableRow, {
           key: index,
-          style: {
-            cursor: 'pointer'
-          }
+          style: _this.getRowStyle(index)
         }, columns.map(function (column, i) {
           return shownColumns[i] && /*#__PURE__*/_react["default"].createElement(_Table.TableRowColumn, {
             key: i,
@@ -386,6 +385,17 @@ var List = /*#__PURE__*/function (_Component) {
 
       return null;
     }
+  }, {
+    key: "getRowStyle",
+    value: function getRowStyle(index) {
+      if (this.props.getRowStyle) {
+        return this.props.getRowStyle(index);
+      }
+
+      return {
+        cursor: 'pointer'
+      };
+    }
   }, {
     key: "render",
     value: function render() {

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/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',

package/Screens/DesignProductionMethods/Reducers/DesignProductionMethodsReducer.js

@@ -34,6 +34,9 @@ var initialState = _objectSpread({}, (0, _Reducer.getDefaultEntityState)({
       vectorsRequired: {
         value: false
       },
+      vectorizedLogoMandatory: {
+        value: false
+      },
       visualizationEffect: {
         value: 'print',
         constraints: {

package/Screens/DesignProductionMethods/Translations.js

@@ -21,7 +21,8 @@ require("../../App/i18n").use({
       embroidery: 'embroidery',
       doming: 'doming'
     },
-    'Vectors Required': 'Vectors Required',
+    vectorsRequired: 'Colorize step is mandatory',
+    vectorizedLogoMandatory: 'Force using vectorized logo',
     'Maximum Color Amount': 'Maximum Color Amount',
     'Minimum Font Size': 'Minimum Font Size',
     'Has Engraving Background Colors': 'Has Engraving Background Colors',
@@ -56,7 +57,8 @@ require("../../App/i18n").use({
       embroidery: 'Stick',
       doming: 'Doming'
     },
-    'Vectors Required': 'Erfordert Vektorisierung',
+    vectorsRequired: 'Umfärben erzwingen',
+    vectorizedLogoMandatory: 'Vektorisierte Bilddaten müssen verwendet werden',
     'Maximum Color Amount': 'Maximale Farbanzahl',
     'Minimum Font Size': 'Minimale Schriftgröße',
     'Has Engraving Background Colors': 'Hat Gravur-Hintergrundfarben',

package/Screens/Designer/Components/TemplateDefaultList.js

@@ -208,11 +208,7 @@ var TemplateDefaultList = /*#__PURE__*/function (_Component) {
       var _this$props = _this.props,
           list = _this$props.list,
           sourceItemId = _this$props.sourceItemId;
-      var movedItems = _this.state.movedItems;
-      var excludedIds = movedItems.map(function (item) {
-        return item.id;
-      });
-      excludedIds.push(sourceItemId);
+      var excludedIds = [sourceItemId];
       return _lodash["default"].get(list, 'data', []).filter(function (item) {
         return excludedIds.indexOf(item.id) === -1;
       });
@@ -226,9 +222,7 @@ var TemplateDefaultList = /*#__PURE__*/function (_Component) {
       var data = _this.getAvailableItems();
 
       var newItems = _lodash["default"].filter(data, function (item, index) {
-        return (selectedRows.indexOf(index) !== -1 || selectedRows === 'all') && !_lodash["default"].find(movedItems, {
-          id: item.id
-        });
+        return selectedRows.indexOf(index) !== -1 || selectedRows === 'all';
       });
 
       _this.setState({
@@ -256,6 +250,30 @@ var TemplateDefaultList = /*#__PURE__*/function (_Component) {
       });
     });
 
+    _defineProperty(_assertThisInitialized(_this), "isItemAtIndexMoved", function (index) {
+      var clickedItem = _this.props.list.data[index];
+      return _lodash["default"].find(_this.state.movedItems, {
+        id: clickedItem.id
+      });
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "isRowSelectable", function (index) {
+      return !_this.isItemAtIndexMoved(index);
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "getRowStyle", function (index) {
+      if (_this.isItemAtIndexMoved(index)) {
+        return {
+          cursor: 'not-allowed',
+          backgroundColor: 'lightgreen'
+        };
+      }
+
+      return {
+        cursor: 'pointer'
+      };
+    });
+
     _defineProperty(_assertThisInitialized(_this), "onMovedItemsChange", function () {
       var movedItemIds = _this.state.movedItems.map(function (item) {
         return item.id;
@@ -356,7 +374,7 @@ var TemplateDefaultList = /*#__PURE__*/function (_Component) {
         data: data,
         columns: columns,
         shownColumns: shownColumns,
-        rowsTotal: data.length,
+        rowsTotal: total,
         rowsPerPage: this.state.listParams.limit,
         onRowSelection: this.onRowSelection,
         selected: selected || this.state.selectedRows,
@@ -368,7 +386,9 @@ var TemplateDefaultList = /*#__PURE__*/function (_Component) {
         onSortChange: this.onSortChange,
         onShownColumnsChange: this.onShownColumnsChange,
         showCheckboxes: !!this.props.onDeleteItems,
-        onMoveItems: this.onMoveItems
+        onMoveItems: this.onMoveItems,
+        isRowSelectable: this.isRowSelectable,
+        getRowStyle: this.getRowStyle
       })), /*#__PURE__*/_react["default"].createElement(_Grid["default"], {
         container: true,
         alignItems: "center",

package/UIComponents/Table/Table.js

@@ -66,32 +66,35 @@ var UITable = /*#__PURE__*/function (_React$Component) {
 
     _defineProperty(_assertThisInitialized(_this), "onRowSelected", function (event, id) {
       var isMultiple = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-      var selected = _this.state.selected;
-      var selectedIndex = selected.indexOf(id);
-      var newSelected = [];
 
-      if (!isMultiple && selected.length === 1) {
-        if ((0, _first["default"])(selected) !== id) {
+      if (!_this.props.isRowSelectable || _this.props.isRowSelectable(id) === true) {
+        var selected = _this.state.selected;
+        var selectedIndex = selected.indexOf(id);
+        var newSelected = [];
+
+        if (!isMultiple && selected.length === 1) {
+          if ((0, _first["default"])(selected) !== id) {
+            newSelected.push(id);
+          }
+        } else if (!isMultiple && selected.length > 1) {
           newSelected.push(id);
+        } else if (selectedIndex === -1) {
+          newSelected = newSelected.concat(selected, id);
+        } else if (selectedIndex === 0) {
+          newSelected = newSelected.concat(selected.slice(1));
+        } else if (selectedIndex === selected.length - 1) {
+          newSelected = newSelected.concat(selected.slice(0, -1));
+        } else if (selectedIndex > 0) {
+          newSelected = newSelected.concat(selected.slice(0, selectedIndex), selected.slice(selectedIndex + 1));
         }
-      } else if (!isMultiple && selected.length > 1) {
-        newSelected.push(id);
-      } else if (selectedIndex === -1) {
-        newSelected = newSelected.concat(selected, id);
-      } else if (selectedIndex === 0) {
-        newSelected = newSelected.concat(selected.slice(1));
-      } else if (selectedIndex === selected.length - 1) {
-        newSelected = newSelected.concat(selected.slice(0, -1));
-      } else if (selectedIndex > 0) {
-        newSelected = newSelected.concat(selected.slice(0, selectedIndex), selected.slice(selectedIndex + 1));
-      }
 
-      _this.setState({
-        selected: newSelected,
-        allSelected: false
-      });
+        _this.setState({
+          selected: newSelected,
+          allSelected: false
+        });
 
-      _this.onSelectedCallback(newSelected, event);
+        _this.onSelectedCallback(newSelected, event);
+      }
     });
 
     _defineProperty(_assertThisInitialized(_this), "isSelected", function (id) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.40.2",
+  "version": "1.40.4",
   "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.40.2",
+    "redhotmagma-visualization": "1.40.4",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

package/src/Components/List.js

@@ -243,6 +243,14 @@ export default class List extends Component {
         }
         return null;
     }
+    
+    getRowStyle(index) {
+        if(this.props.getRowStyle) {
+            return this.props.getRowStyle(index);
+        }
+        
+        return { cursor: 'pointer' };
+    }
 
     renderTable = () => {
         const { rowActions, columns, data, showCheckboxes, onDeleteItems, renderAction } = this.props;
@@ -267,6 +275,7 @@ export default class List extends Component {
                         this.props.onRowSelection(rows, event);
                     }}
                     selected={this.selectedRows}
+                    isRowSelectable={this.props.isRowSelectable}
                 >
                     <TableHead showCheckbox={showCheckboxes}>
                         {this.renderPaginationWithTools()}
@@ -297,7 +306,7 @@ export default class List extends Component {
                     <TableBody className="list-body">
                         {data.map((row, index) => {
                             return (
-                                <TableRow key={index} style={{ cursor: 'pointer' }}>
+                                <TableRow key={index} style={this.getRowStyle(index)}>
                                     {columns.map(
                                         (column, i) =>
                                             shownColumns[i] && (

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

@@ -31,6 +31,17 @@ const formFields = [
             },
         ],
     },
+    {
+        name: 'settings',
+        type: SimpleNestedData,
+        fields: [
+            {
+                name: 'vatrate',
+                label: 'VAT rate',
+                type: 'number',
+            },
+        ],
+    },
     {
         name: 'globalDiscountPercentage',
         label: 'discountPercentage',

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

@@ -17,6 +17,7 @@ const initialState = {
                 value: {},
                 schema: {
                     hidePrices: { value: false },
+                    vatrate: { value: null },
                 },
             },
         },

package/src/Screens/Channel/Translations.js

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

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

@@ -5,8 +5,8 @@ import SimpleNestedData from '../../../Components/FormFragments/SimpleNestedData
 import Toggle from '../../../Components/FormFragments/Toggle';
 import { T } from '../../../App/i18n';
 import TranslationFinder, { findTranslation } from '../../../Components/TranslationFinder';
-import {LocalizedPriceTextField} from "../../../Components/LocalizedPriceTextField";
-import LocalizedPriceValue from "../../../Components/LocalizedPriceValue";
+import { LocalizedPriceTextField } from '../../../Components/LocalizedPriceTextField';
+import LocalizedPriceValue from '../../../Components/LocalizedPriceValue';
 
 const formFields = [
     {
@@ -29,7 +29,12 @@ const formFields = [
         fields: [
             {
                 name: 'vectorsRequired',
-                label: 'Vectors Required',
+                label: 'vectorsRequired',
+                type: 'checkbox',
+            },
+            {
+                name: 'vectorizedLogoMandatory',
+                label: 'vectorizedLogoMandatory',
                 type: 'checkbox',
             },
             {
@@ -192,9 +197,13 @@ const formFields = [
                         className: 'table',
                         array: {
                             disableAdd: ({ parentSchema, value }) => {
-                              const colorAmountDependent = parentSchema.colorAmountDependent && parentSchema.colorAmountDependent.value;
-                              const itemAmountDependent = parentSchema.itemAmountDependent && parentSchema.itemAmountDependent.value;
-                              return !colorAmountDependent && !itemAmountDependent && value.length > 0;
+                                const colorAmountDependent =
+                                    parentSchema.colorAmountDependent &&
+                                    parentSchema.colorAmountDependent.value;
+                                const itemAmountDependent =
+                                    parentSchema.itemAmountDependent &&
+                                    parentSchema.itemAmountDependent.value;
+                                return !colorAmountDependent && !itemAmountDependent && value.length > 0;
                             },
                             addButtonLabel: 'designProductionMethod.prices.addButtonLabel',
                             columns: null,
@@ -203,13 +212,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} />,
                                 },
                                 {
                                     name: 'colorAmountFrom',

package/src/Screens/DesignProductionMethods/Reducers/DesignProductionMethodsReducer.js

@@ -12,6 +12,7 @@ const initialState = {
                 value: {},
                 schema: {
                     vectorsRequired: { value: false },
+                    vectorizedLogoMandatory: { value: false },
                     visualizationEffect: { value: 'print', constraints: { presence: false } },
                     maxColorAmount: {
                         value: 0,

package/src/Screens/DesignProductionMethods/Translations.js

@@ -20,7 +20,8 @@ require('../../App/i18n').use(
                 embroidery: 'embroidery',
                 doming: 'doming',
             },
-            'Vectors Required': 'Vectors Required',
+            vectorsRequired: 'Colorize step is mandatory',
+            vectorizedLogoMandatory: 'Force using vectorized logo',
             'Maximum Color Amount': 'Maximum Color Amount',
             'Minimum Font Size': 'Minimum Font Size',
             'Has Engraving Background Colors': 'Has Engraving Background Colors',
@@ -56,7 +57,8 @@ require('../../App/i18n').use(
                 embroidery: 'Stick',
                 doming: 'Doming',
             },
-            'Vectors Required': 'Erfordert Vektorisierung',
+            vectorsRequired: 'Umfärben erzwingen',
+            vectorizedLogoMandatory: 'Vektorisierte Bilddaten müssen verwendet werden',
             'Maximum Color Amount': 'Maximale Farbanzahl',
             'Minimum Font Size': 'Minimale Schriftgröße',
             'Has Engraving Background Colors': 'Hat Gravur-Hintergrundfarben',

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

@@ -175,10 +175,8 @@ export default class TemplateDefaultList extends Component {
 
     getAvailableItems = () => {
         const { list, sourceItemId } = this.props;
-        const { movedItems } = this.state;
 
-        const excludedIds = movedItems.map(item => item.id);
-        excludedIds.push(sourceItemId);
+        const excludedIds = [sourceItemId];
 
         return _.get(list, 'data', []).filter(item => excludedIds.indexOf(item.id) === -1);
     };
@@ -188,10 +186,7 @@ export default class TemplateDefaultList extends Component {
         const data = this.getAvailableItems();
 
         const newItems = _.filter(data, (item, index) => {
-            return (
-                (selectedRows.indexOf(index) !== -1 || selectedRows === 'all') &&
-                !_.find(movedItems, { id: item.id })
-            );
+            return (selectedRows.indexOf(index) !== -1 || selectedRows === 'all');
         });
 
         this.setState(
@@ -222,6 +217,23 @@ export default class TemplateDefaultList extends Component {
             }
         );
     };
+    
+    isItemAtIndexMoved= (index) => {
+        const clickedItem = this.props.list.data[index];
+
+        return _.find(this.state.movedItems, { id: clickedItem.id });
+    }
+    
+    isRowSelectable = (index) => {
+        return !this.isItemAtIndexMoved(index);
+    }
+
+    getRowStyle = (index) => {
+        if (this.isItemAtIndexMoved(index)) {
+            return { cursor: 'not-allowed', backgroundColor: 'lightgreen' };
+        }
+        return { cursor: 'pointer' };
+    }
 
     onMovedItemsChange = () => {
         const movedItemIds = this.state.movedItems.map(item => item.id);
@@ -261,7 +273,7 @@ export default class TemplateDefaultList extends Component {
                             data={data}
                             columns={columns}
                             shownColumns={shownColumns}
-                            rowsTotal={data.length}
+                            rowsTotal={total}
                             rowsPerPage={this.state.listParams.limit}
                             onRowSelection={this.onRowSelection}
                             selected={selected || this.state.selectedRows}
@@ -274,6 +286,8 @@ export default class TemplateDefaultList extends Component {
                             onShownColumnsChange={this.onShownColumnsChange}
                             showCheckboxes={!!this.props.onDeleteItems}
                             onMoveItems={this.onMoveItems}
+                            isRowSelectable={this.isRowSelectable}
+                            getRowStyle={this.getRowStyle}
                         />
                     </Grid>
 

package/src/UIComponents/Table/Table.js

@@ -30,35 +30,37 @@ class UITable extends React.Component {
     }
 
     onRowSelected = (event, id, isMultiple = false) => {
-        const { selected } = this.state;
-        const selectedIndex = selected.indexOf(id);
-        let newSelected = [];
+        if (!this.props.isRowSelectable || this.props.isRowSelectable(id) === true) {
+            const { selected } = this.state;
+            const selectedIndex = selected.indexOf(id);
+            let newSelected = [];
 
-        if (!isMultiple && selected.length === 1) {
-            if (first(selected) !== id) {
+            if (!isMultiple && selected.length === 1) {
+                if (first(selected) !== id) {
+                    newSelected.push(id);
+                }
+            } else if (!isMultiple && selected.length > 1) {
                 newSelected.push(id);
+            } else if (selectedIndex === -1) {
+                newSelected = newSelected.concat(selected, id);
+            } else if (selectedIndex === 0) {
+                newSelected = newSelected.concat(selected.slice(1));
+            } else if (selectedIndex === selected.length - 1) {
+                newSelected = newSelected.concat(selected.slice(0, -1));
+            } else if (selectedIndex > 0) {
+                newSelected = newSelected.concat(
+                    selected.slice(0, selectedIndex),
+                    selected.slice(selectedIndex + 1)
+                );
             }
-        } else if (!isMultiple && selected.length > 1) {
-            newSelected.push(id);
-        } else if (selectedIndex === -1) {
-            newSelected = newSelected.concat(selected, id);
-        } else if (selectedIndex === 0) {
-            newSelected = newSelected.concat(selected.slice(1));
-        } else if (selectedIndex === selected.length - 1) {
-            newSelected = newSelected.concat(selected.slice(0, -1));
-        } else if (selectedIndex > 0) {
-            newSelected = newSelected.concat(
-                selected.slice(0, selectedIndex),
-                selected.slice(selectedIndex + 1)
-            );
-        }
 
-        this.setState({
-            selected: newSelected,
-            allSelected: false,
-        });
+            this.setState({
+                selected: newSelected,
+                allSelected: false,
+            });
 
-        this.onSelectedCallback(newSelected, event);
+            this.onSelectedCallback(newSelected, event);
+        }
     };
 
     isSelected = id => this.state.selected.indexOf(id) !== -1;