@configuratorware/configurator-admingui 1.26.5 → 1.27.2

package/src/Screens/Designer/SubScreens/DesignAreas/Reducers/Reducer.js

@@ -49,11 +49,27 @@ const initialState = {
                     id: { value: null },
                     height: { value: 0 },
                     width: { value: 0 },
+                    designElementsLocked: { value: false },
                     minimumOrderAmount: {
                         constraints: {
                             emptyOrPositive: true,
                         },
                     },
+                    maxTexts: {
+                        constraints: {
+                            numericOrEmpty: { strict: true, onlyInteger: true, greaterThanOrEqualTo: 0 },
+                        },
+                    },
+                    maxImages: {
+                        constraints: {
+                            numericOrEmpty: { strict: true, onlyInteger: true, greaterThanOrEqualTo: 0 },
+                        },
+                    },
+                    maxElements: {
+                        constraints: {
+                            numericOrEmpty: { strict: true, onlyInteger: true, greaterThanOrEqualTo: 1 },
+                        },
+                    },
                     mask: { value: {} },
                     calculationTypes: {
                         value: [],
@@ -91,7 +107,6 @@ const initialState = {
                             minFontSize: 0,
                             maxColorAmount: 0,
                             visualizationRenderer: '',
-                            hasEngravingBackgroundColors: false,
                         },
                     },
                     additionalData: {
@@ -154,7 +169,7 @@ const populateDesignProductionMethod = (state, action) => {
     return state;
 };
 
-const overwriteEmptyMinimumOrderAmount = (state, action) => {
+export const overwriteEmptyDesignProductionData = (state, action) => {
     if ((action.type === SET_VALIDATED_DATA || action.type === MOUNT_NEXT) && action.key === DATA_KEY) {
         return {
             ...state,
@@ -165,6 +180,14 @@ const overwriteEmptyMinimumOrderAmount = (state, action) => {
                     value: state.data.designProductionMethods.value.map(method => ({
                         ...method,
                         minimumOrderAmount: method.minimumOrderAmount || 1,
+                        maxElements:
+                            method.maxElements !== null &&
+                            method.maxElements !== '' &&
+                            Number(method.maxElements) < Number(method.maxTexts) + Number(method.maxImages)
+                                ? Number(method.maxTexts) + Number(method.maxImages)
+                                : method.maxElements,
+                        maxTexts: method.maxTexts,
+                        maxImages: method.maxImages,
                     })),
                 },
             },
@@ -177,7 +200,7 @@ const overwriteEmptyMinimumOrderAmount = (state, action) => {
 export const designAreasData = createFeatureReducer(REDUCER_NAME, (state = initialState, action) => {
     state = defaultEntityReducer(state, action, initialState);
     state = populateDesignProductionMethod(state, action);
-    state = overwriteEmptyMinimumOrderAmount(state, action);
+    state = overwriteEmptyDesignProductionData(state, action);
 
     switch (action.type) {
         case SET_ITEM: {

package/src/Screens/Designer/SubScreens/DesignAreas/Translations.js

@@ -6,7 +6,7 @@ require('../../../../App/i18n').use(
             isDefault: 'default',
             allowBulkNames: 'Allow bulk names',
             varyingDefaultColors: 'Varying Default Color',
-            EngravingBackgroundColor: ' hex-color',
+            EngravingBackgroundColor: 'Color value',
             errors: {
                 noProdMethodLeft: 'No more production methods exist.',
             },
@@ -54,6 +54,12 @@ require('../../../../App/i18n').use(
                     },
                 },
             },
+            maxTextElements: 'Maximum number of text elements allowed (empty for any number, 0 for none)',
+            maxImageElements: 'Maximum number of picture elements allowed (empty for any number, 0 for none)',
+            maxTotalElements: 'Maximum number of elements allowed in total (empty for any number)',
+            designElementsLocked:
+                'Design position locked - Design elements appear centered and cannot be moved by the user',
+            minElementsError: 'At least 1 text or picture element need to be allowed',
         },
         de: {
             Title: 'Titel',
@@ -69,7 +75,7 @@ require('../../../../App/i18n').use(
             isDefault: 'Standard',
             allowBulkNames: 'Einzelnamen erlauben',
             varyingDefaultColors: 'abweichende Standardfarbe',
-            EngravingBackgroundColor: ' hex-color',
+            EngravingBackgroundColor: 'Farbwert',
             errors: {
                 noProdMethodLeft: 'Keine weiteren Produktionsverfahren vorhanden.',
             },
@@ -111,6 +117,14 @@ require('../../../../App/i18n').use(
                     },
                 },
             },
+            maxTextElements:
+                'Maximal erlaubte Anzahl an Textelementen (leer für beliebig viele, 0 für keine)',
+            maxImageElements:
+                'Maximal erlaubte Anzahl an Bildelementen (leer für beliebig viele, 0 für keine)',
+            maxTotalElements: 'Maximal erlaubte Anzahl Element insgesamt (leer für beliebig viele)',
+            designElementsLocked:
+                'Designposition gesperrt - Designelemente erscheinen zentriert und können vom Nutzer nicht bewegt werden',
+            minElementsError: 'Mindestens 1 Text- oder Bildelement müssen erlaubt werden',
         },
     },
     true

package/src/Screens/Designer/__tests__/FormProductionMethods.test.js

@@ -44,7 +44,6 @@ const productionMethod = {
                 minFontSize: 5,
                 maxColorAmount: 4,
                 visualizationRenderer: 'print',
-                hasEngravingBackgroundColors: true,
             },
             additionalData: {
                 engravingBackgroundColors: [
@@ -105,7 +104,6 @@ const availableMethods = [
             minFontSize: 5,
             maxColorAmount: 4,
             visualizationRenderer: 'engraving',
-            hasEngravingBackgroundColors: true,
         },
         customData: {},
         calculationTypes: [],

package/src/Screens/Designer/__tests__/__snapshots__/FormProductionMethods.test.js.snap

@@ -2,28 +2,28 @@
 
 exports[`Unit- FormProductionMethods renders correctly 1`] = `
 <div
-  class="MuiPaper-root-14 MuiPaper-elevation1-17 MuiPaper-rounded-15 MuiCard-root-13 FormProductionMethods-card-12"
+  class="MuiPaper-root-16 MuiPaper-elevation1-19 MuiPaper-rounded-17 MuiCard-root-15 FormProductionMethods-card-12"
 >
   <div
-    class="MuiGrid-container-41"
+    class="MuiGrid-container-43"
   >
     <div
-      class="MuiGrid-item-42 MuiGrid-grid-xs-12-81"
+      class="MuiGrid-item-44 MuiGrid-grid-xs-12-83"
     >
       <div
-        class="MuiFormControl-root-141 UISelectField-formControl-139"
+        class="MuiFormControl-root-143 UISelectField-formControl-141"
         style="width:100%"
       >
         <div
-          class="MuiInputBase-root-165 MuiInput-root-152 MuiInput-underline-156 MuiInputBase-formControl-166 MuiInput-formControl-153 UISelectField-selectEmpty-140"
+          class="MuiInputBase-root-167 MuiInput-root-154 MuiInput-underline-158 MuiInputBase-formControl-168 MuiInput-formControl-155 UISelectField-selectEmpty-142"
         >
           <div
-            class="MuiSelect-root-145"
+            class="MuiSelect-root-147"
           >
             <div
               aria-haspopup="true"
               aria-pressed="false"
-              class="MuiSelect-select-146 MuiSelect-selectMenu-149 MuiInputBase-input-175 MuiInput-input-160"
+              class="MuiSelect-select-148 MuiSelect-selectMenu-151 MuiInputBase-input-177 MuiInput-input-162"
               id="select-SelectInput"
               role="button"
               tabindex="0"
@@ -40,7 +40,7 @@ exports[`Unit- FormProductionMethods renders correctly 1`] = `
             />
             <svg
               aria-hidden="true"
-              class="MuiSvgIcon-root-182 MuiSelect-icon-151"
+              class="MuiSvgIcon-root-184 MuiSelect-icon-153"
               focusable="false"
               role="presentation"
               viewBox="0 0 24 24"
@@ -52,28 +52,28 @@ exports[`Unit- FormProductionMethods renders correctly 1`] = `
           </div>
         </div>
         <p
-          class="MuiFormHelperText-root-195 MuiFormHelperText-filled-201"
+          class="MuiFormHelperText-root-197 MuiFormHelperText-filled-203"
         />
       </div>
       <div
-        class="MuiGrid-item-42 MuiGrid-grid-xs-12-81"
+        class="MuiGrid-item-44 MuiGrid-grid-xs-12-83"
       />
     </div>
     <div
-      class="MuiGrid-item-42 MuiGrid-grid-xs-12-81 FormProductionMethods-checkboxGrid-1"
+      class="MuiGrid-item-44 MuiGrid-grid-xs-12-83 FormProductionMethods-checkboxGrid-1"
     >
       <label
-        class="MuiFormControlLabel-root-203"
+        class="MuiFormControlLabel-root-205"
       >
         <span
-          class="MuiButtonBase-root-225 MuiIconButton-root-219 MuiPrivateSwitchBase-root-215 MuiCheckbox-root-209 MuiCheckbox-colorPrimary-213"
+          class="MuiButtonBase-root-227 MuiIconButton-root-221 MuiPrivateSwitchBase-root-217 MuiCheckbox-root-211 MuiCheckbox-colorPrimary-215"
         >
           <span
-            class="MuiIconButton-label-224"
+            class="MuiIconButton-label-226"
           >
             <svg
               aria-hidden="true"
-              class="MuiSvgIcon-root-182"
+              class="MuiSvgIcon-root-184"
               focusable="false"
               role="presentation"
               viewBox="0 0 24 24"
@@ -83,7 +83,7 @@ exports[`Unit- FormProductionMethods renders correctly 1`] = `
               />
             </svg>
             <input
-              class="MuiPrivateSwitchBase-input-218"
+              class="MuiPrivateSwitchBase-input-220"
               data-indeterminate="false"
               type="checkbox"
               value="varyingDimensions"
@@ -91,27 +91,27 @@ exports[`Unit- FormProductionMethods renders correctly 1`] = `
           </span>
         </span>
         <span
-          class="MuiTypography-root-228 MuiTypography-body1-237 MuiFormControlLabel-label-208"
+          class="MuiTypography-root-230 MuiTypography-body1-239 MuiFormControlLabel-label-210"
         >
           varyingDimensions
         </span>
       </label>
     </div>
     <div
-      class="MuiGrid-item-42 MuiGrid-grid-xs-12-81 FormProductionMethods-checkboxGrid-1"
+      class="MuiGrid-item-44 MuiGrid-grid-xs-12-83 FormProductionMethods-checkboxGrid-1"
     >
       <label
-        class="MuiFormControlLabel-root-203"
+        class="MuiFormControlLabel-root-205"
       >
         <span
-          class="MuiButtonBase-root-225 MuiIconButton-root-219 MuiPrivateSwitchBase-root-215 MuiCheckbox-root-209 MuiCheckbox-colorPrimary-213"
+          class="MuiButtonBase-root-227 MuiIconButton-root-221 MuiPrivateSwitchBase-root-217 MuiCheckbox-root-211 MuiCheckbox-colorPrimary-215"
         >
           <span
-            class="MuiIconButton-label-224"
+            class="MuiIconButton-label-226"
           >
             <svg
               aria-hidden="true"
-              class="MuiSvgIcon-root-182"
+              class="MuiSvgIcon-root-184"
               focusable="false"
               role="presentation"
               viewBox="0 0 24 24"
@@ -121,7 +121,7 @@ exports[`Unit- FormProductionMethods renders correctly 1`] = `
               />
             </svg>
             <input
-              class="MuiPrivateSwitchBase-input-218"
+              class="MuiPrivateSwitchBase-input-220"
               data-indeterminate="false"
               type="checkbox"
               value="allowBulkNames"
@@ -129,27 +129,27 @@ exports[`Unit- FormProductionMethods renders correctly 1`] = `
           </span>
         </span>
         <span
-          class="MuiTypography-root-228 MuiTypography-body1-237 MuiFormControlLabel-label-208"
+          class="MuiTypography-root-230 MuiTypography-body1-239 MuiFormControlLabel-label-210"
         >
           allowBulkNames
         </span>
       </label>
     </div>
     <div
-      class="MuiGrid-item-42 MuiGrid-grid-xs-12-81 FormProductionMethods-checkboxGrid-1"
+      class="MuiGrid-item-44 MuiGrid-grid-xs-12-83 FormProductionMethods-checkboxGrid-1"
     >
       <label
-        class="MuiFormControlLabel-root-203"
+        class="MuiFormControlLabel-root-205"
       >
         <span
-          class="MuiButtonBase-root-225 MuiIconButton-root-219 MuiPrivateSwitchBase-root-215 MuiCheckbox-root-209 MuiCheckbox-colorPrimary-213"
+          class="MuiButtonBase-root-227 MuiIconButton-root-221 MuiPrivateSwitchBase-root-217 MuiCheckbox-root-211 MuiCheckbox-colorPrimary-215"
         >
           <span
-            class="MuiIconButton-label-224"
+            class="MuiIconButton-label-226"
           >
             <svg
               aria-hidden="true"
-              class="MuiSvgIcon-root-182"
+              class="MuiSvgIcon-root-184"
               focusable="false"
               role="presentation"
               viewBox="0 0 24 24"
@@ -159,7 +159,7 @@ exports[`Unit- FormProductionMethods renders correctly 1`] = `
               />
             </svg>
             <input
-              class="MuiPrivateSwitchBase-input-218"
+              class="MuiPrivateSwitchBase-input-220"
               data-indeterminate="false"
               type="checkbox"
               value="isDefault"
@@ -167,27 +167,27 @@ exports[`Unit- FormProductionMethods renders correctly 1`] = `
           </span>
         </span>
         <span
-          class="MuiTypography-root-228 MuiTypography-body1-237 MuiFormControlLabel-label-208"
+          class="MuiTypography-root-230 MuiTypography-body1-239 MuiFormControlLabel-label-210"
         >
           isDefault
         </span>
       </label>
     </div>
     <div
-      class="MuiGrid-item-42 MuiGrid-grid-xs-12-81 FormProductionMethods-checkboxGrid-1"
+      class="MuiGrid-item-44 MuiGrid-grid-xs-12-83 FormProductionMethods-checkboxGrid-1"
     >
       <label
-        class="MuiFormControlLabel-root-203"
+        class="MuiFormControlLabel-root-205"
       >
         <span
-          class="MuiButtonBase-root-225 MuiIconButton-root-219 MuiPrivateSwitchBase-root-215 MuiCheckbox-root-209 MuiCheckbox-colorPrimary-213"
+          class="MuiButtonBase-root-227 MuiIconButton-root-221 MuiPrivateSwitchBase-root-217 MuiCheckbox-root-211 MuiCheckbox-colorPrimary-215"
         >
           <span
-            class="MuiIconButton-label-224"
+            class="MuiIconButton-label-226"
           >
             <svg
               aria-hidden="true"
-              class="MuiSvgIcon-root-182"
+              class="MuiSvgIcon-root-184"
               focusable="false"
               role="presentation"
               viewBox="0 0 24 24"
@@ -197,7 +197,7 @@ exports[`Unit- FormProductionMethods renders correctly 1`] = `
               />
             </svg>
             <input
-              class="MuiPrivateSwitchBase-input-218"
+              class="MuiPrivateSwitchBase-input-220"
               data-indeterminate="false"
               type="checkbox"
               value="varyingDefaultColors"
@@ -205,30 +205,68 @@ exports[`Unit- FormProductionMethods renders correctly 1`] = `
           </span>
         </span>
         <span
-          class="MuiTypography-root-228 MuiTypography-body1-237 MuiFormControlLabel-label-208"
+          class="MuiTypography-root-230 MuiTypography-body1-239 MuiFormControlLabel-label-210"
         >
           varyingDefaultColors
         </span>
       </label>
     </div>
     <div
-      class="MuiGrid-item-42 MuiGrid-grid-xs-12-81 FormProductionMethods-checkboxGrid-1"
+      class="MuiGrid-item-44 MuiGrid-grid-xs-12-83 FormProductionMethods-checkboxGrid-1"
+    >
+      <label
+        class="MuiFormControlLabel-root-205"
+      >
+        <span
+          class="MuiButtonBase-root-227 MuiIconButton-root-221 MuiPrivateSwitchBase-root-217 MuiCheckbox-root-211 MuiCheckbox-colorPrimary-215"
+        >
+          <span
+            class="MuiIconButton-label-226"
+          >
+            <svg
+              aria-hidden="true"
+              class="MuiSvgIcon-root-184"
+              focusable="false"
+              role="presentation"
+              viewBox="0 0 24 24"
+            >
+              <path
+                d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
+              />
+            </svg>
+            <input
+              class="MuiPrivateSwitchBase-input-220"
+              data-indeterminate="false"
+              type="checkbox"
+              value="designElementsLocked"
+            />
+          </span>
+        </span>
+        <span
+          class="MuiTypography-root-230 MuiTypography-body1-239 MuiFormControlLabel-label-210"
+        >
+          designElementsLocked
+        </span>
+      </label>
+    </div>
+    <div
+      class="MuiGrid-item-44 MuiGrid-grid-xs-12-83 FormProductionMethods-checkboxGrid-1"
     >
       <div
-        class="MuiFormControl-root-141"
+        class="MuiFormControl-root-143"
       >
         <label
-          class="MuiFormLabel-root-275 MuiInputLabel-root-264 MuiInputLabel-formControl-269 MuiInputLabel-animated-272"
+          class="MuiFormLabel-root-277 MuiInputLabel-root-266 MuiInputLabel-formControl-271 MuiInputLabel-animated-274"
           data-shrink="false"
         >
           minimumOrderAmount
         </label>
         <div
-          class="MuiInputBase-root-165 MuiInput-root-152 MuiInput-underline-156 MuiInputBase-formControl-166 MuiInput-formControl-153"
+          class="MuiInputBase-root-167 MuiInput-root-154 MuiInput-underline-158 MuiInputBase-formControl-168 MuiInput-formControl-155"
         >
           <input
             aria-invalid="false"
-            class="MuiInputBase-input-175 MuiInput-input-160 MuiInputBase-inputType-178 MuiInput-inputType-163"
+            class="MuiInputBase-input-177 MuiInput-input-162 MuiInputBase-inputType-180 MuiInput-inputType-165"
             type="number"
             value=""
           />
@@ -236,31 +274,110 @@ exports[`Unit- FormProductionMethods renders correctly 1`] = `
       </div>
     </div>
     <div
-      class="MuiGrid-container-41"
+      class="MuiGrid-item-44 MuiGrid-grid-xs-12-83 FormProductionMethods-checkboxGrid-1"
+    >
+      <div
+        class="FormProductionMethods-inputWithLabel-14"
+      >
+        <legend
+          class="MuiFormLabel-root-277"
+        >
+           maxTextElements 
+        </legend>
+        <div
+          class="MuiFormControl-root-143"
+        >
+          <div
+            class="MuiInputBase-root-167 MuiInput-root-154 MuiInput-underline-158 MuiInputBase-formControl-168 MuiInput-formControl-155"
+          >
+            <input
+              aria-invalid="false"
+              class="MuiInputBase-input-177 MuiInput-input-162 MuiInputBase-inputType-180 MuiInput-inputType-165"
+              type="number"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="MuiGrid-item-44 MuiGrid-grid-xs-12-83 FormProductionMethods-checkboxGrid-1"
+    >
+      <div
+        class="FormProductionMethods-inputWithLabel-14"
+      >
+        <legend
+          class="MuiFormLabel-root-277"
+        >
+           maxImageElements 
+        </legend>
+        <div
+          class="MuiFormControl-root-143"
+        >
+          <div
+            class="MuiInputBase-root-167 MuiInput-root-154 MuiInput-underline-158 MuiInputBase-formControl-168 MuiInput-formControl-155"
+          >
+            <input
+              aria-invalid="false"
+              class="MuiInputBase-input-177 MuiInput-input-162 MuiInputBase-inputType-180 MuiInput-inputType-165"
+              type="number"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="MuiGrid-item-44 MuiGrid-grid-xs-12-83 FormProductionMethods-checkboxGrid-1"
+    >
+      <div
+        class="FormProductionMethods-inputWithLabel-14"
+      >
+        <legend
+          class="MuiFormLabel-root-277"
+        >
+           maxTotalElements 
+        </legend>
+        <div
+          class="MuiFormControl-root-143"
+        >
+          <div
+            class="MuiInputBase-root-167 MuiInput-root-154 MuiInput-underline-158 MuiInputBase-formControl-168 MuiInput-formControl-155"
+          >
+            <input
+              aria-invalid="false"
+              class="MuiInputBase-input-177 MuiInput-input-162 MuiInputBase-inputType-180 MuiInput-inputType-165"
+              type="number"
+              value=""
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="MuiGrid-container-43"
     >
       <div
-        class="MuiGrid-item-42 MuiGrid-grid-xs-12-81"
+        class="MuiGrid-item-44 MuiGrid-grid-xs-12-83"
       />
     </div>
     <div
-      class="MuiGrid-container-41 MuiGrid-justify-xs-flex-end-59"
+      class="MuiGrid-container-43 MuiGrid-justify-xs-flex-end-61"
     >
       <div
-        class="MuiGrid-item-42 MuiGrid-grid-xs-12-81"
+        class="MuiGrid-item-44 MuiGrid-grid-xs-12-83"
       >
         <button
-          class="MuiButtonBase-root-225 MuiIconButton-root-219"
+          class="MuiButtonBase-root-227 MuiIconButton-root-221"
           id="remove"
           label="Remove"
           tabindex="0"
           type="button"
         >
           <span
-            class="MuiIconButton-label-224"
+            class="MuiIconButton-label-226"
           >
             <svg
               aria-hidden="true"
-              class="MuiSvgIcon-root-182"
+              class="MuiSvgIcon-root-184"
               focusable="false"
               role="presentation"
               viewBox="0 0 24 24"

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

@@ -1,12 +1,24 @@
+import React from 'react';
 import { REDUCER_NAME } from '../Reducers/Actions';
+import { connect } from 'react-redux';
+import clsx from 'clsx';
+import get from 'lodash/get';
 import generateConnectedEdit from '../../../Components/DefaultConnectedForm';
 import Actions from '../Reducers/Actions';
-import {LocalizedPriceTextField} from "../../../Components/LocalizedPriceTextField";
-import LocalizedPriceValue from "../../../Components/LocalizedPriceValue";
-import React from "react";
+import { T } from '../../../App/i18n';
+import { LocalizedPriceTextField } from '../../../Components/LocalizedPriceTextField';
+import LocalizedPriceValue from '../../../Components/LocalizedPriceValue';
+
 const { setFieldData, postData } = Actions;
 
 const formFields = [
+    {
+        name: 'calculationTypes',
+        type: 'hinttext',
+        renderHintText: v => {
+            return v.length === 0 ? T('detailViewHint') : '';
+        },
+    },
     {
         name: 'calculationTypes',
         label: 'calculationType',
@@ -53,13 +65,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: 'amountFrom',
@@ -75,4 +87,20 @@ const formFields = [
     },
 ];
 
-export default generateConnectedEdit(formFields, REDUCER_NAME, setFieldData, postData);
+const BaseForm = generateConnectedEdit(formFields, REDUCER_NAME, setFieldData, postData);
+
+const ConnectedEditForm = ({ calculationTypes }) => {
+    return (
+        <div className={clsx(calculationTypes.length === 0 && 'hideSave')}>
+            <BaseForm />
+        </div>
+    );
+};
+
+const mapStateToProps = state => {
+    return {
+        calculationTypes: get(state[REDUCER_NAME], 'data.calculationTypes.value'),
+    };
+};
+
+export default connect(mapStateToProps, null)(ConnectedEditForm);

package/src/Screens/DesignerGlobalItemPrices/Reducers/Actions.js

@@ -1,6 +1,6 @@
 export const LIST_KEY = 'designerglobalitemprices';
 export const DESIGNER_LIST_URL = 'designerglobalitemprices';
-export const LIST_URL = 'items';
+export const LIST_URL = 'items/designer';
 export const DATA_KEY = 'designerglobalitemprice';
 export const REDUCER_NAME = 'designerglobalitempricesData';
 

package/src/Screens/DesignerGlobalItemPrices/Screen.js

@@ -6,6 +6,7 @@ import './Translations';
 import '../Item/Translations';
 
 import { generateConnectedSplitScreen } from '../../Components/DefaultConnectedScreen';
+import { T } from '../../App/i18n';
 
 export default generateConnectedSplitScreen(
     'designer_global_item_prices',
@@ -14,5 +15,6 @@ export default generateConnectedSplitScreen(
     REDUCER_NAME,
     Actions.invalidateList,
     Actions.triggerUnsavedEntity,
-    Actions.hideDetails
+    Actions.hideDetails,
+    T('listHint')
 );

package/src/Screens/DesignerGlobalItemPrices/Translations.js

@@ -7,6 +7,10 @@ require('../../App/i18n').use(
                     addButtonLabel: 'Add Price',
                 },
             },
+            listHint:
+                'Here prices are maintained that are multiplied by the number of products, such as individual packaging. See designer > Core data > Global calculation types > Multiply by item amount.',
+            detailViewHint:
+                'There is no global calculation type maintained that is multiplied by the item amount. No price maintenance is therefore necessary here. See designer > Coredata> Global costing items > Multiply by item amount.',
         },
         de: {
             designer_global_item_prices: 'Designer Produktpreise',
@@ -15,6 +19,10 @@ require('../../App/i18n').use(
                     addButtonLabel: 'Preis hinzufügen',
                 },
             },
+            listHint:
+                'An dieser Stelle werden Preise gepflegt, die mit der Produktanzahl multipliziert werden, etwa Einzelverpackungen. Siehe designer > Stammmdaten > Globale Kalkulationsposten > Mit Produktanzahl multiplizieren.',
+            detailViewHint:
+                'Es ist kein globaler Kalkulationsposten gepflegt, der mit der Produktanzahl multipliziert wird. Somit ist hier keine Preispflege notwendig. Siehe designer > Stammmdaten > Globale Kalkulationsposten > Mit Produktanzahl multiplizieren.',
         },
     },
     true