diff --git a/website/pizzas/templates/pizzas/overview.html b/website/pizzas/templates/pizzas/overview.html index d21c0f431074e6a764dcd4a6bf942709fb6db11e..fa7dfa738bb2d78f42051980c7e8efb62fb7e180 100644 --- a/website/pizzas/templates/pizzas/overview.html +++ b/website/pizzas/templates/pizzas/overview.html @@ -24,7 +24,7 @@ - {% for product in product_list.values %} + {% for product in product_list %} {{ product.name }} diff --git a/website/pizzas/views.py b/website/pizzas/views.py index 086d2a78665c9bc56d05eb34987456c64cc58d67..78be8d1454d903d9bd7efac0c23205a75c0c8053 100644 --- a/website/pizzas/views.py +++ b/website/pizzas/views.py @@ -28,7 +28,8 @@ def orders(request, event_pk): event = get_object_or_404(PizzaEvent, pk=event_pk) context = {'event': event, 'orders': Order.objects.filter(pizza_event=event) - .prefetch_related('member', 'product')} + .prefetch_related('member', 'product') + .order_by('member__user__first_name')} return render(request, 'pizzas/orders.html', context) @@ -55,6 +56,8 @@ def overview(request, event_pk): total_products += 1 total_money += order.product.price + product_list = sorted(product_list.values(), key=lambda x: x['name']) + context = { 'event': event, 'product_list': product_list,