Supporter record management

README.md

@@ -1,2 +1,7 @@
 # consortial-billing
 This is a plugin for Janeway that handles consortial billing.
+
+## Development
+
+You can get up and running with example data by running the management
+command `install_example_supporter_data`.

admin.py

@@ -3,6 +3,7 @@
 from django.contrib import admin
 from django.contrib import messages
 from django.utils import timezone
+from django.conf import settings
 
 from plugins.consortial_billing import models
 from core import files
@@ -21,15 +22,19 @@ class SupporterContactInline(admin.TabularInline):
 
 
 class SupporterInline(admin.TabularInline):
+    fk_name = 'band'
     model = models.Supporter
-    fields = ('name', 'country')
-    readonly_fields = ('name', 'country')
+    fields = ('name', '_country')
+    readonly_fields = ('name', '_country')
     show_change_link = True
     can_delete = False
 
     def has_add_permission(self, request, obj):
         return False
 
+    def _country(self, obj):
+        return obj.band.country.name if obj and obj.band else ''
+
 
 class OldBandInline(admin.TabularInline):
     model = models.OldBand
@@ -41,11 +46,33 @@ def has_add_permission(self, request, obj):
         return False
 
 
+class BaseBandInline(admin.TabularInline):
+    model = models.Band
+    extra = 0
+    verbose_name_plural = 'Base Bands (including Old Bands)'
+    exclude = ('warnings',)
+    readonly_fields = (
+        'size',
+        'country',
+        'currency',
+        'level',
+        'datetime',
+        'fee',
+        'category',
+    )
+    can_delete = False
+
+    def get_queryset(self, request):
+        queryset = super().get_queryset(request)
+        return queryset.filter(category='base').order_by('-datetime')
+
+
 class BillingAgentAdmin(admin.ModelAdmin):
     list_display = (
         'name',
         '_contacts',
         'country',
+        'redirect_url',
         'default',
     )
     list_editable = (
@@ -54,6 +81,7 @@ class BillingAgentAdmin(admin.ModelAdmin):
     )
     inlines = [
         AgentContactInline,
+        BaseBandInline,
     ]
 
     def _contacts(self, obj):
@@ -78,6 +106,9 @@ class SupporterSizeAdmin(admin.ModelAdmin):
         'multiplier',
         'internal_notes',
     )
+    inlines = [
+        BaseBandInline,
+    ]
 
 
 class SupportLevelAdmin(admin.ModelAdmin):
@@ -96,6 +127,9 @@ class SupportLevelAdmin(admin.ModelAdmin):
         'internal_notes',
         'default',
     )
+    inlines = [
+        BaseBandInline,
+    ]
 
 
 class CurrencyAdmin(admin.ModelAdmin):
@@ -116,6 +150,10 @@ class CurrencyAdmin(admin.ModelAdmin):
     readonly_fields = (
         '_exchange_rate',
     )
+    inlines = [
+        BaseBandInline,
+    ]
+
 
     def _exchange_rate(self, obj):
         if obj:
@@ -135,13 +173,10 @@ class BandAdmin(admin.ModelAdmin):
         'fee',
         'datetime',
         'billing_agent',
-        'display',
-        'base',
+        'category',
     )
     list_filter = (
-        'base',
-        'display',
-        'fixed_fee',
+        'category',
         'datetime',
         'size',
         'currency',
@@ -156,36 +191,6 @@ class BandAdmin(admin.ModelAdmin):
         OldBandInline,
     ]
 
-    def get_readonly_fields(self, request, obj=None):
-        if obj and obj.fixed_fee:
-            return (
-                'size',
-                'country',
-                'currency',
-                'level',
-                'warnings',
-                'datetime',
-                'base',
-            )
-        elif obj:
-            return (
-                'size',
-                'country',
-                'currency',
-                'level',
-                'fee',
-                'fixed_fee',
-                'warnings',
-                'datetime',
-                'billing_agent',
-                'base',
-            )
-        else:
-            return (
-                'warnings',
-                'datetime',
-            )
-
 
 class SupporterAdmin(admin.ModelAdmin):
 
@@ -197,7 +202,7 @@ class SupporterAdmin(admin.ModelAdmin):
         '_contacts',
         'address',
         'postal_code',
-        'country',
+        '_country',
         'size',
         'level',
         'fee',
@@ -208,6 +213,8 @@ class SupporterAdmin(admin.ModelAdmin):
     )
     search_fields = (
         'name',
+        'id',
+        'ror',
         'address',
         'postal_code',
         'supportercontact__account__first_name',
@@ -224,6 +231,7 @@ class SupporterAdmin(admin.ModelAdmin):
     )
     raw_id_fields = (
         'band',
+        'prospective_band',
     )
 
     inlines = [
@@ -242,6 +250,9 @@ def _contacts(self, obj):
         else:
             return ''
 
+    def _country(self, obj):
+        return obj.band.country.name if obj and obj.band else ''
+
     @admin.action(description="Export selected supporters")
     def export_supporters(self, request, queryset):
         """
@@ -254,7 +265,6 @@ def export_supporters(self, request, queryset):
             'ror',
             'address',
             'postal_code',
-            'country',
             'display',
             'active',
             'size',