Skip to content
Code-Schnipsel Gruppen Projekte
Commit 1aff8d08 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

feat: defining areas for shipping rules

Übergeordneter de8964a5
No related branches found
No related tags found
Keine zugehörigen Merge Requests gefunden
......@@ -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>
......
......@@ -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();
......
......@@ -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>
......
......@@ -70,6 +70,7 @@ public function createChild($data = [])
'discount_type',
'articles',
'articles_only',
'areas',
'user_groups',
'unit_terms',
'no_rule_after'
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren