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

Introduce Item.show_quota_left

Browse Source
This commit is contained in:
Raphael Michel
2019-07-10 16:08:21 +02:00
parent 6d6cd3b7cf
commit 491753008d
10 changed files with 63 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pretix/presale/forms/checkout.py
View File

@@ -174,7 +174,7 @@ class AddOnsForm(forms.Form):
elif avail[0] < 100:
n += ' – {}'.format(_('Currently unavailable'))
else:
if avail[1] is not None and event.settings.show_quota_left:
if avail[1] is not None and item.do_show_quota_left:
n += ' – {}'.format(_('%(num)s currently available') % {'num': avail[1]})
if not isinstance(item_or_variation, ItemVariation) and item.picture:
@@ -236,6 +236,7 @@ class AddOnsForm(forms.Form):
to_attr='_subevent_quotas',
queryset=event.quotas.filter(subevent=subevent))
).distinct()),
'event'
).annotate(
quotac=Count('quotas'),
has_variations=Count('variations')

4
src/pretix/presale/templates/pretixpresale/event/fragment_product_list.html
View File

@@ -81,7 +81,7 @@
{{ var.description|localize|rich_text }}
</div>
{% endif %}
{% if event.settings.show_quota_left %}
{% if item.do_show_quota_left %}
{% include "pretixpresale/event/fragment_quota_left.html" with avail=var.cached_availability %}
{% endif %}
</div>
@@ -187,7 +187,7 @@
{{ item.description|localize|rich_text }}
</div>
{% endif %}
{% if event.settings.show_quota_left %}
{% if item.do_show_quota_left %}
{% include "pretixpresale/event/fragment_quota_left.html" with avail=item.cached_availability %}
{% endif %}
{% if item.min_per_order and item.min_per_order > 1 %}

4
src/pretix/presale/views/widget.py
View File

@@ -198,7 +198,7 @@ class WidgetAPIProductList(EventListMixin, View):
'free_price': item.free_price,
'avail': [
item.cached_availability[0],
item.cached_availability[1] if self.request.event.settings.show_quota_left else None
item.cached_availability[1] if item.do_show_quota_left else None
] if not item.has_variations else None,
'original_price': (
(item.original_price.net
@@ -228,7 +228,7 @@ class WidgetAPIProductList(EventListMixin, View):
),
'avail': [
var.cached_availability[0],
var.cached_availability[1] if self.request.event.settings.show_quota_left else None
var.cached_availability[1] if item.do_show_quota_left else None
],
} for var in item.available_variations
]