From 87e92c9185999d5a3522d0e304e8f5a172929fbe Mon Sep 17 00:00:00 2001
From: Henning <leutz@pcsg.de>
Date: Thu, 6 Mar 2025 12:49:03 +0100
Subject: [PATCH] fix: business type b2b&b2b considered at netgross calc type
---
src/QUI/ERP/Utils/User.php | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/QUI/ERP/Utils/User.php b/src/QUI/ERP/Utils/User.php
index 28262f2..d156a9f 100644
--- a/src/QUI/ERP/Utils/User.php
+++ b/src/QUI/ERP/Utils/User.php
@@ -177,32 +177,36 @@ public static function getBruttoNettoUserStatus(UserInterface $User): int
// no address found
}
- // @todo es gibt neue einstellungen b2b, b2c b2bANDb2c ... von diesen einstellungen ausgehen
- // @todo tax ist nicht optimal dafür
$isNetto = $Config->getValue('shop', 'isNetto');
if ($isNetto) {
self::$userBruttoNettoStatus[$uid] = self::IS_NETTO_USER;
-
return self::$userBruttoNettoStatus[$uid];
}
-
try {
$Tax = QUI\ERP\Tax\Utils::getTaxByUser($User);
if ($Tax->getValue() == 0) {
self::$userBruttoNettoStatus[$uid] = self::IS_NETTO_USER;
-
return self::$userBruttoNettoStatus[$uid];
}
} catch (QUI\Exception) {
- self::$userBruttoNettoStatus[$uid] = self::IS_NETTO_USER;
+ }
- return self::$userBruttoNettoStatus[$uid];
+ try {
+ $Package = QUI::getPackage('quiqqer/erp');
+ $Config = $Package->getConfig();
+
+ if ($Config->getValue('general', 'businessType') === 'B2B&B2C') {
+ self::$userBruttoNettoStatus[$uid] = self::IS_NETTO_USER;
+ return self::$userBruttoNettoStatus[$uid];
+ }
+ } catch (QUI\Exception) {
}
+
self::$userBruttoNettoStatus[$uid] = self::IS_BRUTTO_USER;
return self::$userBruttoNettoStatus[$uid];
--
GitLab