From f6bdf5ef2c892670d2ab97810626f118b97e9f64 Mon Sep 17 00:00:00 2001
From: Gena <opengena@gmail.com>
Date: Sun, 14 Jun 2015 00:40:58 +0600
Subject: [PATCH] no message

---
 batiskaf/templates/jinja2/base.jinja        |  7 +++----
 batiskaf/templates/jinja2/cart_detail.jinja | 17 ++++++++++++++---
 static/js/_.js                              | 17 ++++++++++++++---
 static/less/_.css                           | 14 +++++++++-----
 static/less/_.less                          | 12 +++++++-----
 5 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/batiskaf/templates/jinja2/base.jinja b/batiskaf/templates/jinja2/base.jinja
index 60cdda8..3176ba0 100644
--- a/batiskaf/templates/jinja2/base.jinja
+++ b/batiskaf/templates/jinja2/base.jinja
@@ -12,7 +12,7 @@
 
     <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/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 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">
@@ -93,8 +93,7 @@
 
             <p class="quick-links"><a href="#">Мой аккаунт</a> | <a href="/news/">Новости</a> | <a href="/store/cart/">Моя
                 корзина {% if (request|cart).items|length > 0 %}
-                    <span class="label label-success">{{ (request|cart).items|length }}</span>{% endif %}</a> | <a
-                    href="#">Оформление заказа</a> | <a href="#">Войти</a></p>
+                    <span class="label label-success">{{ (request|cart).items|length }}</span>{% endif %}</a> | <a href="#">Войти</a></p>
         </div>
     </div>
 </div>
@@ -380,7 +379,7 @@
     <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/select2.min.js"></script>
-    <script src="/static/js/_.js?v=4"></script>
+    <script src="/static/js/_.js?v=5"></script>
 {% endblock footer_scripts %}
 {% block jss %}{% endblock jss %}
 {% if messages %}
diff --git a/batiskaf/templates/jinja2/cart_detail.jinja b/batiskaf/templates/jinja2/cart_detail.jinja
index 101d3d0..a1729aa 100644
--- a/batiskaf/templates/jinja2/cart_detail.jinja
+++ b/batiskaf/templates/jinja2/cart_detail.jinja
@@ -57,7 +57,7 @@
                         <tr>
                             <th colspan="2" class="text-left"><a href="javascript:history.back()" class="">
                                 &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">
                                 <button type="submit" class="btn btn-primary"><span
                                         class="glyphicon glyphicon-repeat"></span> Пересчитать
@@ -69,23 +69,34 @@
                     </table>
                 </form>
             </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="row">
                     <h3 class="">Расчет доставки</h3><br/>
+
                     <div class="col-xs-6 col-xs-offset-3">
                         <div class="panel panel-default">
                             <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 }}
                                     <br/>
+
                                     <div class="order-itogo text-right">
                                         Стоимость доставки: <span id="order-itogo-delivery">0</span> ₸
                                         <br/>
                                         Итого к оплате: <span id="order-itogo-amount">{{ cart.total }}</span> ₸
                                     </div>
                                     <br/>
+
                                     <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>
                                 </form>
                             </div>
diff --git a/static/js/_.js b/static/js/_.js
index 68f0700..679f5c4 100644
--- a/static/js/_.js
+++ b/static/js/_.js
@@ -172,9 +172,11 @@ $(document).ready(function () {
     function selectCity() {
         var city = $('#id_city').val();
         var deliv = $('#id_deliv_type').val();
-        var cart_itogo = $('#cart-itogo').html();
-        var order_itogo = $('#order-itogo-amount');
+        var cart_itogo = $('#cart-itogo');
         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) {
             $.ajax({
@@ -188,11 +190,20 @@ $(document).ready(function () {
             })
                 .done(function (msg) {
                     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(
                         parseFloat(msg.AmountPlusFSAmount)
                     );
+                    //cart_itogo.html(
+                    //    parseFloat(msg.AmountPlusFSAmount) + parseFloat(cart_itogo.html())
+                    //);
+                    order_itogo_delivery_up.html(
+                        parseFloat(msg.AmountPlusFSAmount)
+                    );
                 });
 
         } else {
diff --git a/static/less/_.css b/static/less/_.css
index 05f5dc4..9bca604 100644
--- a/static/less/_.css
+++ b/static/less/_.css
@@ -630,7 +630,7 @@ footer .footer-col {
   margin-top: 10px;
   background: none;
   border-left: 1px #5e5e5e solid;
-  height: 150px;
+  height: 100px;
 }
 footer .footer-col.col-last {
   border-right: 1px #5e5e5e solid;
@@ -641,7 +641,7 @@ footer .footer-top {
   background-color: #fed000;
 }
 footer .footer-bottom {
-  height: 380px;
+  height: 330px;
   color: #ffffff;
   font-size: 12px;
 }
@@ -663,14 +663,14 @@ html {
 }
 body {
   /* Margin bottom by footer height */
-  margin-bottom: 410px !important;
+  margin-bottom: 360px !important;
 }
 .footer {
   position: absolute !important;
   bottom: 0 !important;
   width: 100% !important;
   /* Set the fixed height of the footer here */
-  height: 410px !important;
+  height: 360px !important;
 }
 .navbar-inverse {
   background-image: -webkit-linear-gradient(top, #434a54 0%, #535b68 100%);
@@ -925,7 +925,11 @@ ul.messages {
   margin-left: 15px;
 }
 #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;
 }
 .well-large {
diff --git a/static/less/_.less b/static/less/_.less
index 6606ec6..b0b0587 100644
--- a/static/less/_.less
+++ b/static/less/_.less
@@ -454,7 +454,7 @@ footer {
     margin-top: 10px;
     background: none;
     border-left: 1px darken(@gray, 30%) solid;
-    height: 150px;
+    height: 100px;
     &.col-last {
       border-right: 1px darken(@gray, 30%) solid;
     }
@@ -465,7 +465,7 @@ footer {
     background-color: @brand-yellow;
   }
   .footer-bottom {
-    height: 380px;
+    height: 330px;
     //background-color: @brand-gray;
     color: @white;
     font-size: 12px;
@@ -491,7 +491,7 @@ html {
 
 body {
   /* Margin bottom by footer height */
-  margin-bottom: 410px !important;
+  margin-bottom: 360px !important;
 }
 
 .footer {
@@ -499,7 +499,7 @@ body {
   bottom: 0 !important;
   width: 100% !important;
   /* Set the fixed height of the footer here */
-  height: 410px !important;
+  height: 360px !important;
 }
 
 .navbar-inverse {
@@ -798,7 +798,9 @@ ul.messages {
   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;
 }
 .well-large{