From 8fa490c938ba8c36fd44610f757ee52fb2c8a801 Mon Sep 17 00:00:00 2001
From: Tobias Kunze <rixx@cutebit.de>
Date: Fri, 16 Jun 2017 23:21:23 +0200
Subject: [PATCH] Allow to add a prefix when generating voucher codes (#518)

---
 src/pretix/base/models/vouchers.py                           | 4 +++-
 .../control/templates/pretixcontrol/vouchers/bulk.html       | 5 ++++-
 src/pretix/control/views/vouchers.py                         | 3 ++-
 src/pretix/static/pretixcontrol/js/ui/main.js                | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/pretix/base/models/vouchers.py b/src/pretix/base/models/vouchers.py
index 41bf251996..8bdbb7298f 100644
--- a/src/pretix/base/models/vouchers.py
+++ b/src/pretix/base/models/vouchers.py
@@ -13,8 +13,10 @@ from .event import Event
 from .items import Item, ItemVariation, Quota
 
 
-def _generate_random_code():
+def _generate_random_code(prefix=None):
     charset = list('ABCDEFGHKLMNPQRSTUVWXYZ23456789')
+    if prefix:
+        return prefix + get_random_string(length=settings.ENTROPY['voucher_code'], allowed_chars=charset)
     return get_random_string(length=settings.ENTROPY['voucher_code'], allowed_chars=charset)
 
 
diff --git a/src/pretix/control/templates/pretixcontrol/vouchers/bulk.html b/src/pretix/control/templates/pretixcontrol/vouchers/bulk.html
index 30b9c43c67..edd1ed1431 100644
--- a/src/pretix/control/templates/pretixcontrol/vouchers/bulk.html
+++ b/src/pretix/control/templates/pretixcontrol/vouchers/bulk.html
@@ -10,8 +10,11 @@
         {% bootstrap_form_errors form %}
         <fieldset>
             <legend>{% trans "Voucher codes" %}</legend>
-            <div class="form-group">
+            <div class="form-group form-inline">
                 <div class="col-md-7 col-sm-12 col-md-offset-3">
+                    <input type="text" class="form-control input-xs"
+                           id="voucher-bulk-codes-prefix"
+                           placeholder="{% trans "Prefix (optional)" %}">
                     <div class="input-group">
                         <input type="number" class="form-control input-xs"
                                id="voucher-bulk-codes-num"
diff --git a/src/pretix/control/views/vouchers.py b/src/pretix/control/views/vouchers.py
index f0b046343b..48060381b4 100644
--- a/src/pretix/control/views/vouchers.py
+++ b/src/pretix/control/views/vouchers.py
@@ -278,10 +278,11 @@ class VoucherRNG(EventPermissionRequiredMixin, View):
         except ValueError:  # NOQA
             return HttpResponseBadRequest()
 
+        prefix = request.GET.get('prefix')
         while len(codes) < num:
             new_codes = set()
             for i in range(min(num - len(codes), 500)):  # Work around SQLite's SQLITE_MAX_VARIABLE_NUMBER
-                new_codes.add(_generate_random_code())
+                new_codes.add(_generate_random_code(prefix=prefix))
             new_codes -= set([v['code'] for v in Voucher.objects.filter(code__in=new_codes).values('code')])
             codes |= new_codes
 
diff --git a/src/pretix/static/pretixcontrol/js/ui/main.js b/src/pretix/static/pretixcontrol/js/ui/main.js
index 05d11418be..50a09ba21d 100644
--- a/src/pretix/static/pretixcontrol/js/ui/main.js
+++ b/src/pretix/static/pretixcontrol/js/ui/main.js
@@ -105,11 +105,11 @@ $(function () {
     // Vouchers
     $("#voucher-bulk-codes-generate").click(function () {
         var num = $("#voucher-bulk-codes-num").val();
+        var prefix = $('#voucher-bulk-codes-prefix').val();
         if (num != "") {
-            $(".form-group:has(#voucher-bulk-codes-num)").addClass("has-error");
             var url = $(this).attr("data-rng-url");
             $("#id_codes").html("Generating...");
-            $.getJSON(url + '?num=' + num, function (data) {
+            $.getJSON(url + '?num=' + num + '&prefix=' + escape(prefix), function (data) {
                 $("#id_codes").val(data.codes.join("\n"));
             });
         } else {