Fix the speaker coupon script for EP2021. (#1436)

Remove coupons for people on the waitlist.

Adjust the talk admin to show the admin type, which is used to
filter out coupon eligible talks or apply special casing for e.g.
keynotes.

Author: malemburg

p3/admin.py

@@ -90,8 +90,8 @@ class TalkAdmin(admin.ModelAdmin):
         "status",
         "duration",
         "type",
+        "admin_type",
         "level",
-        "tags__name",
     )
     list_editable = ("status",)
     search_fields = [
@@ -112,6 +112,7 @@ class TalkAdmin(admin.ModelAdmin):
         "type",
         "duration",
         "status",
+        "admin_type",
         "created",
         "level",
         "domain_level",

p3/management/commands/create_speaker_coupons.py

@@ -14,6 +14,9 @@
     to get recreated, deleted it in the database first and then run
     the script.
 
+    There are several special cases handled by the script, e.g.  when
+    setting the admin type to keynote.  Please check below for details.
+
     Use --dry-run to test drive the script.
 
     WARNING: This script will create coupons for all speakers,
@@ -105,7 +108,7 @@ def handle(self, *args, **options):
         speakers = {}
         qs = cmodels.TalkSpeaker.objects\
             .filter(Q(talk__conference=conference.code), 
-                    Q(talk__status='accepted') | Q(talk__status='waitlist'),
+                    Q(talk__status='accepted'),
                     Q(helper=False))\
             .select_related('talk', 'speaker__user')
         for row in qs:
@@ -144,11 +147,6 @@ def handle(self, *args, **options):
                     entry['discount'] != '100%'):
                     entry = None
 
-            if talk_code == 'r' and talk_status == 'waitlist':
-                # Training entries on the waiting list only get a
-                # 25% coupon, not a 100% one
-                discount_code = '25%'
-
             # Entry already exists, so don't create a new coupon
             if entry is not None:
                 continue