X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/2034e81d72872e673c2ee733b09542c717a7a266..fe91ba3abbf192dc851e377c1edb799aa7f1e47e:/src/club/admin.py?ds=sidebyside diff --git a/src/club/admin.py b/src/club/admin.py index 24884f160..d966ad64d 100644 --- a/src/club/admin.py +++ b/src/club/admin.py @@ -3,9 +3,14 @@ # import json from django.contrib import admin +from django.db.models.functions import Now +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 fnpdjango.actions import export_as_csv_action from modeltranslation.admin import TranslationAdmin +from wolnelektury.utils import YesNoFilter from . import models @@ -37,13 +42,30 @@ class PayUCardTokenInline(admin.TabularInline): return False +class PayedFilter(YesNoFilter): + title = _('payment complete') + parameter_name = 'payed' + q = ~Q(payed_at=None) + + +class ExpiredFilter(YesNoFilter): + title = _('schedule expired') + parameter_name = 'expired' + q = Q(expires_at__isnull=False, expires_at__lt=Now()) + + 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'] + list_filter = ['is_cancelled', 'monthly', 'yearly', 'method', PayedFilter, ExpiredFilter, 'source'] + filter_horizontal = ['consent'] date_hierarchy = 'started_at' raw_id_fields = ['membership'] inlines = [PayUOrderInline, PayUCardTokenInline] + actions = [export_as_csv_action()] admin.site.register(models.Schedule, ScheduleAdmin) @@ -61,9 +83,11 @@ class ScheduleInline(admin.TabularInline): 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'] - 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) @@ -116,3 +140,16 @@ admin.site.register(models.PayUOrder, PayUOrderAdmin) 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 []