Merge pull request #361 from bornhack/backoffice_invoice_scanning

Save ticket tokens to db. Rename some fields to make using tickets more sane. Initial scanning of tickets.

src/backoffice/templates/badge_handout.html

@@ -13,7 +13,7 @@
       Use this view to hand out badges to participants. Use the search field to search for username, email, products, order ID, ticket UUID, etc. To check in participants go to the <a href="{% url 'backoffice:ticket_checkin' camp_slug=camp.slug %}">Ticket Checkin view</a> instead. To hand out merchandise and other products go to the <a href="{% url 'backoffice:product_handout' camp_slug=camp.slug %}">Hand Out Products</a> view instead.
  </div>
   <div>
-      This table shows all (Shop|Discount|Sponsor)Tickets which are badge_handed_out=False. Tickets must be checked in before they are shown in this list.
+      This table shows all (Shop|Discount|Sponsor)Tickets which are badge_ticket_generated=False. Tickets must be checked in before they are shown in this list.
   </div>
 </div>
 <br>

src/backoffice/templates/index.html

@@ -16,17 +16,14 @@
     <div class="list-group">
       {% if perms.camps.infoteam_permission %}
       <h3>Info Team</h3>
-      <a href="{% url 'backoffice:product_handout' camp_slug=camp.slug %}" class="list-group-item">
-        <h4 class="list-group-item-heading">Hand Out Products</h4>
-        <p class="list-group-item-text">Use this view to mark products such as merchandise, cabins, fridges and so on as handed out.</p>
-      </a>
-      <a href="{% url 'backoffice:ticket_checkin' camp_slug=camp.slug %}" class="list-group-item">
-        <h4 class="list-group-item-heading">Check-In Tickets</h4>
-        <p class="list-group-item-text">Use this view to check-in tickets when participants arrive.</p>
-      </a>
-      <a href="{% url 'backoffice:badge_handout' camp_slug=camp.slug %}" class="list-group-item">
-        <h4 class="list-group-item-heading">Hand Out Badges</h4>
-        <p class="list-group-item-text">Use this view to mark badges as handed out.</p>
+      <a href="{% url 'backoffice:user_interaction' camp_slug=camp.slug %}"
+         class="list-group-item">
+        <h4 class="list-group-item-heading">
+          User stuff
+        </h4>
+        <p class="list-group-item-text">
+          Use this to get everything related to a user
+        </p>
       </a>
       {% endif %}
 

src/backoffice/templates/product_handout.html

@@ -13,7 +13,7 @@
       Use this view to hand out products to participants. Use the search field to search for username, email, products, order ID etc. To check in participants go to the <a href="{% url 'backoffice:ticket_checkin' camp_slug=camp.slug %}">Ticket Checkin view</a> instead. To hand out badges go to the <a href="{% url 'backoffice:badge_handout' camp_slug=camp.slug %}">Badge Handout view</a> instead.
  </div>
   <div>
-      This table shows all OrderProductRelations which are handed_out=False (not including unpaid, cancelled and refunded orders). The table is initally sorted by order ID but the sorting can be changed by clicking the column headlines (if javascript is enabled).
+      This table shows all OrderProductRelations which are ticket_generated=False (not including unpaid, cancelled and refunded orders). The table is initally sorted by order ID but the sorting can be changed by clicking the column headlines (if javascript is enabled).
   </div>
 </div>
 <br>

src/backoffice/templates/ticket_checkin.html

@@ -13,7 +13,7 @@
       Use this view to check in participants. Use the search field to search for username, email, products, order ID, ticket UUID, etc. To hand out badges go to the <a href="{% url 'backoffice:badge_handout' camp_slug=camp.slug %}">Badge Handout view</a> instead. To hand out other products go to the <a href="{% url 'backoffice:product_handout' camp_slug=camp.slug %}">Hand Out Products</a> view instead.
   </div>
   <div>
