Merge remote-tracking branch 'zawadzki/new-design'

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

diff --git a/src/club/admin.py b/src/club/admin.py
index 4e85d4d..d966ad6 100644 (file)
--- a/src/club/admin.py
+++ b/src/club/admin.py
@@ -55,9 +55,13 @@ class ExpiredFilter(YesNoFilter):
 
 
 class ScheduleAdmin(admin.ModelAdmin):
-    list_display = ['email', 'started_at', 'payed_at', 'expires_at', 'amount', 'monthly', 'yearly', 'is_cancelled']
+    list_display = [
+        'email', 'started_at', 'payed_at', 'expires_at', 'amount', 'monthly', 'yearly', 'is_cancelled',
+        'method'
+    ]
     search_fields = ['email']
-    list_filter = ['is_cancelled', 'monthly', 'yearly', PayedFilter, ExpiredFilter, 'source']
+    list_filter = ['is_cancelled', 'monthly', 'yearly', 'method', PayedFilter, ExpiredFilter, 'source']
+    filter_horizontal = ['consent']
     date_hierarchy = 'started_at'
     raw_id_fields = ['membership']
     inlines = [PayUOrderInline, PayUCardTokenInline]
@@ -138,21 +142,14 @@ admin.site.register(models.PayUOrder, PayUOrderAdmin)
 admin.site.register(models.Ambassador)
 
 
-
-@admin.register(models.DirectDebit)
-class DirectDebitAdmin(admin.ModelAdmin):
-    list_display = ['date', 'amount', 'first_name', 'last_name']
-    fields = [
-        ('first_name', 'sex', 'date_of_birth'),
-        'last_name',
-        ('street', 'building'),
-        ('town', 'flat'),
-        ('postal_code', 'phone'),
-        'email',
-        'iban',
-        'payment_id',
-        'agree_newsletter',
-        'date',
-        'amount'
-    ]
     
+
+@admin.register(models.Consent)
+class ConsentAdmin(admin.ModelAdmin):
+    list_display = ['text', 'order', 'active', 'required']
+
+    def get_readonly_fields(self, request, obj=None):
+        if obj:
+            return ['text']
+        else:
+            return []