mitri4
/
batiskaf
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no message

Browse Source
remotes/origin/artem
Gena 11 years ago
parent 25c560519c
commit f6bdf5ef2c
5 changed files with 47 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      batiskaf/templates/jinja2/base.jinja
  2. 17
      batiskaf/templates/jinja2/cart_detail.jinja
  3. 17
      static/js/_.js
  4. 14
      static/less/_.css
  5. 12
      static/less/_.less

7
batiskaf/templates/jinja2/base.jinja
Unescape View File

@ -12,7 +12,7 @@
<link href="/static/bower_components/Bootflat/css/bootstrap.min.css" rel="stylesheet"> <link href="/static/bower_components/Bootflat/css/bootstrap.min.css" rel="stylesheet">
<link href="/static/bower_components/Bootflat/bootflat/css/bootflat.min.css" rel="stylesheet"> <link href="/static/bower_components/Bootflat/bootflat/css/bootflat.min.css" rel="stylesheet">
<link href="/static/less/_.css?v=8" rel="stylesheet"> <link href="/static/less/_.css?v=9" rel="stylesheet">
<link href="/static/css/select2.min.css" rel="stylesheet"> <link href="/static/css/select2.min.css" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="/static/bower_components/sweetalert/lib/sweet-alert.css"> <link rel="stylesheet" type="text/css" href="/static/bower_components/sweetalert/lib/sweet-alert.css">
<link href="/static/js/icheck/skins/square/blue.css" rel="stylesheet"> <link href="/static/js/icheck/skins/square/blue.css" rel="stylesheet">
@ -93,8 +93,7 @@
<p class="quick-links"><a href="#">Мой аккаунт</a> | <a href="/news/">Новости</a> | <a href="/store/cart/">Моя <p class="quick-links"><a href="#">Мой аккаунт</a> | <a href="/news/">Новости</a> | <a href="/store/cart/">Моя
корзина {% if (request|cart).items|length > 0 %} корзина {% if (request|cart).items|length > 0 %}
<span class="label label-success">{{ (request|cart).items|length }}</span>{% endif %}</a> | <a <span class="label label-success">{{ (request|cart).items|length }}</span>{% endif %}</a> | <a href="#">Войти</a></p>
href="#">Оформление заказа</a> | <a href="#">Войти</a></p>
</div> </div>
</div> </div>
</div> </div>
@ -380,7 +379,7 @@
<script src="/static/js/jquery.elevateZoom-3.0.8.min.js"></script> <script src="/static/js/jquery.elevateZoom-3.0.8.min.js"></script>
<script src="/static/js/Selecter/jquery.fs.selecter.min.js"></script> <script src="/static/js/Selecter/jquery.fs.selecter.min.js"></script>
<script src="/static/js/select2.min.js"></script> <script src="/static/js/select2.min.js"></script>
<script src="/static/js/_.js?v=4"></script> <script src="/static/js/_.js?v=5"></script>
{% endblock footer_scripts %} {% endblock footer_scripts %}
{% block jss %}{% endblock jss %} {% block jss %}{% endblock jss %}
{% if messages %} {% if messages %}

17
batiskaf/templates/jinja2/cart_detail.jinja
Unescape View File

@ -57,7 +57,7 @@
<tr> <tr>
<th colspan="2" class="text-left"><a href="javascript:history.back()" class=""> <th colspan="2" class="text-left"><a href="javascript:history.back()" class="">
&larr; Продолжить покупки</a></th> &larr; Продолжить покупки</a></th>
<th colspan="3" class="text-right table-cart-itogo">Стоимость товара: <span id="cart-itogo">{{ cart.total }}</span> ₸</th> <th colspan="3" class="text-right table-cart-itogo"></th>
<th class="text-center"> <th class="text-center">
<button type="submit" class="btn btn-primary"><span <button type="submit" class="btn btn-primary"><span
class="glyphicon glyphicon-repeat"></span> Пересчитать class="glyphicon glyphicon-repeat"></span> Пересчитать
@ -69,23 +69,34 @@
</table> </table>
</form> </form>
</div> </div>
<p class="text-right price-subtotal">
Стоимость товара: <span id="cart-itogo">{{ cart.total }}</span> ₸ <br/>
Стоимость доставки: <span id="order-itogo-delivery-up">0</span> ₸
<br/>
Итого к оплате: <span id="order-itogo-amount-up">{{ cart.total }}</span> ₸
</p>
<div class="order-data"> <div class="order-data">
<div class="row"> <div class="row">
<h3 class="">Расчет доставки</h3><br/> <h3 class="">Расчет доставки</h3><br/>
<div class="col-xs-6 col-xs-offset-3"> <div class="col-xs-6 col-xs-offset-3">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<form action="" class="" method="post"><input type="hidden" name="csrfmiddlewaretoken" value="{{ csrf_token }}"> <form action="" class="" method="post"><input type="hidden" name="csrfmiddlewaretoken"
value="{{ csrf_token }}">
{{ form|bootstrap }} {{ form|bootstrap }}
<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> ₸
<br/> <br/>
Итого к оплате: <span id="order-itogo-amount">{{ cart.total }}</span> ₸ Итого к оплате: <span id="order-itogo-amount">{{ cart.total }}</span> ₸
</div> </div>
<br/> <br/>
<div class="form-group text-center"> <div class="form-group text-center">
<button type="submit" name="order_next" class="btn btn-success">Продолжить</button> <button type="submit" name="order_next" class="btn btn-success">Продолжить
</button>
</div> </div>
</form> </form>
</div> </div>

