Skip to content
Code-Schnipsel Gruppen Projekte
Bestätigt Commit 2551d884 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

fix: #14

Übergeordneter 1a1a441d
No related branches found
No related tags found
Keine zugehörigen Merge Requests gefunden
Leerzeichenänderungen ausblenden
Inline Nebeneinander
ajax/create.php
+ 12
− 4
Zeige Datei @ 2551d884
<?php <?php
use QUI\ERP\Coupons\Handler;
use QUI\Utils\Security\Orthos;
use QUI\ERP\Coupons\CouponCodeException; use QUI\ERP\Coupons\CouponCodeException;
use QUI\ERP\Coupons\Handler;
use QUI\ERP\Discount\Handler as DiscountsHandler; use QUI\ERP\Discount\Handler as DiscountsHandler;
use QUI\Utils\Security\Orthos;
/** /**
* Create new CouponCode(s) * Create new CouponCode(s)
...@@ -14,7 +14,15 @@ ...@@ -14,7 +14,15 @@
QUI::$Ajax->registerFunction( QUI::$Ajax->registerFunction(
'package_quiqqer_coupons_ajax_create', 'package_quiqqer_coupons_ajax_create',
function ($attributes) { function ($attributes) {
$attributes = Orthos::clearArray(\json_decode($attributes, true)); $attributes = Orthos::clearArray(json_decode($attributes, true));
if (!empty($attributes['code'])) {
$attributes['code'] = html_entity_decode($attributes['code']);
}
if (!empty($attributes['title'])) {
$attributes['title'] = html_entity_decode($attributes['title']);
}
try { try {
$amount = 1; $amount = 1;
...@@ -64,7 +72,7 @@ function ($attributes) { ...@@ -64,7 +72,7 @@ function ($attributes) {
if ($i === 0) { if ($i === 0) {
\QUI\Translator::update( \QUI\Translator::update(
'quiqqer/discount', 'quiqqer/discount',
'discount.'.$NewDiscount->getId().'.title', 'discount.' . $NewDiscount->getId() . '.title',
'quiqqer/discount', 'quiqqer/discount',
[ [
'de' => $L->getByLang('de', 'quiqqer/coupons', 'Discount.default_title', [ 'de' => $L->getByLang('de', 'quiqqer/coupons', 'Discount.default_title', [
......
bin/backend/controls/Manager.js
+ 58
− 50
Zeige Datei @ 2551d884
...@@ -63,11 +63,11 @@ define('package/quiqqer/coupons/bin/backend/controls/Manager', [ ...@@ -63,11 +63,11 @@ define('package/quiqqer/coupons/bin/backend/controls/Manager', [
initialize: function (options) { initialize: function (options) {
this.parent(options); this.parent(options);
this.Loader = new QUILoader(); this.Loader = new QUILoader();
this.$User = null; this.$User = null;
this.$Grid = null; this.$Grid = null;
this.$GridParent = null; this.$GridParent = null;
this.$Panel = null; this.$Panel = null;
this.addEvents({ this.addEvents({
onCreate : this.$onCreate, onCreate : this.$onCreate,
...@@ -155,43 +155,51 @@ define('package/quiqqer/coupons/bin/backend/controls/Manager', [ ...@@ -155,43 +155,51 @@ define('package/quiqqer/coupons/bin/backend/controls/Manager', [
); );
this.$Grid = new Grid(this.$GridParent, { this.$Grid = new Grid(this.$GridParent, {
columnModel : [{ columnModel : [
header : QUILocale.get('quiqqer/system', 'id'), {
dataIndex: 'id', header : QUILocale.get('quiqqer/system', 'id'),
dataType : 'number', dataIndex: 'id',
width : 50 dataType : 'number',
}, { width : 50
header : QUILocale.get(lg, 'controls.manager.tbl.header.code'), },
dataIndex: 'code', {
dataType : 'string', header : QUILocale.get(lg, 'controls.manager.tbl.header.code'),
width : 150 dataIndex: 'code',
}, { dataType : 'string',
header : QUILocale.get(lg, 'controls.manager.tbl.header.title'), width : 150
dataIndex: 'title', },
dataType : 'string', {
width : 200 header : QUILocale.get(lg, 'controls.manager.tbl.header.title'),
}, { dataIndex: 'title',
header : QUILocale.get(lg, 'controls.manager.tbl.header.status'), dataType : 'string',
dataIndex: 'status', width : 200
dataType : 'node', },
width : 200, {
className: 'clickable' header : QUILocale.get(lg, 'controls.manager.tbl.header.status'),
}, { dataIndex: 'status',
header : QUILocale.get(lg, 'controls.manager.tbl.header.validUntilDate'), dataType : 'node',
dataIndex: 'validUntilDateText', width : 200,
dataType : 'string', className: 'clickable'
width : 150 },
}, { {
header : QUILocale.get(lg, 'controls.manager.tbl.header.reusable'), header : QUILocale.get(lg, 'controls.manager.tbl.header.validUntilDate'),
dataIndex: 'maxUsageLabel', dataIndex: 'validUntilDateText',
dataType : 'string', dataType : 'string',
width : 150 width : 150
}, { },
header : QUILocale.get(lg, 'controls.manager.tbl.header.createDate'), {
dataIndex: 'createDate', header : QUILocale.get(lg, 'controls.manager.tbl.header.reusable'),
dataType : 'string', dataIndex: 'maxUsageLabel',
width : 150 dataType : 'string',
}], width : 150
},
{
header : QUILocale.get(lg, 'controls.manager.tbl.header.createDate'),
dataIndex: 'createDate',
dataType : 'string',
width : 150
}
],
pagination : true, pagination : true,
serverSort : true, serverSort : true,
selectable : true, selectable : true,
...@@ -356,7 +364,7 @@ define('package/quiqqer/coupons/bin/backend/controls/Manager', [ ...@@ -356,7 +364,7 @@ define('package/quiqqer/coupons/bin/backend/controls/Manager', [
return; return;
} }
console.log(QUIFormUtils.getFormData(Form));
CouponCodes.create(QUIFormUtils.getFormData(Form)).then((couponCodeId) => { CouponCodes.create(QUIFormUtils.getFormData(Form)).then((couponCodeId) => {
if (!couponCodeId) { if (!couponCodeId) {
Popup.Loader.hide(); Popup.Loader.hide();
...@@ -408,7 +416,7 @@ define('package/quiqqer/coupons/bin/backend/controls/Manager', [ ...@@ -408,7 +416,7 @@ define('package/quiqqer/coupons/bin/backend/controls/Manager', [
events : { events : {
onOpen: (Win) => { onOpen: (Win) => {
const Content = Popup.getContent(); const Content = Popup.getContent();
Form = Content.getElement('form'); Form = Content.getElement('form');
Form.addEvent('submit', function (event) { Form.addEvent('submit', function (event) {
event.stop(); event.stop();
...@@ -416,12 +424,12 @@ define('package/quiqqer/coupons/bin/backend/controls/Manager', [ ...@@ -416,12 +424,12 @@ define('package/quiqqer/coupons/bin/backend/controls/Manager', [
}); });
const Amount = Content.getElement('input[name="amount"]'); const Amount = Content.getElement('input[name="amount"]');
const Code = Content.getElement('input[name="code"]'); const Code = Content.getElement('input[name="code"]');
Code.addEvent('keyup', function () { Code.addEvent('keyup', function () {
if (Code.value !== '') { if (Code.value !== '') {
Amount.disabled = true; Amount.disabled = true;
Amount.value = 1; Amount.value = 1;
} else { } else {
Amount.disabled = false; Amount.disabled = false;
} }
...@@ -523,10 +531,10 @@ define('package/quiqqer/coupons/bin/backend/controls/Manager', [ ...@@ -523,10 +531,10 @@ define('package/quiqqer/coupons/bin/backend/controls/Manager', [
* Remove all selected licenses * Remove all selected licenses
*/ */
$delete: function () { $delete: function () {
var self = this; var self = this;
var deleteData = []; var deleteData = [];
var deleteIds = []; var deleteIds = [];
var rows = this.$Grid.getSelectedData(); var rows = this.$Grid.getSelectedData();
for (var i = 0, len = rows.length; i < len; i++) { for (var i = 0, len = rows.length; i < len; i++) {
deleteData.push( deleteData.push(
...@@ -612,7 +620,7 @@ define('package/quiqqer/coupons/bin/backend/controls/Manager', [ ...@@ -612,7 +620,7 @@ define('package/quiqqer/coupons/bin/backend/controls/Manager', [
headerOrderPrefixedId: QUILocale.get(lg, lgPrefix + 'headerOrderPrefixedId') headerOrderPrefixedId: QUILocale.get(lg, lgPrefix + 'headerOrderPrefixedId')
})); }));
var Content = Popup.getContent(); var Content = Popup.getContent();
var TableBody = Content.getElement('tbody'); var TableBody = Content.getElement('tbody');
for (var i = 0, len = RowData.usages.length; i < len; i++) { for (var i = 0, len = RowData.usages.length; i < len; i++) {
...@@ -620,7 +628,7 @@ define('package/quiqqer/coupons/bin/backend/controls/Manager', [ ...@@ -620,7 +628,7 @@ define('package/quiqqer/coupons/bin/backend/controls/Manager', [
var Row = new Element('tr', { var Row = new Element('tr', {
html: '<td>' + usage.date + '</td>' + html: '<td>' + usage.date + '</td>' +
'<td>' + usage.userId + ' (' + usage.userName + ')</td>' '<td>' + usage.userId + ' (' + usage.userName + ')</td>'
}).inject(TableBody); }).inject(TableBody);
new Element('td', { new Element('td', {
......
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