From 00dab77c92d439cfb4b57cc8c015d813c6a2ce32 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Tue, 16 Jun 2015 21:05:13 +0200 Subject: [PATCH] Removed "from" if all variations have the same price --- .../presale/templates/pretixpresale/event/index.html | 10 +++++++--- src/pretix/presale/views/event.py | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/pretix/presale/templates/pretixpresale/event/index.html b/src/pretix/presale/templates/pretixpresale/event/index.html index 4c7f99276c..c1c02b4cfc 100644 --- a/src/pretix/presale/templates/pretixpresale/event/index.html +++ b/src/pretix/presale/templates/pretixpresale/event/index.html @@ -66,9 +66,13 @@ {% if item.short_description %}

{{ item.short_description }}

{% endif %}
- {% 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 %}
diff --git a/src/pretix/presale/views/event.py b/src/pretix/presale/views/event.py index 41d84a8305..75bdb77cc8 100644 --- a/src/pretix/presale/views/event.py +++ b/src/pretix/presale/views/event.py @@ -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]