From 8294391ebc387b2dd9b629fbb90cbaa7644c7d49 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Tue, 2 May 2017 19:12:42 +0200
Subject: [PATCH] Hide payment fees if they are all equal to 0.00

---
 src/pretix/presale/checkoutflow.py                            | 1 +
 .../templates/pretixpresale/event/checkout_addons.html        | 2 +-
 .../templates/pretixpresale/event/checkout_payment.html       | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pretix/presale/checkoutflow.py b/src/pretix/presale/checkoutflow.py
index 998b831a8..016340800 100644
--- a/src/pretix/presale/checkoutflow.py
+++ b/src/pretix/presale/checkoutflow.py
@@ -381,6 +381,7 @@ class PaymentStep(QuestionsViewMixin, CartMixin, TemplateFlowStep):
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
         ctx['providers'] = self.provider_forms
+        ctx['show_fees'] = any(p['fee'] for p in self.provider_forms)
         ctx['selected'] = self.request.POST.get('payment', self.request.session.get('payment', ''))
         return ctx
 
diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html b/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html
index 39b9083e2..811318eb0 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html
@@ -35,7 +35,7 @@
                                             {% endblocktrans %}
                                         {% elif c.min_count == 0 %}
                                             {% blocktrans trimmed with max_count=c.max_count %}
-                                                You can to choose up to {{ max_count }} options from this category.
+                                                You can choose up to {{ max_count }} options from this category.
                                             {% endblocktrans %}
                                         {% else %}
                                             {% blocktrans trimmed with min_count=c.min_count max_count=c.max_count %}
diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html b/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
index dda2ba465..344dd5abb 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
@@ -13,7 +13,9 @@
                     <div class="panel-heading">
                         <h4 class="panel-title">
                             <label class="radio">
-                                <strong class="pull-right">+ {{ p.fee|floatformat:2 }} {{ event.currency }}</strong>
+                                {% if show_fees %}
+                                    <strong class="pull-right">+ {{ p.fee|floatformat:2 }} {{ event.currency }}</strong>
+                                {% endif %}
                                 <input type="radio" name="payment" value="{{ p.provider.identifier }}"
                                         data-parent="#payment_accordion"
                                         {% if selected == p.provider.identifier %}checked="checked"{% endif %}