From 0d2a534982d9767d6abd24fc76659455b834c710 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Thu, 9 Jan 2020 21:40:51 +0100 Subject: [PATCH] Bank transfer: Show date of last import --- .../banktransfer/import_base.html | 9 ++++++++- .../banktransfer/import_base_organizer.html | 11 ++++++++++- src/pretix/plugins/banktransfer/views.py | 18 ++++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_base.html b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_base.html index 91c0e35b0a..40346e8755 100644 --- a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_base.html +++ b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_base.html @@ -3,7 +3,14 @@ {% load static %} {% block title %}{% trans "Import bank data" %}{% endblock %} {% block content %} -

{% trans "Import bank data" %}

+

+ {% trans "Import bank data" %} + {% if runningimport %} + {% trans "Import currently running…" %} + {% else %} + {% blocktrans trimmed with date=lastimport.created|date:"SHORT_DATETIME_FORMAT" %}Last import: {{ date }}{% endblocktrans %} + {% endif %} +

{% block inner %} {% endblock %} {% endblock %} diff --git a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_base_organizer.html b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_base_organizer.html index 91fe25ffb0..8f8b10919e 100644 --- a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_base_organizer.html +++ b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_base_organizer.html @@ -3,7 +3,16 @@ {% load static %} {% block title %}{% trans "Import bank data" %}{% endblock %} {% block content %} -

{% trans "Import bank data" %}

+

+ {% trans "Import bank data" %} + {% if runningimport %} + {% trans "Import currently running…" %} + {% else %} + {% blocktrans trimmed with date=lastimport.created|date:"SHORT_DATETIME_FORMAT" %}Last import: + {{ date }}{% endblocktrans %} + {% endif %} +

+ {% block inner %} {% endblock %} {% endblock %} diff --git a/src/pretix/plugins/banktransfer/views.py b/src/pretix/plugins/banktransfer/views.py index bab1dfe5fd..8fdc3c8e29 100644 --- a/src/pretix/plugins/banktransfer/views.py +++ b/src/pretix/plugins/banktransfer/views.py @@ -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