CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix redemption of all-product vouchers with seating plans

Browse Source
This commit is contained in:
Raphael Michel
2019-12-11 12:06:03 +01:00
parent 24b931e1c3
commit 49b73fc096
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/base/models/vouchers.py
View File

@@ -460,7 +460,7 @@ class Voucher(LoggedModel):
return Order.objects.filter(all_positions__voucher__in=[self]).distinct() return Order.objects.filter(all_positions__voucher__in=[self]).distinct()
def seating_available(self): def seating_available(self, subevent):
kwargs = {} kwargs = {}
if self.subevent: if self.subevent:
kwargs['subevent'] = self.subevent kwargs['subevent'] = self.subevent
@@ -469,4 +469,4 @@ class Voucher(LoggedModel):
elif self.item_id: elif self.item_id:
return self.item.seat_category_mappings.filter(**kwargs).exists() return self.item.seat_category_mappings.filter(**kwargs).exists()
else: else:
return False return bool(subevent.seating_plan) if subevent else self.event.seating_plan

2
src/pretix/presale/templates/pretixpresale/event/voucher.html
View File

@@ -30,7 +30,7 @@
<input type="hidden" name="subevent" value="{{ subevent.id|default_if_none:"" }}" /> <input type="hidden" name="subevent" value="{{ subevent.id|default_if_none:"" }}" />
<input type="hidden" name="_voucher_code" value="{{ voucher.code }}"> <input type="hidden" name="_voucher_code" value="{{ voucher.code }}">
{% if voucher.seating_available %} {% if seating_available %}
{% if event.has_subevents %} {% if event.has_subevents %}
{% eventsignal event "pretix.presale.signals.render_seating_plan" request=request subevent=subevent voucher=voucher %} {% eventsignal event "pretix.presale.signals.render_seating_plan" request=request subevent=subevent voucher=voucher %}
{% else %} {% else %}

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

@@ -435,6 +435,7 @@ class RedeemView(NoSearchIndexViewMixin, EventViewMixin, TemplateView):
context['items_by_category'] = item_group_by_category(items) context['items_by_category'] = item_group_by_category(items)
context['subevent'] = self.subevent context['subevent'] = self.subevent
context['seating_available'] = self.voucher.seating_available(self.subevent)
context['new_tab'] = ( context['new_tab'] = (
'require_cookie' in self.request.GET and 'require_cookie' in self.request.GET and