remotes/origin/mitri4
spacenergy 10 years ago
parent 15fd6e283b
commit d856df9544
  1. 67
      batiskaf/templates/jinja2/product.jinja
  2. 10
      store/views.py

@ -41,7 +41,10 @@
data-zoom-image='/static/{{ product.main_image().url }}'/> data-zoom-image='/static/{{ product.main_image().url }}'/>
<!-- </a> --> <!-- </a> -->
</div> </div>
<br>
<p><small><em>Доставка по Казахстану: от 2 до 12 дней, в зависимости от выбранного способа доставки.</em></small></p>
</div> </div>
</div> </div>
<div class="col-xs-6 product-short-description"> <div class="col-xs-6 product-short-description">
<h1 style="font-size:19px; margin-top:0;" class="text-left">{{ product.title }}</h1> <h1 style="font-size:19px; margin-top:0;" class="text-left">{{ product.title }}</h1>
@ -113,12 +116,74 @@
<div class=" text-left product-description"> <div class=" text-left product-description">
{{ product.description|linebreaks|safe }} {{ product.description|linebreaks|safe }}
</div> </div>
{% if ranee %}
<hr class="dashed"/>
<h4>Ранее просмотренные товары</h4>
<div class="index-goods">
<div class="row">
{% for product in ranee %}
<div class="col-md-3 col-xs-3 col-sm-3 col-lg-3">
<div class="thumbnail">
{% set im = product.main_image()|thumbnail("420x420") %}
<a href="{{ product.get_absolute_url() }}"><img src="/static/{{ im.url }}"
class="img-responsive"
alt="Купить {{ product.title }}"
title="Купить {{ product.title }}"></a>
<div class="caption">
<div class="title">
<a href="{{ product.get_absolute_url() }}">
{{ product.title }}
</a>
</div>
<div class="price">
{{ product.min_price() }} ₸
</div>
{% if product.in_stock() %}
<div class="state-yes">
<span class="glyphicon glyphicon-ok-sign" aria-hidden="true"></span> Товар
есть в наличии
</div>
{% else %}
<div class="state-no">
<span class="glyphicon glyphicon-ok-sign" aria-hidden="true"></span> Товара
нет в наличии
</div>
{% endif %}
<div class="in-cart">
{% if product.in_stock() %}
<a class="btn btn-warning btn-block"
href="/store/cart/add/?pk={{ product.variations.filter(in_stock__gt=0).order_by('price').first().pk }}&count=1&next={{ request.get_full_path()|urlencode }}"><span><span
class="glyphicon glyphicon-shopping-cart" aria-hidden="true"></span> Добавить в корзину</span></a>
{% else %}
<a class=" btn btn-danger btn-block order-order-link" href="#order-form"
data-itemid="{{ product.pk }}"><span><span
class="glyphicon glyphicon-import"
aria-hidden="true"></span> Заказать</span></a>
{% endif %}
</div>
</div>
</div>
</div>
{% endfor %}
</div>
</div>
{% endif %}
<hr class="dashed"/> <hr class="dashed"/>
<h3 class=""> <h3 class="">
Отзывы о товаре {{ product.title }} Отзывы о товаре {{ product.title }}
</h3><br/> </h3><br/>
<div class="well well-lg news-container"> <div class="well well-lg news-container">
<ul class="media-list"> <ul class="media-list">
{% if product.feedback.all() %} {% if product.feedback.all() %}
{% for comment in product.feedback.all() %} {% for comment in product.feedback.all() %}

@ -157,6 +157,12 @@ class ProductView(CategoryBaseView, DetailView):
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
self.category = self._get_full_category(kwargs['categories']) self.category = self._get_full_category(kwargs['categories'])
retval = super(ProductView, self).get(request, args, kwargs) retval = super(ProductView, self).get(request, args, kwargs)
ranee = request.session.get('ranee', [])
#import pdb;pdb.set_trace()
if kwargs['slug'] not in ranee:
ranee.append(kwargs['slug'])
request.session['ranee'] = ranee
return retval return retval
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
@ -164,6 +170,10 @@ class ProductView(CategoryBaseView, DetailView):
retval['category'] = self.category retval['category'] = self.category
retval['form'] = ProductFeedbackForm(self.request.POST or None) retval['form'] = ProductFeedbackForm(self.request.POST or None)
retval['updated'] = ProductsUpdate.objects.last() retval['updated'] = ProductsUpdate.objects.last()
ranee = self.request.session.get('ranee', [])
#import pdb;pdb.set_trace()
#ranee.pop(kwargs['object'].slug)
retval['ranee'] = Product.objects.filter(slug__in=ranee).exclude(pk = kwargs['object'].pk)[:4]
return retval return retval
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):

Loading…
Cancel
Save