CGM_Public/pretix_original
3
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-08-19 12:16:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove iteration over unnecessary transmission types

Browse Source
This commit is contained in:
Phin Wolkwitz
2025-12-18 16:56:19 +01:00
parent dc1a115863
commit a2dc467d0b
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pretix/presale/checkoutflow.py
+23 -12
View File
@@ -56,7 +56,7 @@ from django.utils.translation import (
from django.views.generic.base import TemplateResponseMixin
from django_scopes import scopes_disabled
from pretix.base.invoicing.transmission import get_transmission_types
from pretix.base.invoicing.transmission import transmission_types
from pretix.base.models import Customer, Membership, Order
from pretix.base.models.items import Question
from pretix.base.models.orders import (
@@ -1507,6 +1507,20 @@ class ConfirmStep(CartMixin, AsyncAction, TemplateFlowStep):
label = pgettext_lazy('checkoutflow', 'Review order')
icon = 'eye'
def _default_invisible(self, transmission_type):
# reusing hack from questions.py for default transmission -- this should at least be fast
for k, __ in transmission_type.invoice_address_form_fields.items():
if (
transmission_type.identifier == "email" and
k in ("transmission_email_other", "transmission_email_address") and
(
self.event.settings.invoice_generate == "False" or
not self.event.settings.invoice_email_attachment
)
):
return True
return False
def is_applicable(self, request):
return True
@@ -1546,17 +1560,14 @@ class ConfirmStep(CartMixin, AsyncAction, TemplateFlowStep):
ctx['invoice_address_asked'] = self.address_asked
ctx['customer'] = self.cart_customer
transmission_visible = False
for transmission_type in get_transmission_types():
if (
transmission_type.identifier == self.invoice_address.transmission_type and
transmission_type.invoice_address_form_fields_visible(
country=self.invoice_address.country, is_business=self.invoice_address.is_business
)
):
transmission_visible = True
break
ctx['show_transmission_type'] = transmission_visible
transmission_fields = []
transmission_type, __ = transmission_types.get(identifier=self.invoice_address.transmission_type)
if not self._default_invisible(transmission_type) and transmission_type.invoice_address_form_fields_visible(
country=self.invoice_address.country, is_business=self.invoice_address.is_business
):
for line in self.invoice_address.describe_transmission():
transmission_fields.append(line)
ctx['transmission_fields'] = transmission_fields
self.cart_session['shown_total'] = str(ctx['cart']['total'])
src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html
+4 -6
View File
@@ -111,12 +111,10 @@
<dt>{% trans "Internal reference" %}</dt>
<dd>{{ addr.internal_reference }}</dd>
{% endif %}
{% if show_transmission_type %}
{% for k, v in addr.describe_transmission %}
<dt>{{ k }}</dt>
<dd>{{ v }}</dd>
{% endfor %}
{% endif %}
{% for k, v in transmission_fields %}
<dt>{{ k }}</dt>
<dd>{{ v }}</dd>
{% endfor %}
</dl>
</div>
</div>