Skip to content
Code-Schnipsel Gruppen Projekte
Commit 3c71900d erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

Merge branch 'next' into 'master' 

Next

See merge request !34
Übergeordnete f66de536 c8177b6b
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
3 Merge Requests!52Update 'next-3.x' with latest changes from 'main',!48Add QUIQQER Tooling,!34Next
Pipeline-Nr. 5230 bestanden
Phase: release
Leerzeichenänderungen ausblenden
Inline Nebeneinander
ajax/convertWithSign.php
+ 17
− 0
Zeige Datei @ 3c71900d
...@@ -20,12 +20,29 @@ function ($data) { ...@@ -20,12 +20,29 @@ function ($data) {
$amount = $entry['amount']; $amount = $entry['amount'];
$currencyFrom = $entry['from']; $currencyFrom = $entry['from'];
$currencyTo = $entry['to']; $currencyTo = $entry['to'];
$converted = QUI\ERP\Currency\Calc::convert($amount, $currencyFrom, $currencyTo);
$convertedRound = $converted;
$numberAsString = strval($converted);
$exploded = explode('.', $numberAsString);
$numberOfDecimalPlaces = isset($exploded[1]) ? strlen($exploded[1]) : 0;
if ($numberOfDecimalPlaces > 4) {
$CurrencyTo = QUI\ERP\Currency\Handler::getCurrency($currencyTo);
$priceRounded = round($converted, 4);
$PriceDisplay = new QUI\ERP\Money\Price($priceRounded, $CurrencyTo);
$convertedRound = '~' . $PriceDisplay->getDisplayPrice();
} else {
$convertedRound = QUI\ERP\Currency\Calc::convertWithSign($convertedRound, $currencyFrom, $currencyTo);
}
$result[] = [ $result[] = [
'amount' => $entry['amount'], 'amount' => $entry['amount'],
'from' => $entry['from'], 'from' => $entry['from'],
'to' => $entry['to'], 'to' => $entry['to'],
'converted' => QUI\ERP\Currency\Calc::convertWithSign($amount, $currencyFrom, $currencyTo), 'converted' => QUI\ERP\Currency\Calc::convertWithSign($amount, $currencyFrom, $currencyTo),
'convertedRound' => $convertedRound,
'id' => $entry['id'] 'id' => $entry['id']
]; ];
} }
......
bin/Currency.js
+ 12
− 12
Zeige Datei @ 3c71900d
...@@ -11,8 +11,8 @@ define('package/quiqqer/currency/bin/Currency', [ ...@@ -11,8 +11,8 @@ define('package/quiqqer/currency/bin/Currency', [
'Ajax', 'Ajax',
'package/quiqqer/currency/bin/classes/BulkConverting' 'package/quiqqer/currency/bin/classes/BulkConverting'
], function (QUI, QUIDOM, QUIAjax, BulkConverting) { ], function(QUI, QUIDOM, QUIAjax, BulkConverting) {
"use strict"; 'use strict';
let Converter = null; let Converter = null;
let def = 'EUR'; let def = 'EUR';
...@@ -36,7 +36,7 @@ define('package/quiqqer/currency/bin/Currency', [ ...@@ -36,7 +36,7 @@ define('package/quiqqer/currency/bin/Currency', [
Extends: QUIDOM, Extends: QUIDOM,
Type: 'package/quiqqer/currency/bin/Currency', Type: 'package/quiqqer/currency/bin/Currency',
initialize: function (options) { initialize: function(options) {
this.parent(options); this.parent(options);
this.$currency = def; this.$currency = def;
...@@ -56,9 +56,9 @@ define('package/quiqqer/currency/bin/Currency', [ ...@@ -56,9 +56,9 @@ define('package/quiqqer/currency/bin/Currency', [
* *
* @param {String} currencyCode * @param {String} currencyCode
*/ */
setCurrency: function (currencyCode) { setCurrency: function(currencyCode) {
this.getCurrencies().then(function (currencies) { this.getCurrencies().then(function(currencies) {
const found = currencies.find(function (Currency) { const found = currencies.find(function(Currency) {
return Currency.code === currencyCode; return Currency.code === currencyCode;
}); });
...@@ -79,7 +79,7 @@ define('package/quiqqer/currency/bin/Currency', [ ...@@ -79,7 +79,7 @@ define('package/quiqqer/currency/bin/Currency', [
* @param {Boolean} [refresh] - Refresh data from database * @param {Boolean} [refresh] - Refresh data from database
* @return {Promise} * @return {Promise}
*/ */
getCurrency: function (currencyCode, refresh) { getCurrency: function(currencyCode, refresh) {
currencyCode = currencyCode || this.$currency; currencyCode = currencyCode || this.$currency;
refresh = refresh || false; refresh = refresh || false;
...@@ -113,7 +113,7 @@ define('package/quiqqer/currency/bin/Currency', [ ...@@ -113,7 +113,7 @@ define('package/quiqqer/currency/bin/Currency', [
* *
* @returns {Promise} * @returns {Promise}
*/ */
getCurrencies: function () { getCurrencies: function() {
if (Object.getLength(this.$currencies)) { if (Object.getLength(this.$currencies)) {
return Promise.resolve(this.$currencies); return Promise.resolve(this.$currencies);
} }
...@@ -147,7 +147,7 @@ define('package/quiqqer/currency/bin/Currency', [ ...@@ -147,7 +147,7 @@ define('package/quiqqer/currency/bin/Currency', [
* *
* @returns {Promise<Array>} * @returns {Promise<Array>}
*/ */
getCurrencyTypes: function () { getCurrencyTypes: function() {
if (this.$currencyTypes.length) { if (this.$currencyTypes.length) {
return Promise.resolve(this.$currencyTypes); return Promise.resolve(this.$currencyTypes);
} }
...@@ -171,7 +171,7 @@ define('package/quiqqer/currency/bin/Currency', [ ...@@ -171,7 +171,7 @@ define('package/quiqqer/currency/bin/Currency', [
* @param {String} currencyTo * @param {String} currencyTo
* @returns {Promise} * @returns {Promise}
*/ */
convert: function (amount, currencyFrom, currencyTo) { convert: function(amount, currencyFrom, currencyTo) {
currencyTo = currencyTo || this.$currency; currencyTo = currencyTo || this.$currency;
currencyFrom = currencyFrom || this.$currency; currencyFrom = currencyFrom || this.$currency;
...@@ -193,7 +193,7 @@ define('package/quiqqer/currency/bin/Currency', [ ...@@ -193,7 +193,7 @@ define('package/quiqqer/currency/bin/Currency', [
* @param {String} currencyTo * @param {String} currencyTo
* @returns {Promise} * @returns {Promise}
*/ */
convertWithSign: function (amount, currencyFrom, currencyTo) { convertWithSign: function(amount, currencyFrom, currencyTo) {
currencyTo = currencyTo || this.$currency; currencyTo = currencyTo || this.$currency;
currencyFrom = currencyFrom || this.$currency; currencyFrom = currencyFrom || this.$currency;
...@@ -240,7 +240,7 @@ define('package/quiqqer/currency/bin/Currency', [ ...@@ -240,7 +240,7 @@ define('package/quiqqer/currency/bin/Currency', [
return; return;
} }
resolve(result[i].converted); resolve(result[i]);
}); });
}); });
} }
......
bin/settings/AllowedCurrencies.js
+ 44
− 42
Zeige Datei @ 3c71900d
...@@ -19,8 +19,8 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -19,8 +19,8 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
'css!package/quiqqer/currency/bin/settings/AllowedCurrencies.css' 'css!package/quiqqer/currency/bin/settings/AllowedCurrencies.css'
], function (QUI, QUIControl, QUISwitch, QUIConfirm, QUIPrompt, QUIAjax, QUILocale, Grid, CurrencyWindow) { ], function(QUI, QUIControl, QUISwitch, QUIConfirm, QUIPrompt, QUIAjax, QUILocale, Grid, CurrencyWindow) {
"use strict"; 'use strict';
const lg = 'quiqqer/currency'; const lg = 'quiqqer/currency';
...@@ -43,7 +43,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -43,7 +43,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
values: {} values: {}
}, },
initialize: function (options) { initialize: function(options) {
this.parent(options); this.parent(options);
this.$Input = null; this.$Input = null;
...@@ -59,7 +59,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -59,7 +59,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
/** /**
* event : on import * event : on import
*/ */
$onImport: function () { $onImport: function() {
let i, len; let i, len;
this.$Input = this.getElm(); this.$Input = this.getElm();
...@@ -164,7 +164,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -164,7 +164,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
textimage: 'fa fa-edit', textimage: 'fa fa-edit',
disabled: true, disabled: true,
events: { events: {
onClick: function () { onClick: function() {
self.openUpdateDialog(self.$Grid.getSelectedData()[0].code); self.openUpdateDialog(self.$Grid.getSelectedData()[0].code);
} }
} }
...@@ -178,8 +178,8 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -178,8 +178,8 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
textimage: 'fa fa-trash', textimage: 'fa fa-trash',
disabled: true, disabled: true,
events: { events: {
onClick: function () { onClick: function() {
const currencies = self.$Grid.getSelectedData().map(function (C) { const currencies = self.$Grid.getSelectedData().map(function(C) {
return C.code; return C.code;
}); });
...@@ -193,28 +193,30 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -193,28 +193,30 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
this.$Grid.setWidth(width); this.$Grid.setWidth(width);
this.$Grid.addEvents({ this.$Grid.addEvents({
onClick: function () { onClick: function() {
const selected = self.$Grid.getSelectedIndices(), const selected = self.$Grid.getSelectedIndices(),
buttons = self.$Grid.getButtons(); buttons = self.$Grid.getButtons();
const Edit = buttons.filter(function (Btn) { const Edit = buttons.filter(function(Btn) {
return Btn.getAttribute('name') === 'edit'; return Btn.getAttribute('name') === 'edit';
})[0]; })[0];
const Delete = buttons.filter(function (Btn) { const Delete = buttons.filter(function(Btn) {
return Btn.getAttribute('name') === 'delete'; return Btn.getAttribute('name') === 'delete';
})[0]; })[0];
if (selected.length === 1) { if (selected.length === 1) {
Edit.enable(); Edit.enable();
Delete.enable(); Delete.enable();
} else if (selected.length > 1) { } else {
Edit.disable(); if (selected.length > 1) {
Delete.enable(); Edit.disable();
Delete.enable();
}
} }
}, },
onDblClick: function () { onDblClick: function() {
self.openUpdateDialog(self.$Grid.getSelectedData()[0].code); self.openUpdateDialog(self.$Grid.getSelectedData()[0].code);
}, },
...@@ -227,8 +229,8 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -227,8 +229,8 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
/** /**
* refresh the currency list * refresh the currency list
*/ */
refresh: function () { refresh: function() {
return this.getCurrencies().then(function (list) { return this.getCurrencies().then(function(list) {
let data = [], let data = [],
values = this.getAttribute('values'); values = this.getAttribute('values');
...@@ -247,7 +249,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -247,7 +249,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
data = data.splice(start, perPage); data = data.splice(start, perPage);
data.each(function (entry, i) { data.each(function(entry, i) {
data[i].allowed = new QUISwitch({ data[i].allowed = new QUISwitch({
status: (typeof values[entry.code] !== 'undefined'), status: (typeof values[entry.code] !== 'undefined'),
currency: entry.code, currency: entry.code,
...@@ -273,11 +275,11 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -273,11 +275,11 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
const buttons = this.$Grid.getButtons(); const buttons = this.$Grid.getButtons();
const Edit = buttons.filter(function (Btn) { const Edit = buttons.filter(function(Btn) {
return Btn.getAttribute('name') === 'edit'; return Btn.getAttribute('name') === 'edit';
})[0]; })[0];
const Delete = buttons.filter(function (Btn) { const Delete = buttons.filter(function(Btn) {
return Btn.getAttribute('name') === 'delete'; return Btn.getAttribute('name') === 'delete';
})[0]; })[0];
...@@ -290,7 +292,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -290,7 +292,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
/** /**
* update values to the input field * update values to the input field
*/ */
update: function () { update: function() {
const allowed = [], const allowed = [],
values = this.getAttribute('values'); values = this.getAttribute('values');
...@@ -313,8 +315,8 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -313,8 +315,8 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
* Return all available currencies * Return all available currencies
* @returns {Promise} * @returns {Promise}
*/ */
getCurrencies: function () { getCurrencies: function() {
return new Promise(function (resolve, reject) { return new Promise(function(resolve, reject) {
QUIAjax.get('package_quiqqer_currency_ajax_getCurrencies', resolve, { QUIAjax.get('package_quiqqer_currency_ajax_getCurrencies', resolve, {
'package': 'quiqqer/currency', 'package': 'quiqqer/currency',
onError: reject onError: reject
...@@ -328,12 +330,12 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -328,12 +330,12 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
* @param {Array|String} currencies * @param {Array|String} currencies
* @returns {Promise} * @returns {Promise}
*/ */
deleteCurrency: function (currencies) { deleteCurrency: function(currencies) {
if (typeOf(currencies) === 'string') { if (typeOf(currencies) === 'string') {
currencies = [currencies]; currencies = [currencies];
} }
return new Promise(function (resolve, reject) { return new Promise(function(resolve, reject) {
QUIAjax.post('package_quiqqer_currency_ajax_delete', resolve, { QUIAjax.post('package_quiqqer_currency_ajax_delete', resolve, {
'package': 'quiqqer/currency', 'package': 'quiqqer/currency',
currencies: JSON.encode(currencies), currencies: JSON.encode(currencies),
...@@ -348,8 +350,8 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -348,8 +350,8 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
* @param {String} currency * @param {String} currency
* @returns {Promise} * @returns {Promise}
*/ */
createCurrency: function (currency) { createCurrency: function(currency) {
return new Promise(function (resolve, reject) { return new Promise(function(resolve, reject) {
QUIAjax.post('package_quiqqer_currency_ajax_create', resolve, { QUIAjax.post('package_quiqqer_currency_ajax_create', resolve, {
'package': 'quiqqer/currency', 'package': 'quiqqer/currency',
currency: currency, currency: currency,
...@@ -363,7 +365,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -363,7 +365,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
* *
* @param {Object} Switch * @param {Object} Switch
*/ */
$onCurrencyStatusChange: function (Switch) { $onCurrencyStatusChange: function(Switch) {
const currency = Switch.getAttribute('currency'); const currency = Switch.getAttribute('currency');
const values = this.getAttribute('values'); const values = this.getAttribute('values');
...@@ -398,7 +400,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -398,7 +400,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
* *
* @param {Event} event * @param {Event} event
*/ */
$switchCurrencyStatus: function (event) { $switchCurrencyStatus: function(event) {
const Target = event.target; const Target = event.target;
const SwitchContainer = Target.getParent().getElement('.qui-switch'); const SwitchContainer = Target.getParent().getElement('.qui-switch');
...@@ -415,8 +417,8 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -415,8 +417,8 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
* @param {Object} Switch * @param {Object} Switch
* @return {Promise} * @return {Promise}
*/ */
$changeAutoUpdate: function (Switch) { $changeAutoUpdate: function(Switch) {
return new Promise(function (resolve, reject) { return new Promise(function(resolve, reject) {
QUIAjax.post('package_quiqqer_currency_ajax_setAutoupdate', resolve, { QUIAjax.post('package_quiqqer_currency_ajax_setAutoupdate', resolve, {
'package': 'quiqqer/currency', 'package': 'quiqqer/currency',
currency: Switch.getAttribute('currency'), currency: Switch.getAttribute('currency'),
...@@ -431,8 +433,8 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -431,8 +433,8 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
* *
* @returns {Promise} * @returns {Promise}
*/ */
$importFromECB: function () { $importFromECB: function() {
return new Promise(function (resolve, reject) { return new Promise(function(resolve, reject) {
QUIAjax.post('package_quiqqer_currency_ajax_importFromECB', resolve, { QUIAjax.post('package_quiqqer_currency_ajax_importFromECB', resolve, {
'package': 'quiqqer/currency', 'package': 'quiqqer/currency',
onError: reject onError: reject
...@@ -449,7 +451,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -449,7 +451,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
* *
* @param {String} currency * @param {String} currency
*/ */
openUpdateDialog: function (currency) { openUpdateDialog: function(currency) {
new CurrencyWindow({ new CurrencyWindow({
currency: currency, currency: currency,
events: { events: {
...@@ -463,7 +465,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -463,7 +465,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
* *
* @param {Array} currencies * @param {Array} currencies
*/ */
openDeleteDialog: function (currencies) { openDeleteDialog: function(currencies) {
if (!currencies.length) { if (!currencies.length) {
return; return;
} }
...@@ -501,17 +503,17 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -501,17 +503,17 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
maxWidth: 600, maxWidth: 600,
autoclose: false, autoclose: false,
events: { events: {
onSubmit: function (Win) { onSubmit: function(Win) {
Win.Loader.show(); Win.Loader.show();
self.deleteCurrency(currencies).then(function () { self.deleteCurrency(currencies).then(function() {
self.refresh().then(function () { self.refresh().then(function() {
self.update(); self.update();
Win.Loader.hide(); Win.Loader.hide();
Win.close(); Win.close();
}); });
}, function () { }, function() {
Win.Loader.hide(); Win.Loader.hide();
}); });
} }
...@@ -522,7 +524,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -522,7 +524,7 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
/** /**
* Opens the create dialog * Opens the create dialog
*/ */
openCreateDialog: function () { openCreateDialog: function() {
const self = this; const self = this;
new QUIPrompt({ new QUIPrompt({
...@@ -533,13 +535,13 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [ ...@@ -533,13 +535,13 @@ define('package/quiqqer/currency/bin/settings/AllowedCurrencies', [
maxHeight: 300, maxHeight: 300,
maxWidth: 450, maxWidth: 450,
events: { events: {
onSubmit: function (value, Win) { onSubmit: function(value, Win) {
Win.Loader.show(); Win.Loader.show();
self.createCurrency(value).then(function () { self.createCurrency(value).then(function() {
Win.close(); Win.close();
self.openUpdateDialog(value); self.openUpdateDialog(value);
}, function () { }, function() {
Win.Loader.hide(); Win.Loader.hide();
}); });
} }
......
bin/settings/CurrencyList.js
+ 12
− 12
Zeige Datei @ 3c71900d
...@@ -9,12 +9,12 @@ define('package/quiqqer/currency/bin/settings/CurrencyList', [ ...@@ -9,12 +9,12 @@ define('package/quiqqer/currency/bin/settings/CurrencyList', [
'qui/controls/buttons/Select', 'qui/controls/buttons/Select',
'Ajax' 'Ajax'
], function (QUI, QUIControl, QUISelect, QUIAjax) { ], function(QUI, QUIControl, QUISelect, QUIAjax) {
"use strict"; 'use strict';
return new Class({ return new Class({
Type : 'package/quiqqer/currency/bin/settings/CurrencyList', Type: 'package/quiqqer/currency/bin/settings/CurrencyList',
Extends: QUIControl, Extends: QUIControl,
Binds: [ Binds: [
...@@ -22,7 +22,7 @@ define('package/quiqqer/currency/bin/settings/CurrencyList', [ ...@@ -22,7 +22,7 @@ define('package/quiqqer/currency/bin/settings/CurrencyList', [
'$onSelectChange' '$onSelectChange'
], ],
initialize: function (options) { initialize: function(options) {
this.parent(options); this.parent(options);
this.$Input = null; this.$Input = null;
...@@ -36,7 +36,7 @@ define('package/quiqqer/currency/bin/settings/CurrencyList', [ ...@@ -36,7 +36,7 @@ define('package/quiqqer/currency/bin/settings/CurrencyList', [
/** /**
* event : on import * event : on import
*/ */
$onImport: function () { $onImport: function() {
this.$Input = this.getElm(); this.$Input = this.getElm();
this.$Input.type = 'hidden'; this.$Input.type = 'hidden';
...@@ -46,15 +46,15 @@ define('package/quiqqer/currency/bin/settings/CurrencyList', [ ...@@ -46,15 +46,15 @@ define('package/quiqqer/currency/bin/settings/CurrencyList', [
this.$Select = new QUISelect({ this.$Select = new QUISelect({
showIcons: false, showIcons: false,
events : { events: {
onChange: this.$onSelectChange onChange: this.$onSelectChange
}, },
styles : { styles: {
width: '100%' width: '100%'
} }
}).inject(this.$Elm); }).inject(this.$Elm);
this.getCurrencies().then(function (result) { this.getCurrencies().then(function(result) {
for (let i in result) { for (let i in result) {
if (!result.hasOwnProperty(i)) { if (!result.hasOwnProperty(i)) {
continue; continue;
...@@ -84,11 +84,11 @@ define('package/quiqqer/currency/bin/settings/CurrencyList', [ ...@@ -84,11 +84,11 @@ define('package/quiqqer/currency/bin/settings/CurrencyList', [
* Return all available currencies * Return all available currencies
* @returns {Promise} * @returns {Promise}
*/ */
getCurrencies: function () { getCurrencies: function() {
return new Promise(function (resolve, reject) { return new Promise(function(resolve, reject) {
QUIAjax.get('package_quiqqer_currency_ajax_getAllowedCurrencies', resolve, { QUIAjax.get('package_quiqqer_currency_ajax_getAllowedCurrencies', resolve, {
'package': 'quiqqer/currency', 'package': 'quiqqer/currency',
onError : reject onError: reject
}); });
}); });
}, },
...@@ -99,7 +99,7 @@ define('package/quiqqer/currency/bin/settings/CurrencyList', [ ...@@ -99,7 +99,7 @@ define('package/quiqqer/currency/bin/settings/CurrencyList', [
* @param {String} value * @param {String} value
* @param {Object} Select - qui/controls/buttons/Select * @param {Object} Select - qui/controls/buttons/Select
*/ */
$onSelectChange: function (value, Select) { $onSelectChange: function(value, Select) {
this.$Input.value = value; this.$Input.value = value;
this.fireEvent('change', [ this.fireEvent('change', [
this, this,
......
events.xml
+ 1
− 0
Zeige Datei @ 3c71900d
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<events> <events>
<event on="onTemplateGetHeader" fire="\QUI\ERP\Currency\EventHandler::onTemplateGetHeader"/> <event on="onTemplateGetHeader" fire="\QUI\ERP\Currency\EventHandler::onTemplateGetHeader"/>
<event on="onPackageConfigSave" fire="\QUI\ERP\Currency\EventHandler::onPackageConfigSave"/>
<!--<event on="onPackageInstall" fire="\QUI\ERP\Currency\EventHandler::onPackageInstall"/>--> <!--<event on="onPackageInstall" fire="\QUI\ERP\Currency\EventHandler::onPackageInstall"/>-->
</events> </events>
src/QUI/ERP/Currency/EventHandler.php
+ 17
− 0
Zeige Datei @ 3c71900d
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
namespace QUI\ERP\Currency; namespace QUI\ERP\Currency;
use QUI; use QUI;
use QUI\Package\Package;
use function json_encode; use function json_encode;
...@@ -41,4 +42,20 @@ public static function onTemplateGetHeader(QUI\Template $TemplateManager) ...@@ -41,4 +42,20 @@ public static function onTemplateGetHeader(QUI\Template $TemplateManager)
); );
} }
} }
/**
* Clears the currency list cache if the package config of 'quiqqer/currency' is saved
*
* @param Package $Package The package object.
* @param array $params Additional parameters passed to the method.
* @return void
*/
public static function onPackageConfigSave(Package $Package, array $params)
{
if ($Package->getName() !== 'quiqqer/currency') {
return;
}
QUI\Cache\Manager::clear('quiqqer/currency/list');
}
} }
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