diff --git a/src/pretix/base/pdf.py b/src/pretix/base/pdf.py index 6f99fa6b7..77e7e2d48 100644 --- a/src/pretix/base/pdf.py +++ b/src/pretix/base/pdf.py @@ -192,6 +192,7 @@ DEFAULT_VARIABLES = OrderedDict(( op.addons.all() if 'addons' in getattr(op, '_prefetched_objects_cache', {}) else op.addons.select_related('item', 'variation') ) + if not p.canceled ]) }), ("organizer", { diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py index 9b7a97997..42c5f48d6 100644 --- a/src/pretix/base/settings.py +++ b/src/pretix/base/settings.py @@ -386,7 +386,7 @@ Your {event} team""")) 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(ugettext_noop("""Hello, -we did not yet receive a payment for your order for {event}. +we did not yet receive a full payment for your order for {event}. Please keep in mind that we only guarantee your order if we receive your payment before {expire_date}. diff --git a/src/pretix/control/templates/pretixcontrol/vouchers/detail.html b/src/pretix/control/templates/pretixcontrol/vouchers/detail.html index 09bb678ca..afdc1bc1d 100644 --- a/src/pretix/control/templates/pretixcontrol/vouchers/detail.html +++ b/src/pretix/control/templates/pretixcontrol/vouchers/detail.html @@ -27,15 +27,17 @@ {% bootstrap_field form.code layout="control" %} {% if voucher.pk %} -