remotes/origin/mitri4
spacenergy 10 years ago
parent 1becf1fdeb
commit b0a672a12b
  1. 20
      accounts/migrations/0006_auto_20160307_2043.py
  2. 6
      batiskaf/templates/jinja2/product.jinja
  3. 20
      store/migrations/0049_auto_20160307_2043.py

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.3 on 2016-03-07 20:43
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('accounts', '0005_profile_sale'),
]
operations = [
migrations.AlterField(
model_name='profile',
name='sale',
field=models.IntegerField(default=0, verbose_name='Индивидуальная скидка (Beuchat и Scorpena) %'),
),
]

@ -50,7 +50,7 @@
<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>
<div class="product-detail-price"> <div class="product-detail-price">
<span class="product-detail-price-span">{{ product.min_price() }}</span> ₸ <span class="product-detail-price-span">{{ product.min_price(request.user) }}</span> ₸
</div> </div>
<br/> <br/>
{% set variant = product.variations.filter(in_stock__gt=0).order_by('price').first() %} {% set variant = product.variations.filter(in_stock__gt=0).order_by('price').first() %}
@ -84,7 +84,7 @@
</select> </select>
<div class="row"> <div class="row">
<div class="itogo col-xs-6"> <div class="itogo col-xs-6">
Итого: <span class="itogo-span">{{ product.min_price() }}</span> ₸ Итого: <span class="itogo-span">{{ product.min_price(request.user) }}</span> ₸
</div> </div>
<div class="col-xs-6 text-right"> <div class="col-xs-6 text-right">
<a href="/store/cart/add/?pk={{ variant.pk }}&count=1&next={{ product.get_absolute_url() }}" <a href="/store/cart/add/?pk={{ variant.pk }}&count=1&next={{ product.get_absolute_url() }}"
@ -140,7 +140,7 @@
</a> </a>
</div> </div>
<div class="price"> <div class="price">
{{ product.min_price() }} ₸ {{ product.min_price(request.user) }} ₸
</div> </div>
{% if product.in_stock() %} {% if product.in_stock() %}
<div class="state-yes"> <div class="state-yes">

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save