diff --git a/choose/models.py b/choose/models.py
index c50dd60..3b0220d 100644
--- a/choose/models.py
+++ b/choose/models.py
@@ -47,6 +47,7 @@ class Tea(models.Model):
type = models.ForeignKey(TeaType,
related_name='teas',
on_delete=models.CASCADE)
+ m = models.IntegerField()
def __str__(self):
return self.name
diff --git a/choose/templates/choose.html b/choose/templates/choose.html
index 7453280..67ee75e 100644
--- a/choose/templates/choose.html
+++ b/choose/templates/choose.html
@@ -10,7 +10,7 @@
|
Название |
- Цена за 50 гр |
+ Цена за минимальную массу |
Вес |
|
@@ -37,8 +37,8 @@
@@ -81,17 +81,21 @@
{% for type_name,type in category.items %}
"{{ type_name }}": {
{% for key,item in type.items%}
- "{{ key }}": "{{ item }}",
+ {% if not key == 'ms' %}
+ "{{ key }}": "{{ item }}",
+ {% else %}
+ "{{ key }}": {{ item }},
+ {% endif %}
{% endfor %}
},
{% endfor %}
{% endfor %}
}
- function change(value, type) {
+ function change(value, type, step) {
choice[type] = parseInt(value)
const price_el = document.getElementById('price ' + type);
- price_el.innerText = parseInt(value) / 50 * parseInt(a[type].price)
+ price_el.innerText = parseInt(value) / step * parseInt(a[type].price)
sum_price()
}
diff --git a/choose/views.py b/choose/views.py
index f626fb8..66dc93c 100644
--- a/choose/views.py
+++ b/choose/views.py
@@ -38,8 +38,9 @@ def list_of_teas():
dic[tt.category.name][tt.name]['price'] = int(tt.preferred.price / 100)
dic[tt.category.name][tt.name]['pic'] = '/media/' + str(tt.preferred.pic.id) + '.' + get_extension(
tt.preferred.pic.href)
+ dic[tt.category.name][tt.name]['ms'] = [tt.preferred.m * x for x in range(0, 11)]
- return {'categories': dic, 'ms': [0, 50, 100, 150, 200, 250, 300, 350, 400, 450, 500]}
+ return {'categories': dic}
def list_of_choices(request):
|