diff --git a/k4ever/buyable/templates/buyables/product_list.html b/k4ever/buyable/templates/buyables/product_list.html index aea79c0..a20ca8d 100644 --- a/k4ever/buyable/templates/buyables/product_list.html +++ b/k4ever/buyable/templates/buyables/product_list.html @@ -1,7 +1,7 @@ {% load thumbnail %} {% if buyables %} -
{{ buyable.name }} | {% if buyable.hasDeposit %} - - {{ buyable.price|floatformat:2 }} € + {{ buyable.price|floatformat:2 }}€ - - {{ buyable.price|floatformat:2 }} € / {{ buyable.deposit|floatformat:2 }} € + {{ buyable.price|floatformat:2 }}€ / {{ buyable.deposit|floatformat:2 }}€ - - {{ buyable.deposit|floatformat:2 }} € + {{ buyable.deposit|floatformat:2 }}€ {% else %} - - {{ buyable.price|floatformat:2 }} € + {{ buyable.price|floatformat:2 }}€ {% endif %} | diff --git a/k4ever/buyable/templates/buyables/showItem.html b/k4ever/buyable/templates/buyables/showItem.html index f7be065..7fef02c 100644 --- a/k4ever/buyable/templates/buyables/showItem.html +++ b/k4ever/buyable/templates/buyables/showItem.html @@ -3,70 +3,45 @@ {% block "content" %} - + Zur Liste aller Items {% if item %} -
-
|
- ||||||||
-
|
-
{{ buyable.buyable__name }} {% if buyable.num_buys %}({{ buyable.num_buys }} mal gekauft){% endif %} | {% if buyable.buyable__deposit > 0 %} - {{ buyable.buyable__price|floatformat:2 }}€ - {{ buyable.buyable__price|floatformat:2 }} € / {{ buyable.buyable__deposit|floatformat:2 }}€ + {{ buyable.buyable__price|floatformat:2 }}€ + {{ buyable.buyable__price|floatformat:2 }}€ / {{ buyable.buyable__deposit|floatformat:2 }}€ {% if includeDeposit %} - {{ buyable.buyable__deposit|floatformat:2 }}€ + {{ buyable.buyable__deposit|floatformat:2 }}€ {% endif %} {% else %} - {{ buyable.buyable__price|floatformat:2 }}€ + {{ buyable.buyable__price|floatformat:2 }}€ {% endif %} |
@@ -14,25 +14,25 @@ | ||||||
Getränke | -+ | {% include "main/product_list.html" with buyables=allMostDrinks %} | -+ | {% include "main/product_list.html" with buyables=usersMostDrinks %} | -+ | {% include "main/product_list.html" with buyables=usersLastDrinks %} |
---|---|---|---|---|---|---|
Snacks | -+ | {% include "main/product_list.html" with buyables=allMostSnacks %} | -+ | {% include "main/product_list.html" with buyables=usersMostSnacks %} | -+ | {% include "main/product_list.html" with buyables=usersLastSnacks %} |