From b12cc837f13a27dcbf0c444bfddf2d7bbdb0ef91 Mon Sep 17 00:00:00 2001
From: Henning <leutz@pcsg.de>
Date: Wed, 26 Mar 2025 09:26:08 +0100
Subject: [PATCH] feat: update currency handling
Updated the way how we handle the currency in the system. Now instead of directly getting the
user's currency or the default one, we use the getRuntimeCurrency() method. This method is likely
to return the correct currency even if the user did not set it or if there is no default currency
set in the system. This change is applied in several files including `index.php`,
`CurrencySwitch.php`, and `LangCurrencySwitch.php`. Additionally, updated `composer.json` to use
version 2.2 of `quiqqer/currency`. Removed unused code.
---
composer.json | 2 +-
index.php | 8 +-------
.../Controls/CurrencySwitch.php | 15 +--------------
.../Controls/LangCurrencySwitch.php | 19 ++++---------------
4 files changed, 7 insertions(+), 37 deletions(-)
diff --git a/composer.json b/composer.json
index a553c16..4ee4e0f 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
"quiqqer/unsemantic": "^2",
"quiqqer-asset/fastclick": "^1",
"quiqqer/tooltips": "^2",
- "quiqqer/currency": "^2",
+ "quiqqer/currency": "^2.2",
"quiqqer/smarty4": "^2.0.7"
},
"autoload": {
diff --git a/index.php b/index.php
index 85536cd..3facd45 100644
--- a/index.php
+++ b/index.php
@@ -61,12 +61,6 @@
/**
* Basket button
*/
-$Currency = QUI\ERP\Currency\Handler::getUserCurrency();
-
-if (!$Currency) {
- $Currency = QUI\ERP\Currency\Handler::getDefaultCurrency();
-}
-
$createBasketButton = true;
$simpleSiteTypes = [
'quiqqer/order:types/orderingProcess',
@@ -79,7 +73,7 @@
$Template->setAttribute('content-header', false);
}
-$InitialBasketPrice = new QUI\ERP\Money\Price(0, $Currency);
+$InitialBasketPrice = new QUI\ERP\Money\Price(0, QUI\ERP\Currency\Handler::getRuntimeCurrency());
$Logo = $Project->getMedia()->getLogoImage();
$logoHeight = $templateSettings['logoHeight'];
diff --git a/src/QUI/TemplateCologne/Controls/CurrencySwitch.php b/src/QUI/TemplateCologne/Controls/CurrencySwitch.php
index 424d15e..7054101 100644
--- a/src/QUI/TemplateCologne/Controls/CurrencySwitch.php
+++ b/src/QUI/TemplateCologne/Controls/CurrencySwitch.php
@@ -30,13 +30,6 @@ public function __construct(array $attributes = [])
parent::__construct($attributes);
}
- /**
- * (non-PHPdoc)
- *
- * @throws QUI\Exception
- * @see \QUI\Control::create()
- *
- */
public function getBody(): string
{
$Engine = QUI::getTemplateManager()->getEngine();
@@ -61,15 +54,9 @@ public function getBody(): string
}
}
- $Currency = QUI\ERP\Currency\Handler::getDefaultCurrency();
-
- if (QUI\ERP\Currency\Handler::getUserCurrency()) {
- $Currency = QUI\ERP\Currency\Handler::getUserCurrency();
- }
-
$Engine->assign([
'this' => $this,
- 'DefaultCurrency' => $Currency,
+ 'DefaultCurrency' => QUI\ERP\Currency\Handler::getRuntimeCurrency()
]);
return $Engine->fetch(dirname(__FILE__) . '/CurrencySwitch.html');
diff --git a/src/QUI/TemplateCologne/Controls/LangCurrencySwitch.php b/src/QUI/TemplateCologne/Controls/LangCurrencySwitch.php
index 4924243..fb31322 100644
--- a/src/QUI/TemplateCologne/Controls/LangCurrencySwitch.php
+++ b/src/QUI/TemplateCologne/Controls/LangCurrencySwitch.php
@@ -8,6 +8,8 @@
use QUI;
+use function count;
+
/**
* Class LangCurrencySwitch
*/
@@ -32,13 +34,6 @@ public function __construct(array $attributes = [])
parent::__construct($attributes);
}
- /**
- * (non-PHPdoc)
- *
- * @throws QUI\Exception
- * @see \QUI\Control::create()
- *
- */
public function getBody(): string
{
$Engine = QUI::getTemplateManager()->getEngine();
@@ -67,7 +62,7 @@ public function getBody(): string
}
$langSwitch = false;
- if (\count($Project->getLanguages()) > 1) {
+ if (count($Project->getLanguages()) > 1) {
$langSwitch = true;
}
@@ -76,12 +71,6 @@ public function getBody(): string
$enableChange = true;
}
- $Currency = QUI\ERP\Currency\Handler::getDefaultCurrency();
-
- if (QUI\ERP\Currency\Handler::getUserCurrency()) {
- $Currency = QUI\ERP\Currency\Handler::getUserCurrency();
- }
-
if ($Locale->exists('quiqqer/core', 'language.' . $Project->getLang())) {
$imgAltText = $Locale->get('quiqqer/core', 'language.' . $Project->getLang());
} else {
@@ -92,7 +81,7 @@ public function getBody(): string
'this' => $this,
'projectLang' => $Project->getLang(),
'currencySwitch' => $currencySwitch,
- 'DefaultCurrency' => $Currency,
+ 'DefaultCurrency' => QUI\ERP\Currency\Handler::getRuntimeCurrency(),
'flagFolderPath' => $flagFolder,
'imgAltText' => $imgAltText,
'enableChange' => $enableChange
--
GitLab