-      This table shows all (Shop|Discount|Sponsor)Tickets which are checked_in=False.
+      This table shows all (Shop|Discount|Sponsor)Tickets which are used=False.
   </div>
 </div>
 <br>

src/backoffice/templates/user/search.html

@@ -0,0 +1,90 @@
+{% extends 'base.html' %}
+{% load static from staticfiles %}
+{% load qrcode %}
+
+{% block content %}
+
+<form id="search_form" method="POST" action="">
+    {% csrf_token %}
+
+    <div class="row">
+
+        <div class="col-md-12">
+            <h3>Scan the ticket!</h3>
+            <input type="text" name="ticket_token" id="ticket_token_input" autocomplete="off" style="color: #fff; background: #fff; border: 0; height: 0; width: 0;"/>
+
+            <span id="scan_again" hidden>Scan again!</span>
+
+        </div>
+
+    </div>
+
+</form>
+
+{% if ticket %}
+    {{ ticket }}<br />
+    <br />
+    Used?: {{ ticket.used }}
+
+    <hr />
+    <form id="check_in_form" method="POST" action="">{% csrf_token %}
+    <input type="input" name="check_in_ticket_id" id="check_in_input" value="{{ ticket.pk }}" style="color: #fff; background: #fff; border: 0; height: 0; width: 0;"/>
+    </form>
+
+    <div class="row">
+        <div class="col-md-6">
+            {% qr_code "clear" %}
+        </div>
+
+        <div class="col-md-6">
+            {% qr_code "check-in" %}
+        </div>
+    </divc>
+{% endif %}
+
+
+
+<script>
+
+document.addEventListener('DOMContentLoaded', () => {
+    'use strict';
+
+    const search_form = document.getElementById('search_form');
+    const ticket_token_input = document.getElementById('ticket_token_input');
+    const scan_again = document.getElementById('scan_again');
+
+    const check_in_input = document.getElementById('check_in_input');
+    const check_in_form = document.getElementById('check_in_form');
+
+    search_form.onsubmit = submit;
+
+    function submit(e) {
+        e.preventDefault();
+
+        console.log(ticket_token_input.value);
+
+        if(ticket_token_input.value === "#clear") {
+            window.location.replace(window.location.pathname);
+        } else if(ticket_token_input.value === "#check-in") {
+            check_in_input.checked = true;
+            check_in_form.submit();
+        } else if(ticket_token_input.value.length === 65) {
+            search_form.submit();
+        } else {
+            scan_again.removeAttribute('hidden');
+        }
+    };
+
+    document.addEventListener('keydown', event => {
+        if(event.key === '#') {
+            ticket_token_input.value = "";
+            ticket_token_input.focus();
+        }
+    });
+
+});
+
+</script>
+
+{% endblock content %}
+

src/backoffice/urls.py

