From 70e95b42fa614d42ad44786c3f6d712d6ce99af4 Mon Sep 17 00:00:00 2001
From: Martin Gross <gross@rami.io>
Date: Tue, 29 Oct 2019 11:54:36 +0100
Subject: [PATCH] Add manual order-matching field for duplicate bankimport
 transactions (#1461)

* Add manual order-matching field for duplicate bankimport transactions

* Only show matching-field for already matched transactions - not for errored ones.
---
 .../banktransfer/transaction_list.html         | 18 +++++++++++++++++-
 src/pretix/plugins/banktransfer/views.py       |  3 ++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/transaction_list.html b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/transaction_list.html
index 1e2d2cd155..2e0ebeecec 100644
--- a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/transaction_list.html
+++ b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/transaction_list.html
@@ -42,7 +42,7 @@
                                 <span class="fa fa-trash"></span>
                             </button>
                         </div>
-                    {% elif trans.state == 'error' or trans.state == 'already' %}
+                    {% elif trans.state == 'error' %}
                         <div class="btn-group" role="group">
                             <button type="button" class="btn btn-default" name="action_{{ trans.id }}" value="retry"
                                 data-toggle="tooltip" title="{% trans "Retry" %}" data-placement="right">
@@ -53,6 +53,22 @@
                                 <span class="fa fa-trash"></span>
                             </button>
                         </div>
+                    {% elif trans.state == 'already' %}
+                        <input type="text" class="form-control" placeholder="{% trans "Order code" %}">
+                        <div class="btn-group" role="group">
+                            <button class="btn btn-default" type="button" name="action_{{ trans.id }}"
+                                    value="assign" data-toggle="tooltip" title="{% trans "Assign to order" %}" data-placement="right">
+                                <span class="fa fa-check"></span>
+                            </button>
+                            <button type="button" class="btn btn-default" name="action_{{ trans.id }}" value="retry"
+                                data-toggle="tooltip" title="{% trans "Retry" %}" data-placement="right">
+                                <span class="fa fa-refresh"></span>
+                            </button>
+                            <button type="button" class="btn btn-default" name="action_{{ trans.id }}" value="discard"
+                                data-toggle="tooltip" title="{% trans "Discard" %}">
+                                <span class="fa fa-trash"></span>
+                            </button>
+                        </div>
                     {% endif %}
                 </td>
                 <td>{{ trans.date }}</td>
diff --git a/src/pretix/plugins/banktransfer/views.py b/src/pretix/plugins/banktransfer/views.py
index e5234ff83e..6f042bf324 100644
--- a/src/pretix/plugins/banktransfer/views.py
+++ b/src/pretix/plugins/banktransfer/views.py
@@ -136,7 +136,8 @@ class ActionView(View):
             elif v.startswith('comment:'):
                 return self._comment(trans, v[8:])
 
-            elif v.startswith('assign:') and trans.state == BankTransaction.STATE_NOMATCH:
+            elif v.startswith('assign:') and trans.state in (BankTransaction.STATE_NOMATCH,
+                                                             BankTransaction.STATE_DUPLICATE):
                 return self._assign(trans, v[7:])
 
             elif v == 'retry' and trans.state in (BankTransaction.STATE_ERROR, BankTransaction.STATE_DUPLICATE):