From de2426433179fb9e9e02c991e8a4126a777f07d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Ho=CC=88rler?= Date: Wed, 28 Feb 2018 21:47:19 +0100 Subject: [PATCH] undo currency dropdown onclick and fix price tag in order --- django/didgeridoo/currencies/forms.py | 12 ++++++------ django/didgeridoo/webshop/templates/webshop/nav.html | 3 ++- .../didgeridoo/webshop/templates/webshop/order.html | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/django/didgeridoo/currencies/forms.py b/django/didgeridoo/currencies/forms.py index 29e2cc2..6dc1071 100644 --- a/django/didgeridoo/currencies/forms.py +++ b/django/didgeridoo/currencies/forms.py @@ -8,10 +8,10 @@ class CurrenciesForm(forms.Form): required=False, empty_label='CHF', label='CURENCIES', - widget=forms.Select( - attrs={ - 'onchange': 'currency.submit();', - 'class': 'btn-primary dropdown-toggle' - } - ) + # widget=forms.Select( + # attrs={ + # 'onchange': 'currency.submit();', + # 'class': 'btn-primary dropdown-toggle' + # } + #) ) diff --git a/django/didgeridoo/webshop/templates/webshop/nav.html b/django/didgeridoo/webshop/templates/webshop/nav.html index fac5436..3800432 100644 --- a/django/didgeridoo/webshop/templates/webshop/nav.html +++ b/django/didgeridoo/webshop/templates/webshop/nav.html @@ -17,7 +17,8 @@ {% if article_view %}
{{ currencies_form.as_ul }} - {% csrf_token %} + {% csrf_token %} +
  • {% endif %} diff --git a/django/didgeridoo/webshop/templates/webshop/order.html b/django/didgeridoo/webshop/templates/webshop/order.html index 6f0ab0b..301f7aa 100644 --- a/django/didgeridoo/webshop/templates/webshop/order.html +++ b/django/didgeridoo/webshop/templates/webshop/order.html @@ -37,7 +37,7 @@ {{ order_position.article.stock }} {{ order_position.amount }} - {{ order_position.article.price_in_chf }} + {{ price }} {{ currency_name }}