Squashed commit of the following:

commit d382a85
Author: Marc-Andre Lemburg <[email protected]>
Date:   Tue May 11 12:18:14 2021 +0200

    Update bulk coupon docs (#1396)

    * Add update functionality to the bulk coupon script

    * Update create coupon script docs.

commit ad14175
Author: Marc-Andre Lemburg <[email protected]>
Date:   Tue May 11 11:52:08 2021 +0200

    Add update functionality to the bulk coupon script (#1395)

commit 3ad73b5
Author: Marc-Andre Lemburg <[email protected]>
Date:   Mon May 10 23:06:34 2021 +0200

    Fix bulk coupon script (#1394)

commit 7d2e20d
Author: Marc-Andre Lemburg <[email protected]>
Date:   Tue May 4 15:22:53 2021 +0200

    Fix a few additional corner cases for the automatic anchor generation (#1387)

commit f7e2193
Author: Marc-Andre Lemburg <[email protected]>
Date:   Tue May 4 14:59:38 2021 +0200

    Have the TOC script cleanup headers even more (#1385)

    They will now also ignore leading and trailing hyphens as well
    as non-breaking spaces.

commit e09f78a
Author: Marc-Andre Lemburg <[email protected]>
Date:   Tue May 4 14:11:12 2021 +0200

    Scroll to the anchor, if given, after processing the TOC. (#1384)

    Fixes #1380.

Author: fpierfed

assets/js/generate_toc_for_cms.js

@@ -16,9 +16,10 @@ function addTOC() {
       var header = $(this);
       var title = header.text();
       var header_id = title
-        .replace(/[ :&\/\$]/g, "-")
+        .replace(/[ \n\t:&\/\$\xa0()]/g, "-")
         .replace(/--+/g, "-")
-        .replace(/[\?!,.\'\"]/g, "");
+        .replace(/[\?!,.\'\"\’]/g, "")
+        .replace(/^-|-$/g, "");
       header.attr("id", header_id);
       toc +=
         '<li class="toc-li table-of-contents-' +
@@ -31,5 +32,6 @@ function addTOC() {
     });
   toc += "</ul>" + "</p>";
   div_toc.replaceWith(toc);
+  $(document).scrollTop( $($(location).attr("hash")).offset().top );
 }
 $(document).ready(addTOC);

p3/management/commands/create_bulk_coupons.py

@@ -1,9 +1,9 @@
 
-""" Create a batch of single use discount coupons from a CSV file.
+""" Create/update a batch of discount coupons from a CSV file.
 
     Parameters: <conference> <csv-file>
 
-    Creates coupons based on the CSV file contents:
+    Creates/updates coupons based on the CSV file contents:
     
 	code		- coupon code
         max_usage 	- max. number of uses
@@ -14,6 +14,9 @@
 
     Use --dry-run to test drive the script.
 
+    Existing coupon codes will get updated by the script.  Indexing is by
+    code.
+
 """
 import sys
 import csv
@@ -54,9 +57,9 @@ def handle(self, *args, **options):
         csv_filename = options['csv']
 
         # Get set of existing coupon codes
-        all_codes = set(c['code'] for c in Coupon.objects\
-            .filter(conference=conference.code)\
-            .values('code'))
+        all_codes = dict((c.code, c)
+            for c in Coupon.objects\
+                .filter(conference=conference.code))
 
         # Valid fares (conference fares only)
         all_fares = cmodels.Fare.objects\
@@ -70,23 +73,24 @@ def handle(self, *args, **options):
         with csv_file:
             reader = csv.DictReader(csv_file)
             for row in reader:
+                #print ('Row %r' % row)
                 code = row['code'].strip()
-                if not code:
+                if not code or code == '0':
                     # Skip lines without code
                     continue
                 if code in all_codes:
-                    # Skip coupons which already exist
-                    print ('Coupon %r already exists - skipping' % code)
-                    continue
-                c = Coupon(conference=conference)
-                c.code = code
+                    print ('Coupon %r already exists - updating' % code)
+                    c = all_codes[code]
+                else:
+                    print ('New coupon %r will be created' % c.code)
+                    c = Coupon(conference=conference)
+                    c.code = code
                 c.max_usage = int(row.get('max_usage', 1))
                 c.items_per_usage = int(row.get('items_per_usage', 1))
                 c.value = row['value']
                 c.description = row.get('description', '')
                 if not self.dry_run:
                     c.save()
-                    c.fares = all_fares.filter(
+                    c.fares.set(all_fares.filter(
                         code__in = [x.strip()
-                                    for x in row['fares'].split(',')])
-                print ('Coupond %r created' % c.code)
+                                    for x in row['fares'].split(',')]))