diff --git a/batiskaf/templates/jinja2/category.jinja b/batiskaf/templates/jinja2/category.jinja index cc3cbf1..fda46db 100644 --- a/batiskaf/templates/jinja2/category.jinja +++ b/batiskaf/templates/jinja2/category.jinja @@ -52,10 +52,10 @@ {% endif %}
Показать на странице @@ -174,10 +174,10 @@ {% endif %}
Показать на странице diff --git a/store/models.py b/store/models.py index 73ec67a..3778eab 100644 --- a/store/models.py +++ b/store/models.py @@ -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/' diff --git a/store/views.py b/store/views.py index 28cc6ac..3b7f894 100644 --- a/store/views.py +++ b/store/views.py @@ -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