From 404941b235781b231f1dd123171d76542303efa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Ho=CC=88rler?= Date: Wed, 28 Feb 2018 21:40:17 +0100 Subject: [PATCH] fix pos_price in Orderview --- django/didgeridoo/webshop/templates/webshop/order.html | 5 ++--- django/didgeridoo/webshop/views.py | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/django/didgeridoo/webshop/templates/webshop/order.html b/django/didgeridoo/webshop/templates/webshop/order.html index 16f7cd0..6f0ab0b 100644 --- a/django/didgeridoo/webshop/templates/webshop/order.html +++ b/django/didgeridoo/webshop/templates/webshop/order.html @@ -1,5 +1,4 @@ {% extends "webshop/base.html" %} -{% load customfilters %} {% block section_title %}Order{% endblock %} {% block content %} {% if order %} @@ -26,7 +25,7 @@ PRICE p.pce. POSITION PRICE - {% for order_position, price in order_position_list_zip %} + {% for order_position, price, pos_price in order_position_list_zip %} {{ order_position.id }} {{ order_position.article.id }} @@ -42,7 +41,7 @@ {{ currency_name }} - {{ price }} {{ currency_name }} + {{ pos_price }} {{ currency_name }} {% endfor %} diff --git a/django/didgeridoo/webshop/views.py b/django/didgeridoo/webshop/views.py index 6382ede..32470d5 100644 --- a/django/didgeridoo/webshop/views.py +++ b/django/didgeridoo/webshop/views.py @@ -477,7 +477,9 @@ def order(request, order_id): price_list.append(price) totalprice_list.append(position_price) total = sum(totalprice_list) - order_position_list_zip = zip(order_position_list, price_list) + order_position_list_zip = zip(order_position_list, + price_list, + totalprice_list) return render(request, 'webshop/order.html', { 'order': order, 'order_position_list_zip': order_position_list_zip,