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

refactor: code style

Übergeordneter d9d5a39b
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
Keine zugehörigen Merge Requests gefunden
...@@ -19,7 +19,7 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [ ...@@ -19,7 +19,7 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
], function (QUI, QUIControl, Mustache, QUILocale, template) { ], function (QUI, QUIControl, Mustache, QUILocale, template) {
"use strict"; "use strict";
var lg = 'quiqqer/erp'; const lg = 'quiqqer/erp';
return new Class({ return new Class({
...@@ -37,7 +37,7 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [ ...@@ -37,7 +37,7 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
initialize: function (options) { initialize: function (options) {
this.parent(options); this.parent(options);
this.$filter = false; this.$filter = false;
this.$comments = {}; this.$comments = {};
this.addEvents({ this.addEvents({
...@@ -76,10 +76,10 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [ ...@@ -76,10 +76,10 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
return; return;
} }
var Formatter = this.$getFormatter(); const Formatter = this.$getFormatter();
comments = comments.map(function (entry) { comments = comments.map(function (entry) {
var date = new Date(entry.time * 1000), let date = new Date(entry.time * 1000),
type = 'fa fa-comment'; type = 'fa fa-comment';
if (typeof entry.type !== 'undefined') { if (typeof entry.type !== 'undefined') {
...@@ -123,15 +123,15 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [ ...@@ -123,15 +123,15 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
}); });
// grouping // grouping
var i, len, day, date, entry, title; let i, len, day, date, entry, title;
var group = {}; const group = {};
var DayFormatter = this.$getDayFormatter(); const DayFormatter = this.$getDayFormatter();
for (i = 0, len = comments.length; i < len; i++) { for (i = 0, len = comments.length; i < len; i++) {
entry = comments[i]; entry = comments[i];
date = entry.date; date = entry.date;
day = DayFormatter.format(date); day = DayFormatter.format(date);
if (typeof group[day] === 'undefined') { if (typeof group[day] === 'undefined') {
group[day] = { group[day] = {
...@@ -143,7 +143,7 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [ ...@@ -143,7 +143,7 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
title = ''; title = '';
if (entry.source !== '') { if (entry.source !== '') {
var packageTitle = QUILocale.get(entry.source, 'package.title'); let packageTitle = QUILocale.get(entry.source, 'package.title');
title = QUILocale.get(lg, 'comments.comment.title', { title = QUILocale.get(lg, 'comments.comment.title', {
source: packageTitle + ' (' + entry.source + ')' source: packageTitle + ' (' + entry.source + ')'
...@@ -170,20 +170,20 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [ ...@@ -170,20 +170,20 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
* refresh the display * refresh the display
*/ */
refresh: function () { refresh: function () {
var i, data, realData, commentEntries; let i, data, realData, commentEntries;
var self = this; const self = this;
var comments = []; const comments = [];
var sortComments = function (a, b) { const sortComments = function (a, b) {
return a.timestamp - b.timestamp; return a.timestamp - b.timestamp;
}; };
var commentClone = Object.clone(this.$comments); const commentClone = Object.clone(this.$comments);
var filterComments = function (entry) { const filterComments = function (entry) {
var message = entry.message.toLowerCase(); const message = entry.message.toLowerCase();
var type = entry.type.toLowerCase(); const type = entry.type.toLowerCase();
var id = entry.id.toLowerCase(); const id = entry.id.toLowerCase();
if (message.indexOf(self.$filter) === -1 && if (message.indexOf(self.$filter) === -1 &&
type.indexOf(self.$filter) === -1 && type.indexOf(self.$filter) === -1 &&
...@@ -201,11 +201,11 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [ ...@@ -201,11 +201,11 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
} }
commentEntries = commentClone[i]; commentEntries = commentClone[i];
data = commentEntries.data; data = commentEntries.data;
if (this.$filter) { if (this.$filter) {
// check filter // check filter
data = []; data = [];
realData = commentEntries.data; // copy realData = commentEntries.data; // copy
realData.forEach(filterComments.bind(data)); realData.forEach(filterComments.bind(data));
...@@ -229,18 +229,22 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [ ...@@ -229,18 +229,22 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
}); });
this.$Elm.getElements('[data-editable]').addEvent('click', function (event) { this.$Elm.getElements('[data-editable]').addEvent('click', function (event) {
var Parent = event.target; let Parent = event.target;
if (!Parent.hasClass('quiqqer-erp-comments-comment')) { if (!Parent.hasClass('quiqqer-erp-comments-comment')) {
Parent = Parent.getParent('.quiqqer-erp-comments-comment'); Parent = Parent.getParent('.quiqqer-erp-comments-comment');
} }
var data = { const data = {
id : Parent.get('data-id'), id : Parent.get('data-id'),
source: Parent.get('data-source') source: Parent.get('data-source')
}; };
self.fireEvent('edit', [self, Parent, data]); self.fireEvent('edit', [
self,
Parent,
data
]);
}); });
}, },
...@@ -250,9 +254,9 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [ ...@@ -250,9 +254,9 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
* @return {window.Intl.DateTimeFormat} * @return {window.Intl.DateTimeFormat}
*/ */
$getFormatter: function () { $getFormatter: function () {
var locale = QUILocale.getCurrent(); let locale = QUILocale.getCurrent();
var options = { const options = {
// year : 'numeric', // year : 'numeric',
// month : '2-digit', // month : '2-digit',
// day : '2-digit', // day : '2-digit',
...@@ -280,9 +284,9 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [ ...@@ -280,9 +284,9 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
* @return {window.Intl.DateTimeFormat} * @return {window.Intl.DateTimeFormat}
*/ */
$getDayFormatter: function () { $getDayFormatter: function () {
var locale = QUILocale.getCurrent(); let locale = QUILocale.getCurrent();
var options = { const options = {
year : 'numeric', year : 'numeric',
month: '2-digit', month: '2-digit',
day : '2-digit' day : '2-digit'
......
...@@ -26,7 +26,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [ ...@@ -26,7 +26,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
], function (QUI, QUIControl, QUIButton, Countries, Users, QUILocale, Mustache, template) { ], function (QUI, QUIControl, QUIButton, Countries, Users, QUILocale, Mustache, template) {
"use strict"; "use strict";
var lg = 'quiqqer/erp'; const lg = 'quiqqer/erp';
return new Class({ return new Class({
...@@ -47,19 +47,19 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [ ...@@ -47,19 +47,19 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
this.parent(options); this.parent(options);
this.$Addresses = null; this.$Addresses = null;
this.$Company = null; this.$Company = null;
this.$Street = null; this.$Street = null;
this.$ZIP = null; this.$ZIP = null;
this.$City = null; this.$City = null;
this.$Country = null; this.$Country = null;
this.$Salutation = null; this.$Salutation = null;
this.$Firstname = null; this.$Firstname = null;
this.$Lastname = null; this.$Lastname = null;
this.checked = false; this.checked = false;
this.$loaded = false; this.$loaded = false;
this.$userId = this.getAttribute('userId'); this.$userId = this.getAttribute('userId');
this.$AddressSelectBtn = null; this.$AddressSelectBtn = null;
this.addEvents({ this.addEvents({
...@@ -73,8 +73,8 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [ ...@@ -73,8 +73,8 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
* event: on import * event: on import
*/ */
$onImport: function () { $onImport: function () {
var self = this, const self = this,
Elm = this.getElm(); Elm = this.getElm();
Elm.set('html', Mustache.render(template, { Elm.set('html', Mustache.render(template, {
labelDifferentDeliveryAddress: QUILocale.get(lg, 'control.DeliveryAddress.tpl.labelDifferentDeliveryAddress'), labelDifferentDeliveryAddress: QUILocale.get(lg, 'control.DeliveryAddress.tpl.labelDifferentDeliveryAddress'),
...@@ -108,26 +108,26 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [ ...@@ -108,26 +108,26 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
// address stuff // address stuff
this.$addressId = false; this.$addressId = false;
this.$Company = Elm.getElement('[name="delivery-company"]'); this.$Company = Elm.getElement('[name="delivery-company"]');
this.$Street = Elm.getElement('[name="delivery-street_no"]'); this.$Street = Elm.getElement('[name="delivery-street_no"]');
this.$ZIP = Elm.getElement('[name="delivery-zip"]'); this.$ZIP = Elm.getElement('[name="delivery-zip"]');
this.$City = Elm.getElement('[name="delivery-city"]'); this.$City = Elm.getElement('[name="delivery-city"]');
this.$Country = Elm.getElement('[name="delivery-country"]'); this.$Country = Elm.getElement('[name="delivery-country"]');
this.$Salutation = Elm.getElement('[name="delivery-salutation"]'); this.$Salutation = Elm.getElement('[name="delivery-salutation"]');
this.$Firstname = Elm.getElement('[name="delivery-firstname"]'); this.$Firstname = Elm.getElement('[name="delivery-firstname"]');
this.$Lastname = Elm.getElement('[name="delivery-lastname"]'); this.$Lastname = Elm.getElement('[name="delivery-lastname"]');
this.$Company.disabled = false; this.$Company.disabled = false;
this.$Street.disabled = false; this.$Street.disabled = false;
this.$ZIP.disabled = false; this.$ZIP.disabled = false;
this.$City.disabled = false; this.$City.disabled = false;
this.$Salutation.disabled = false; this.$Salutation.disabled = false;
this.$Firstname.disabled = false; this.$Firstname.disabled = false;
this.$Lastname.disabled = false; this.$Lastname.disabled = false;
var Panel = QUI.Controls.getById( const Panel = QUI.Controls.getById(
this.getElm().getParent('.qui-panel').get('data-quiid') this.getElm().getParent('.qui-panel').get('data-quiid')
); );
...@@ -145,7 +145,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [ ...@@ -145,7 +145,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
html : '' html : ''
}).inject(self.$Country); }).inject(self.$Country);
for (var code in result) { for (let code in result) {
if (!result.hasOwnProperty(code)) { if (!result.hasOwnProperty(code)) {
continue; continue;
} }
...@@ -161,7 +161,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [ ...@@ -161,7 +161,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
} }
self.$Country.disabled = false; self.$Country.disabled = false;
self.$loaded = true; self.$loaded = true;
self.fireEvent('loaded', [self]); self.fireEvent('loaded', [self]);
}); });
...@@ -241,7 +241,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [ ...@@ -241,7 +241,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
this.$userId = value.uid; this.$userId = value.uid;
} }
var Address = { const Address = {
company : '', company : '',
street_no : '', street_no : '',
zip : '', zip : '',
...@@ -269,7 +269,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [ ...@@ -269,7 +269,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
return Promise.reject('No User-ID'); return Promise.reject('No User-ID');
} }
var User = Users.get(this.$userId); const User = Users.get(this.$userId);
if (User.isLoaded()) { if (User.isLoaded()) {
return Promise.resolve(User); return Promise.resolve(User);
...@@ -285,13 +285,13 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [ ...@@ -285,13 +285,13 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
*/ */
$displayAddressData: function (Address) { $displayAddressData: function (Address) {
this.$Company.value = Address.company; this.$Company.value = Address.company;
this.$Street.value = Address.street_no; this.$Street.value = Address.street_no;
this.$ZIP.value = Address.zip; this.$ZIP.value = Address.zip;
this.$City.value = Address.city; this.$City.value = Address.city;
this.$Salutation.value = Address.salutation; this.$Salutation.value = Address.salutation;
this.$Firstname.value = Address.firstname; this.$Firstname.value = Address.firstname;
this.$Lastname.value = Address.lastname; this.$Lastname.value = Address.lastname;
this.$Country.value = Address.country; this.$Country.value = Address.country;
this.setAttribute('country', Address.country); this.setAttribute('country', Address.country);
...@@ -321,9 +321,9 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [ ...@@ -321,9 +321,9 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
* @param {DocumentEvent} [event] * @param {DocumentEvent} [event]
*/ */
$checkBoxChange: function (event) { $checkBoxChange: function (event) {
var self = this, const self = this,
Checkbox = this.getElm().getElement('[name="differentDeliveryAddress"]'), Checkbox = this.getElm().getElement('[name="differentDeliveryAddress"]'),
closables = this.getElm().getElements('.closable'); closables = this.getElm().getElements('.closable');
if (event) { if (event) {
event.stop(); event.stop();
...@@ -334,7 +334,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [ ...@@ -334,7 +334,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
} }
if (!this.$userId) { if (!this.$userId) {
var Panel = QUI.Controls.getById( const Panel = QUI.Controls.getById(
this.getElm().getParent('.qui-panel').get('data-quiid') this.getElm().getParent('.qui-panel').get('data-quiid')
); );
...@@ -388,7 +388,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [ ...@@ -388,7 +388,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
* Select customer address to pre-fill address fields * Select customer address to pre-fill address fields
*/ */
$onClickSelectAddress: function () { $onClickSelectAddress: function () {
var self = this; const self = this;
if (!this.$userId) { if (!this.$userId) {
return; return;
...@@ -408,7 +408,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [ ...@@ -408,7 +408,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
self.getUser().then(function (User) { self.getUser().then(function (User) {
return User.getAddressList(); return User.getAddressList();
}).then(function (addresses) { }).then(function (addresses) {
for (var i = 0, len = addresses.length; i < len; i++) { for (let i = 0, len = addresses.length; i < len; i++) {
if (addresses[i].id === addressId) { if (addresses[i].id === addressId) {
self.$displayAddressData(addresses[i]); self.$displayAddressData(addresses[i]);
break; break;
......
...@@ -29,8 +29,8 @@ define('package/quiqqer/erp/bin/backend/controls/ErpUserData', [ ...@@ -29,8 +29,8 @@ define('package/quiqqer/erp/bin/backend/controls/ErpUserData', [
* @event: on import * @event: on import
*/ */
$onImport: function () { $onImport: function () {
var self = this; const self = this;
var Panel = QUI.Controls.getById( const Panel = QUI.Controls.getById(
self.getElm().getParent('.qui-panel').get('data-quiid') self.getElm().getParent('.qui-panel').get('data-quiid')
); );
......
...@@ -422,7 +422,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputDialog', [ ...@@ -422,7 +422,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputDialog', [
* @param {String} msg * @param {String} msg
*/ */
$addMessage: function (msg) { $addMessage: function (msg) {
var Now = new Date(); const Now = new Date();
new Element('div', { new Element('div', {
'class': 'quiqqer-erp-outputDialog-messages-entry box message-success', 'class': 'quiqqer-erp-outputDialog-messages-entry box message-success',
......
...@@ -23,7 +23,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [ ...@@ -23,7 +23,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
], function (QUI, QUIConfirm, QUIButton, Permissions, QUIAjax, QUILocale, Mustache, template) { ], function (QUI, QUIConfirm, QUIButton, Permissions, QUIAjax, QUILocale, Mustache, template) {
"use strict"; "use strict";
var lg = 'quiqqer/erp'; const lg = 'quiqqer/erp';
return new Class({ return new Class({
...@@ -60,17 +60,17 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [ ...@@ -60,17 +60,17 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
} }
}); });
this.$Output = null; this.$Output = null;
this.$Preview = null; this.$Preview = null;
this.$cutomerMail = null; this.$cutomerMail = null;
this.$Template = null; this.$Template = null;
this.$subject = null; this.$subject = null;
this.$content = null; this.$content = null;
this.$MailSubjectInput = null; this.$MailSubjectInput = null;
this.$MailContentEditor = null; this.$MailContentEditor = null;
this.$Attachments = null; this.$Attachments = null;
this.addEvents({ this.addEvents({
onOpen : this.$onOpen, onOpen : this.$onOpen,
...@@ -82,8 +82,8 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [ ...@@ -82,8 +82,8 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
* event: on open * event: on open
*/ */
$onOpen: function () { $onOpen: function () {
var self = this, const self = this,
Content = this.getContent(); Content = this.getContent();
this.Loader.show(); this.Loader.show();
...@@ -101,11 +101,11 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [ ...@@ -101,11 +101,11 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
Content.addClass('quiqqer-erp-OutputMailEditor'); Content.addClass('quiqqer-erp-OutputMailEditor');
this.$MailSubjectInput = Content.getElement('.quiqqer-erp-outputMailEditor-mailEditor-subject'); this.$MailSubjectInput = Content.getElement('.quiqqer-erp-outputMailEditor-mailEditor-subject');
this.$subject = this.getAttribute('mailSubject'); this.$subject = this.getAttribute('mailSubject');
this.$content = this.getAttribute('mailContent'); this.$content = this.getAttribute('mailContent');
// Add attachments btn // Add attachments btn
var AttachmentBtn = new QUIButton({ const AttachmentBtn = new QUIButton({
text : QUILocale.get(lg, 'controls.OutputMailEditor.btn.attachments'), text : QUILocale.get(lg, 'controls.OutputMailEditor.btn.attachments'),
title : QUILocale.get(lg, 'controls.OutputMailEditor.btn.attachments'), title : QUILocale.get(lg, 'controls.OutputMailEditor.btn.attachments'),
textimage: 'fa fa-paperclip', textimage: 'fa fa-paperclip',
...@@ -115,7 +115,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [ ...@@ -115,7 +115,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
}, },
events : { events : {
onClick: function (Btn) { onClick: function (Btn) {
var AttachmentBox = Content.getElement('.quiqqer-erp-outputMailEditor-attachments'); const AttachmentBox = Content.getElement('.quiqqer-erp-outputMailEditor-attachments');
AttachmentBox.setStyle('display', 'block'); AttachmentBox.setStyle('display', 'block');
self.setAttribute('maxWidth', 1200); self.setAttribute('maxWidth', 1200);
...@@ -131,7 +131,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [ ...@@ -131,7 +131,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
this.$getMailData(), this.$getMailData(),
Permissions.hasPermission('quiqqer.erp.mail_editor_attach_files') Permissions.hasPermission('quiqqer.erp.mail_editor_attach_files')
]).then(function (result) { ]).then(function (result) {
var MailData = result[1]; const MailData = result[1];
self.$Attachments = QUI.Controls.getById( self.$Attachments = QUI.Controls.getById(
Content.getElement('input[name="attachments"]').get('data-quiid') Content.getElement('input[name="attachments"]').get('data-quiid')
...@@ -140,7 +140,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [ ...@@ -140,7 +140,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
self.$Attachments.getElm().setStyle('height', 610); self.$Attachments.getElm().setStyle('height', 610);
// Check if user has permission to attach files // Check if user has permission to attach files
var hasAttachmentPermission = result[2]; const hasAttachmentPermission = result[2];
if (hasAttachmentPermission) { if (hasAttachmentPermission) {
AttachmentBtn.enable(); AttachmentBtn.enable();
...@@ -150,9 +150,9 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [ ...@@ -150,9 +150,9 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
); );
} }
var mediaFilesAdded = false; let mediaFilesAdded = false;
var addMediaFiles = function () { const addMediaFiles = function () {
if (mediaFilesAdded) { if (mediaFilesAdded) {
return; return;
} }
...@@ -161,10 +161,10 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [ ...@@ -161,10 +161,10 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
// Add previously selected media items // Add previously selected media items
if (self.getAttribute('attachedMediaFileIds') && hasAttachmentPermission) { if (self.getAttribute('attachedMediaFileIds') && hasAttachmentPermission) {
var mediaIds = self.getAttribute('attachedMediaFileIds'); const mediaIds = self.getAttribute('attachedMediaFileIds');
if (mediaIds.length) { if (mediaIds.length) {
for (var i = 0, len = mediaIds.length; i < len; i++) { for (let i = 0, len = mediaIds.length; i < len; i++) {
self.$Attachments.addItem(mediaIds[i]); self.$Attachments.addItem(mediaIds[i]);
} }
...@@ -210,15 +210,15 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [ ...@@ -210,15 +210,15 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
* Event: onSubmit * Event: onSubmit
*/ */
$onSubmit: function () { $onSubmit: function () {
var mediaIds = []; let mediaIds = [];
if (this.$Attachments.getValue()) { if (this.$Attachments.getValue()) {
mediaIds = this.$Attachments.getValue().split(','); mediaIds = this.$Attachments.getValue().split(',');
} }
var uniqueMediaIds = []; const uniqueMediaIds = [];
for (var i = 0, len = mediaIds.length; i < len; i++) { for (let i = 0, len = mediaIds.length; i < len; i++) {
if (!uniqueMediaIds.contains(mediaIds[i])) { if (!uniqueMediaIds.contains(mediaIds[i])) {
uniqueMediaIds.push(mediaIds[i]); uniqueMediaIds.push(mediaIds[i]);
} }
...@@ -242,7 +242,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [ ...@@ -242,7 +242,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
* @return {Promise} * @return {Promise}
*/ */
$getMailData: function () { $getMailData: function () {
var self = this; const self = this;
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
QUIAjax.get('package_quiqqer_erp_ajax_output_getMailData', resolve, { QUIAjax.get('package_quiqqer_erp_ajax_output_getMailData', resolve, {
......
...@@ -78,7 +78,7 @@ define('package/quiqqer/erp/bin/backend/controls/Panel', [ ...@@ -78,7 +78,7 @@ define('package/quiqqer/erp/bin/backend/controls/Panel', [
* @param Parent * @param Parent
*/ */
$appendItems: function (items, Parent) { $appendItems: function (items, Parent) {
var i, len, item, text, Item; let i, len, item, text, Item;
for (i = 0, len = items.length; i < len; i++) { for (i = 0, len = items.length; i < len; i++) {
item = items[i]; item = items[i];
...@@ -109,7 +109,7 @@ define('package/quiqqer/erp/bin/backend/controls/Panel', [ ...@@ -109,7 +109,7 @@ define('package/quiqqer/erp/bin/backend/controls/Panel', [
* @param Item * @param Item
*/ */
$itemClick: function (Item) { $itemClick: function (Item) {
var needle = Item.getAttribute('require'); const needle = Item.getAttribute('require');
if (needle === false || needle === '') { if (needle === false || needle === '') {
if (Item.isOpen() === false) { if (Item.isOpen() === false) {
...@@ -120,13 +120,13 @@ define('package/quiqqer/erp/bin/backend/controls/Panel', [ ...@@ -120,13 +120,13 @@ define('package/quiqqer/erp/bin/backend/controls/Panel', [
return; return;
} }
var icon = Item.getAttribute('icon'); const icon = Item.getAttribute('icon');
Item.removeIcon(icon); Item.removeIcon(icon);
Item.setAttribute('icon', 'fa fa-spinner fa-spin'); Item.setAttribute('icon', 'fa fa-spinner fa-spin');
require([needle], function (cls) { require([needle], function (cls) {
var Instance; let Instance;
Item.deselect(); Item.deselect();
...@@ -143,7 +143,7 @@ define('package/quiqqer/erp/bin/backend/controls/Panel', [ ...@@ -143,7 +143,7 @@ define('package/quiqqer/erp/bin/backend/controls/Panel', [
} }
if (typeOf(cls) === 'function') { if (typeOf(cls) === 'function') {
var Prom = cls(); const Prom = cls();
if (!Prom) { if (!Prom) {
Item.removeIcon('fa-spinner'); Item.removeIcon('fa-spinner');
...@@ -155,8 +155,6 @@ define('package/quiqqer/erp/bin/backend/controls/Panel', [ ...@@ -155,8 +155,6 @@ define('package/quiqqer/erp/bin/backend/controls/Panel', [
Item.removeIcon('fa-spinner'); Item.removeIcon('fa-spinner');
Item.setAttribute('icon', icon); Item.setAttribute('icon', icon);
}); });
return;
} }
}); });
} }
......
...@@ -44,7 +44,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/Article', [ ...@@ -44,7 +44,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/Article', [
], function (QUI, QUIControl, QUIButton, QUIConfirm, QUIElements, DiscountUtils, MoneyUtils, Currency, Mustache, QUILocale, QUIAjax, Editors, template) { ], function (QUI, QUIControl, QUIButton, QUIConfirm, QUIElements, DiscountUtils, MoneyUtils, Currency, Mustache, QUILocale, QUIAjax, Editors, template) {
"use strict"; "use strict";
var lg = 'quiqqer/erp'; const lg = 'quiqqer/erp';
return new Class({ return new Class({
......
...@@ -17,8 +17,6 @@ define('package/quiqqer/erp/bin/backend/controls/articles/SelectArticleList', [ ...@@ -17,8 +17,6 @@ define('package/quiqqer/erp/bin/backend/controls/articles/SelectArticleList', [
], function (ArticleList) { ], function (ArticleList) {
"use strict"; "use strict";
var lg = 'quiqqer/erp';
return new Class({ return new Class({
Extends: ArticleList, Extends: ArticleList,
...@@ -55,7 +53,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/SelectArticleList', [ ...@@ -55,7 +53,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/SelectArticleList', [
* @return {[]} * @return {[]}
*/ */
getSelectedArticles: function () { getSelectedArticles: function () {
var articles = []; let articles = [];
this.$articles.forEach(function (Article) { this.$articles.forEach(function (Article) {
if (Article.isSelected()) { if (Article.isSelected()) {
...@@ -73,7 +71,10 @@ define('package/quiqqer/erp/bin/backend/controls/articles/SelectArticleList', [ ...@@ -73,7 +71,10 @@ define('package/quiqqer/erp/bin/backend/controls/articles/SelectArticleList', [
*/ */
$onArticleSelect: function (Article) { $onArticleSelect: function (Article) {
this.$selectedArticle = Article; this.$selectedArticle = Article;
this.fireEvent('articleSelect', [this, Article]); this.fireEvent('articleSelect', [
this,
Article
]);
this.$calc(); this.$calc();
}, },
...@@ -84,7 +85,10 @@ define('package/quiqqer/erp/bin/backend/controls/articles/SelectArticleList', [ ...@@ -84,7 +85,10 @@ define('package/quiqqer/erp/bin/backend/controls/articles/SelectArticleList', [
*/ */
$onArticleUnSelect: function (Article) { $onArticleUnSelect: function (Article) {
this.$selectedArticle = null; this.$selectedArticle = null;
this.fireEvent('articleUnSelect', [this, Article]); this.fireEvent('articleUnSelect', [
this,
Article
]);
this.$calc(); this.$calc();
}, },
...@@ -94,7 +98,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/SelectArticleList', [ ...@@ -94,7 +98,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/SelectArticleList', [
* @return {Array} * @return {Array}
*/ */
$getArticleDataForCalculation: function () { $getArticleDataForCalculation: function () {
var returnSelectedOnly = true; let returnSelectedOnly = true;
// Only return selected articles if all articles have been calculated once // Only return selected articles if all articles have been calculated once
this.$articles.forEach(function (Article) { this.$articles.forEach(function (Article) {
......
...@@ -19,7 +19,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/Text', [ ...@@ -19,7 +19,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/Text', [
], function (Article, QUIButton, QUILocale, Mustache, template) { ], function (Article, QUIButton, QUILocale, Mustache, template) {
"use strict"; "use strict";
var lg = 'quiqqer/erp'; const lg = 'quiqqer/erp';
return new Class({ return new Class({
...@@ -57,8 +57,8 @@ define('package/quiqqer/erp/bin/backend/controls/articles/Text', [ ...@@ -57,8 +57,8 @@ define('package/quiqqer/erp/bin/backend/controls/articles/Text', [
}); });
this.$Position = this.$Elm.getElement('.quiqqer-erp-backend-erpArticleText-pos'); this.$Position = this.$Elm.getElement('.quiqqer-erp-backend-erpArticleText-pos');
this.$Text = this.$Elm.getElement('.quiqqer-erp-backend-erpArticleText-text'); this.$Text = this.$Elm.getElement('.quiqqer-erp-backend-erpArticleText-text');
this.$Buttons = this.$Elm.getElement('.quiqqer-erp-backend-erpArticleText-buttons'); this.$Buttons = this.$Elm.getElement('.quiqqer-erp-backend-erpArticleText-buttons');
this.$Loader = new Element('div', { this.$Loader = new Element('div', {
html : '<span class="fa fa-spinner fa-spin"></span>', html : '<span class="fa fa-spinner fa-spin"></span>',
......
...@@ -16,7 +16,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/windows/PriceBrutto', ...@@ -16,7 +16,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/windows/PriceBrutto',
], function (QUI, QUIConfirm, QUILocale, QUIAjax, Mustache, template) { ], function (QUI, QUIConfirm, QUILocale, QUIAjax, Mustache, template) {
"use strict"; "use strict";
var lg = 'quiqqer/erp'; const lg = 'quiqqer/erp';
return new Class({ return new Class({
...@@ -60,8 +60,8 @@ define('package/quiqqer/erp/bin/backend/controls/articles/windows/PriceBrutto', ...@@ -60,8 +60,8 @@ define('package/quiqqer/erp/bin/backend/controls/articles/windows/PriceBrutto',
* @return {Element} * @return {Element}
*/ */
$onOpen: function () { $onOpen: function () {
var self = this, const self = this,
Content = this.getContent(); Content = this.getContent();
Content.set('html', Mustache.render(template, { Content.set('html', Mustache.render(template, {
title : QUILocale.get(lg, 'control.window.price.brutto.label'), title : QUILocale.get(lg, 'control.window.price.brutto.label'),
...@@ -87,12 +87,15 @@ define('package/quiqqer/erp/bin/backend/controls/articles/windows/PriceBrutto', ...@@ -87,12 +87,15 @@ define('package/quiqqer/erp/bin/backend/controls/articles/windows/PriceBrutto',
* submit the window * submit the window
*/ */
submit: function () { submit: function () {
var self = this; const self = this;
this.Loader.show(); this.Loader.show();
QUIAjax.get('package_quiqqer_erp_ajax_calcNettoPrice', function (price) { QUIAjax.get('package_quiqqer_erp_ajax_calcNettoPrice', function (price) {
self.fireEvent('submit', [self, price]); self.fireEvent('submit', [
self,
price
]);
self.close(); self.close();
}, { }, {
'package': 'quiqqer/erp', 'package': 'quiqqer/erp',
......
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