@@ -7,6 +7,9 @@ app_name = "backoffice"
 urlpatterns = [
     path("", BackofficeIndexView.as_view(), name="index"),
     # infodesk
+    path(
+        "user/", include([path("", SearchForUser.as_view(), name="user_interaction")])
+    ),
     path("product_handout/", ProductHandoutView.as_view(), name="product_handout"),
     path("badge_handout/", BadgeHandoutView.as_view(), name="badge_handout"),
     path("ticket_checkin/", TicketCheckinView.as_view(), name="ticket_checkin"),

src/backoffice/views.py

@@ -1,6 +1,7 @@
 import logging, os
 from itertools import chain
 
+import qrcode
 from django.contrib.auth.mixins import PermissionRequiredMixin, UserPassesTestMixin
 from django.contrib.auth.models import User
 from django.views.generic import TemplateView, ListView, DetailView
@@ -14,7 +15,7 @@ from django.conf import settings
 from django.core.files import File
 
 from camps.mixins import CampViewMixin
-from shop.models import OrderProductRelation
+from shop.models import OrderProductRelation, Invoice, Order
 from tickets.models import ShopTicket, SponsorTicket, DiscountTicket
 from profiles.models import Profile
 from program.models import SpeakerProposal, EventProposal
@@ -40,7 +41,7 @@ class ProductHandoutView(CampViewMixin, InfoTeamPermissionMixin, ListView):
 
     def get_queryset(self, **kwargs):
         return OrderProductRelation.objects.filter(
-            handed_out=False,
+            ticket_generated=False,
             order__paid=True,
             order__refunded=False,
             order__cancelled=False,
@@ -52,9 +53,9 @@ class BadgeHandoutView(CampViewMixin, InfoTeamPermissionMixin, ListView):
     context_object_name = "tickets"
 
     def get_queryset(self, **kwargs):
-        shoptickets = ShopTicket.objects.filter(badge_handed_out=False)
-        sponsortickets = SponsorTicket.objects.filter(badge_handed_out=False)
-        discounttickets = DiscountTicket.objects.filter(badge_handed_out=False)
+        shoptickets = ShopTicket.objects.filter(badge_ticket_generated=False)
+        sponsortickets = SponsorTicket.objects.filter(badge_ticket_generated=False)
+        discounttickets = DiscountTicket.objects.filter(badge_ticket_generated=False)
         return list(chain(shoptickets, sponsortickets, discounttickets))
 
 
@@ -63,9 +64,9 @@ class TicketCheckinView(CampViewMixin, InfoTeamPermissionMixin, ListView):
     context_object_name = "tickets"
 
     def get_queryset(self, **kwargs):
-        shoptickets = ShopTicket.objects.filter(checked_in=False)
-        sponsortickets = SponsorTicket.objects.filter(checked_in=False)
-        discounttickets = DiscountTicket.objects.filter(checked_in=False)
+        shoptickets = ShopTicket.objects.filter(used=False)
+        sponsortickets = SponsorTicket.objects.filter(used=False)
+        discounttickets = DiscountTicket.objects.filter(used=False)
         return list(chain(shoptickets, sponsortickets, discounttickets))
 
 
@@ -151,7 +152,7 @@ class MerchandiseOrdersView(CampViewMixin, OrgaTeamPermissionMixin, ListView):
 
         return (
             OrderProductRelation.objects.filter(
-                handed_out=False,
+                ticket_generated=False,
                 order__paid=True,
                 order__refunded=False,
                 order__cancelled=False,
@@ -169,7 +170,7 @@ class MerchandiseToOrderView(CampViewMixin, OrgaTeamPermissionMixin, TemplateVie
         camp_prefix = "BornHack {}".format(timezone.now().year)
 
         order_relations = OrderProductRelation.objects.filter(
-            handed_out=False,
+            ticket_generated=False,
             order__paid=True,
             order__refunded=False,
             order__cancelled=False,
@@ -197,7 +198,7 @@ class VillageOrdersView(CampViewMixin, OrgaTeamPermissionMixin, ListView):
 
         return (
             OrderProductRelation.objects.filter(
-                handed_out=False,
+                ticket_generated=False,
                 order__paid=True,
                 order__refunded=False,
                 order__cancelled=False,
@@ -215,7 +216,7 @@ class VillageToOrderView(CampViewMixin, OrgaTeamPermissionMixin, TemplateView):
         camp_prefix = "BornHack {}".format(timezone.now().year)
 
         order_relations = OrderProductRelation.objects.filter(
-            handed_out=False,
+            ticket_generated=False,
             order__paid=True,
             order__refunded=False,
             order__cancelled=False,
@@ -345,7 +346,6 @@ class ReimbursementCreateView(CampViewMixin, EconomyTeamPermissionMixin, CreateV
 
     def dispatch(self, request, *args, **kwargs):
         """ Get the user from kwargs """
-        print("inside dispatch() with method %s" % request.method)
         self.reimbursement_user = get_object_or_404(User, pk=kwargs["user_id"])
 
         # get response now so we have self.camp available below
@@ -544,3 +544,30 @@ class RevenueDetailView(CampViewMixin, EconomyTeamPermissionMixin, UpdateView):
         return redirect(
             reverse("backoffice:revenue_list", kwargs={"camp_slug": self.camp.slug})
         )
+
+
+class SearchForUser(TemplateView):
+    template_name = "user/search.html"
+
+    def post(self, request, **kwargs):
+        check_in_ticket_id = request.POST.get("check_in_ticket_id")
+        if check_in_ticket_id:
+            ticket_to_check_in = ShopTicket.objects.get(pk=check_in_ticket_id)
+            ticket_to_check_in.used = True
+            ticket_to_check_in.save()
+            messages.info(request, "Ticket checked-in!")
+
+        return super().get(request, **kwargs)
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        ticket_token = self.request.POST.get("ticket_token")
+        if ticket_token:
+            try:
+                ticket = ShopTicket.objects.get(token=ticket_token[1:])
+                context["ticket"] = ticket
+            except ShopTicket.DoesNotExist:
+                messages.warning(self.request, "Ticket not found!")
+
+        return context

src/profiles/templates/tickets/ticket_detail.html

@@ -10,7 +10,7 @@
   </div>
   <div class="panel-body">
 
-    <h2>{% if ticket.checked_in %}This ticket has been used{% else %}This ticket is unused{% endif %}</h2>
+    <h2>{% if ticket.used %}This ticket has been used{% else %}This ticket is unused{% endif %}</h2>
     <form method="POST" class="form">
       {% csrf_token %}
       {% bootstrap_field form.name %}

src/profiles/templates/tickets/ticket_list.html

@@ -23,9 +23,13 @@
               Checked in
             <th>
               Actions
-
         <tbody>
           {% for ticket in tickets %}
+          {% ifchanged ticket.ticket_type.camp %}
+          <tr>
+            <td colspan="5">
+              <strong>{{ ticket.ticket_type.camp }}</strong>
+          {% endifchanged %}
           <tr>
             <td>
                 {% if ticket.name %}
@@ -38,7 +42,7 @@
             <td>
               {{ ticket.product.price|currency }}
             <td>
-              {% if ticket.checked_in %}
+              {% if ticket.used %}
               Yes
               {% else %}
               Not yet

src/shop/factories.py

@@ -46,4 +46,4 @@ class OrderProductRelationFactory(DjangoModelFactory):
     product = factory.SubFactory(ProductFactory)
     order = factory.SubFactory(OrderFactory)
     quantity = 1
-    handed_out = False
+    ticket_generated = False

src/shop/migrations/0059_auto_20190718_2051.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.2 on 2019-07-18 18:51
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shop', '0058_order_pdf'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='orderproductrelation',
+            old_name='handed_out',
+            new_name='ticket_generated',
+        ),
+    ]

src/shop/models.py

@@ -239,8 +239,8 @@ class Order(CreatedUpdatedModel):
                     else:
                         print(msg)
 
-                    # and mark the OPR as handed_out=True
-                    order_product.handed_out = True
+                    # and mark the OPR as ticket_generated=True
+                    order_product.ticket_generated = True
                     order_product.save()
 
     def mark_as_paid(self, request=None):
@@ -289,35 +289,36 @@ class Order(CreatedUpdatedModel):
             self.open = None
             self.save()
 
-    def is_not_handed_out(self):
-        if self.orderproductrelation_set.filter(handed_out=True).count() == 0:
+    def is_not_ticket_generated(self):
+        if self.orderproductrelation_set.filter(tic=True).count() == 0:
             return True
         else:
             return False
 
-    def is_partially_handed_out(self):
+    def is_partially_ticket_generated(self):
         if (
-            self.orderproductrelation_set.filter(handed_out=True).count() != 0
-            and self.orderproductrelation_set.filter(handed_out=False).count() != 0
+            self.orderproductrelation_set.filter(ticket_generated=True).count() != 0
+            and self.orderproductrelation_set.filter(ticket_generated=False).count()
+            != 0
         ):
             # some products are handed out, others are not
             return True
         else:
             return False
 
-    def is_fully_handed_out(self):
-        if self.orderproductrelation_set.filter(handed_out=False).count() == 0:
+    def is_fully_ticket_generated(self):
+        if self.orderproductrelation_set.filter(ticket_generated=False).count() == 0:
             return True
         else:
             return False
 
     @property
-    def handed_out_status(self):
-        if self.is_not_handed_out():
+    def ticket_generated_status(self):
+        if self.is_not_ticket_generated():
             return "no"
-        elif self.is_partially_handed_out():
+        elif self.is_partially_ticket_generated():
             return "partially"
-        elif self.is_fully_handed_out():
+        elif self.is_fully_ticket_generated():
             return "fully"
         else:
             return False
@@ -466,14 +467,14 @@ class OrderProductRelation(CreatedUpdatedModel):
     order = models.ForeignKey("shop.Order", on_delete=models.PROTECT)
     product = models.ForeignKey("shop.Product", on_delete=models.PROTECT)
     quantity = models.PositiveIntegerField()
-    handed_out = models.BooleanField(default=False)
+    ticket_generated = models.BooleanField(default=False)
 
     @property
     def total(self):
         return Decimal(self.product.price * self.quantity)
 
     def clean(self):
-        if self.handed_out and not self.order.paid:
+        if self.ticket_generated and not self.order.paid:
             raise ValidationError(
                 "Product can not be handed out when order is not paid."
             )

src/shop/templates/order_list.html

@@ -25,13 +25,13 @@
           <tbody>
         {% for order in orders %}
             {% if order.products.exists %}
-            <tr {% if not order.open and order.paid and order.is_fully_handed_out %}style="color: lightgrey"{% endif %}>
+            <tr {% if not order.open and order.paid and order.is_fully_ticket_generated %}style="color: lightgrey"{% endif %}>
                 <td>{{ order.id }}</td>
                 <td>{{ order.get_number_of_items }}</td>
                 <td>{{ order.total|currency }}</td>
                 <td class="text-center">{{ order.open|truefalseicon }}</td>
                 <td class="text-center">{{ order.paid|truefalseicon }}</td>
-                <td class="text-center">{{ order.handed_out_status }}</td>
+                <td class="text-center">{{ order.ticket_generated_status }}</td>
                 <td>
                 {% if order.paid %}
                     {% if order.invoice.pdf %}

src/tickets/admin.py

@@ -23,9 +23,9 @@ class TicketTypeAdmin(admin.ModelAdmin):
 
 @admin.register(SponsorTicket)
 class SponsorTicketAdmin(BaseTicketAdmin):
-    list_display = ["pk", "ticket_type", "sponsor", "checked_in"]
+    list_display = ["pk", "ticket_type", "sponsor", "used"]
 
-    list_filter = ["ticket_type__camp", "checked_in", "ticket_type", "sponsor"]
+    list_filter = ["ticket_type__camp", "used", "ticket_type", "sponsor"]
 
     search_fields = ["pk", "sponsor__name"]
 
@@ -50,10 +50,10 @@ class ShopTicketAdmin(BaseTicketAdmin):
         "ticket_type",
         "order",
         "product",
-        "checked_in",
+        "used",
     ]
 
-    list_filter = ["ticket_type__camp", "checked_in", "ticket_type", "order", "product"]
+    list_filter = ["ticket_type__camp", "used", "ticket_type", "order", "product"]
 
     search_fields = ["uuid", "order__id", "order__user__email", "name", "email"]
 

src/tickets/migrations/0006_auto_20190616_1746.py

@@ -0,0 +1,28 @@
+# Generated by Django 2.2.2 on 2019-06-16 15:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tickets', '0005_auto_20180318_0906'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='discountticket',
+            name='token',
+            field=models.CharField(max_length=64, null=True),
+        ),
+        migrations.AddField(
+            model_name='shopticket',
+            name='token',
+            field=models.CharField(max_length=64, null=True),
+        ),
+        migrations.AddField(
+            model_name='sponsorticket',
+            name='token',
+            field=models.CharField(max_length=64, null=True),
+        ),
+    ]

src/tickets/migrations/0007_save_token_to_db.py

@@ -0,0 +1,29 @@
+# Generated by Django 2.2.2 on 2019-07-18 18:52
+from django.conf import settings
+from django.db import migrations
+
+from tickets.models import create_ticket_token
+
+
+def save_tokens(apps, schema_editor):
+    ShopTicket = apps.get_model("tickets", "ShopTicket")
+    SponsorTicket = apps.get_model("tickets", "SponsorTicket")
+    DiscountTicket = apps.get_model("tickets", "DiscountTicket")
+
+    for model in (ShopTicket, SponsorTicket, DiscountTicket):
+
+        for ticket in model.objects.all():
+            token = create_ticket_token(
+                "{_id}{secret_key}".format(
+                    _id=ticket.uuid, secret_key=settings.SECRET_KEY
+                ).encode("utf-8")
+            )
+            ticket.token = token
+            ticket.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("tickets", "0006_auto_20190616_1746")]
+
+    operations = [migrations.RunPython(save_tokens)]

src/tickets/migrations/0008_auto_20190718_2055.py

@@ -0,0 +1,43 @@
+# Generated by Django 2.2.2 on 2019-07-18 18:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tickets', '0007_save_token_to_db'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='discountticket',
+            old_name='checked_in',
+            new_name='used',
+        ),
+        migrations.RenameField(
+            model_name='shopticket',
+            old_name='checked_in',
+            new_name='used',
+        ),
+        migrations.RenameField(
+            model_name='sponsorticket',
+            old_name='checked_in',
+            new_name='used',
+        ),
+        migrations.AlterField(
+            model_name='discountticket',
+            name='token',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='shopticket',
+            name='token',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='sponsorticket',
+            name='token',
+            field=models.CharField(max_length=64),
+        ),
+    ]

src/tickets/migrations/0009_tickettype_includes_badge.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.3 on 2019-07-23 20:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tickets', '0008_auto_20190718_2055'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tickettype',
+            name='includes_badge',
+            field=models.BooleanField(default=False),
+        ),
+    ]

