diff --git a/bin/backend/controls/shippingRules/Rule.html b/bin/backend/controls/shippingRules/Rule.html index b62960cfc65201c08c4cf04927b33df0d927dcb6..e5ce73f5db41f86744dd8b05b6c6738579eed69a 100644 --- a/bin/backend/controls/shippingRules/Rule.html +++ b/bin/backend/controls/shippingRules/Rule.html @@ -198,6 +198,20 @@ </label> </td> </tr> + <tr> + <td> + <label class="field-container"> + <span class="field-container-item"> + {{usageAssignmentArea}} + </span> + <span class="field-container-field field-container-field-no-padding"> + <input type="text" name="areas" + data-qui="package/quiqqer/areas/bin/controls/Select" + /> + </span> + </label> + </td> + </tr> </tbody> </table> diff --git a/bin/backend/controls/shippingRules/Rule.js b/bin/backend/controls/shippingRules/Rule.js index bb77f11e577d0964c17196d4ec44da7afcd2a4a0..474c3e2d6bed028d2629398d2381d7d8d60078ad 100644 --- a/bin/backend/controls/shippingRules/Rule.js +++ b/bin/backend/controls/shippingRules/Rule.js @@ -48,6 +48,7 @@ define('package/quiqqer/shipping/bin/backend/controls/shippingRules/Rule', [ this.$DataTitle = null; this.$DataWorkingTitle = null; this.$UserGroups = null; + this.$Areas = null; this.$Articles = null; this.addEvents({ @@ -92,6 +93,7 @@ define('package/quiqqer/shipping/bin/backend/controls/shippingRules/Rule', [ usageValueTo : QUILocale.get(lg, 'shipping.edit.template.purchase.value.to'), usageAssignmentUser : QUILocale.get(lg, 'shipping.edit.template.assignment.user'), usageAssignmentProduct: QUILocale.get(lg, 'shipping.edit.template.assignment.product'), + usageAssignmentArea : QUILocale.get(lg, 'shipping.edit.template.assignment.areas'), productHeader : QUILocale.get(lg, 'shipping.edit.template.assignment.product.header'), usageAssignmentProductOnly : QUILocale.get(lg, 'shipping.edit.template.assignment.product.only'), @@ -180,6 +182,13 @@ define('package/quiqqer/shipping/bin/backend/controls/shippingRules/Rule', [ .get('data-quiid') ); + self.$Areas = QUI.Controls.getById( + self.$Elm + .getElement('[name="areas"]') + .getParent('.qui-elements-select') + .get('data-quiid') + ); + self.$Articles = QUI.Controls.getById( self.$Elm .getElement('[name="articles"]') @@ -197,6 +206,7 @@ define('package/quiqqer/shipping/bin/backend/controls/shippingRules/Rule', [ self.$DataTitle.setData(rule.title); self.$DataWorkingTitle.setData(rule.workingTitle); + self.$Areas.importValue(rule.areas); self.$UserGroups.importValue(rule.user_groups); self.$Articles.importValue(rule.articles); @@ -223,8 +233,6 @@ define('package/quiqqer/shipping/bin/backend/controls/shippingRules/Rule', [ Row.getElement('[name="unit"]').value = term.unit; Row.getElement('[name="term"]').value = term.term; Row.getElement('[name="value"]').value = term.value; - - //console.log(term); } resolve(); diff --git a/locale.xml b/locale.xml index 4b907e7ded653d92e2b11441e7c4f3dc45138a91..cef3adf64a46950825f1ac42df72a661ac6a31f3 100644 --- a/locale.xml +++ b/locale.xml @@ -354,8 +354,10 @@ <en><![CDATA[Default delivery time]]></en> </locale> <locale name="shipping.settings.deliveryTimeDefault.description"> - <de><![CDATA[Legt den Standardwert für das "Lieferzeit"-Feld fest, wenn ein Produkt neu angelegt wird bzw. kein Feldwert gesetzt ist.]]></de> - <en><![CDATA[Determines the default value for the "Delivery time" field for newly created products or if no field value is set.]]></en> + <de> + <![CDATA[Legt den Standardwert für das "Lieferzeit"-Feld fest, wenn ein Produkt neu angelegt wird bzw. kein Feldwert gesetzt ist.]]></de> + <en> + <![CDATA[Determines the default value for the "Delivery time" field for newly created products or if no field value is set.]]></en> </locale> <locale name="shipping.order.title"> @@ -514,6 +516,10 @@ <de><![CDATA[Kombinierbar mit]]></de> <en><![CDATA[Combined with]]></en> </locale> + <locale name="shipping.edit.template.assignment.areas"> + <de><![CDATA[Zonen]]></de> + <en><![CDATA[Areas]]></en> + </locale> <locale name="shipping.edit.template.customIcon"> <de><![CDATA[Benutzerdefiniertes Bild]]></de> <en><![CDATA[Custom Icon]]></en> diff --git a/src/QUI/ERP/Shipping/Rules/Factory.php b/src/QUI/ERP/Shipping/Rules/Factory.php index 226698015db95a751969497c4655f259207e5277..e9a36f6dde0e436e9cce38fc02afa34dd360e823 100644 --- a/src/QUI/ERP/Shipping/Rules/Factory.php +++ b/src/QUI/ERP/Shipping/Rules/Factory.php @@ -70,6 +70,7 @@ public function createChild($data = []) 'discount_type', 'articles', 'articles_only', + 'areas', 'user_groups', 'unit_terms', 'no_rule_after'