17
static/js/_.js
Unescape View File

@ -172,9 +172,11 @@ $(document).ready(function () {
function selectCity() { function selectCity() {
var city = $('#id_city').val(); var city = $('#id_city').val();
var deliv = $('#id_deliv_type').val(); var deliv = $('#id_deliv_type').val();
var cart_itogo = $('#cart-itogo').html(); var cart_itogo = $('#cart-itogo');
var order_itogo = $('#order-itogo-amount');
var order_itogo_delivery = $('#order-itogo-delivery'); var order_itogo_delivery = $('#order-itogo-delivery');
var order_itogo = $('#order-itogo-amount');
var order_itogo_up = $('#order-itogo-amount-up');
var order_itogo_delivery_up = $('#order-itogo-delivery-up');
if (city && deliv) { if (city && deliv) {
$.ajax({ $.ajax({
@ -188,11 +190,20 @@ $(document).ready(function () {
}) })
.done(function (msg) { .done(function (msg) {
order_itogo.html( order_itogo.html(
parseFloat(msg.AmountPlusFSAmount) + parseFloat(cart_itogo) parseFloat(msg.AmountPlusFSAmount) + parseFloat(cart_itogo.html())
);
order_itogo_up.html(
parseFloat(msg.AmountPlusFSAmount) + parseFloat(cart_itogo.html())
); );
order_itogo_delivery.html( order_itogo_delivery.html(
parseFloat(msg.AmountPlusFSAmount) parseFloat(msg.AmountPlusFSAmount)
); );
//cart_itogo.html(
// parseFloat(msg.AmountPlusFSAmount) + parseFloat(cart_itogo.html())
//);
order_itogo_delivery_up.html(
parseFloat(msg.AmountPlusFSAmount)
);
}); });
} else { } else {

14
static/less/_.css
Unescape View File

@ -630,7 +630,7 @@ footer .footer-col {
margin-top: 10px; margin-top: 10px;
background: none; background: none;
border-left: 1px #5e5e5e solid; border-left: 1px #5e5e5e solid;
height: 150px; height: 100px;
} }
footer .footer-col.col-last { footer .footer-col.col-last {
border-right: 1px #5e5e5e solid; border-right: 1px #5e5e5e solid;
@ -641,7 +641,7 @@ footer .footer-top {
background-color: #fed000; background-color: #fed000;
} }
footer .footer-bottom { footer .footer-bottom {
height: 380px; height: 330px;
color: #ffffff; color: #ffffff;
font-size: 12px; font-size: 12px;
} }
@ -663,14 +663,14 @@ html {
} }
body { body {
/* Margin bottom by footer height */ /* Margin bottom by footer height */
margin-bottom: 410px !important; margin-bottom: 360px !important;
} }
.footer { .footer {
position: absolute !important; position: absolute !important;
bottom: 0 !important; bottom: 0 !important;
width: 100% !important; width: 100% !important;
/* Set the fixed height of the footer here */ /* Set the fixed height of the footer here */
height: 410px !important; height: 360px !important;
} }
.navbar-inverse { .navbar-inverse {
background-image: -webkit-linear-gradient(top, #434a54 0%, #535b68 100%); background-image: -webkit-linear-gradient(top, #434a54 0%, #535b68 100%);
@ -925,7 +925,11 @@ ul.messages {
margin-left: 15px; margin-left: 15px;
} }
#order-itogo-amount, #order-itogo-amount,
#order-itogo-delivery { #order-itogo-delivery,
#cart-itogo,
#order-itogo-amount-up,
#order-itogo-delivery-up,
#cart-itogo-up {
font-size: 20px; font-size: 20px;
} }
.well-large { .well-large {

12
static/less/_.less
Unescape View File

@ -454,7 +454,7 @@ footer {
margin-top: 10px; margin-top: 10px;
background: none; background: none;
border-left: 1px darken(@gray, 30%) solid; border-left: 1px darken(@gray, 30%) solid;
height: 150px; height: 100px;
&.col-last { &.col-last {
border-right: 1px darken(@gray, 30%) solid; border-right: 1px darken(@gray, 30%) solid;
} }
@ -465,7 +465,7 @@ footer {
background-color: @brand-yellow; background-color: @brand-yellow;
} }
.footer-bottom { .footer-bottom {
height: 380px; height: 330px;
//background-color: @brand-gray; //background-color: @brand-gray;
color: @white; color: @white;
font-size: 12px; font-size: 12px;
@ -491,7 +491,7 @@ html {
body { body {
/* Margin bottom by footer height */ /* Margin bottom by footer height */
margin-bottom: 410px !important; margin-bottom: 360px !important;
} }
.footer { .footer {
@ -499,7 +499,7 @@ body {
bottom: 0 !important; bottom: 0 !important;
width: 100% !important; width: 100% !important;
/* Set the fixed height of the footer here */ /* Set the fixed height of the footer here */
height: 410px !important; height: 360px !important;
} }
.navbar-inverse { .navbar-inverse {
@ -798,7 +798,9 @@ ul.messages {
margin-left: 15px; margin-left: 15px;
} }
#order-itogo-amount, #order-itogo-delivery{ #order-itogo-amount, #order-itogo-delivery, #cart-itogo,
#order-itogo-amount-up, #order-itogo-delivery-up, #cart-itogo-up
{
font-size: 20px; font-size: 20px;
} }
.well-large{ .well-large{

Write Preview
Loading…
Cancel
Save