src/tickets/migrations/0010_auto_20190724_2037.py

@@ -0,0 +1,28 @@
+# Generated by Django 2.2.3 on 2019-07-24 18:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tickets', '0009_tickettype_includes_badge'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='discountticket',
+            name='badge_token',
+            field=models.CharField(max_length=64, null=True),
+        ),
+        migrations.AddField(
+            model_name='shopticket',
+            name='badge_token',
+            field=models.CharField(max_length=64, null=True),
+        ),
+        migrations.AddField(
+            model_name='sponsorticket',
+            name='badge_token',
+            field=models.CharField(max_length=64, null=True),
+        ),
+    ]

src/tickets/migrations/0011_save_badge_token_to_db.py

@@ -0,0 +1,29 @@
+# Generated by Django 2.2.3 on 2019-07-24 18:37
+from django.conf import settings
+from django.db import migrations
+
+from tickets.models import create_ticket_token
+
+
+def save_badge_tokens(apps, schema_editor):
+    ShopTicket = apps.get_model("tickets", "ShopTicket")
+    SponsorTicket = apps.get_model("tickets", "SponsorTicket")
+    DiscountTicket = apps.get_model("tickets", "DiscountTicket")
+
+    for model in (ShopTicket, SponsorTicket, DiscountTicket):
+
+        for ticket in model.objects.all():
+            badge_token = create_ticket_token(
+                "{_id}{secret_key}-badge".format(
+                    _id=ticket.uuid, secret_key=settings.SECRET_KEY
+                ).encode("utf-8")
+            )
+            ticket.badge_token = badge_token
+            ticket.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("tickets", "0010_auto_20190724_2037")]
+
+    operations = [migrations.RunPython(save_badge_tokens)]

