From 167b208df99af697e830cdee5b65850e1e35fc70 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Wed, 13 Apr 2016 11:10:37 +0200
Subject: [PATCH] Fixed bugs in voucher deletion view

---
 .../templates/pretixcontrol/vouchers/delete.html  | 15 ++++-----------
 src/pretix/control/views/vouchers.py              |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/pretix/control/templates/pretixcontrol/vouchers/delete.html b/src/pretix/control/templates/pretixcontrol/vouchers/delete.html
index 9bc41a2999..7d566c65de 100644
--- a/src/pretix/control/templates/pretixcontrol/vouchers/delete.html
+++ b/src/pretix/control/templates/pretixcontrol/vouchers/delete.html
@@ -6,21 +6,14 @@
     <h1>{% trans "Delete voucher" %}</h1>
     <form action="" method="post" class="form-horizontal">
         {% csrf_token %}
-        {% if not allowed %}
-            <p>{% trans "You can not delete this voucher after it has been redeemed" %}</p>
-        {% else %}
-            <p>{% blocktrans %}Are you sure you want to delete the voucher
-                <strong>{{ voucher }}</strong>?{% endblocktrans %}</p>
-        {% endif %}
+        <p>{% blocktrans %}Are you sure you want to delete the voucher <strong>{{ voucher }}</strong>?{% endblocktrans %}</p>
         <div class="form-group submit-group">
             <a href="{% url "control:event.vouchers" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">
                 {% trans "Cancel" %}
             </a>
-            {% if allowed %}
-                <button type="submit" class="btn btn-danger btn-save">
-                    {% trans "Delete" %}
-                </button>
-            {% endif %}
+            <button type="submit" class="btn btn-danger btn-save">
+                {% trans "Delete" %}
+            </button>
         </div>
     </form>
 {% endblock %}
diff --git a/src/pretix/control/views/vouchers.py b/src/pretix/control/views/vouchers.py
index bc784cc52a..fa69006b3f 100644
--- a/src/pretix/control/views/vouchers.py
+++ b/src/pretix/control/views/vouchers.py
@@ -39,7 +39,7 @@ class VoucherDelete(EventPermissionRequiredMixin, DeleteView):
         if self.get_object().is_ordered():
             messages.error(request, _('A voucher can not be deleted if it already has been redeemed.'))
             return HttpResponseRedirect(self.get_success_url())
-        super().get(request, *args, **kwargs)
+        return super().get(request, *args, **kwargs)
 
     @transaction.atomic()
     def delete(self, request, *args, **kwargs):