Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
This commit is contained in:
commit
ccde016af5
|
@ -8,6 +8,7 @@
|
||||||
<th scope="col">ID</th>
|
<th scope="col">ID</th>
|
||||||
<th scope="col">NAME</th>
|
<th scope="col">NAME</th>
|
||||||
<th scope="col">STOCK</th>
|
<th scope="col">STOCK</th>
|
||||||
|
<th scope="col">AMOUNT</th>
|
||||||
<th scope="col">PRICE</th>
|
<th scope="col">PRICE</th>
|
||||||
</tr>
|
</tr>
|
||||||
{% for article in articles_list %}
|
{% for article in articles_list %}
|
||||||
|
@ -18,6 +19,7 @@
|
||||||
{{ article.article.name }}
|
{{ article.article.name }}
|
||||||
</a></td>
|
</a></td>
|
||||||
<td scope="col">{{ article.article.stock }}</td>
|
<td scope="col">{{ article.article.stock }}</td>
|
||||||
|
<td scope="col">{{ article.amount }}</td>
|
||||||
<td scope="col">{{ article.article.price_in_chf }} {{ currency_name }}</td>
|
<td scope="col">{{ article.article.price_in_chf }} {{ currency_name }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
|
@ -232,6 +232,8 @@ def cart(request):
|
||||||
article_view = True
|
article_view = True
|
||||||
currency_name = "CHF"
|
currency_name = "CHF"
|
||||||
message = ""
|
message = ""
|
||||||
|
cart_id = False
|
||||||
|
articles_list = ""
|
||||||
|
|
||||||
if not 'currency' in request.session:
|
if not 'currency' in request.session:
|
||||||
request.session['currency'] = None
|
request.session['currency'] = None
|
||||||
|
|
Loading…
Reference in New Issue