currancy in template

remotes/origin/mitri4
Dmitriy Shesterkin 9 years ago
parent 9643df68cf
commit 30d21eb971
  1. 14
      batiskaf/templates/jinja2/cart_detail.jinja
  2. 7
      batiskaf/templates/jinja2/includes/category_product_thumb.jinja
  3. 2
      batiskaf/templates/jinja2/index.jinja
  4. 12
      batiskaf/templates/jinja2/product.jinja
  5. 1
      static/less/_.css
  6. 2
      static/less/_.min.css
  7. 1
      static/less/components/_navbar.less
  8. 1
      store/cart.py
  9. 5
      store/currency.py
  10. 8
      store/views.py

@ -45,11 +45,11 @@
<a href="{{ item.item.product.get_absolute_url() }}">{{ item.item.product.title }}</a><br/> <a href="{{ item.item.product.get_absolute_url() }}">{{ item.item.product.title }}</a><br/>
<em>{{ item.item.variation }}</em> <em>{{ item.item.variation }}</em>
</td> </td>
<td class="text-right info">{{ item.item.get_price(request.user) }}</td> <td class="text-right info">{{ (request|currency).get_string_price(item.item.get_price(request.user)) }}</td>
<td class="text-right"><input type="number" value="{{ item.count }}" <td class="text-right"><input type="number" value="{{ item.count }}"
name="{{ item.id }}" class="form-control col-xs-1"/> name="{{ item.id }}" class="form-control col-xs-1"/>
</td> </td>
<td class="text-right success">{{ item.subtotal }}</td> <td class="text-right success">{{ (request|currency).get_string_price(item.subtotal) }}</td>
<td class="text-center"> <td class="text-center">
<a class="text-danger" href="/store/cart/remove/?id={{ item.id }}"><span <a class="text-danger" href="/store/cart/remove/?id={{ item.id }}"><span
class="glyphicon glyphicon-remove"></span> Удалить</a> class="glyphicon glyphicon-remove"></span> Удалить</a>
@ -60,10 +60,10 @@
<tfoot> <tfoot>
<tr> <tr>
<th colspan="5" class="text-left"><p class="text-right price-subtotal"> <th colspan="5" class="text-left"><p class="text-right price-subtotal">
Стоимость товара: <span id="cart-itogo">{{ cart.total }}</span> ₸ <br/> Стоимость товара: <span id="cart-itogo">{{ (request|currency).get_price(cart.total) }}</span> {{ (request|currency).get_symbol() }} <br/>
Стоимость доставки: <span id="order-itogo-delivery-up">0</span> Стоимость доставки: <span id="order-itogo-delivery-up">0</span> {{ (request|currency).get_symbol() }}
<br/> <br/>
Итого к оплате: <span id="order-itogo-amount-up">{{ cart.total }}</span> ₸ Итого к оплате: <span id="order-itogo-amount-up">{{ (request|currency).get_price(cart.total) }}</span> {{ (request|currency).get_symbol() }}
</p> </p>
<p> <p>
<a href="javascript:history.back()" class=""> <a href="javascript:history.back()" class="">
@ -167,9 +167,9 @@
<br> <br>
<div class="order-itogo text-right"> <div class="order-itogo text-right">
Стоимость доставки: <span id="order-itogo-delivery">0</span> Стоимость доставки: <span id="order-itogo-delivery">0</span> {{ (request|currency).get_symbol() }}
<br/> <br/>
Итого к оплате: <span id="order-itogo-amount">{{ cart.total }}</span> Итого к оплате: <span id="order-itogo-amount">{{ cart.total }}</span> {{ (request|currency).get_symbol() }}
</div> </div>
<br/> <br/>
<div class="radio"> <div class="radio">

@ -18,10 +18,11 @@
</div> </div>
<div class="price"> <div class="price">
{% if is_sale %} {% if is_sale %}
<small class="text-danger"><s>{{ product.min_price_variation().price }} <small class="text-danger"><s>
₸</s></small> {{ (request|currency).get_string_price(product.min_price_variation().price) }}
</s></small>
{% endif %} {% endif %}
{{ product.min_price(request.user) }} {{ (request|currency).get_string_price(product.min_price(request.user)) }}
</div> </div>
{% if product.in_stock() %} {% if product.in_stock() %}
<div class="state-yes"> <div class="state-yes">

