X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/eb2eb95bfbfe8c777c4192ea434a0e999edf3a51..7bbeecb5dd5c5f20120f9e40e41568a3bff1caa4:/src/pz/admin.py?ds=sidebyside

diff --git a/src/pz/admin.py b/src/pz/admin.py
index 1373a5687..1bbb1da6d 100644
--- a/src/pz/admin.py
+++ b/src/pz/admin.py
@@ -1,11 +1,10 @@
 from django.contrib import admin
-from django.contrib.admin.filters import FieldListFilter
+from django.contrib.admin.filters import FieldListFilter, SimpleListFilter
 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
-from django.utils.translation import gettext_lazy as _
 from django.utils.timezone import now
 from fnpdjango.actions import export_as_csv_action
 from . import bank
@@ -18,6 +17,8 @@ admin.site.register(models.Campaign)
 
 # Backport from Django 3.1.
 class EmptyFieldListFilter(FieldListFilter):
+    with_empty_str = False
+
     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)
@@ -30,6 +31,8 @@ class EmptyFieldListFilter(FieldListFilter):
             raise IncorrectLookupParameters
 
         lookup_condition = Q(**{'%s__isnull' % self.field_path: True})
+        if self.with_empty_str:
+            lookup_condition |= Q(**{self.field_path: ''})
         if self.lookup_val == '1':
             return queryset.filter(lookup_condition)
         return queryset.exclude(lookup_condition)
@@ -39,9 +42,9 @@ class EmptyFieldListFilter(FieldListFilter):
 
     def choices(self, changelist):
         for lookup, title in (
-            (None, _('All')),
-            ('1', _('Empty')),
-            ('0', _('Not empty')),
+            (None, 'Wszystkie'),
+            ('1', 'Puste'),
+            ('0', 'Niepuste'),
         ):
             yield {
                 'selected': self.lookup_val == lookup,
@@ -50,13 +53,35 @@ class EmptyFieldListFilter(FieldListFilter):
             }
 
 
+class PayedListFilter(SimpleListFilter):
+    title = 'pobrane'
+    parameter_name = 'payed'
+    def lookups(self, request, model_admin):
+        return (
+                ('yes', 'tak'),
+                ('no', 'nie'),
+                )
+
+    def queryset(self, request, queryset):
+        if self.value() == 'yes':
+            return queryset.filter(payment__is_dd=True, payment__realised=True).distinct()
+        if self.value() == 'no':
+            return queryset.exclude(payment__is_dd=True, payment__realised=True).distinct()
+
+
+
 class BankExportFeedbackLineInline(admin.TabularInline):
     model = models.BankExportFeedbackLine
     extra = 0
 
+class BankPaymentInline(admin.TabularInline):
+    model = models.Payment
+    extra = 0
 
 @admin.register(models.DirectDebit)
 class DirectDebitAdmin(admin.ModelAdmin):
+    #unpaginate
+
     list_display = [
         'payment_id', 'acquisition_date',
         'iban_valid',
@@ -87,10 +112,12 @@ class DirectDebitAdmin(admin.ModelAdmin):
         'is_consumer',
         ('fundraiser_commission', EmptyFieldListFilter),
         ('fundraiser_bonus', EmptyFieldListFilter),
+        PayedListFilter,
     ]
     fieldsets = [
         (None, {
             "fields": [
+                'nosignature',
                 ('first_name', 'sex', 'date_of_birth'),
                 'last_name',
                 ('street', 'building'),
@@ -108,7 +135,7 @@ class DirectDebitAdmin(admin.ModelAdmin):
                 'campaign',
             ]
         }),
-        (_('Processing'), {"fields": [
+        ('Przetwarzanie', {"fields": [
             ('cancelled_at', 'needs_redo', 'optout'),
             'submission_date',
             'fundraiser_commission',
@@ -121,7 +148,7 @@ class DirectDebitAdmin(admin.ModelAdmin):
         })
     ]
     readonly_fields = ['agree_contact', 'iban_valid', 'iban_warning', 'latest_status']
-    inlines = [BankExportFeedbackLineInline]
+    inlines = [BankExportFeedbackLineInline, BankPaymentInline]
 
     def set_bank_submission(m, r, q):
         q.update(bank_submission_date=now())
@@ -144,8 +171,8 @@ class DirectDebitAdmin(admin.ModelAdmin):
     ]
 
     def agree_contact(self, obj):
-        return _('obligatory')
-    agree_contact.short_description = _('agree contact')
+        return 'obowiązkowo'
+    agree_contact.short_description = 'zgoda na kontakt'
 
     def get_changeform_initial_data(self, request):
         return {
@@ -155,7 +182,7 @@ class DirectDebitAdmin(admin.ModelAdmin):
 
 @admin.register(models.BankExportFeedback)
 class BankExportFeedbackAdmin(admin.ModelAdmin):
-    inlines = [BankExportFeedbackLineInline]
+    inlines = [BankExportFeedbackLineInline, BankPaymentInline]