add 800 tg in order

batiskaf/templates/jinja2/base.jinja

@@ -17,7 +17,7 @@
     <link href='/static/favicon.ico?v=3' type='image/x-icon' rel='shortcut icon'/>
     <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/_.min.css?v=9" rel="stylesheet">
+    <link href="/static/less/_.min.css?v=10" rel="stylesheet">
     <link href="/static/less/icons.css?v=1" 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">
@@ -378,7 +378,7 @@
     <script src="/static/js/formstone/js/touch.js"></script>
     <script src="/static/js/formstone/js/dropdown.js"></script>
     <script src="/static/star-rating/jquery.rating.pack.js"></script>
-    <script src="/static/js/_.js?v=17"></script>
+    <script src="/static/js/_.js?v=20"></script>
 {% endblock footer_scripts %}
 {% block jss %}{% endblock jss %}
 {% if messages %}

batiskaf/templates/jinja2/cart_detail.jinja

@@ -208,9 +208,9 @@
                                                                                         <table class="table table-hover table-responsive">
                                                                                              <thead>
                                                                                                  <tr>
-                                                                                                     <th>Название<br/>услуги</th>
-                                                                                                     <th>Стоимость,<br/>тенге</th>
-                                                                                                     <th>Срок доставки,<br/>раб. дни</th>
+                                                                                                     <th style="text-align: center;">Название<br/>услуги</th>
+                                                                                                     <th style="text-align: center;">Стоимость,<br/>тенге</th>
+                                                                                                     <th style="text-align: center;">Срок доставки,<br/>раб. дни</th>
                                                                                                  </tr>
                                                                                              </thead>
                                                                                              <tbody></tbody>
@@ -238,6 +238,12 @@
 
                                     <br>
 
+                                    <div id="dpd_note" style="display: none">
+                                        <p>
+                                            <span style="color: red">!</span> У услуги "DPD CLASSIC Parcel" надбавка за приём от двери - 800 тенге независимо от общего веса принимаемых единовременно отправлений с одного адреса.
+                                        </p>
+                                    </div>
+
                                     <div class="order-itogo text-right">
                                         Стоимость доставки: <span id="order-itogo-delivery">0</span> <span class="price__currency price__currency_up">{{ (request|currency).get_symbol() }}</span>
                                         <br/>

static/js/_.js

@@ -303,7 +303,7 @@ $(document).ready(function () {
                 'html':
             '<td><div class="radio"><label><input type="radio" value="'+ service.name +'" id="' +
             service.code + '" name="dpd_service"> '+ service.name +
-            '</label></div></td><td>' + service.cost + '</td><td>' +
+            '</label></div></td><td align="center">' + service.cost + '</td><td align="center">' +
             service.days + '</td>'
             }).appendTo(div);
 
@@ -318,13 +318,31 @@ $(document).ready(function () {
                 orderItogoUp = $('#order-itogo-amount-up'),
                 orderItogoDeliveryUp = $('#order-itogo-delivery-up'),
                 city = $('#id_dpd_delivery').text(),
+                self_delivery = $('input[name=dpd_type_delivery]:checked').val(),
                 delivery, result, service;
 
             input.prop('checked', true);
             delivery = $(input.children().context.childNodes[1].childNodes[0]).text();
-            service = input.parents()[0].childNodes[1].data;
+            service = input.val();
 
 
+            // to dour
+            if ((self_delivery === 'false') && (input[0].id === 'PCL')) {
+                console.log(input);
+                if (input.parents()[0].childNodes[1].data === ' DPD CLASSIC Parcel') {
+
+                    if ($(input.parents()[0]).text().indexOf('!') === -1) {
+                        $(input.parents()[0])[0].innerHTML += '<span style="color:red;"> !</span>';
+                    }
+
+                }
+                $('#dpd_note').show();
+
+                delivery = parseFloat(delivery) + 800
+            } else {
+                $('#dpd_note').hide();
+            }
+
             orderItogo.html(parseFloat(delivery) + parseFloat(cartItogo.html()));
             orderItogoUp.html(parseFloat(delivery) + parseFloat(cartItogo.html()));
             orderItogoDelivery.html(parseFloat(delivery));
@@ -356,8 +374,10 @@ $(document).ready(function () {
 
 
     $( document ).ajaxSend(function( event, jqxhr, settings ) {
+
         if (settings.url.indexOf('get_order_dpd_amount') !== -1) {
             $('#ajaxLoading').show();
+
         }
     });
 
@@ -365,12 +385,22 @@ $(document).ready(function () {
         $('#ajaxLoading').hide();
     });
 
+    function clearAmounts() {
+        var cartItogo = $('#cart-itogo').html();
+
+        $('#order-itogo-delivery-up').html(0);
+        $('#order-itogo-delivery').html(0);
+        $('#order-itogo-amount-up').html(parseFloat(cartItogo));
+        $('#order-itogo-amount').html(parseFloat(cartItogo));
+    }
+
     function selectDpdCity() {
         var city = $('#id_dpd_delivery').val();
         var city_sent = $('#id_dpd_pickup').val();
         var self_delivery = $('input[name=dpd_type_delivery]:checked').val();
 
         // console.log(self_delivery);
+        clearAmounts();
 
         if (city) {
             $.ajax({
@@ -433,17 +463,20 @@ $(document).ready(function () {
 
     $('#id_dpd_pickup').on('change', function() {
         selectDpdCity();
+        $('#dpd_note').hide();
     });
 
 
     $('#id_dpd_delivery').on('select2:select', function (evt) {
         selectDpdCity();
+        $('#dpd_note').hide();
 
     });
 
     // select type delivery on radiobutton
     $(document).on("change","input[name=dpd_type_delivery]",function(){
         selectDpdCity();
+        $('#dpd_note').hide();
     });
 
     $('input[name=deliv_service]').change(function () {
@@ -455,6 +488,7 @@ $(document).ready(function () {
                 $('.dpd_block').hide();
                 $('#dpd_services_result').hide();
                 $('#dpd_services_no_result').hide();
+                $('#dpd_note').hide();
                 break;
 
             case 'kazpost' :
@@ -464,6 +498,7 @@ $(document).ready(function () {
                 $('.kazpost_block').show();
                 $('#dpd_services_result').hide();
                 $('#dpd_services_no_result').hide();
+                $('#dpd_note').hide();
                 break;
 
             case 'dpd' :
@@ -473,6 +508,7 @@ $(document).ready(function () {
                 $('.dpd_block').show();
                 $('#dpd_services_result').hide();
                 $('#dpd_services_no_result').hide();
+                $('#dpd_note').hide();
                 break;
 
             case 'alemtat' :
@@ -481,6 +517,7 @@ $(document).ready(function () {
                 $('.kazpost_block').hide();
                 $('#dpd_services_result').hide();
                 $('#dpd_services_no_result').hide();
+                $('#dpd_note').hide();
                 $('#id_city').select2({
                     placeholder: "Выберите город",
                     allowClear: false

static/less/_.css

@@ -935,3 +935,6 @@ ul.messages {
   left: 50%;
   margin-left: -15px;
 }
+table .table th {
+  text-align: center;
+}

static/less/_.less

@@ -919,3 +919,7 @@ ul.messages {
   left: 50%;
   margin-left: -15px;
 }
+
+table .table th {
+  text-align: center;
+}