X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/5fb53c16b8de6efee032dea734dd9047f33d3d54..10d01e2faef06d1db0958908394f1f79441cd744:/src/pz/admin.py?ds=inline
diff --git a/src/pz/admin.py b/src/pz/admin.py
index 6c51aefaa..1373a5687 100644
--- a/src/pz/admin.py
+++ b/src/pz/admin.py
@@ -1,5 +1,7 @@
from django.contrib import admin
+from django.contrib.admin.filters import FieldListFilter
from django.contrib import messages
+from django.db.models import Q
from django.shortcuts import get_object_or_404, redirect
from django.urls import path, reverse
from django.utils.safestring import mark_safe
@@ -14,6 +16,40 @@ admin.site.register(models.Fundraiser)
admin.site.register(models.Campaign)
+# Backport from Django 3.1.
+class EmptyFieldListFilter(FieldListFilter):
+ def __init__(self, field, request, params, model, model_admin, field_path):
+ self.lookup_kwarg = '%s__isempty' % field_path
+ self.lookup_val = params.get(self.lookup_kwarg)
+ super().__init__(field, request, params, model, model_admin, field_path)
+
+ def queryset(self, request, queryset):
+ if self.lookup_kwarg not in self.used_parameters:
+ return queryset
+ if self.lookup_val not in ('0', '1'):
+ raise IncorrectLookupParameters
+
+ lookup_condition = Q(**{'%s__isnull' % self.field_path: True})
+ if self.lookup_val == '1':
+ return queryset.filter(lookup_condition)
+ return queryset.exclude(lookup_condition)
+
+ def expected_parameters(self):
+ return [self.lookup_kwarg]
+
+ def choices(self, changelist):
+ for lookup, title in (
+ (None, _('All')),
+ ('1', _('Empty')),
+ ('0', _('Not empty')),
+ ):
+ yield {
+ 'selected': self.lookup_val == lookup,
+ 'query_string': changelist.get_query_string({self.lookup_kwarg: lookup}),
+ 'display': title,
+ }
+
+
class BankExportFeedbackLineInline(admin.TabularInline):
model = models.BankExportFeedbackLine
extra = 0
@@ -24,6 +60,7 @@ class DirectDebitAdmin(admin.ModelAdmin):
list_display = [
'payment_id', 'acquisition_date',
'iban_valid',
+ 'latest_status',
'bank_submission_date',
'bank_acceptance_date',
'amount', 'first_name', 'last_name',
@@ -41,12 +78,15 @@ class DirectDebitAdmin(admin.ModelAdmin):
'agree_newsletter',
'fundraiser',
'campaign',
- 'is_cancelled',
+ ('cancelled_at', EmptyFieldListFilter),
+ 'latest_status',
'needs_redo',
'optout',
'amount',
'sex',
'is_consumer',
+ ('fundraiser_commission', EmptyFieldListFilter),
+ ('fundraiser_bonus', EmptyFieldListFilter),
]
fieldsets = [
(None, {
@@ -58,7 +98,7 @@ class DirectDebitAdmin(admin.ModelAdmin):
('postal_code', 'phone'),
'email',
('iban', 'iban_valid', 'iban_warning'),
- 'payment_id',
+ ('payment_id', 'latest_status'),
'agree_contact',
'agree_fundraising',
'agree_newsletter',
@@ -69,9 +109,10 @@ class DirectDebitAdmin(admin.ModelAdmin):
]
}),
(_('Processing'), {"fields": [
- ('is_cancelled', 'needs_redo', 'optout'),
+ ('cancelled_at', 'needs_redo', 'optout'),
'submission_date',
'fundraiser_commission',
+ 'fundraiser_bonus',
'fundraiser_bill',
'bank_submission_date',
'bank_acceptance_date',
@@ -79,7 +120,7 @@ class DirectDebitAdmin(admin.ModelAdmin):
]
})
]
- readonly_fields = ['agree_contact', 'iban_valid', 'iban_warning']
+ readonly_fields = ['agree_contact', 'iban_valid', 'iban_warning', 'latest_status']
inlines = [BankExportFeedbackLineInline]
def set_bank_submission(m, r, q):
@@ -130,9 +171,12 @@ class BankOrderAdmin(admin.ModelAdmin):
return fields
def download(self, obj):
- return mark_safe('Download'.format(
- reverse('admin:pz_bankorder_download', args=[obj.pk])
- ))
+ if obj is not None and obj.pk:
+ return mark_safe('Download'.format(
+ reverse('admin:pz_bankorder_download', args=[obj.pk])
+ ))
+ else:
+ return ''
def get_urls(self):
urls = super().get_urls()
@@ -149,7 +193,11 @@ class BankOrderAdmin(admin.ModelAdmin):
order = get_object_or_404(
models.BankOrder, pk=pk)
try:
- return bank.bank_order(order.payment_date, order.debits.all())
+ return bank.bank_order(
+ order.payment_date,
+ order.sent,
+ order.debits.all()
+ )
except Exception as e:
messages.error(request, str(e))
return redirect('admin:pz_bankorder_change', pk)