diff --git a/django/didgeridoo/currencies/forms.py b/django/didgeridoo/currencies/forms.py index 0464a86..29e2cc2 100644 --- a/django/didgeridoo/currencies/forms.py +++ b/django/didgeridoo/currencies/forms.py @@ -1,5 +1,5 @@ from django import forms -from currencies.models import ExchangeRate_name +from currencies.models import ExchangeRate, ExchangeRate_name class CurrenciesForm(forms.Form): diff --git a/django/didgeridoo/currencies/templates/currencies/index.html b/django/didgeridoo/currencies/templates/currencies/index.html index acd63fb..4c9ef7b 100644 --- a/django/didgeridoo/currencies/templates/currencies/index.html +++ b/django/didgeridoo/currencies/templates/currencies/index.html @@ -1,88 +1,28 @@ {% extends "webshop/base.html" %} {% block section_title %}Currencies in CHF{% endblock %} {% block content %} -
DATE | +NAME | RATE | |
---|---|---|---|
{{ currency.date.date }} | +{{ currency.date }} | +{{ currency.name }} | {{ currency.exchange_rate_to_chf }} |
{{ message }}
{% else %} +- currency_USD_list missing. + currency_list missing.
{% endif %} -DATE | -RATE | -
---|---|
{{ currency.date.date }} | -{{ currency.exchange_rate_to_chf }} | -
- currency_EUR_list missing. -
- {% endif %} -DATE | -RATE | -
---|---|
{{ currency.date.date }} | -{{ currency.exchange_rate_to_chf }} | -
- currency_JPY_list missing. -
- {% endif %} -DATE | -RATE | -
---|---|
{{ currency.date.date }} | -{{ currency.exchange_rate_to_chf }} | -
- currency_GBP_list missing. -
- {% endif %} {% endblock %} diff --git a/django/didgeridoo/currencies/templatetags/customfilters.py b/django/didgeridoo/currencies/templatetags/customfilters.py deleted file mode 100644 index a30e2ab..0000000 --- a/django/didgeridoo/currencies/templatetags/customfilters.py +++ /dev/null @@ -1,12 +0,0 @@ -from django import template - - -register = template.Library() - - -@register.filter() -def boldcoffee(value): - # currency_of_customer = request.session['currency'] - return '%s !!gefiltert!!' % value - - # excample filter: {{ article.price_in_chf|boldcoffee }} diff --git a/django/didgeridoo/currencies/views.py b/django/didgeridoo/currencies/views.py index 62de99a..4a5ac1f 100644 --- a/django/didgeridoo/currencies/views.py +++ b/django/didgeridoo/currencies/views.py @@ -42,7 +42,7 @@ def currencies(request): message_offline = """ Are you offline? - useing stored currencies. This does not efect you, but your purchase prices will be - recalculated as soon as you submit your Order. + recalculated as soon as you submit your Order.please login to fill your basket...
++ please login to fill your basket... +
{% endif %} {% for picture in picture_list %} diff --git a/django/didgeridoo/webshop/templates/webshop/index.html b/django/didgeridoo/webshop/templates/webshop/index.html index f04590a..4c2dfd7 100644 --- a/django/didgeridoo/webshop/templates/webshop/index.html +++ b/django/didgeridoo/webshop/templates/webshop/index.html @@ -1,5 +1,4 @@ {% extends "webshop/base.html" %} -{% load customfilters %} {% block section_title %}Articles{% endblock %} {% block content %}