src/tickets/migrations/0012_auto_20190724_2037.py

@@ -0,0 +1,28 @@
+# Generated by Django 2.2.3 on 2019-07-24 18:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tickets', '0011_save_badge_token_to_db'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='discountticket',
+            name='badge_token',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='shopticket',
+            name='badge_token',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='sponsorticket',
+            name='badge_token',
+            field=models.CharField(max_length=64),
+        ),
+    ]

src/tickets/models.py

@@ -17,15 +17,32 @@ logger = logging.getLogger("bornhack.%s" % __name__)
 class TicketType(CampRelatedModel, UUIDModel):
     name = models.TextField()
     camp = models.ForeignKey("camps.Camp", on_delete=models.PROTECT)
+    includes_badge = models.BooleanField(default=False)
 
     def __str__(self):
         return "{} ({})".format(self.name, self.camp.title)
 
 
+def create_ticket_token(string):
+    return hashlib.sha256(string).hexdigest()
+
+
+def qr_code_base64(token):
+    qr = qrcode.make(
+        token, version=1, error_correction=qrcode.constants.ERROR_CORRECT_H
+    ).resize((250, 250))
+    file_like = io.BytesIO()
+    qr.save(file_like, format="png")
+    qrcode_base64 = base64.b64encode(file_like.getvalue())
+    return qrcode_base64
+
+
 class BaseTicket(CampRelatedModel, UUIDModel):
     ticket_type = models.ForeignKey("TicketType", on_delete=models.PROTECT)
