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 @@
- {% for order in order_list %}
- {% for productrel in order.orderproductrelation_set.all %}
+ {% for productrel in orderproductrelation_list %}
- Order #{{ order.id }} |
- {{ order.user }} |
+ Order #{{ productrel.order.id }} |
+ {{ productrel.order.user }} |
{{ productrel.id }} |
{{ productrel.product.name }} |
{{ productrel.quantity }} |
{{ productrel.handed_out }} |
{% endfor %}
- {% endfor %}
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')