@ -47,7 +47,7 @@
</a> </a>
</div> </div>
<div class="price"> <div class="price">
{{ (request|currency).get_price(product.min_price(request.user)) }} {{ (request|currency).get_string_price(product.min_price(request.user)) }}
</div> </div>
{% if product.in_stock() %} {% if product.in_stock() %}
<div class="state-yes"> <div class="state-yes">

@ -53,7 +53,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(request.user) }}</span> ₸ <span class="product-detail-price-span">{{ (request|currency).get_price(product.min_price(request.user)) }}</span> {{ (request|currency).get_symbol() }}
</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() %}
@ -65,10 +65,10 @@
<select name="product-variations-selecter" class="product-variations-selecter"> <select name="product-variations-selecter" class="product-variations-selecter">
{% for variation in product.variations.order_by('price') %} {% for variation in product.variations.order_by('price') %}
<option {% if variation.pk == variant.pk %}selected='selected'{% endif %} <option {% if variation.pk == variant.pk %}selected='selected'{% endif %}
value="{{ variation.pk }}" data-price="{{ variation.get_price(request.user) }}" value="{{ variation.pk }}" data-price="{{ (request|currency).get_price(variation.get_price(request.user)) }}"
data-count="{{ variation.in_stock }}">{{ variation.variation }} data-count="{{ variation.in_stock }}">{{ variation.variation }}
- {{ variation.get_price(request.user) }} - {{ (request|currency).get_price(variation.get_price(request.user)) }}
{{ (request|currency).get_symbol() }}
</option> </option>
{% endfor %} {% endfor %}
</select> </select>
@ -87,7 +87,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(request.user) }}</span> ₸ Итого: <span class="itogo-span">{{ (request|currency).get_price(product.min_price(request.user)) }}</span> {{ (request|currency).get_symbol() }}
</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() }}"
@ -160,7 +160,7 @@
</a> </a>
</div> </div>
<div class="price"> <div class="price">
{{ product.min_price(request.user) }} {{ (request|currency).get_string_price(product.min_price(request.user)) }}
</div> </div>
{% if product.in_stock() %} {% if product.in_stock() %}
<div class="state-yes"> <div class="state-yes">

@ -335,6 +335,7 @@
width: 49px; width: 49px;
text-align: center; text-align: center;
line-height: 50px; line-height: 50px;
background: #FC6E51;
} }
.currency-menu { .currency-menu {
width: 50px; width: 50px;

File diff suppressed because one or more lines are too long

@ -31,6 +31,7 @@
width: 49px; width: 49px;
text-align: center; text-align: center;
line-height: 50px; line-height: 50px;
background: #FC6E51;
} }
.currency-menu { .currency-menu {

@ -58,7 +58,6 @@ class Cart(object):
cart_object.profile = self.request.user cart_object.profile = self.request.user
cart_object.save() cart_object.save()
def deserialize_items(self): def deserialize_items(self):
for j in self.json_items['items']: for j in self.json_items['items']:
variation = None variation = None

@ -44,5 +44,8 @@ class Currency(object):
def get_price(self, price): def get_price(self, price):
_price = int(price * self.exchange) _price = int(price * self.exchange)
return Markup('{price} {code}'.format(price=_price, code=self.symbol)) return _price
def get_string_price(self, price):
return Markup('{price} {code}'.format(price=self.get_price(price), code=self.symbol))

@ -357,6 +357,8 @@ class CartDetailView(TemplateView):
def get_order_amount(request): def get_order_amount(request):
retval = None retval = None
_currency = _Currency(request)
a = AlemTat() a = AlemTat()
cart = Cart(request) cart = Cart(request)
retval = dict(a.get_amount( retval = dict(a.get_amount(
@ -366,7 +368,10 @@ def get_order_amount(request):
request.GET['deliv'], request.GET['deliv'],
)) ))
return JsonResponse(retval) _retval = {k: _currency.get_price(v) for k, v in retval.items() if k != 'FS'}
_retval['FS'] = retval['FS']
return JsonResponse(_retval)
def get_kazpost_tarif(weight, to): def get_kazpost_tarif(weight, to):
@ -439,6 +444,7 @@ def order_kkb(request, order):
).decode('utf-8') ).decode('utf-8')
c = dict(order=order, context=context, appendix=appendix) c = dict(order=order, context=context, appendix=appendix)
print(c)
return render(request, 'kkb.jinja', c) return render(request, 'kkb.jinja', c)

Loading…
Cancel
Save