Fix for carousel management.

[wolnelektury.git] / src / pz / admin.py

diff --git a/src/pz/admin.py b/src/pz/admin.py
index 9687948..1b88383 100644 (file)
--- a/src/pz/admin.py
+++ b/src/pz/admin.py
@@ -1,5 +1,5 @@
 from django.contrib import admin
 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.contrib import messages
 from django.db.models import Q
 from django.shortcuts import get_object_or_404, redirect


@@ -18,6 +18,8 @@ admin.site.register(models.Campaign)
 
 # Backport from Django 3.1.
 class EmptyFieldListFilter(FieldListFilter):
 
 # 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)
     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 +32,8 @@ class EmptyFieldListFilter(FieldListFilter):
             raise IncorrectLookupParameters
 
         lookup_condition = Q(**{'%s__isnull' % self.field_path: True})
             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)
         if self.lookup_val == '1':
             return queryset.filter(lookup_condition)
         return queryset.exclude(lookup_condition)


@@ -50,16 +54,37 @@ 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 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):
     list_display = [
         'payment_id', 'acquisition_date',
         'iban_valid',
 
 @admin.register(models.DirectDebit)
 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',
         'bank_submission_date',
         'bank_acceptance_date',
         'amount', 'first_name', 'last_name',


@@ -78,11 +103,15 @@ class DirectDebitAdmin(admin.ModelAdmin):
         'fundraiser',
         'campaign',
         ('cancelled_at', EmptyFieldListFilter),
         'fundraiser',
         'campaign',
         ('cancelled_at', EmptyFieldListFilter),

+        'latest_status',

         'needs_redo',
         'optout',
         'amount',
         'sex',
         'is_consumer',
         'needs_redo',
         'optout',
         'amount',
         'sex',
         'is_consumer',

+        ('fundraiser_commission', EmptyFieldListFilter),
+        ('fundraiser_bonus', EmptyFieldListFilter),
+        PayedListFilter,

     ]
     fieldsets = [
         (None, {
     ]
     fieldsets = [
         (None, {


@@ -94,7 +123,7 @@ class DirectDebitAdmin(admin.ModelAdmin):
                 ('postal_code', 'phone'),
                 'email',
                 ('iban', 'iban_valid', 'iban_warning'),
                 ('postal_code', 'phone'),
                 'email',
                 ('iban', 'iban_valid', 'iban_warning'),

-                'payment_id',
+                ('payment_id', 'latest_status'),

                 'agree_contact',
                 'agree_fundraising',
                 'agree_newsletter',
                 'agree_contact',
                 'agree_fundraising',
                 'agree_newsletter',


@@ -108,6 +137,7 @@ class DirectDebitAdmin(admin.ModelAdmin):
             ('cancelled_at', 'needs_redo', 'optout'),
             'submission_date',
             'fundraiser_commission',
             ('cancelled_at', 'needs_redo', 'optout'),
             'submission_date',
             'fundraiser_commission',

+            'fundraiser_bonus',

             'fundraiser_bill',
             'bank_submission_date',
             'bank_acceptance_date',
             'fundraiser_bill',
             'bank_submission_date',
             'bank_acceptance_date',


@@ -115,8 +145,8 @@ class DirectDebitAdmin(admin.ModelAdmin):
             ]
         })
     ]
             ]
         })
     ]

-    readonly_fields = ['agree_contact', 'iban_valid', 'iban_warning']
-    inlines = [BankExportFeedbackLineInline]
+    readonly_fields = ['agree_contact', 'iban_valid', 'iban_warning', 'latest_status']
+    inlines = [BankExportFeedbackLineInline, BankPaymentInline]

 
     def set_bank_submission(m, r, q):
         q.update(bank_submission_date=now())
 
     def set_bank_submission(m, r, q):
         q.update(bank_submission_date=now())


@@ -150,7 +180,7 @@ class DirectDebitAdmin(admin.ModelAdmin):
 
 @admin.register(models.BankExportFeedback)
 class BankExportFeedbackAdmin(admin.ModelAdmin):
 
 @admin.register(models.BankExportFeedback)
 class BankExportFeedbackAdmin(admin.ModelAdmin):

-    inlines = [BankExportFeedbackLineInline]
+    inlines = [BankExportFeedbackLineInline, BankPaymentInline]