diff --git a/django/didgeridoo/webshop/templates/registration/profile.html b/django/didgeridoo/webshop/templates/registration/profile.html index 787540b..864795e 100644 --- a/django/didgeridoo/webshop/templates/registration/profile.html +++ b/django/didgeridoo/webshop/templates/registration/profile.html @@ -23,18 +23,14 @@ ID DATE STATUS - ITEMS - PRICE - {% for order, order_positions_count, total, currency_name in order_list_zip %} + {% for order, order_positions_count in order_list_zip %} {{ order.id }} {{ order.date }} {{ order.status }} - {{ order_positions_count }} - {{ total }} {{ currency_name }} {% endfor %} diff --git a/django/didgeridoo/webshop/views.py b/django/didgeridoo/webshop/views.py index be85bac..fa800a9 100644 --- a/django/didgeridoo/webshop/views.py +++ b/django/didgeridoo/webshop/views.py @@ -177,36 +177,11 @@ def profile(request): order_positions = OrderPosition.objects.filter(order=order) if (order_positions.count()) > 0: order_positions_count = order_positions.count() - order_position_list = list(order_positions) - for idx2, order_position in enumerate(order_position_list): - position_price = None - price = None - # get currencyname to display: - if order.exchange_rate is not None: - # get price of position in order and append to a list: - rate = ExchangeRate.objects.get( - id=order.exchange_rate.id) - price = round( - rate.exchange_rate_to_chf * - order_position.price_in_chf, - 2) - currency_name = order.exchange_rate - else: - currency_name = 'CHF' - price = order_position.price_in_chf - position_price = price * Decimal.from_float( - order_position.amount) - totalprice_list.append(position_price) - order_position_list[idx2] = order_position - total = sum(totalprice_list) - currency_list.append(currency_name) - total_list.append(total) order_positions_count_list.append(order_positions_count) orders_list[idx1] = order order_list_zip = zip(orders_list, - order_positions_count_list, - total_list, - currency_list) + order_positions_count_list + ) # assert False return render(request, 'registration/profile.html', {'person': person,