@configuratorware/configurator-admingui 1.40.3 → 1.40.4
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 +8 -0
- package/Screens/Channel/Reducers/Reducer.js +3 -0
- package/Screens/Channel/Translations.js +2 -1
- package/Screens/DesignProductionMethods/Containers/Edit.js +5 -1
- package/Screens/DesignProductionMethods/Reducers/DesignProductionMethodsReducer.js +3 -0
- package/Screens/DesignProductionMethods/Translations.js +4 -2
- package/package.json +2 -2
- package/src/Screens/Channel/Containers/Edit.js +11 -0
- package/src/Screens/Channel/Reducers/Reducer.js +1 -0
- package/src/Screens/Channel/Translations.js +1 -0
- package/src/Screens/DesignProductionMethods/Containers/Edit.js +17 -8
- package/src/Screens/DesignProductionMethods/Reducers/DesignProductionMethodsReducer.js +1 -0
- package/src/Screens/DesignProductionMethods/Translations.js +4 -2
|
@@ -47,6 +47,14 @@ 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
|
+
}]
|
|
50
58
|
}, {
|
|
51
59
|
name: 'globalDiscountPercentage',
|
|
52
60
|
label: 'discountPercentage',
|
|
@@ -62,7 +62,11 @@ var formFields = [{
|
|
|
62
62
|
type: _SimpleNestedData["default"],
|
|
63
63
|
fields: [{
|
|
64
64
|
name: 'vectorsRequired',
|
|
65
|
-
label: '
|
|
65
|
+
label: 'vectorsRequired',
|
|
66
|
+
type: 'checkbox'
|
|
67
|
+
}, {
|
|
68
|
+
name: 'vectorizedLogoMandatory',
|
|
69
|
+
label: 'vectorizedLogoMandatory',
|
|
66
70
|
type: 'checkbox'
|
|
67
71
|
}, {
|
|
68
72
|
name: 'visualizationEffect',
|
|
@@ -21,7 +21,8 @@ require("../../App/i18n").use({
|
|
|
21
21
|
embroidery: 'embroidery',
|
|
22
22
|
doming: 'doming'
|
|
23
23
|
},
|
|
24
|
-
|
|
24
|
+
vectorsRequired: 'Colorize step is mandatory',
|
|
25
|
+
vectorizedLogoMandatory: 'Force using vectorized logo',
|
|
25
26
|
'Maximum Color Amount': 'Maximum Color Amount',
|
|
26
27
|
'Minimum Font Size': 'Minimum Font Size',
|
|
27
28
|
'Has Engraving Background Colors': 'Has Engraving Background Colors',
|
|
@@ -56,7 +57,8 @@ require("../../App/i18n").use({
|
|
|
56
57
|
embroidery: 'Stick',
|
|
57
58
|
doming: 'Doming'
|
|
58
59
|
},
|
|
59
|
-
|
|
60
|
+
vectorsRequired: 'Umfärben erzwingen',
|
|
61
|
+
vectorizedLogoMandatory: 'Vektorisierte Bilddaten müssen verwendet werden',
|
|
60
62
|
'Maximum Color Amount': 'Maximale Farbanzahl',
|
|
61
63
|
'Minimum Font Size': 'Minimale Schriftgröße',
|
|
62
64
|
'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.4",
|
|
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.4",
|
|
33
33
|
"redux": "^4.1.0",
|
|
34
34
|
"redux-logger": "^3.0.6",
|
|
35
35
|
"redux-persist": "^5.10.0",
|
|
@@ -31,6 +31,17 @@ 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
|
+
},
|
|
34
45
|
{
|
|
35
46
|
name: 'globalDiscountPercentage',
|
|
36
47
|
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 {LocalizedPriceTextField} from
|
|
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,7 +29,12 @@ const formFields = [
|
|
|
29
29
|
fields: [
|
|
30
30
|
{
|
|
31
31
|
name: 'vectorsRequired',
|
|
32
|
-
label: '
|
|
32
|
+
label: 'vectorsRequired',
|
|
33
|
+
type: 'checkbox',
|
|
34
|
+
},
|
|
35
|
+
{
|
|
36
|
+
name: 'vectorizedLogoMandatory',
|
|
37
|
+
label: 'vectorizedLogoMandatory',
|
|
33
38
|
type: 'checkbox',
|
|
34
39
|
},
|
|
35
40
|
{
|
|
@@ -192,9 +197,13 @@ const formFields = [
|
|
|
192
197
|
className: 'table',
|
|
193
198
|
array: {
|
|
194
199
|
disableAdd: ({ parentSchema, value }) => {
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
200
|
+
const colorAmountDependent =
|
|
201
|
+
parentSchema.colorAmountDependent &&
|
|
202
|
+
parentSchema.colorAmountDependent.value;
|
|
203
|
+
const itemAmountDependent =
|
|
204
|
+
parentSchema.itemAmountDependent &&
|
|
205
|
+
parentSchema.itemAmountDependent.value;
|
|
206
|
+
return !colorAmountDependent && !itemAmountDependent && value.length > 0;
|
|
198
207
|
},
|
|
199
208
|
addButtonLabel: 'designProductionMethod.prices.addButtonLabel',
|
|
200
209
|
columns: null,
|
|
@@ -203,13 +212,13 @@ const formFields = [
|
|
|
203
212
|
name: 'price',
|
|
204
213
|
label: 'Price',
|
|
205
214
|
type: LocalizedPriceTextField,
|
|
206
|
-
renderValue: value => <LocalizedPriceValue data={value}/>,
|
|
215
|
+
renderValue: value => <LocalizedPriceValue data={value} />,
|
|
207
216
|
},
|
|
208
217
|
{
|
|
209
218
|
name: 'priceNet',
|
|
210
219
|
label: 'Price Net',
|
|
211
220
|
type: LocalizedPriceTextField,
|
|
212
|
-
renderValue: value => <LocalizedPriceValue data={value}/>,
|
|
221
|
+
renderValue: value => <LocalizedPriceValue data={value} />,
|
|
213
222
|
},
|
|
214
223
|
{
|
|
215
224
|
name: 'colorAmountFrom',
|
|
@@ -20,7 +20,8 @@ require('../../App/i18n').use(
|
|
|
20
20
|
embroidery: 'embroidery',
|
|
21
21
|
doming: 'doming',
|
|
22
22
|
},
|
|
23
|
-
|
|
23
|
+
vectorsRequired: 'Colorize step is mandatory',
|
|
24
|
+
vectorizedLogoMandatory: 'Force using vectorized logo',
|
|
24
25
|
'Maximum Color Amount': 'Maximum Color Amount',
|
|
25
26
|
'Minimum Font Size': 'Minimum Font Size',
|
|
26
27
|
'Has Engraving Background Colors': 'Has Engraving Background Colors',
|
|
@@ -56,7 +57,8 @@ require('../../App/i18n').use(
|
|
|
56
57
|
embroidery: 'Stick',
|
|
57
58
|
doming: 'Doming',
|
|
58
59
|
},
|
|
59
|
-
|
|
60
|
+
vectorsRequired: 'Umfärben erzwingen',
|
|
61
|
+
vectorizedLogoMandatory: 'Vektorisierte Bilddaten müssen verwendet werden',
|
|
60
62
|
'Maximum Color Amount': 'Maximale Farbanzahl',
|
|
61
63
|
'Minimum Font Size': 'Minimale Schriftgröße',
|
|
62
64
|
'Has Engraving Background Colors': 'Hat Gravur-Hintergrundfarben',
|