CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-05 15:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed "from" if all variations have the same price

Browse Source
This commit is contained in:
Raphael Michel
2015-06-16 21:05:13 +02:00
parent 4adea8ccd0
commit 00dab77c92
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pretix/presale/templates/pretixpresale/event/index.html
View File

@@ -66,9 +66,13 @@
{% if item.short_description %}<p>{{ item.short_description }}</p>{% endif %}
</div>
<div class="col-md-2 col-xs-6 price">
{% blocktrans trimmed with minprice=item.min_price|floatformat:2 currency=event.currency %}
from {{ currency }} {{ minprice }}
{% endblocktrans %}
{% if item.min_price != item.max_price %}
{% blocktrans trimmed with minprice=item.min_price|floatformat:2 currency=event.currency %}
from {{ currency }} {{ minprice }}
{% endblocktrans %}
{% else %}
{{ event.currency }} {{ item.min_price|floatformat:2 }}
{% endif %}
</div>
<div class="col-md-2 col-xs-6 availability-box">
<a href="javascript:void();" data-toggle="variations" class="js-only">

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

@@ -54,6 +54,7 @@ class EventIndex(EventViewMixin, CartDisplayMixin, TemplateView):
var.price = var.get('price', item.default_price)
if len(item.available_variations) > 0:
item.min_price = min([v.price for v in item.available_variations])
item.max_price = max([v.price for v in item.available_variations])
items = [item for item in items if len(item.available_variations) > 0]