CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-08 15:44:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

first round of cleanup

Browse Source
This commit is contained in:
Mira Weller
2024-06-10 15:58:42 +02:00
parent e71d3e21ca
commit 8627eefebc
7 changed files with 63 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/pretix/presale/checkoutflow.py
View File

@@ -55,7 +55,6 @@ from django.utils.translation import (
from django.views.generic.base import TemplateResponseMixin
from django_scopes import scopes_disabled
from pretix.base.decimal import round_decimal
from pretix.base.models import Customer, Membership, Order
from pretix.base.models.items import Question
from pretix.base.models.orders import (
@@ -94,7 +93,8 @@ from pretix.presale.views import (
CartMixin, get_cart, get_cart_is_free, get_cart_total,
)
from pretix.presale.views.cart import (
cart_session, create_empty_cart_id, get_or_create_cart_id, _items_from_post_data,
_items_from_post_data, cart_session, create_empty_cart_id,
get_or_create_cart_id,
)
from pretix.presale.views.event import get_grouped_items
from pretix.presale.views.questions import QuestionsViewMixin
@@ -491,8 +491,10 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep):
if not hasattr(request, '_checkoutflow_addons_applicable'):
cart = get_cart(request)
self.request = request
request._checkoutflow_addons_applicable =('/addons/' in request.path_info or cart.filter(item__addons__isnull=False).exists()
or any(self.cross_selling_applicable_categories))
request._checkoutflow_addons_applicable = (
'/addons/' in request.path_info
or cart.filter(item__addons__isnull=False).exists()
or any(self.cross_selling_applicable_categories))
return request._checkoutflow_addons_applicable
@cached_property
@@ -651,7 +653,7 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep):
allow_cross_sell=True,
memberships=(
self.request.customer.usable_memberships(
for_event=self.request.event, #p.subevent or self.request.event,
for_event=subevent or self.request.event,
testmode=self.request.event.testmode
)
if self.request.customer else None
@@ -659,7 +661,6 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep):
)
for item in items:
print("-> discount info: ",item, discount_info.get(item.pk))
if item.pk in discount_info:
(max_count, discount_rule) = discount_info[item.pk]

3
src/pretix/presale/views/cart.py
View File

@@ -227,6 +227,7 @@ def _item_from_post_value(request, key, value, voucher=None, voucher_ignore_if_r
except ValueError:
raise CartError(_('Please enter numbers only.'))
def _items_from_post_data(request, warn_if_empty=True):
"""
Parses the POST data and returns a list of dictionaries
@@ -247,7 +248,7 @@ def _items_from_post_data(request, warn_if_empty=True):
for value in values:
try:
item = _item_from_post_value(request, key, value, request.POST.get('_voucher_code'),
voucher_ignore_if_redeemed=request.POST.get('_voucher_ignore_if_redeemed') == 'on')
voucher_ignore_if_redeemed=request.POST.get('_voucher_ignore_if_redeemed') == 'on')
except CartError as e:
messages.error(request, str(e))
return