Skip to content
Code-Schnipsel Gruppen Projekte

Revisionen vergleichen

Änderungen werden so angezeigt, als ob die Quellrevision mit der Zielrevision zusammengeführt würde. Erfahre mehr über den Vergleich von Revisionen.

Quelle

Zielprojekt auswählen
No results found

Ziel

Zielprojekt auswählen
  • quiqqer/order
1 Ergebnis
Änderungen anzeigen
Commits auf Quelle (4)
Leerzeichenänderungen ausblenden
Inline Nebeneinander
ajax/backend/settings/paymentChangeable/list.php
Zeige Datei @ 3b281ef8
...@@ -26,7 +26,7 @@ function () { ...@@ -26,7 +26,7 @@ function () {
$paymentId = $Payment->getId(); $paymentId = $Payment->getId();
if (!isset($section[$paymentId])) { if (!isset($section[$paymentId])) {
$result[$paymentId] = 1; $result[$paymentId] = 0;
continue; continue;
} }
......
bin/backend/controls/settings/Payments.js
Zeige Datei @ 3b281ef8
...@@ -18,7 +18,7 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [ ...@@ -18,7 +18,7 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
return new Class({ return new Class({
Extends: QUIControl, Extends: QUIControl,
Type : 'package/quiqqer/order/bin/backend/controls/settings/Payments', Type: 'package/quiqqer/order/bin/backend/controls/settings/Payments',
Binds: [ Binds: [
'$onImport', '$onImport',
...@@ -28,7 +28,7 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [ ...@@ -28,7 +28,7 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
initialize: function (options) { initialize: function (options) {
this.parent(options); this.parent(options);
this.$Input = null; this.$Input = null;
this.$Container = null; this.$Container = null;
this.addEvents({ this.addEvents({
...@@ -42,7 +42,7 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [ ...@@ -42,7 +42,7 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
* @return Promise * @return Promise
*/ */
refresh: function () { refresh: function () {
var self = this, var self = this,
current = QUILocale.getCurrent(); current = QUILocale.getCurrent();
return new Promise(function (resolve) { return new Promise(function (resolve) {
...@@ -52,8 +52,8 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [ ...@@ -52,8 +52,8 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
}); });
}).then(function (result) { }).then(function (result) {
var payments = result[0], var payments = result[0],
list = result[1], list = result[1],
data = []; data = [];
var i, len, title, paymentData; var i, len, title, paymentData;
...@@ -63,7 +63,7 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [ ...@@ -63,7 +63,7 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
for (i = 0, len = payments.length; i < len; i++) { for (i = 0, len = payments.length; i < len; i++) {
paymentData = payments[i]; paymentData = payments[i];
title = paymentData.title; title = paymentData.title;
if (typeOf(title) === 'object' && current in title) { if (typeOf(title) === 'object' && current in title) {
title = title[current]; title = title[current];
...@@ -76,9 +76,9 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [ ...@@ -76,9 +76,9 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
onChange: onChange onChange: onChange
} }
}), }),
id : paymentData.id, id: paymentData.id,
title : title, title: title,
type : paymentData.paymentType.title type: paymentData.paymentType.title
}); });
} }
...@@ -102,50 +102,50 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [ ...@@ -102,50 +102,50 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
this.$Container = new Element('div', { this.$Container = new Element('div', {
styles: { styles: {
opacity: 0, opacity: 0,
width : '100%' width: '100%'
} }
}).wraps(this.$Input); }).wraps(this.$Input);
var Container = new Element('div', { var Container = new Element('div', {
styles: { styles: {
height : 300, height: 300,
width : '100%', width: '100%',
outline: '1px solid red' outline: '1px solid red'
} }
}).inject(this.$Container); }).inject(this.$Container);
this.$Grid = new Grid(Container, { this.$Grid = new Grid(Container, {
height : 300, height: 300,
width : self.$Container.getSize().x, width: self.$Container.getSize().x,
columnModel: [{ columnModel: [{
header : '&nbsp;', header: '&nbsp;',
dataIndex: 'status', dataIndex: 'status',
dataType : 'QUI', dataType: 'QUI',
width : 60 width: 60
}, { }, {
header : QUILocale.get('quiqqer/system', 'id'), header: QUILocale.get('quiqqer/system', 'id'),
dataIndex: 'id', dataIndex: 'id',
dataType : 'integer', dataType: 'integer',
width : 60 width: 60
}, { }, {
header : QUILocale.get('quiqqer/system', 'title'), header: QUILocale.get('quiqqer/system', 'title'),
dataIndex: 'title', dataIndex: 'title',
dataType : 'text', dataType: 'text',
width : 140 width: 140
}, { }, {
header : QUILocale.get('quiqqer/system', 'type'), header: QUILocale.get('quiqqer/system', 'type'),
dataIndex: 'type', dataIndex: 'type',
dataType : 'text', dataType: 'text',
width : 140 width: 140
}], }],
onrefresh : this.refresh onrefresh: this.refresh
}); });
this.refresh().then(function () { this.refresh().then(function () {
var header = self.$Grid.container.getElements('.th'), var header = self.$Grid.container.getElements('.th'),
el = header[1]; el = header[1];
el.click(); // workaround el.click(); // workaround
el.click(); // workaround el.click(); // workaround
...@@ -166,7 +166,7 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [ ...@@ -166,7 +166,7 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
* Save the current settings * Save the current settings
*/ */
save: function () { save: function () {
var data = this.$Grid.getData(); var data = this.$Grid.getData();
var result = {}; var result = {};
for (var i = 0, len = data.length; i < len; i++) { for (var i = 0, len = data.length; i < len; i++) {
...@@ -185,7 +185,7 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [ ...@@ -185,7 +185,7 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
QUIAjax.get('package_quiqqer_order_ajax_backend_settings_paymentChangeable_list', resolve, { QUIAjax.get('package_quiqqer_order_ajax_backend_settings_paymentChangeable_list', resolve, {
'package': 'quiqqer/order', 'package': 'quiqqer/order',
onError : reject onError: reject
}); });
}); });
}, },
...@@ -199,8 +199,8 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [ ...@@ -199,8 +199,8 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
QUIAjax.get('package_quiqqer_order_ajax_backend_settings_paymentChangeable_save', resolve, { QUIAjax.get('package_quiqqer_order_ajax_backend_settings_paymentChangeable_save', resolve, {
'package': 'quiqqer/order', 'package': 'quiqqer/order',
onError : reject, onError: reject,
data : JSON.encode(data) data: JSON.encode(data)
}); });
}); });
} }
......
src/QUI/ERP/Order/Controls/OrderProcess.Nobody.html
Zeige Datei @ 3b281ef8
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
> >
{assign var=text value={locale group='quiqqer/order' var='ordering.nobody.login.text.prefix'}} {assign var=text value={locale group='quiqqer/order' var='ordering.nobody.login.text.prefix'}}
{if $text|trim != ''} {if $text|trim != ''}
{$text|var_dump}
<div class="quiqqer-order-ordering-nobody-login-text quiqqer-order-ordering-nobody-login-text__prefix"> <div class="quiqqer-order-ordering-nobody-login-text quiqqer-order-ordering-nobody-login-text__prefix">
{$text} {$text}
</div> </div>
......

PCSG & QUIQQER support and DEV System - GitLab