Merge branch 'main' into feature/charge_seperatetly

Author: sveneberth

src/viur/shop/types/dc_scope.py

@@ -33,7 +33,7 @@
 from viur.core.skeleton import RefSkel, SkeletonInstance, skeletonByKind
 from .enums import *
 from .exceptions import DispatchError, InvalidStateError
-from ..globals import SENTINEL, SHOP_INSTANCE, SHOP_LOGGER, Sentinel
+from ..globals import DEBUG_DISCOUNTS, SENTINEL, SHOP_INSTANCE, SHOP_LOGGER, Sentinel
 from ..services import HOOK_SERVICE, Hook
 from ..types import SkeletonInstance_T
 
@@ -285,9 +285,9 @@ def is_fulfilled(self) -> bool:
                 self._is_fulfilled = any(cv.is_fulfilled for cv in self.condition_validator_instances)
             elif self.discount_skel["condition_operator"] == ConditionOperator.ALL:
                 logger.debug("Checking for all")
-                logger.debug(f"{self.condition_validator_instances=}")
-
-                pprint.pprint(self.condition_validator_instances)
+                if DEBUG_DISCOUNTS.get():
+                    logger.debug(f"{self.condition_validator_instances=}")
+                    pprint.pprint(self.condition_validator_instances)
                 self._is_fulfilled = all(cv.is_fulfilled for cv in self.condition_validator_instances)
             else:
                 raise InvalidStateError(f'Invalid condition operator: {self.discount_skel["condition_operator"]}')

src/viur/shop/version.py

@@ -2,7 +2,7 @@
 # For pre-releases, postfix with ".betaN" or ".rcN" where `N` is an incremented number for each pre-release.
 # This will mark it as a pre-release as well on PyPI.
 
-__version__ = "0.12.0"
+__version__ = "0.12.1"
 
 assert __version__.count(".") >= 2 and "".join(__version__.split(".", 3)[:3]).isdigit(), \
     "Semantic __version__ expected!"