CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Add manual order-matching field for duplicate bankimport transactions (#1461)

Browse Source 
* Add manual order-matching field for duplicate bankimport transactions

* Only show matching-field for already matched transactions - not for errored ones.
This commit is contained in:
Martin Gross
2019-10-29 11:54:36 +01:00
committed by Raphael Michel
parent 1e0e8184c8
commit 70e95b42fa
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/transaction_list.html
View File

@@ -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>

3
src/pretix/plugins/banktransfer/views.py
View File

@@ -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):