-    checked_in = models.BooleanField(default=False)
+    used = models.BooleanField(default=False)
     badge_handed_out = models.BooleanField(default=False)
+    token = models.CharField(max_length=64)
+    badge_token = models.CharField(max_length=64)
 
     class Meta:
         abstract = True
@@ -34,27 +51,33 @@ class BaseTicket(CampRelatedModel, UUIDModel):
     def camp(self):
         return self.ticket_type.camp
 
-    def _get_token(self):
-        return hashlib.sha256(
-            "{_id}{secret_key}".format(
-                _id=self.pk, secret_key=settings.SECRET_KEY
-            ).encode("utf-8")
-        ).hexdigest()
+    def save(self, **kwargs):
+        self.token = self._get_token()
+        self.badge_token = self._get_token()
+        super().save(**kwargs)
 
-    def get_qr_code_base64(self):
-        qr = qrcode.make(
-            self._get_token(),
-            version=1,
-            error_correction=qrcode.constants.ERROR_CORRECT_H,
-        ).resize((250, 250))
-        file_like = io.BytesIO()
-        qr.save(file_like, format="png")
-        qrcode_base64 = base64.b64encode(file_like.getvalue())
-        return qrcode_base64
+    def _get_token(self):
+        return create_ticket_token(
+            "{_id}{secret_key}".format(
+                _id=self.uuid, secret_key=settings.SECRET_KEY
+            ).encode("utf-8")
+        )
+
+    def _get_badge_token(self):
+        return create_ticket_token(
+            "{_id}{secret_key}-badge".format(
+                _id=self.uuid, secret_key=settings.SECRET_KEY
+            ).encode("utf-8")
+        )
 
     def get_qr_code_url(self):
         return "data:image/png;base64,{}".format(
-            self.get_qr_code_base64().decode("utf-8")
+            qr_code_base64(self._get_token()).decode("utf-8")
+        )
+
+    def get_qr_badge_code_url(self):
+        return "data:image/png;base64,{}".format(
+            qr_code_base64(self._get_badge_token()).decode("utf-8")
         )
 
     def generate_pdf(self):

