ibz
/
web_AI-5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart

This commit is contained in:
Andreas Zweili 2018-02-25 19:59:23 +01:00
parent efa92ea074 2c52c2483a
commit b15745a3bc
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
django/didgeridoo/webshop/templates/webshop/cart.html
View File

@ -3,15 +3,15 @@
{% block content %}
<h3>List of Items in your Shopping Cart:</h3>
{% if cart_position_list_zip %}
<table class="table">
<table class="table price-table">
<tr class="table_header">
<th scope="col">POS.</th>
<th scope="col">ART#</th>
<th scope="col">NAME</th>
<th scope="col">STOCK</th>
<th scope="col">AMOUNT</th>
<th scope="col">PRICE p.pce.</th>
<th scope="col">POSITION PRICE</th>
<th scope="col" class="price-label">PRICE p.pce.</th>
<th scope="col" class="price-label">POSITION PRICE</th>
</tr>
{% for cart_position, amount_form in cart_position_list_zip %}
<tr class="table_content">
@ -33,16 +33,21 @@
</form>
<!-- {{ article.amount }} -->
</td>
<td scope="col">
<td scope="col" class="price-value">
{{ cart_position.article.price_in_chf }}
{{ currency_name }}
</td>
<td scope="col">{{ cart_position.position_price }} {{ currency_name }}</td>
<td scope="col" class="price-value">
{{ cart_position.position_price }} {{ currency_name }}
</td>
</tr>
{% endfor %}
<tr>
<td scope="col" colspan="7" class="text-right">
Total: {{ total }} {{ currency_name }}
<td scope="col" colspan="5"class="text-right">
<td scope="col" class="price-value">
<dl><dt>Total:</dl></dt></td>
<td scope="col" class="price-value">
<dl><dt>{{ total }} {{ currency_name }}</dl></dt>
</td>
</tr>
</table>

5
django/didgeridoo/webshop/views.py
View File

@ -381,11 +381,6 @@ def checkout(request):
cart_position_list = list(cart_positions)
# enumerate the list of articles and loop over items:
for idx, cart_position in enumerate(cart_position_list):
# *************************************************
# !!! here i don't understand how its intended
# to use the utils function.
# cart_position = process_article_prices(request, cart_position)
# *************************************************
# scrap out the details to calculate Total of item and Summ of All:
if currency:
# get currencyname to display: