fix

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

diff --git a/src/pz/admin.py b/src/pz/admin.py
index 9687948..bc1ee8a 100644 (file)
--- a/src/pz/admin.py
+++ b/src/pz/admin.py
@@ -54,12 +54,16 @@ class BankExportFeedbackLineInline(admin.TabularInline):
     model = models.BankExportFeedbackLine
     extra = 0
 
     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 +82,14 @@ 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),

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


@@ -94,7 +101,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 +115,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 +123,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 +158,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]