diff --git a/k4ever/buyable/templates/buyables/product_list.html b/k4ever/buyable/templates/buyables/product_list.html
index e4a6405..ea024a9 100644
--- a/k4ever/buyable/templates/buyables/product_list.html
+++ b/k4ever/buyable/templates/buyables/product_list.html
@@ -8,26 +8,26 @@
|
- {{ buyable.name }} |
+ {{ buyable.name }} |
{% if buyable.hasDeposit %}
-
{{ buyable.price|floatformat:2 }}€
+ href="{% url buyable_buy buyable.id "with/deposit" %}" title="Kaufen (Mit Pfand)">
{{ buyable.price|floatformat:2 }}€ / {{ buyable.deposit|floatformat:2 }}€
+ href="{% url buyable_buy buyable.id "only/deposit" %}" title="Kaufen (Nur Pfand)">
{{ buyable.deposit|floatformat:2 }}€
{% else %}
-
{{ buyable.price|floatformat:2 }}€
diff --git a/k4ever/buyable/urls.py b/k4ever/buyable/urls.py
index c9f857b..eb5ccd1 100644
--- a/k4ever/buyable/urls.py
+++ b/k4ever/buyable/urls.py
@@ -3,8 +3,9 @@ from django.conf.urls.defaults import *
#/store/
urlpatterns = patterns('',
(r'^$', 'buyable.views.showItems'),
- (r'^show/(\d+)/$', 'buyable.views.showItem'),
- (r'^buy/(\d+)/(|with/deposit|only/deposit)/?$', 'buyable.views.buyItem'),
+ url(r'^show/(\d+)/$', 'buyable.views.showItem', name='buyable_show'),
+ url(r'^buy/(\d+)/$', 'buyable.views.buyItem', name='buyable_buy'),
+ url(r'^buy/(\d+)/(with/deposit|only/deposit)/$', 'buyable.views.buyItem', name='buyable_buy'),
(r'^bought/(\d+)/?$', 'buyable.views.boughtItem'),
(r'^history/?$', 'buyable.views.history'),
)
diff --git a/k4ever/main/templates/main/product_list.html b/k4ever/main/templates/main/product_list.html
index ce6e2b6..0d26f8a 100644
--- a/k4ever/main/templates/main/product_list.html
+++ b/k4ever/main/templates/main/product_list.html
@@ -6,18 +6,18 @@
{% for buyable in buyables %}
|
-
+
|
{{ buyable.name }} {% if buyable.num_buys %}({{ buyable.num_buys }} mal gekauft){% endif %} |
{% if buyable.deposit > 0 %}
- {{ buyable.price|floatformat:2 }}€
- {{ buyable.price|floatformat:2 }}€ / {{ buyable.deposit|floatformat:2 }}€
+ {{ buyable.price|floatformat:2 }}€
+ {{ buyable.price|floatformat:2 }}€ / {{ buyable.deposit|floatformat:2 }}€
{% if includeDeposit %}
- {{ buyable.deposit|floatformat:2 }}€
+ {{ buyable.deposit|floatformat:2 }}€
{% endif %}
{% else %}
- {{ buyable.price|floatformat:2 }}€
+ {{ buyable.price|floatformat:2 }}€
{% endif %}
|