From 74729ade14b302a6792d67332f2c234dd994b176 Mon Sep 17 00:00:00 2001
From: Thomas Steen Rasmussen <tykling@bornhack.org>
Date: Mon, 4 Dec 2017 10:43:25 +0100
Subject: [PATCH] fixup backoffice handout view a bit

---
 src/backoffice/templates/infodesk.html | 8 +++-----
 src/backoffice/views.py                | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/backoffice/templates/infodesk.html b/src/backoffice/templates/infodesk.html
index 080c6a68..1da85489 100644
--- a/src/backoffice/templates/infodesk.html
+++ b/src/backoffice/templates/infodesk.html
@@ -26,18 +26,16 @@
        </tr>
       </thead>
       <tbody>
-      {% for order in order_list %}
-      {% for productrel in order.orderproductrelation_set.all %}
+      {% for productrel in orderproductrelation_list %}
       <tr>
-          <td><a href="/admin/shop/order/{{ order.id }}/change/">Order #{{ order.id }}</a></td>
-          <td>{{ order.user }}</td>
+          <td><a href="/admin/shop/order/{{ productrel.order.id }}/change/">Order #{{ productrel.order.id }}</a></td>
+          <td>{{ productrel.order.user }}</td>
           <td>{{ productrel.id }}</td>
           <td>{{ productrel.product.name }}</td>
           <td>{{ productrel.quantity }}</td>
           <td>{{ productrel.handed_out }}</td>
       </tr>
       {% endfor %}
-      {% endfor %}
       </tbody>
     </table>
 </div>
diff --git a/src/backoffice/views.py b/src/backoffice/views.py
index 0dbd2717..bf247609 100644
--- a/src/backoffice/views.py
+++ b/src/backoffice/views.py
@@ -4,7 +4,7 @@ from django.views import View
 from django.conf import settings
 from django.utils.decorators import method_decorator
 from django.http import HttpResponseForbidden
-from shop.models import Order
+from shop.models import OrderProductRelation
 import logging
 logger = logging.getLogger("bornhack.%s" % __name__)
 
@@ -22,5 +22,5 @@ class BackofficeIndexView(StaffMemberRequiredMixin, TemplateView):
 
 class InfodeskView(StaffMemberRequiredMixin, ListView):
     template_name = "infodesk.html"
-    queryset = Order.objects.filter(paid=True, cancelled=False, refunded=False, orderproductrelation__handed_out=False).distinct()
+    queryset = OrderProductRelation.objects.filter(handed_out=False, order__paid=True, order__refunded=False, order__cancelled=False).order_by("'order')