diff --git a/bin/controls/DiscountEdit.html b/bin/controls/DiscountEdit.html
index 310eb7201b7209564f4af5553a9126ce36ac5eac..95799918989370ac8c5fdb4c79bc5417e17a7f6a 100644
--- a/bin/controls/DiscountEdit.html
+++ b/bin/controls/DiscountEdit.html
@@ -3,7 +3,7 @@
<thead>
<tr>
<th colspan="2">
- Rabatt
+ {{header}}
</th>
</tr>
</thead>
@@ -13,7 +13,7 @@
<td>
<label class="field-container">
<span class="field-container-item">
- ID
+ {{id}}
</span>
<div class="field-container-field field-id"></div>
</label>
@@ -23,7 +23,7 @@
<td>
<label class="field-container">
<span class="field-container-item">
- Titel
+ {{title}}
</span>
<div class="field-container-field discount-title"></div>
</label>
@@ -33,7 +33,7 @@
<td>
<label class="field-container">
<span class="field-container-item">
- Rabatt
+ {{discount}}
</span>
<input type="text" name="discount" class="field-container-field"/>
<select name="discount_type"
@@ -46,6 +46,20 @@
</label>
</td>
</tr>
+ <tr class="even">
+ <td>
+ <label class="field-container">
+ <span class="field-container-item" title="{{calculationBasis}}">
+ {{calculationBasis}}
+ </span>
+ <select type="text" name="price_calculation_basis"
+ class="field-container-field">
+ <option value="1">{{calculationBasisNetto}}</option>
+ <option value="2">{{calculationBasisCalcPrice}}</option>
+ </select>
+ </label>
+ </td>
+ </tr>
</tbody>
</table>
@@ -53,7 +67,7 @@
<thead>
<tr>
<th colspan="2">
- Nutzung definieren
+ {{usageHeader}}
</th>
</tr>
</thead>
@@ -64,7 +78,7 @@
<label class="field-container">
<span class="field-container-item">
<span class="fa fa-calendar"></span>
- Nutzbar von
+ {{usageFrom}}
</span>
<input type="datetime" name="date_from"
class="field-container-field"/>
@@ -74,7 +88,7 @@
<label class="field-container">
<span class="field-container-item">
<span class="fa fa-calendar"></span>
- Nutzbar bis
+ {{usageTo}}
</span>
<input type="datetime" name="date_until"
class="field-container-field"/>
@@ -85,7 +99,7 @@
<td>
<label class="field-container">
<span class="field-container-item">
- Einkaufsmenge von
+ {{usageAmountOf}}
</span>
<input type="number" min="0" name="purchase_quantity_from"
class="field-container-field"/>
@@ -94,7 +108,7 @@
<td>
<label class="field-container">
<span class="field-container-item">
- Einkaufsmenge bis
+ {{usageAmountTo}}
</span>
<input type="number" min="0" name="purchase_quantity_until"
class="field-container-field"/>
@@ -106,7 +120,7 @@
<label class="field-container">
<span class="field-container-item">
<span class="fa fa-money"></span>
- Einkaufswert von
+ {{usageValueOf}}
</span>
<input type="number" min="0" name="purchase_value_from"
class="field-container-field"/>
@@ -116,7 +130,7 @@
<label class="field-container">
<span class="field-container-item">
<span class="fa fa-money"></span>
- Einkaufswert bis
+ {{usageValueTo}}
</span>
<input type="number" min="0" name="purchase_value_until"
class="field-container-field"/>
@@ -130,7 +144,7 @@
<thead>
<tr>
<th colspan="2">
- Zuweisung
+ {{usageAssignment}}
</th>
</tr>
</thead>
@@ -140,13 +154,13 @@
<td>
<label class="field-container">
<span class="field-container-item">
- Artikel
+ {{usageAssignmentProduct}}
</span>
- <div class="field-container-field field-container-field-no-padding">
+ <span class="field-container-field field-container-field-no-padding">
<input type="text" name="articles"
data-qui="package/quiqqer/products/bin/controls/products/Select"
/>
- </div>
+ </span>
</label>
</td>
</tr>
@@ -154,13 +168,13 @@
<td>
<label class="field-container">
<span class="field-container-item">
- Kategorien
+ {{usageAssignmentCategory}}
</span>
- <div class="field-container-field field-container-field-no-padding">
+ <span class="field-container-field field-container-field-no-padding">
<input type="text" name="categories"
data-qui="package/quiqqer/products/bin/controls/categories/Select"
/>
- </div>
+ </span>
</label>
</td>
</tr>
@@ -168,14 +182,14 @@
<td>
<label class="field-container">
<span class="field-container-item">
- Benutzer
+ {{usageAssignmentUser}}
</span>
- <div class="field-container-field field-container-field-no-padding">
+ <span class="field-container-field field-container-field-no-padding">
<input type="text" name="user_groups"
class="users_and_groups"
data-qui="controls/usersAndGroups/Input"
/>
- </div>
+ </span>
</label>
</td>
</tr>
@@ -183,13 +197,13 @@
<td>
<label class="field-container">
<span class="field-container-item">
- Kombinerbar mit
+ {{usageAssignmentCombine}}
</span>
- <div class="field-container-field field-container-field-no-padding">
+ <span class="field-container-field field-container-field-no-padding">
<input type="text" name="combined"
data-qui="package/quiqqer/discount/bin/controls/Select"
/>
- </div>
+ </span>
</label>
</td>
</tr>
diff --git a/bin/controls/DiscountEdit.js b/bin/controls/DiscountEdit.js
index 48c473c45b3e6a4518a961b1c261b59395d2ce66..fa533bb386e85e1136dc05f5176a34ff7ec71738 100644
--- a/bin/controls/DiscountEdit.js
+++ b/bin/controls/DiscountEdit.js
@@ -20,6 +20,7 @@ define('package/quiqqer/discount/bin/controls/DiscountEdit', [
'qui/controls/buttons/Button',
'qui/utils/Form',
'Locale',
+ 'Mustache',
'package/quiqqer/discount/bin/classes/Handler',
'package/quiqqer/translator/bin/controls/Update',
@@ -27,7 +28,7 @@ define('package/quiqqer/discount/bin/controls/DiscountEdit', [
'css!package/quiqqer/discount/bin/controls/DiscountEdit.css'
], function (QUI, QUIControl, QUIButton, QUIFormUtils, QUILocale,
- Handler, Translation, template) {
+ Mustache, Handler, Translation, template) {
"use strict";
var lg = 'quiqqer/discount';
@@ -62,9 +63,33 @@ define('package/quiqqer/discount/bin/controls/DiscountEdit', [
*/
create: function () {
this.$Elm = this.parent();
- this.$Elm.set('html', template);
this.$Elm.set('class', 'discount-edit');
+ this.$Elm.set('html', Mustache.render(template, {
+ header : QUILocale.get(lg, 'control.edit.template.title'),
+ id : QUILocale.get(lg, 'control.edit.template.id'),
+ title : QUILocale.get(lg, 'control.edit.template.title'),
+ discount : QUILocale.get(lg, 'control.edit.template.discount'),
+ usageHeader : QUILocale.get(lg, 'control.edit.template.usage'),
+ usageFrom : QUILocale.get(lg, 'control.edit.template.usage.from'),
+ usageTo : QUILocale.get(lg, 'control.edit.template.usage.to'),
+ usageAmountOf : QUILocale.get(lg, 'control.edit.template.shopping.amount.of'),
+ usageAmountTo : QUILocale.get(lg, 'control.edit.template.shopping.amount.to'),
+ usageValueOf : QUILocale.get(lg, 'control.edit.template.purchase.value.of'),
+ usageValueTo : QUILocale.get(lg, 'control.edit.template.purchase.value.to'),
+ usageAssignment: QUILocale.get(lg, 'control.edit.template.assignment'),
+
+ calculationBasis : QUILocale.get(lg, 'control.edit.template.calculationBasis'),
+ calculationBasisNetto : QUILocale.get(lg, 'control.edit.template.calculationBasis.netto'),
+ calculationBasisCalcPrice: QUILocale.get(lg, 'control.edit.template.calculationBasis.calculationBasisCalcPrice'),
+
+ usageAssignmentProduct : QUILocale.get(lg, 'control.edit.template.assignment.product'),
+ usageAssignmentCategory: QUILocale.get(lg, 'control.edit.template.assignment.category'),
+ usageAssignmentUser : QUILocale.get(lg, 'control.edit.template.assignment.user'),
+ usageAssignmentCombine : QUILocale.get(lg, 'control.edit.template.assignment.combine')
+ }));
+
+
this.$Translate = null;
this.$Elm.setStyles({
diff --git a/database.xml b/database.xml
index d8cf0d9858407cf13097a60a22b93708d04a2694..906789cc2413de6d7ca0887577247f9883749806 100644
--- a/database.xml
+++ b/database.xml
@@ -11,6 +11,7 @@
<field type="INT( 10 )">purchase_quantity_until</field>
<field type="text">purchase_value_from</field>
<field type="text">purchase_value_until</field>
+ <field type="INT( 1 )">price_calculation_basis</field>
<field type="text">areas</field>
<field type="text">articles</field>
diff --git a/locale.xml b/locale.xml
index 1bd4bf0c9916050fb43f401936ede3d5e18023ef..a54f85ce17ac792c599a55c620158c6c53240b52 100644
--- a/locale.xml
+++ b/locale.xml
@@ -86,6 +86,84 @@
<en><![CDATA[Combined with]]></en>
</locale>
+
+ <locale name="control.edit.template.header">
+ <de><![CDATA[Rabatt]]></de>
+ <en><![CDATA[Discount]]></en>
+ </locale>
+ <locale name="control.edit.template.id">
+ <de><![CDATA[ID]]></de>
+ <en><![CDATA[ID]]></en>
+ </locale>
+ <locale name="control.edit.template.title">
+ <de><![CDATA[Titel]]></de>
+ <en><![CDATA[Title]]></en>
+ </locale>
+ <locale name="control.edit.template.discount">
+ <de><![CDATA[Rabatt]]></de>
+ <en><![CDATA[Discount]]></en>
+ </locale>
+ <locale name="control.edit.template.calculationBasis">
+ <de><![CDATA[Berechnungs-Grundlage]]></de>
+ <en><![CDATA[Calculation basis]]></en>
+ </locale>
+ <locale name="control.edit.template.calculationBasis.netto">
+ <de><![CDATA[Netto]]></de>
+ <en><![CDATA[Netto]]></en>
+ </locale>
+ <locale name="control.edit.template.calculationBasis.calculationBasisCalcPrice">
+ <de><![CDATA[Kalkulierter Preis]]></de>
+ <en><![CDATA[Calculated price]]></en>
+ </locale>
+ <locale name="control.edit.template.usage">
+ <de><![CDATA[Nutzung definieren]]></de>
+ <en><![CDATA[Defining Terms]]></en>
+ </locale>
+ <locale name="control.edit.template.usage.from">
+ <de><![CDATA[Nutzbar von]]></de>
+ <en><![CDATA[Usage from]]></en>
+ </locale>
+ <locale name="control.edit.template.usage.to">
+ <de><![CDATA[Nutzbar bis]]></de>
+ <en><![CDATA[Usage to]]></en>
+ </locale>
+ <locale name="control.edit.template.shopping.amount.of">
+ <de><![CDATA[Einkaufsmenge von]]></de>
+ <en><![CDATA[Shopping amount of]]></en>
+ </locale>
+ <locale name="control.edit.template.shopping.amount.to">
+ <de><![CDATA[Einkaufsmenge bis]]></de>
+ <en><![CDATA[Shopping amount to]]></en>
+ </locale>
+ <locale name="control.edit.template.purchase.value.of">
+ <de><![CDATA[Einkaufswert von]]></de>
+ <en><![CDATA[Purchase value of]]></en>
+ </locale>
+ <locale name="control.edit.template.purchase.value.to">
+ <de><![CDATA[Einkaufswert bis]]></de>
+ <en><![CDATA[Purchase value to]]></en>
+ </locale>
+ <locale name="control.edit.template.assignment">
+ <de><![CDATA[Zuweisung]]></de>
+ <en><![CDATA[Assignment]]></en>
+ </locale>
+ <locale name="control.edit.template.assignment.product">
+ <de><![CDATA[Produkt]]></de>
+ <en><![CDATA[Product]]></en>
+ </locale>
+ <locale name="control.edit.template.assignment.category">
+ <de><![CDATA[Kategorie]]></de>
+ <en><![CDATA[Category]]></en>
+ </locale>
+ <locale name="control.edit.template.assignment.user">
+ <de><![CDATA[Benutzer]]></de>
+ <en><![CDATA[User]]></en>
+ </locale>
+ <locale name="control.edit.template.assignment.combine">
+ <de><![CDATA[Kombinierbar mit]]></de>
+ <en><![CDATA[Combined with]]></en>
+ </locale>
+
<locale name="control.select.search.placeholder">
<de><![CDATA[Suche nach einem Rabatt ...]]></de>
<en><![CDATA[Search for a discount ...]]></en>
diff --git a/src/QUI/ERP/Discount/Handler.php b/src/QUI/ERP/Discount/Handler.php
index 5a075996a770e529a809cc5f5f4fcde0678339d5..e3464464609c74a6f5ae78354ed4f7292de1c4d7 100644
--- a/src/QUI/ERP/Discount/Handler.php
+++ b/src/QUI/ERP/Discount/Handler.php
@@ -88,6 +88,7 @@ public function getChildAttributes()
'discount',
'date_from',
'date_until',
+ 'price_calculation_basis',
'purchase_quantity_from',
'purchase_quantity_until',
'purchase_value_from',
@@ -96,7 +97,8 @@ public function getChildAttributes()
'articles',
'categories',
'user_groups',
- 'combined'
+ 'combined',
+
);
}