remotes/origin/artem
Gena 11 years ago
parent 51f7dc55e8
commit b11fb1141c
  1. 16
      batiskaf/templates/jinja2/category.jinja
  2. 6
      store/models.py
  3. 2
      store/views.py

@ -52,10 +52,10 @@
{% endif %}</div>
<div class="col-xs-4 text-right">Показать
<select name="show-count" id="">
<option value="10">10</option>
<option value="20">20</option>
<option value="50">50</option>
<option value="100">100</option>
<option value="30">30</option>
<option value="60">60</option>
<option value="90">90</option>
<option value="150">150</option>
<option value="all">Все</option>
</select>
на странице
@ -174,10 +174,10 @@
{% endif %}</div>
<div class="col-xs-4 text-right">Показать
<select name="show-count" id="">
<option value="10">10</option>
<option value="20">20</option>
<option value="50">50</option>
<option value="100">100</option>
<option value="30">30</option>
<option value="60">60</option>
<option value="90">90</option>
<option value="150">150</option>
<option value="all">Все</option>
</select>
на странице

@ -182,7 +182,11 @@ class Product(models.Model):
Min('price'))['price__min'] or 0
if not retval:
retval = self.variations.aggregate(Min('price'))['price__min'] or 0
return retval
if retval > 20000:
return retval * Decimal('.95')
else:
return retval * Decimal('.93')
def get_absolute_url(self):
retval = '/store/'

@ -53,7 +53,7 @@ class CategoryView(CategoryBaseView, TemplateView):
return sort
def paginate(self):
paginate_by = self.request.GET.get('paginate_by', 21)
paginate_by = self.request.GET.get('paginate_by', 30)
if paginate_by == 'all':
paginate_by = 10000

Loading…
Cancel
Save