@configuratorware/configurator-admingui 1.40.4 → 1.40.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Screens/Channel/Containers/Edit.js +0 -8
- package/Screens/Channel/Reducers/Reducer.js +0 -3
- package/Screens/Channel/Translations.js +1 -2
- package/Screens/DesignProductionMethods/Containers/Edit.js +1 -5
- package/Screens/DesignProductionMethods/Reducers/DesignProductionMethodsReducer.js +0 -3
- package/Screens/DesignProductionMethods/Translations.js +2 -4
- package/package.json +2 -2
- package/src/Screens/Channel/Containers/Edit.js +0 -11
- package/src/Screens/Channel/Reducers/Reducer.js +0 -1
- package/src/Screens/Channel/Translations.js +0 -1
- package/src/Screens/DesignProductionMethods/Containers/Edit.js +8 -17
- package/src/Screens/DesignProductionMethods/Reducers/DesignProductionMethodsReducer.js +0 -1
- package/src/Screens/DesignProductionMethods/Translations.js +2 -4
|
@@ -47,14 +47,6 @@ var formFields = [{
|
|
|
47
47
|
label: 'Hide prices',
|
|
48
48
|
type: 'checkbox'
|
|
49
49
|
}]
|
|
50
|
-
}, {
|
|
51
|
-
name: 'settings',
|
|
52
|
-
type: _SimpleNestedData["default"],
|
|
53
|
-
fields: [{
|
|
54
|
-
name: 'vatrate',
|
|
55
|
-
label: 'VAT rate',
|
|
56
|
-
type: 'number'
|
|
57
|
-
}]
|
|
58
50
|
}, {
|
|
59
51
|
name: 'globalDiscountPercentage',
|
|
60
52
|
label: 'discountPercentage',
|
|
@@ -62,11 +62,7 @@ var formFields = [{
|
|
|
62
62
|
type: _SimpleNestedData["default"],
|
|
63
63
|
fields: [{
|
|
64
64
|
name: 'vectorsRequired',
|
|
65
|
-
label: '
|
|
66
|
-
type: 'checkbox'
|
|
67
|
-
}, {
|
|
68
|
-
name: 'vectorizedLogoMandatory',
|
|
69
|
-
label: 'vectorizedLogoMandatory',
|
|
65
|
+
label: 'Vectors Required',
|
|
70
66
|
type: 'checkbox'
|
|
71
67
|
}, {
|
|
72
68
|
name: 'visualizationEffect',
|
|
@@ -21,8 +21,7 @@ require("../../App/i18n").use({
|
|
|
21
21
|
embroidery: 'embroidery',
|
|
22
22
|
doming: 'doming'
|
|
23
23
|
},
|
|
24
|
-
|
|
25
|
-
vectorizedLogoMandatory: 'Force using vectorized logo',
|
|
24
|
+
'Vectors Required': 'Vectors Required',
|
|
26
25
|
'Maximum Color Amount': 'Maximum Color Amount',
|
|
27
26
|
'Minimum Font Size': 'Minimum Font Size',
|
|
28
27
|
'Has Engraving Background Colors': 'Has Engraving Background Colors',
|
|
@@ -57,8 +56,7 @@ require("../../App/i18n").use({
|
|
|
57
56
|
embroidery: 'Stick',
|
|
58
57
|
doming: 'Doming'
|
|
59
58
|
},
|
|
60
|
-
|
|
61
|
-
vectorizedLogoMandatory: 'Vektorisierte Bilddaten müssen verwendet werden',
|
|
59
|
+
'Vectors Required': 'Erfordert Vektorisierung',
|
|
62
60
|
'Maximum Color Amount': 'Maximale Farbanzahl',
|
|
63
61
|
'Minimum Font Size': 'Minimale Schriftgröße',
|
|
64
62
|
'Has Engraving Background Colors': 'Hat Gravur-Hintergrundfarben',
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@configuratorware/configurator-admingui",
|
|
3
|
-
"version": "1.40.
|
|
3
|
+
"version": "1.40.5",
|
|
4
4
|
"license": "UNLICENSED",
|
|
5
5
|
"private": false,
|
|
6
6
|
"dependencies": {
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"react-redux-i18n": "^1.9.3",
|
|
30
30
|
"react-router": "^3.2.6",
|
|
31
31
|
"react-sortable-hoc": "^1.11.0",
|
|
32
|
-
"redhotmagma-visualization": "1.40.
|
|
32
|
+
"redhotmagma-visualization": "1.40.5",
|
|
33
33
|
"redux": "^4.1.0",
|
|
34
34
|
"redux-logger": "^3.0.6",
|
|
35
35
|
"redux-persist": "^5.10.0",
|
|
@@ -31,17 +31,6 @@ const formFields = [
|
|
|
31
31
|
},
|
|
32
32
|
],
|
|
33
33
|
},
|
|
34
|
-
{
|
|
35
|
-
name: 'settings',
|
|
36
|
-
type: SimpleNestedData,
|
|
37
|
-
fields: [
|
|
38
|
-
{
|
|
39
|
-
name: 'vatrate',
|
|
40
|
-
label: 'VAT rate',
|
|
41
|
-
type: 'number',
|
|
42
|
-
},
|
|
43
|
-
],
|
|
44
|
-
},
|
|
45
34
|
{
|
|
46
35
|
name: 'globalDiscountPercentage',
|
|
47
36
|
label: 'discountPercentage',
|
|
@@ -5,8 +5,8 @@ import SimpleNestedData from '../../../Components/FormFragments/SimpleNestedData
|
|
|
5
5
|
import Toggle from '../../../Components/FormFragments/Toggle';
|
|
6
6
|
import { T } from '../../../App/i18n';
|
|
7
7
|
import TranslationFinder, { findTranslation } from '../../../Components/TranslationFinder';
|
|
8
|
-
import {
|
|
9
|
-
import LocalizedPriceValue from
|
|
8
|
+
import {LocalizedPriceTextField} from "../../../Components/LocalizedPriceTextField";
|
|
9
|
+
import LocalizedPriceValue from "../../../Components/LocalizedPriceValue";
|
|
10
10
|
|
|
11
11
|
const formFields = [
|
|
12
12
|
{
|
|
@@ -29,12 +29,7 @@ const formFields = [
|
|
|
29
29
|
fields: [
|
|
30
30
|
{
|
|
31
31
|
name: 'vectorsRequired',
|
|
32
|
-
label: '
|
|
33
|
-
type: 'checkbox',
|
|
34
|
-
},
|
|
35
|
-
{
|
|
36
|
-
name: 'vectorizedLogoMandatory',
|
|
37
|
-
label: 'vectorizedLogoMandatory',
|
|
32
|
+
label: 'Vectors Required',
|
|
38
33
|
type: 'checkbox',
|
|
39
34
|
},
|
|
40
35
|
{
|
|
@@ -197,13 +192,9 @@ const formFields = [
|
|
|
197
192
|
className: 'table',
|
|
198
193
|
array: {
|
|
199
194
|
disableAdd: ({ parentSchema, value }) => {
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
const itemAmountDependent =
|
|
204
|
-
parentSchema.itemAmountDependent &&
|
|
205
|
-
parentSchema.itemAmountDependent.value;
|
|
206
|
-
return !colorAmountDependent && !itemAmountDependent && value.length > 0;
|
|
195
|
+
const colorAmountDependent = parentSchema.colorAmountDependent && parentSchema.colorAmountDependent.value;
|
|
196
|
+
const itemAmountDependent = parentSchema.itemAmountDependent && parentSchema.itemAmountDependent.value;
|
|
197
|
+
return !colorAmountDependent && !itemAmountDependent && value.length > 0;
|
|
207
198
|
},
|
|
208
199
|
addButtonLabel: 'designProductionMethod.prices.addButtonLabel',
|
|
209
200
|
columns: null,
|
|
@@ -212,13 +203,13 @@ const formFields = [
|
|
|
212
203
|
name: 'price',
|
|
213
204
|
label: 'Price',
|
|
214
205
|
type: LocalizedPriceTextField,
|
|
215
|
-
renderValue: value => <LocalizedPriceValue data={value}
|
|
206
|
+
renderValue: value => <LocalizedPriceValue data={value}/>,
|
|
216
207
|
},
|
|
217
208
|
{
|
|
218
209
|
name: 'priceNet',
|
|
219
210
|
label: 'Price Net',
|
|
220
211
|
type: LocalizedPriceTextField,
|
|
221
|
-
renderValue: value => <LocalizedPriceValue data={value}
|
|
212
|
+
renderValue: value => <LocalizedPriceValue data={value}/>,
|
|
222
213
|
},
|
|
223
214
|
{
|
|
224
215
|
name: 'colorAmountFrom',
|
|
@@ -20,8 +20,7 @@ require('../../App/i18n').use(
|
|
|
20
20
|
embroidery: 'embroidery',
|
|
21
21
|
doming: 'doming',
|
|
22
22
|
},
|
|
23
|
-
|
|
24
|
-
vectorizedLogoMandatory: 'Force using vectorized logo',
|
|
23
|
+
'Vectors Required': 'Vectors Required',
|
|
25
24
|
'Maximum Color Amount': 'Maximum Color Amount',
|
|
26
25
|
'Minimum Font Size': 'Minimum Font Size',
|
|
27
26
|
'Has Engraving Background Colors': 'Has Engraving Background Colors',
|
|
@@ -57,8 +56,7 @@ require('../../App/i18n').use(
|
|
|
57
56
|
embroidery: 'Stick',
|
|
58
57
|
doming: 'Doming',
|
|
59
58
|
},
|
|
60
|
-
|
|
61
|
-
vectorizedLogoMandatory: 'Vektorisierte Bilddaten müssen verwendet werden',
|
|
59
|
+
'Vectors Required': 'Erfordert Vektorisierung',
|
|
62
60
|
'Maximum Color Amount': 'Maximale Farbanzahl',
|
|
63
61
|
'Minimum Font Size': 'Minimale Schriftgröße',
|
|
64
62
|
'Has Engraving Background Colors': 'Hat Gravur-Hintergrundfarben',
|