src/tickets/templates/pdf/ticket.html

@@ -1,6 +1,5 @@
 {% load static from staticfiles %}
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-
 <table style="width:100%;">
     <tr>
         <td style="width: 75%;">&nbsp;</td>
@@ -25,11 +24,38 @@
   <h3>Sponsor: {{ ticket.sponsor.name }} </h3>
   <img src="{% static 'img/sponsors/' %}{{ sponsor.logo_filename }}"></img>
 {% endif %}
-{% if ticket.checked_in %}
-  <h2>This ticket has been checked in.</h2>
+
+{% if ticket.used %}
+  <h2>This ticket has been used.</h2>
 {% endif %}
 
 <center>
   <img src="{{ ticket.get_qr_code_url }}"></img>
-  <p>Ticket #{{ ticket.pk }}</p>
+  <p>{{ ticket.token }}</p>
 </center>
+
+{% if ticket.ticket_type.includes_badge %}
+<div style="display:block; clear:both; page-break-after:always;"></div>
+
+<table style="width:100%;">
+    <tr>
+        <td style="width: 75%;">&nbsp;</td>
+        <td>
+            <h3>
+                {{ ticket.created|date:"b jS, Y" }}<br>
+            </h3>
+        </td>
+    </tr>
+</table>
+<br />
+
+<h2>Badge voucher</h2>
+
+<center>
+    <img src="{{ ticket.get_qr_badge_code_url }}"></img>
+    <p>{{ ticket.badge_token }}</p>
+</center>
+
+{% endif %}
+
+

