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

discounts -> edit

Übergeordneter ba391192
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
Keine zugehörigen Merge Requests gefunden
Pipeline-Nr.
Leerzeichenänderungen ausblenden
Inline Nebeneinander
bin/controls/DiscountEdit.css
+ 0
− 1
Zeige Datei @ d9081494
......@@ -9,4 +9,3 @@
text-overflow: ellipsis;
white-space: nowrap;
}
bin/controls/DiscountEdit.html
+ 31
− 31
Zeige Datei @ d9081494
......@@ -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>
......
bin/controls/DiscountEdit.js
+ 14
− 6
Zeige Datei @ d9081494
......@@ -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);
});
}
});
......
bin/controls/Select.js
+ 3
− 1
Zeige Datei @ d9081494
......@@ -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;
......
src/QUI/ERP/Discount/Discount.php
+ 1
− 2
Zeige Datei @ d9081494
......@@ -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
......
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

PCSG & QUIQQER support and DEV System - GitLab