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

AddOnsStep: Use post data as initial data if exists (Z#23232311)

Browse Source
This commit is contained in:
Kara Engelhardt
2026-04-27 13:50:33 +02:00
committed by pajowu
parent 2d31c62812
commit 49f692c666
2 changed files with 107 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,7 @@ import uuid
from collections import defaultdict
from decimal import Decimal
from django import forms
from django.conf import settings
from django.contrib import messages
from django.core.cache import caches
@@ -69,6 +70,7 @@ from pretix.base.services.cart import (
from pretix.base.services.cross_selling import CrossSellingService
from pretix.base.services.memberships import validate_memberships_in_order
from pretix.base.services.orders import perform_order
from pretix.base.services.pricing import get_price
from pretix.base.services.tasks import EventTask
from pretix.base.settings import PERSON_NAME_SCHEMES
from pretix.base.signals import validate_cart_addons
@@ -529,6 +531,48 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep):
self._completed = True
return True
def _get_initial_val_price(self, current_addon_products, cartpos, item, variation):
val = None
price = None
if self.request.POST:
if variation:
field = f'cp_{cartpos.pk}_variation_{item.pk}_{variation.pk}'
else:
field = f'cp_{cartpos.pk}_item_{item.pk}'
try:
val = int(self.request.POST.get(field) or '0')
except ValueError:
pass
if val and item.free_price:
custom_price = forms.DecimalField(localize=True).to_python(self.request.POST.get(f'{field}_price') or '0')
price = get_price(
item, variation, voucher=cartpos.voucher, custom_price=custom_price, subevent=cartpos.subevent,
custom_price_is_net=self.event.settings.display_net_prices,
invoice_address=self.invoice_address,
)
else:
price = variation.suggested_price if variation else item.suggested_price
else:
current_products = current_addon_products[item.pk, variation.pk if variation else None]
val = len(current_products)
if current_products and item.free_price:
a = current_products[0]
price = TaxedPrice(
net=a.price - a.tax_value,
gross=a.price,
tax=a.tax_value,
name=a.item.tax_rule.name if a.item.tax_rule else "",
rate=a.tax_rate,
code=a.item.tax_rule.code if a.item.tax_rule else None,
)
else:
price = variation.suggested_price if variation else item.suggested_price
return val, price
@cached_property
def forms(self):
"""
@@ -587,34 +631,10 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep):
if i.has_variations:
for v in i.available_variations:
v.initial = len(current_addon_products[i.pk, v.pk])
if v.initial and i.free_price:
a = current_addon_products[i.pk, v.pk][0]
v.initial_price = TaxedPrice(
net=a.price - a.tax_value,
gross=a.price,
tax=a.tax_value,
name=a.item.tax_rule.name if a.item.tax_rule else "",
rate=a.tax_rate,
code=a.item.tax_rule.code if a.item.tax_rule else None,
)
else:
v.initial_price = v.suggested_price
v.initial, v.initial_price = self._get_initial_val_price(current_addon_products, cartpos, i, v)
i.expand = any(v.initial for v in i.available_variations)
else:
i.initial = len(current_addon_products[i.pk, None])
if i.initial and i.free_price:
a = current_addon_products[i.pk, None][0]
i.initial_price = TaxedPrice(
net=a.price - a.tax_value,
gross=a.price,
tax=a.tax_value,
name=a.item.tax_rule.name if a.item.tax_rule else "",
rate=a.tax_rate,
code=a.item.tax_rule.code if a.item.tax_rule else None,
)
else:
i.initial_price = i.suggested_price
i.initial, i.initial_price = self._get_initial_val_price(current_addon_products, cartpos, i, None)
if items:
formsetentry['categories'].append({