src/tickets/views.py

@@ -19,7 +19,7 @@ class ShopTicketListView(LoginRequiredMixin, ListView):
     def get_queryset(self):
         tickets = super(ShopTicketListView, self).get_queryset()
         user = self.request.user
-        return tickets.filter(order__user=user)
+        return tickets.filter(order__user=user).order_by("ticket_type__camp")
 
 
 class ShopTicketDownloadView(LoginRequiredMixin, SingleObjectMixin, View):

src/utils/pdf.py

@@ -12,7 +12,9 @@ logger = logging.getLogger("bornhack.%s" % __name__)
 
 
 def generate_pdf_letter(filename, template, formatdict):
-    logger.debug("Generating PDF with filename %s and template %s" % (filename, template))
+    logger.debug(
+        "Generating PDF with filename %s and template %s" % (filename, template)
+    )
 
     # conjure up a fake request for PDFTemplateResponse
     request = RequestFactory().get("/")
@@ -47,9 +49,9 @@ def generate_pdf_letter(filename, template, formatdict):
 
     # add the watermark to all pages
     for pagenum in range(pdfreader.getNumPages()):
-        page = watermark.getPage(0)
+        page = pdfreader.getPage(pagenum)
         try:
-            page.mergePage(pdfreader.getPage(pagenum))
+            page.mergePage(watermark.getPage(0))
         except ValueError:
             # watermark pdf might be broken?
             return False
@@ -65,4 +67,3 @@ def generate_pdf_letter(filename, template, formatdict):
     returnfile = io.BytesIO()
     finalpdf.write(returnfile)
     return returnfile
-

src/utils/templatetags/qrcode.py

@@ -0,0 +1,23 @@
+import base64
+import io
+
+import qrcode
+from django import template
+from django.utils.safestring import mark_safe
+
+register = template.Library()
+
+
+@register.simple_tag
+def qr_code(value):
+    stream = io.BytesIO()
+    img = qrcode.make("#" + value, box_size=5)
+    img.save(stream, "PNG")
+    data = base64.b64encode(stream.getvalue())
+
+    return mark_safe(
+        "<figure>"
+        '<img src="data:image/png;base64,{}" alt="">'
+        "<figcaption>{}</figcaption>"
+        "</figure>".format(data.decode(), value)
+    )