Experiment fixes.

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

diff --git a/src/club/admin.py b/src/club/admin.py
index 79b76cf..d966ad6 100644 (file)
--- a/src/club/admin.py
+++ b/src/club/admin.py
@@ -8,6 +8,7 @@ from django.db.models import Q
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _

+from fnpdjango.actions import export_as_csv_action

 from modeltranslation.admin import TranslationAdmin
 from wolnelektury.utils import YesNoFilter
 from . import models
 from modeltranslation.admin import TranslationAdmin
 from wolnelektury.utils import YesNoFilter
 from . import models


@@ -54,12 +55,17 @@ class ExpiredFilter(YesNoFilter):
 
 
 class ScheduleAdmin(admin.ModelAdmin):
 
 
 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']
     search_fields = ['email']

-    list_filter = ['is_cancelled', 'monthly', 'yearly', PayedFilter, ExpiredFilter]
+    list_filter = ['is_cancelled', 'monthly', 'yearly', 'method', PayedFilter, ExpiredFilter, 'source']
+    filter_horizontal = ['consent']

     date_hierarchy = 'started_at'
     raw_id_fields = ['membership']
     inlines = [PayUOrderInline, PayUCardTokenInline]
     date_hierarchy = 'started_at'
     raw_id_fields = ['membership']
     inlines = [PayUOrderInline, PayUCardTokenInline]

+    actions = [export_as_csv_action()]

 
 admin.site.register(models.Schedule, ScheduleAdmin)
 
 
 admin.site.register(models.Schedule, ScheduleAdmin)
 


@@ -77,9 +83,11 @@ class ScheduleInline(admin.TabularInline):
 
 
 class MembershipAdmin(admin.ModelAdmin):
 
 
 class MembershipAdmin(admin.ModelAdmin):

-    list_display = ['user']
+    list_display = ['user', 'manual', 'updated_at', 'notes']
+    list_filter = ['manual']
+    date_hierarchy = 'updated_at'

     raw_id_fields = ['user']
     raw_id_fields = ['user']

-    search_fields = ['user__username', 'user__email', 'schedule__email']
+    search_fields = ['user__username', 'user__email', 'schedule__email', 'notes']

     inlines = [ScheduleInline]
 
 admin.site.register(models.Membership, MembershipAdmin)
     inlines = [ScheduleInline]
 
 admin.site.register(models.Membership, MembershipAdmin)


@@ -132,3 +140,16 @@ admin.site.register(models.PayUOrder, PayUOrderAdmin)
 
 
 admin.site.register(models.Ambassador)
 
 
 admin.site.register(models.Ambassador)

+
+
+    
+
+@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 []