From 51c5affa85100394f4348a852a23ba5e6a906ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Ho=CC=88rler?= <i.hoerler@me.com>
Date: Wed, 28 Feb 2018 22:22:28 +0100
Subject: [PATCH] delete total of order in profile view

---
 .../templates/registration/profile.html       |  6 +---
 django/didgeridoo/webshop/views.py            | 29 ++-----------------
 2 files changed, 3 insertions(+), 32 deletions(-)

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 @@
     <th scope="col">ID</th>
     <th scope="col">DATE</th>
     <th scope="col">STATUS</th>
-    <th scope="col">ITEMS</th>
-    <th scope="col">PRICE</th>
   </tr>
-  {% for order, order_positions_count, total, currency_name in order_list_zip %}
+  {% for order, order_positions_count in order_list_zip %}
     <tr class="table_content">
         <td scope="col">{{ order.id }}</td>
         <td scope="col">{{ order.date }}</td>
         <td scope="col">
           <a href="{% url 'order' order.id %}">{{ order.status }}</a>
         </td>
-        <td scope="col">{{ order_positions_count }}</td>
-        <td scope="col">{{ total }} {{ currency_name }}</td>
     </tr>
   {% endfor %}
 </table>
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,