From b64fef4b08251bc89a8cb36511021c4f422de3ba Mon Sep 17 00:00:00 2001
From: Tobias Kunze <rixx@cutebit.de>
Date: Tue, 22 Nov 2016 13:58:01 +0100
Subject: [PATCH] Fix #327 -- Problems with banktransfer filtering (#328)

* Filter banktransfer comments aswell

* Make the filtering button actually filter bank imports

* Show empty list if search matches nothing
---
 .../pretixplugins/banktransfer/import_form.html    | 14 +++++++++-----
 src/pretix/plugins/banktransfer/views.py           |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_form.html b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_form.html
index e46cbb3933..bb60fa00b7 100644
--- a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_form.html
+++ b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_form.html
@@ -32,7 +32,7 @@
             {% endif %}
         </div>
     </div>
-    {% if transactions_unhandled|length > 0 %}
+    {% if transactions_unhandled|length > 0 or request.GET.search %}
         <div class="panel panel-default">
             <div class="panel-heading">
                 <h3 class="panel-title">{% trans "Unresolved transactions" %}</h3>
@@ -42,8 +42,8 @@
                 <form class="form-inline helper-display-inline" action="" method="get">
                     <input type="text" name="search" class="form-control" placeholder="{% trans "Search" %}"
                            value="{{ request.GET.search }}">
+                    <button class="btn btn-primary" type="submit">{% trans "Filter" %}</button>
                 </form>
-                <button class="btn btn-primary" type="submit">{% trans "Filter" %}</button>
                 {% if not request.GET.search %}
                     <form action="" method="post" class="helper-display-inline pull-right">
                         {% csrf_token %}
@@ -55,9 +55,13 @@
                 {% endif %}
                 </p>
 
-                {% include "pretixcontrol/pagination.html" %}
-                {% include "pretixplugins/banktransfer/transaction_list.html" with list=transactions_unhandled %}
-                {% include "pretixcontrol/pagination.html" %}
+                {% if transactions_unhandled|length > 0 %}
+                    {% include "pretixcontrol/pagination.html" %}
+                    {% include "pretixplugins/banktransfer/transaction_list.html" with list=transactions_unhandled %}
+                    {% include "pretixcontrol/pagination.html" %}
+                {% else %}
+                    <div>{% trans "Your search matched no transactions." %}</div>
+                {% endif %}
             </div>
         </div>
     {% endif %}
diff --git a/src/pretix/plugins/banktransfer/views.py b/src/pretix/plugins/banktransfer/views.py
index 705f87c868..4ac70e5047 100644
--- a/src/pretix/plugins/banktransfer/views.py
+++ b/src/pretix/plugins/banktransfer/views.py
@@ -214,7 +214,7 @@ class ImportView(EventPermissionRequiredMixin, ListView):
         if 'search' in self.request.GET:
             q = self.request.GET.get('search')
             qs = qs.filter(
-                Q(payer__icontains=q) | Q(reference__icontains=q)
+                Q(payer__icontains=q) | Q(reference__icontains=q) | Q(comment__icontains=q)
             )
 
         return qs