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

fix: status window use prefixed number

Übergeordneter 2cd92bab
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
2 Merge Requests!117Update 'next-3.x' with latest changes from 'main',!108fix: status window use prefixed number
Pipeline-Nr. 9656 mit Warnungen bestanden
......@@ -7,11 +7,12 @@ define('package/quiqqer/order/bin/backend/controls/panels/order/StatusWindow', [
'qui/QUI',
'qui/controls/windows/Confirm',
'package/quiqqer/order/bin/backend/ProcessingStatus',
'package/quiqqer/erp/bin/backend/utils/ERPEntities',
'package/quiqqer/order/bin/backend/Orders',
'Locale',
'Ajax'
], function(QUI, QUIConfirm, ProcessingStatus, Orders, QUILocale, QUIAjax) {
], function(QUI, QUIConfirm, ProcessingStatus, ERPEntities, Orders, QUILocale, QUIAjax) {
'use strict';
const lg = 'quiqqer/order';
......@@ -56,21 +57,35 @@ define('package/quiqqer/order/bin/backend/controls/panels/order/StatusWindow', [
this.Loader.show();
this.getContent().set('html', '');
new Element('p', {
html: QUILocale.get(lg, 'window.status.text', {
orderId: this.getAttribute('orderId')
})
}).inject(this.getContent());
let Select;
const Select = new Element('select', {
styles: {
display: 'block',
margin: '20px auto 0',
width: '80%'
}
}).inject(this.getContent());
return ERPEntities.getEntity(this.getAttribute('orderId'), 'quiqqer/order').then((data) => {
this.setAttributes({
icon: 'fa fa-check',
title: QUILocale.get(lg, 'window.status.title', {
orderId: data.prefixedNumber
})
});
this.refresh();
return ProcessingStatus.getList().then((statusList) => {
new Element('p', {
html: QUILocale.get(lg, 'window.status.text', {
orderId: data.prefixedNumber
})
}).inject(this.getContent());
Select = new Element('select', {
styles: {
display: 'block',
margin: '20px auto 0',
width: '80%'
}
}).inject(this.getContent());
}).then(() => {
return ProcessingStatus.getList();
}).then((statusList) => {
statusList = statusList.data;
new Element('option', {
......
......@@ -24,7 +24,7 @@
"ramsey/uuid": "^3|^4",
"quiqqer/core": "^2",
"quiqqer/qui": "^1.6.7",
"quiqqer/erp": "^3.5",
"quiqqer/erp": "^3.7.1",
"quiqqer/countries": "^2",
"quiqqer/areas": "^2",
"quiqqer/products": "^2",
......
<?xml version="1.0" encoding="UTF-8"?>
<locales xmlns="https://doc.quiqqer.com/xml/quiqqer-quiqqer-locale.xsd">
<groups name="quiqqer/order" datatype="php,js">
<locale name="package.title">
<de><![CDATA[QUIQQER - Shop - Bestellungen]]></de>
......@@ -2383,20 +2382,19 @@
</locale>
<locale name="window.status.title">
<de><![CDATA[Status Änderung für Bestellung #[orderId]]]></de>
<en><![CDATA[Status change for order #[orderId]]]></en>
<de><![CDATA[Status Änderung für Bestellung: [orderId]]]></de>
<en><![CDATA[Status change for order: [orderId]]]></en>
</locale>
<locale name="window.status.text">
<locale name="window.status.text" html="true">
<de><![CDATA[
Wechsel den Status der Bestellung #[orderId].
Wechsel den Status der Bestellung <strong>[orderId]</strong>.
Beachte, Statusänderungen können verschiedene Aktionen auslösen.
]]></de>
<en><![CDATA[
Change the status of the order #[orderId].
Change the status of the order <strong>[orderId]</strong>.
Note, status changes can trigger different actions.
]]></en>
</locale>
</groups>
</locales>
0% Lade oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren