diff --git a/src/pretix/base/payment.py b/src/pretix/base/payment.py index c8047bbd5..7e33b9993 100644 --- a/src/pretix/base/payment.py +++ b/src/pretix/base/payment.py @@ -72,7 +72,7 @@ from pretix.helpers.countries import CachedCountries from pretix.helpers.format import format_map from pretix.helpers.money import DecimalTextInput from pretix.multidomain.urlreverse import eventreverse_absolute -from pretix.presale.views import get_cart +from pretix.presale.views import get_cart_positions from pretix.presale.views.cart import cart_session, get_or_create_cart_id logger = logging.getLogger(__name__) @@ -1148,7 +1148,7 @@ class FreeOrderProvider(BasePaymentProvider): def is_allowed(self, request: HttpRequest, total: Decimal=None) -> bool: from .services.cart import get_fees - cart = get_cart(request) + cart = get_cart_positions(request) try: fees = get_fees(event=request.event, request=request, @@ -1416,7 +1416,7 @@ class GiftCardPayment(BasePaymentProvider): for p in cs.get('payments', []) if p.get('info_data', {}).get('gift_card') ] - positions = get_cart(request) + positions = get_cart_positions(request) testmode = self.event.testmode else: used_cards = [] diff --git a/src/pretix/presale/checkoutflow.py b/src/pretix/presale/checkoutflow.py index 622d3ffef..6efca2da8 100644 --- a/src/pretix/presale/checkoutflow.py +++ b/src/pretix/presale/checkoutflow.py @@ -95,7 +95,7 @@ from pretix.presale.signals import ( question_form_fields_overrides, ) from pretix.presale.utils import customer_login -from pretix.presale.views import CartMixin, get_cart, get_cart_is_free +from pretix.presale.views import CartMixin, get_cart_positions, get_cart_is_free from pretix.presale.views.cart import ( _items_from_post_data, cart_session, create_empty_cart_id, get_or_create_cart_id, @@ -494,7 +494,7 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep): self.request = request # check whether addons are applicable - if get_cart(request).filter(item__addons__isnull=False).exists(): + if get_cart_positions(request).filter(item__addons__isnull=False).exists(): return True # don't re-check whether cross-selling is applicable if we're already past the AddOnsStep diff --git a/src/pretix/presale/views/__init__.py b/src/pretix/presale/views/__init__.py index 50ee1d25f..845fe6048 100644 --- a/src/pretix/presale/views/__init__.py +++ b/src/pretix/presale/views/__init__.py @@ -95,7 +95,7 @@ class CartMixin: """ A list of this users cart position """ - return list(get_cart(self.request)) + return list(get_cart_positions(self.request)) @cached_property def cart_session(self): @@ -390,7 +390,7 @@ def cart_exists(request): return bool(request._cart_cache) -def get_cart(request): +def get_cart_positions(request): from pretix.presale.views.cart import get_or_create_cart_id if not hasattr(request, '_cart_cache'): @@ -449,6 +449,8 @@ def get_cart(request): cp.addon_to = by_id[cp.addon_to_id] return request._cart_cache +get_cart = get_cart_positions # legacy compatibility + def get_cart_total(request): """ @@ -500,7 +502,7 @@ def get_cart_is_free(request): if not hasattr(request, '_cart_free_cache'): cs = cart_session(request) - pos = get_cart(request) + pos = get_cart_positions(request) ia = get_cart_invoice_address(request) try: fees = get_fees(event=request.event, request=request, invoice_address=ia,