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

Hide waiting list vouchers in voucher list

Browse Source
This commit is contained in:
Raphael Michel
2018-07-21 13:00:48 +02:00
parent 54b906addb
commit 24739e1638
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pretix/base/models/waitinglist.py
View File

@@ -42,7 +42,8 @@ class WaitingListEntry(LoggedModel):
voucher = models.ForeignKey( voucher = models.ForeignKey(
'Voucher', 'Voucher',
verbose_name=_("Assigned voucher"), verbose_name=_("Assigned voucher"),
null=True, blank=True null=True, blank=True,
related_name='waitinglistentries'
) )
item = models.ForeignKey( item = models.ForeignKey(
Item, related_name='waitinglistentries', Item, related_name='waitinglistentries',

4
src/pretix/control/views/item.py
View File

@@ -613,7 +613,7 @@ class QuotaView(ChartContainingView, DetailView):
'sum': True, 'sum': True,
}, },
{ {
'label': ugettext('Vouchers'), 'label': ugettext('Vouchers and waiting list reservations'),
'value': self.object.count_blocking_vouchers(), 'value': self.object.count_blocking_vouchers(),
'sum': True, 'sum': True,
}, },
@@ -623,7 +623,7 @@ class QuotaView(ChartContainingView, DetailView):
'sum': True, 'sum': True,
}, },
{ {
'label': ugettext('Waiting list'), 'label': ugettext('Waiting list (pending)'),
'value': self.object.count_waiting_list_pending(), 'value': self.object.count_waiting_list_pending(),
'sum': False, 'sum': False,
}, },

7
src/pretix/control/views/vouchers.py
View File

@@ -33,7 +33,7 @@ class VoucherList(PaginationMixin, EventPermissionRequiredMixin, ListView):
permission = 'can_view_vouchers' permission = 'can_view_vouchers'
def get_queryset(self): def get_queryset(self):
qs = self.request.event.vouchers.all().select_related('item', 'variation') qs = self.request.event.vouchers.filter(waitinglistentries__isnull=True).select_related('item', 'variation')
if self.filter_form.is_valid(): if self.filter_form.is_valid():
qs = self.filter_form.filter_qs(qs) qs = self.filter_form.filter_qs(qs)
@@ -97,7 +97,10 @@ class VoucherTags(EventPermissionRequiredMixin, TemplateView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
ctx = super().get_context_data(**kwargs) ctx = super().get_context_data(**kwargs)
tags = self.request.event.vouchers.order_by('tag').filter(tag__isnull=False).values('tag').annotate( tags = self.request.event.vouchers.order_by('tag').filter(
tag__isnull=False,
waitinglistentries__isnull=True
).values('tag').annotate(
total=Sum('max_usages'), total=Sum('max_usages'),
redeemed=Sum('redeemed') redeemed=Sum('redeemed')
) )