add patch

This commit is contained in:
Ivan Hörler 2018-02-04 19:27:09 +01:00
parent afbc2b500b
commit e9a24863dc
2 changed files with 6 additions and 14 deletions

View File

@ -6,26 +6,18 @@
HOME HOME
</a> </a>
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li><a href="{% url 'cart' %}">CART</a></li>
{% if user.is_authenticated %} {% if user.is_authenticated %}
<li> <li><a href="{% url 'cart' %}">CART</a></li>
<a href="{% url 'profile' %}">PROFILE</a> <li><a href="{% url 'profile' %}">PROFILE</a></li>
</li> <li><a href="{% url 'logout' %}">LOGOUT</a></li>
<li>
<a href="{% url 'logout' %}">LOGOUT</a>
</li>
{% else %} {% else %}
<li> <li><a href="{% url 'login' %}">LOGIN</a></li>
<a href="{% url 'login' %}">LOGIN</a>
</li>
{% endif %} {% endif %}
<li class="dropdown"> <li class="dropdown">
{% if article_view %} {% if article_view %}
<form id="currency" action="" method="POST" novalidate> <form id="currency" action="" method="POST" novalidate>
{{ currencies_form.as_ul }} {{ currencies_form.as_ul }}
<li> <li><input type="submit" value="Select"></li>
<input type="submit" value="Select">
</li>
{% csrf_token %} {% csrf_token %}
</form> </form>
{% endif %} {% endif %}

View File

@ -251,7 +251,7 @@ def cart(request):
articles_list = list(articles) articles_list = list(articles)
for idx, article in enumerate(articles_list): for idx, article in enumerate(articles_list):
article.price_in_chf = rate.exchange( article.price_in_chf = rate.exchange(
currency, article.price_in_chf) currency, article.article.price_in_chf)
articles_list[idx] = article articles_list[idx] = article
currency_name = ExchangeRate_name.objects.get(id=currency) currency_name = ExchangeRate_name.objects.get(id=currency)
article.price_in_chf = rate.exchange(currency, article.price_in_chf) article.price_in_chf = rate.exchange(currency, article.price_in_chf)