diff --git a/bin/controls/DiscountEdit.css b/bin/controls/DiscountEdit.css
index 2fcfda6297eb319c75dc385fe1496c27452d8a4e..2823cadd1fbf05e3d94cd2c2a0c876093a1a9754 100644
--- a/bin/controls/DiscountEdit.css
+++ b/bin/controls/DiscountEdit.css
@@ -9,4 +9,3 @@
text-overflow: ellipsis;
white-space: nowrap;
}
-
diff --git a/bin/controls/DiscountEdit.html b/bin/controls/DiscountEdit.html
index fe5f418966a39e5737d58db5d1c47b5bd2d30986..3fcc754b08eca39b0dcb8256b5ff63ee14192920 100644
--- a/bin/controls/DiscountEdit.html
+++ b/bin/controls/DiscountEdit.html
@@ -12,9 +12,9 @@
<tr class="odd">
<td>
<label class="field-container">
- <span class="field-container-item">
- ID
- </span>
+ <span class="field-container-item">
+ ID
+ </span>
<div class="field-container-field field-id"></div>
</label>
</td>
@@ -22,9 +22,9 @@
<tr class="even">
<td>
<label class="field-container">
- <span class="field-container-item">
- Titel
- </span>
+ <span class="field-container-item">
+ Titel
+ </span>
<div class="field-container-field discount-title"></div>
</label>
</td>
@@ -32,9 +32,9 @@
<tr class="even">
<td>
<label class="field-container">
- <span class="field-container-item">
- Rabatt
- </span>
+ <span class="field-container-item">
+ Rabatt
+ </span>
<input type="text" name="discount"
class="field-container-field"/>
<select name="discount_type"
@@ -63,20 +63,20 @@
<tr class="odd">
<td>
<label class="field-container">
- <span class="field-container-item">
- <span class="fa fa-calendar"></span>
- Nutzbar von
- </span>
+ <span class="field-container-item">
+ <span class="fa fa-calendar"></span>
+ Nutzbar von
+ </span>
<input type="datetime" name="date_from"
class="field-container-field"/>
</label>
</td>
<td>
<label class="field-container">
- <span class="field-container-item">
- <span class="fa fa-calendar"></span>
- Nutzbar bis
- </span>
+ <span class="field-container-item">
+ <span class="fa fa-calendar"></span>
+ Nutzbar bis
+ </span>
<input type="datetime" name="date_until"
class="field-container-field"/>
</label>
@@ -85,18 +85,18 @@
<tr class="even">
<td>
<label class="field-container">
- <span class="field-container-item">
- Einkaufsmenge von
- </span>
+ <span class="field-container-item">
+ Einkaufsmenge von
+ </span>
<input type="number" min="0" name="purchase_quantity_from"
class="field-container-field"/>
</label>
</td>
<td>
<label class="field-container">
- <span class="field-container-item">
- Einkaufsmenge bis
- </span>
+ <span class="field-container-item">
+ Einkaufsmenge bis
+ </span>
<input type="number" min="0" name="purchase_quantity_until"
class="field-container-field"/>
</label>
@@ -105,20 +105,20 @@
<tr class="odd">
<td>
<label class="field-container">
- <span class="field-container-item">
- <span class="fa fa-money"></span>
- Einkaufswert von
- </span>
+ <span class="field-container-item">
+ <span class="fa fa-money"></span>
+ Einkaufswert von
+ </span>
<input type="number" min="0" name="purchase_value_from"
class="field-container-field"/>
</label>
</td>
<td>
<label class="field-container">
- <span class="field-container-item">
- <span class="fa fa-money"></span>
- Einkaufswert bis
- </span>
+ <span class="field-container-item">
+ <span class="fa fa-money"></span>
+ Einkaufswert bis
+ </span>
<input type="number" min="0" name="purchase_value_until"
class="field-container-field"/>
</label>
diff --git a/bin/controls/DiscountEdit.js b/bin/controls/DiscountEdit.js
index 119c064f72b0679cff126c86df735527780a3873..48c473c45b3e6a4518a961b1c261b59395d2ce66 100644
--- a/bin/controls/DiscountEdit.js
+++ b/bin/controls/DiscountEdit.js
@@ -21,7 +21,7 @@ define('package/quiqqer/discount/bin/controls/DiscountEdit', [
'qui/utils/Form',
'Locale',
'package/quiqqer/discount/bin/classes/Handler',
- 'package/quiqqer/translator/bin/controls/VariableTranslation',
+ 'package/quiqqer/translator/bin/controls/Update',
'text!package/quiqqer/discount/bin/controls/DiscountEdit.html',
'css!package/quiqqer/discount/bin/controls/DiscountEdit.css'
@@ -65,6 +65,8 @@ define('package/quiqqer/discount/bin/controls/DiscountEdit', [
this.$Elm.set('html', template);
this.$Elm.set('class', 'discount-edit');
+ this.$Translate = null;
+
this.$Elm.setStyles({
overflow: 'hidden',
opacity : 0
@@ -91,7 +93,7 @@ define('package/quiqqer/discount/bin/controls/DiscountEdit', [
).then(function (data) {
QUIFormUtils.setDataToForm(data, Form);
- new Translation({
+ self.$Translate = new Translation({
'group': lg,
'var' : 'discount.' + data.id + '.title'
}).inject(
@@ -132,18 +134,24 @@ define('package/quiqqer/discount/bin/controls/DiscountEdit', [
*/
save: function () {
var self = this;
+
return new Promise(function (resolve, reject) {
+
var Elm = self.getElm(),
Form = Elm.getElement('form');
var data = QUIFormUtils.getFormData(Form);
- Discounts.update(
- self.getAttribute('discountId'),
- data
- ).then(function () {
+ self.$Translate.save().then(function () {
+ return Discounts.update(
+ self.getAttribute('discountId'),
+ data
+ );
+ }).then(function () {
resolve();
+
}).catch(reject);
+
});
}
});
diff --git a/bin/controls/Select.js b/bin/controls/Select.js
index e33b2732adb19a8e2dd5e84490d14096ad9ed37e..67b13a3a714b72b3aab30d13bcb3e9f587cb9224 100644
--- a/bin/controls/Select.js
+++ b/bin/controls/Select.js
@@ -222,7 +222,9 @@ define('package/quiqqer/discount/bin/controls/Select', [
// load values
if (this.$Input.value || this.$Input.value !== '') {
- this.addDiscount(this.$Input.value);
+ this.$Input.value.split(',').each(function (discountId) {
+ self.addDiscount(discountId);
+ });
}
return this.$Elm;
diff --git a/src/QUI/ERP/Discount/Discount.php b/src/QUI/ERP/Discount/Discount.php
index 99364519fde5af27d879bf7cfb92575813288fff..57f3d47af921536b816f0400cd76aaafb58ae493 100644
--- a/src/QUI/ERP/Discount/Discount.php
+++ b/src/QUI/ERP/Discount/Discount.php
@@ -71,8 +71,7 @@ public function __construct($id, Handler $Factory)
'exception.discount.purchase_quantity_from.wrong'
));
}
- QUI\System\Log::writeRecursive($this->getAttributes());
-
+
if ($purchaseQuantityUntil === false
|| $purchaseQuantityUntil < 0