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

feat(Currency.js): get default currency

This commit introduces several changes in bin/Currency.js to make the code more readable and
consistent:

1. Improved function declaration style: Rather than using `function(arg1, arg2) { .. }`, we now use
`function (arg1, arg2) { .. }` for better style consistency.
2. Cleaned up unnecessary whitespace: Removed redundant lines to make the code cleaner and more
readable.
3. Added a new function: Introduced a new function `getDefaultCurrency()` for fetching the default
system currency. This asynchronous function returns a Promise that resolves to the code of the
default currency.
Übergeordneter ae339c05
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
2 Merge Requests!54Update 'next-3.x' with latest changes from 'main',!53feat(Currency.js): get default currency
Pipeline-Nr. 16537 bestanden
...@@ -11,7 +11,7 @@ define('package/quiqqer/currency/bin/Currency', [ ...@@ -11,7 +11,7 @@ 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;
...@@ -19,7 +19,6 @@ define('package/quiqqer/currency/bin/Currency', [ ...@@ -19,7 +19,6 @@ define('package/quiqqer/currency/bin/Currency', [
let SYSTEM_CURRENCY = ''; let SYSTEM_CURRENCY = '';
let getCurrenciesFetch = false; let getCurrenciesFetch = false;
// package_quiqqer_currency_ajax_setUserCurrency // package_quiqqer_currency_ajax_setUserCurrency
if (typeof window.DEFAULT_CURRENCY !== 'undefined') { if (typeof window.DEFAULT_CURRENCY !== 'undefined') {
def = window.DEFAULT_CURRENCY; def = window.DEFAULT_CURRENCY;
...@@ -36,7 +35,7 @@ define('package/quiqqer/currency/bin/Currency', [ ...@@ -36,7 +35,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 +55,9 @@ define('package/quiqqer/currency/bin/Currency', [ ...@@ -56,9 +55,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 +78,7 @@ define('package/quiqqer/currency/bin/Currency', [ ...@@ -79,7 +78,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;
...@@ -108,12 +107,13 @@ define('package/quiqqer/currency/bin/Currency', [ ...@@ -108,12 +107,13 @@ define('package/quiqqer/currency/bin/Currency', [
}); });
}, },
/** /**
* Return all available currencies * Return all available currencies
* *
* @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);
} }
...@@ -142,12 +142,33 @@ define('package/quiqqer/currency/bin/Currency', [ ...@@ -142,12 +142,33 @@ define('package/quiqqer/currency/bin/Currency', [
}); });
}, },
/**
* Return all available currency types.
*
* @returns {Promise}
*/
getDefaultCurrency: function () {
if (SYSTEM_CURRENCY !== '') {
return Promise.resolve(SYSTEM_CURRENCY);
}
return new Promise((resolve, reject) => {
QUIAjax.get('package_quiqqer_currency_ajax_getDefault', (result) => {
SYSTEM_CURRENCY = result.code;
resolve(result.code);
}, {
'package': 'quiqqer/currency',
onError: reject
});
});
},
/** /**
* Return all available currency types. * Return all available currency types.
* *
* @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 +192,7 @@ define('package/quiqqer/currency/bin/Currency', [ ...@@ -171,7 +192,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 +214,7 @@ define('package/quiqqer/currency/bin/Currency', [ ...@@ -193,7 +214,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;
......
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