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

Bank transfer: Show date of last import

Browse Source
This commit is contained in:
Raphael Michel
2020-01-09 21:40:51 +01:00
parent a1ad00a30c
commit 0d2a534982
3 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_base.html
View File

@@ -3,7 +3,14 @@
{% load static %}
{% block title %}{% trans "Import bank data" %}{% endblock %}
{% block content %}
<h1>{% trans "Import bank data" %}</h1>
<h1>
{% trans "Import bank data" %}
{% if runningimport %}
<small>{% trans "Import currently running…" %}</small>
{% else %}
<small>{% blocktrans trimmed with date=lastimport.created|date:"SHORT_DATETIME_FORMAT" %}Last import: {{ date }}{% endblocktrans %}</small>
{% endif %}
</h1>
{% block inner %}
{% endblock %}
{% endblock %}

11
src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_base_organizer.html
View File

@@ -3,7 +3,16 @@
{% load static %}
{% block title %}{% trans "Import bank data" %}{% endblock %}
{% block content %}
<h1>{% trans "Import bank data" %}</h1>
<h1>
{% trans "Import bank data" %}
{% if runningimport %}
<small>{% trans "Import currently running…" %}</small>
{% else %}
<small>{% blocktrans trimmed with date=lastimport.created|date:"SHORT_DATETIME_FORMAT" %}Last import:
{{ date }}{% endblocktrans %}</small>
{% endif %}
</h1>
{% block inner %}
{% endblock %}
{% endblock %}

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

@@ -481,7 +481,25 @@ class ImportView(ListView):
if not self.request.event.has_subevents and self.request.event.settings.get('payment_term_last'):
if now() > self.request.event.payment_term_last:
ctx['no_more_payments'] = True
ctx['lastimport'] = BankImportJob.objects.filter(
state=BankImportJob.STATE_COMPLETED,
organizer=self.request.organizer,
event=self.request.event
).order_by('created').last()
ctx['runningimport'] = BankImportJob.objects.filter(
state__in=[BankImportJob.STATE_PENDING, BankImportJob.STATE_RUNNING],
event=self.request.event
).order_by('created').last()
else:
ctx['lastimport'] = BankImportJob.objects.filter(
state=BankImportJob.STATE_COMPLETED,
organizer=self.request.organizer,
event__isnull=True
).order_by('created').last()
ctx['runningimport'] = BankImportJob.objects.filter(
state__in=[BankImportJob.STATE_PENDING, BankImportJob.STATE_RUNNING],
event__isnull=True
).order_by('created').last()
ctx['basetpl'] = 'pretixplugins/banktransfer/import_base_organizer.html'
ctx['organizer'] = self.request.organizer
return ctx