From b38dc41c8c13112694583941b4e8bffbc3a01eeb Mon Sep 17 00:00:00 2001
From: Michael Danielczok <michael@pcsg.de>
Date: Mon, 20 Jan 2025 09:46:51 +0000
Subject: [PATCH 1/3] fix: remove debug output of variable from HTML
---
src/QUI/ERP/Order/Controls/OrderProcess.Nobody.html | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/QUI/ERP/Order/Controls/OrderProcess.Nobody.html b/src/QUI/ERP/Order/Controls/OrderProcess.Nobody.html
index 7a171b8c..0cdc9405 100644
--- a/src/QUI/ERP/Order/Controls/OrderProcess.Nobody.html
+++ b/src/QUI/ERP/Order/Controls/OrderProcess.Nobody.html
@@ -79,7 +79,6 @@
>
{assign var=text value={locale group='quiqqer/order' var='ordering.nobody.login.text.prefix'}}
{if $text|trim != ''}
- {$text|var_dump}
<div class="quiqqer-order-ordering-nobody-login-text quiqqer-order-ordering-nobody-login-text__prefix">
{$text}
</div>
--
GitLab
From 45819e51115431cd9d0665f2e03cb43ae1dd5b49 Mon Sep 17 00:00:00 2001
From: Henning <leutz@pcsg.de>
Date: Tue, 4 Feb 2025 09:13:41 +0100
Subject: [PATCH 2/3] refactor(Payments): code style refactor
---
bin/backend/controls/settings/Payments.js | 64 +++++++++++------------
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/bin/backend/controls/settings/Payments.js b/bin/backend/controls/settings/Payments.js
index e8411e17..36e17e5d 100644
--- a/bin/backend/controls/settings/Payments.js
+++ b/bin/backend/controls/settings/Payments.js
@@ -18,7 +18,7 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
return new Class({
Extends: QUIControl,
- Type : 'package/quiqqer/order/bin/backend/controls/settings/Payments',
+ Type: 'package/quiqqer/order/bin/backend/controls/settings/Payments',
Binds: [
'$onImport',
@@ -28,7 +28,7 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
initialize: function (options) {
this.parent(options);
- this.$Input = null;
+ this.$Input = null;
this.$Container = null;
this.addEvents({
@@ -42,7 +42,7 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
* @return Promise
*/
refresh: function () {
- var self = this,
+ var self = this,
current = QUILocale.getCurrent();
return new Promise(function (resolve) {
@@ -52,8 +52,8 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
});
}).then(function (result) {
var payments = result[0],
- list = result[1],
- data = [];
+ list = result[1],
+ data = [];
var i, len, title, paymentData;
@@ -63,7 +63,7 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
for (i = 0, len = payments.length; i < len; i++) {
paymentData = payments[i];
- title = paymentData.title;
+ title = paymentData.title;
if (typeOf(title) === 'object' && current in title) {
title = title[current];
@@ -76,9 +76,9 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
onChange: onChange
}
}),
- id : paymentData.id,
- title : title,
- type : paymentData.paymentType.title
+ id: paymentData.id,
+ title: title,
+ type: paymentData.paymentType.title
});
}
@@ -102,50 +102,50 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
this.$Container = new Element('div', {
styles: {
opacity: 0,
- width : '100%'
+ width: '100%'
}
}).wraps(this.$Input);
var Container = new Element('div', {
styles: {
- height : 300,
- width : '100%',
+ height: 300,
+ width: '100%',
outline: '1px solid red'
}
}).inject(this.$Container);
this.$Grid = new Grid(Container, {
- height : 300,
- width : self.$Container.getSize().x,
+ height: 300,
+ width: self.$Container.getSize().x,
columnModel: [{
- header : ' ',
+ header: ' ',
dataIndex: 'status',
- dataType : 'QUI',
- width : 60
+ dataType: 'QUI',
+ width: 60
}, {
- header : QUILocale.get('quiqqer/system', 'id'),
+ header: QUILocale.get('quiqqer/system', 'id'),
dataIndex: 'id',
- dataType : 'integer',
- width : 60
+ dataType: 'integer',
+ width: 60
}, {
- header : QUILocale.get('quiqqer/system', 'title'),
+ header: QUILocale.get('quiqqer/system', 'title'),
dataIndex: 'title',
- dataType : 'text',
- width : 140
+ dataType: 'text',
+ width: 140
}, {
- header : QUILocale.get('quiqqer/system', 'type'),
+ header: QUILocale.get('quiqqer/system', 'type'),
dataIndex: 'type',
- dataType : 'text',
- width : 140
+ dataType: 'text',
+ width: 140
}],
- onrefresh : this.refresh
+ onrefresh: this.refresh
});
this.refresh().then(function () {
var header = self.$Grid.container.getElements('.th'),
- el = header[1];
+ el = header[1];
el.click(); // workaround
el.click(); // workaround
@@ -166,7 +166,7 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
* Save the current settings
*/
save: function () {
- var data = this.$Grid.getData();
+ var data = this.$Grid.getData();
var result = {};
for (var i = 0, len = data.length; i < len; i++) {
@@ -185,7 +185,7 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
return new Promise(function (resolve, reject) {
QUIAjax.get('package_quiqqer_order_ajax_backend_settings_paymentChangeable_list', resolve, {
'package': 'quiqqer/order',
- onError : reject
+ onError: reject
});
});
},
@@ -199,8 +199,8 @@ define('package/quiqqer/order/bin/backend/controls/settings/Payments', [
return new Promise(function (resolve, reject) {
QUIAjax.get('package_quiqqer_order_ajax_backend_settings_paymentChangeable_save', resolve, {
'package': 'quiqqer/order',
- onError : reject,
- data : JSON.encode(data)
+ onError: reject,
+ data: JSON.encode(data)
});
});
}
--
GitLab
From 23af248710d948fcc5ecfd202bf3359f0e44488a Mon Sep 17 00:00:00 2001
From: Henning <leutz@pcsg.de>
Date: Tue, 4 Feb 2025 09:23:41 +0100
Subject: [PATCH 3/3] fix: update default paymentId status
Changed the default value of paymentId status in the paymentChangeable list from 1 to 0 to ensure
accurate payment status representation.
Related: quiqqer/order#176
---
ajax/backend/settings/paymentChangeable/list.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ajax/backend/settings/paymentChangeable/list.php b/ajax/backend/settings/paymentChangeable/list.php
index 06b498ba..32cd9a7d 100644
--- a/ajax/backend/settings/paymentChangeable/list.php
+++ b/ajax/backend/settings/paymentChangeable/list.php
@@ -26,7 +26,7 @@ function () {
$paymentId = $Payment->getId();
if (!isset($section[$paymentId])) {
- $result[$paymentId] = 1;
+ $result[$paymentId] = 0;
continue;
}
--
GitLab