From c2e492b40c2a4afb87e5b74ab1941ccd0c7df56b Mon Sep 17 00:00:00 2001
From: Dmitriy Shesterkin <mitri4@bk.ru>
Date: Sun, 14 May 2017 01:24:07 +0300
Subject: [PATCH] add pickup delivery

---
 batiskaf/templates/jinja2/base.jinja        |  4 ++--
 batiskaf/templates/jinja2/cart_detail.jinja | 13 ++++++++----
 static/js/_.js                              | 22 ++++++++++++++++++---
 static/less/_.css                           |  8 ++++++--
 static/less/_.less                          |  8 +++++---
 static/less/_.min.css                       |  2 +-
 store/forms.py                              |  2 ++
 store/views.py                              |  5 +++--
 8 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/batiskaf/templates/jinja2/base.jinja b/batiskaf/templates/jinja2/base.jinja
index c7b257d..3fa6a02 100644
--- a/batiskaf/templates/jinja2/base.jinja
+++ b/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=6" rel="stylesheet">
+    <link href="/static/less/_.min.css?v=7" 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" href="/static/js/mp/dist/magnific-popup.css">
@@ -375,7 +375,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=13"></script>
+    <script src="/static/js/_.js?v=14"></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 b98aaa2..37a8807 100644
--- a/batiskaf/templates/jinja2/cart_detail.jinja
+++ b/batiskaf/templates/jinja2/cart_detail.jinja
@@ -93,8 +93,13 @@
                                                                                   доставки</label></div>
                                                                               <div class="radio">
                                                                                   <label>
-                                                                                      <input type="radio" name="deliv_service" id="deliv_service1" value="kazpost"
-                                                                                             checked>
+                                                                                      <input type="radio" name="deliv_service" id="deliv_service3" value="pickup" checked>
+                                                                                      Самовывоз <br>
+                                                                                  </label>
+                                                                              </div>
+                                                                              <div class="radio">
+                                                                                  <label>
+                                                                                      <input type="radio" name="deliv_service" id="deliv_service1" value="kazpost">
                                                                                       Казпочта <br><img src="/static/img/kazpost.jpg" alt="" width="150">
                                                                                   </label>
                                                                               </div>
@@ -139,11 +144,11 @@
                                                                               </div>
 
 
-                                                                              <div class="kazpost_block">
+                                                                              <div class="kazpost_block" style="display: none;">
                                                                                   <div class="form-group">
                                                                                       <label class="control-label" for="id_city">Ближайшее областное отделение</label>
                                                                                       <div>
-                                                                                          <select name="kazpost_city" id="id_kazpost_city" class="form-control">
+                                                                                          <select name="kazpost_city" id="id_kazpost_city" class="form-control" style="width:100%">
                                                                                               {% for city in kazpost_cities %}
                                                                                                   <option value="{{ city[0] }}" {% if request.POST['kazpost_city'] %}selected{% endif %}>{{ city[1] }}</option>
                                                                                               {% endfor %}
diff --git a/static/js/_.js b/static/js/_.js
index 7d04bf7..937947f 100644
--- a/static/js/_.js
+++ b/static/js/_.js
@@ -292,8 +292,23 @@ $(document).ready(function () {
         }
     });
 
+    function selectPickup() {
+        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));
+    }
+
     $('input[name=deliv_service]').change(function () {
         switch ($(this).val()) {
+            case 'pickup' :
+                selectPickup();
+                $('.alemtat_block').hide();
+                $('.kazpost_block').hide();
+
+                break;
             case 'kazpost' :
                 selectKazpostCity();
                 $('.alemtat_block').hide();
@@ -322,7 +337,8 @@ $(document).ready(function () {
     });
     // not needed
     // selectCity();
-    selectKazpostCity();
+
+    //selectKazpostCity();
     $('#call-form').on('submit', function () {
         var f_name = $('#call-form #id_name');
         var f_phone = $('#call-form #id_phone');
@@ -410,11 +426,11 @@ $(document).ready(function () {
         }
         //form-group has-error
         return false;
-    })
+    });
     $('input[name=stars]').each(function () {
         var star = $(this);
         star.parent('label').replaceWith(star);
-    })
+    });
     $('input[name=stars]').rating();
     $('.star-rating-control').append('<div class="clearfix"></div><br>');
     $('.star').rating();
diff --git a/static/less/_.css b/static/less/_.css
index cdb28cd..9370e52 100644
--- a/static/less/_.css
+++ b/static/less/_.css
@@ -1030,8 +1030,8 @@ ul.messages {
   margin-bottom: 10px;
 }
 .radio label {
-  margin-left: 0px !important;
-  padding-left: 0px !important;
+  margin-left: 0 !important;
+  padding-left: 0 !important;
 }
 .radio label input {
   margin-left: 0 !important;
@@ -1040,3 +1040,7 @@ ul.messages {
 .yamm .yamm-content {
   text-transform: uppercase;
 }
+.required:after {
+  content: "*";
+  color: red;
+}
diff --git a/static/less/_.less b/static/less/_.less
index 88c84fe..6eb9be5 100644
--- a/static/less/_.less
+++ b/static/less/_.less
@@ -862,8 +862,8 @@ ul.messages {
     margin-bottom: 10px;
   }
   label {
-    margin-left: 0px !important;
-    padding-left: 0px !important;
+    margin-left: 0 !important;
+    padding-left: 0 !important;
     input {
       margin-left: 0 !important;
       position: relative !important;
@@ -873,4 +873,6 @@ ul.messages {
 
 .yamm .yamm-content {
   text-transform: uppercase;
-}
\ No newline at end of file
+}
+
+.required:after { content:"*"; color: red; }
\ No newline at end of file
diff --git a/static/less/_.min.css b/static/less/_.min.css
index 40dde20..3d84a7b 100644
--- a/static/less/_.min.css
+++ b/static/less/_.min.css
@@ -1 +1 @@
-.navbar-container,.navbar-container.affix{z-index:5000;width:100%}.bg-navy{background-color:#001F3F}.bg-blue{background-color:#0074D9}.bg-aqua{background-color:#7FDBFF}.bg-teal{background-color:#39CCCC}.bg-olive{background-color:#3D9970}.bg-green{background-color:#2ECC40}.bg-lime{background-color:#01FF70}.bg-yellow{background-color:#FFDC00}.bg-orange{background-color:#FF851B}.bg-red{background-color:#FF4136}.bg-fuchsia{background-color:#F012BE}.bg-purple{background-color:#B10DC9}.bg-maroon{background-color:#85144B}.bg-white{background-color:#fff}.bg-gray{background-color:#aaa}.bg-silver{background-color:#ddd}.bg-black{background-color:#111}.navy{color:#001F3F}.blue{color:#0074D9}.aqua{color:#7FDBFF}.teal{color:#39CCCC}.olive{color:#3D9970}.green{color:#2ECC40}.lime{color:#01FF70}.yellow{color:#FFDC00}.orange{color:#FF851B}.red{color:#FF4136}.fuchsia{color:#F012BE}.purple{color:#B10DC9}.maroon{color:#85144B}.white{color:#fff}.silver{color:#ddd}.gray{color:#aaa}.black{color:#111}.border--navy{border-color:#001F3F}.border--blue{border-color:#0074D9}.border--aqua{border-color:#7FDBFF}.border--teal{border-color:#39CCCC}.border--olive{border-color:#3D9970}.border--green{border-color:#2ECC40}.border--lime{border-color:#01FF70}.border--yellow{border-color:#FFDC00}.border--orange{border-color:#FF851B}.border--red{border-color:#FF4136}.border--fuchsia{border-color:#F012BE}.border--purple{border-color:#B10DC9}.border--maroon{border-color:#85144B}.border--white{border-color:#fff}.border--gray{border-color:#aaa}.border--silver{border-color:#ddd}.border--black{border-color:#111}.fill-navy{fill:#001F3F}.fill-blue{fill:#0074D9}.fill-aqua{fill:#7FDBFF}.fill-teal{fill:#39CCCC}.fill-olive{fill:#3D9970}.fill-green{fill:#2ECC40}.fill-lime{fill:#01FF70}.fill-yellow{fill:#FFDC00}.fill-orange{fill:#FF851B}.fill-red{fill:#FF4136}.fill-fuchsia{fill:#F012BE}.fill-purple{fill:#B10DC9}.fill-maroon{fill:#85144B}.fill-white{fill:#fff}.fill-gray{fill:#aaa}.fill-silver{fill:#ddd}.fill-black{fill:#111}.stroke-navy{stroke:#001F3F}.stroke-blue{stroke:#0074D9}.stroke-aqua{stroke:#7FDBFF}.stroke-teal{stroke:#39CCCC}.stroke-olive{stroke:#3D9970}.stroke-green{stroke:#2ECC40}.stroke-lime{stroke:#01FF70}.stroke-yellow{stroke:#FFDC00}.stroke-orange{stroke:#FF851B}.stroke-red{stroke:#FF4136}.stroke-fuchsia{stroke:#F012BE}.stroke-purple{stroke:#B10DC9}.stroke-maroon{stroke:#85144B}.stroke-white{stroke:#fff}.stroke-gray{stroke:#aaa}.stroke-silver{stroke:#ddd}.stroke-black{stroke:#111}.yamm .collapse,.yamm .dropdown,.yamm .dropup,.yamm .nav{position:static}.yamm .container{position:relative}.yamm .dropdown-menu{left:auto}.yamm .nav.navbar-right .dropdown-menu{left:auto;right:0}.yamm .yamm-content{padding:10px 20px;text-transform:uppercase}.yamm .dropdown.yamm-fw .dropdown-menu{left:0;right:0}.navbar-item__roballen{background:#027BC1}.navbar-item__currency{float:left;height:50px;font-size:14px!important;width:34px}.navbar-item__currency:after{clear:both;display:table;content:" "}.currency-icon,.currency-item__link{display:block;font-family:'PT Sans',serif}.open .currency-icon{background-image:linear-gradient(to bottom,#080808 0,#0f0f0f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);box-shadow:inset 0 3px 9px rgba(0,0,0,.25)}.currency-menu,.navbar .navbar-nav .open .dropdown-menu{position:absolute;box-shadow:0 6px 12px rgba(0,0,0,.175)}.currency-icon{margin-left:0;width:49px;text-align:center;line-height:50px;background:#E9573F}.header-top,.header-top .container{line-height:40px;height:40px}.currency-menu{width:50px;left:inherit!important;margin:0;float:left;background-color:#434a54;color:#fff;border-width:0 1px 1px;border-radius:0 0 2px 2px}.header-top .container .top-left-links a,span.yellow{color:#fed000}.currency-menu .yamm-content{padding:10px}.currency-item{margin-bottom:15px;text-align:center}.currency-item:last-child{margin-bottom:0}.currency-item__link{padding:0!important;border:0!important;font-size:14px!important}.price__currency{font-family:'PT Sans',serif}.price__currency_up{font-size:20px}.navbar,body{min-width:970px!important}.nav .lead{font-size:13px;text-transform:uppercase;font-weight:700}.container{width:970px!important;max-width:none!important}.header-top{background-color:#434a54}.header-top .container .top-left-links{float:left;text-align:left;color:#fed000;font-size:10pt}.header-top .container .top-right-links{float:right;text-align:right;color:#fff;font-weight:700;font-size:10pt}.header-top .container .top-right-links a{color:#fff}.header-middle{background-color:#fed000;height:130px}.header-middle .logo-container{line-height:130px;float:left;text-align:left}.header-middle .quick-access-container{float:right;text-align:right}.navbar-header,.navbar-nav>li{float:left}.header-middle .quick-access-container form{margin-top:30px}.header-middle .quick-access-container form input{background-color:#ffda32;border:1px solid #cba600;width:245px;height:30px;padding:5px}.header-middle .quick-access-container form button{background:0 0;border:none}.header-middle .quick-access-container .small-welcome{font-size:10pt;margin-top:10px}.header-middle .quick-access-container .quick-links{font-size:10pt;color:#434a54}.header-middle .quick-access-container .quick-links a{color:#434a54}.navbar-fixed-bottom,.navbar-static-top,body{min-width:970px}.lead{font-size:14px;font-weight:700}.page-header{margin-bottom:30px}.page-header .lead{margin-bottom:10px}.container .navbar-collapse,.container .navbar-header{margin-right:0;margin-left:0}.navbar-collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important;visibility:visible!important;border-top:0}.navbar-toggle{display:none}.navbar-form .form-control-static,.navbar-form .form-group{display:inline-block}.navbar-brand{margin-left:-15px}.navbar-nav{float:left;margin:0}.navbar-nav>li>a{padding:15px}.navbar-nav.navbar-right{float:right}.navbar .navbar-nav .open .dropdown-menu{float:left;background-color:#434a54;color:#fff;border-width:0 1px 1px;border-radius:0 0 2px 2px}.navbar .navbar-nav .open .dropdown-menu ul{list-style-type:none;padding:0;margin:0 0 15px}.navbar-form .control-label,.navbar-form .form-group{margin-bottom:0;vertical-align:middle}.navbar .navbar-nav .open .dropdown-menu a{color:#fff;border:none;font-weight:700;font-size:11px}.navbar .navbar-nav .open .dropdown-menu a.title{color:#fed000!important;font-weight:700;font-size:12px;white-space:nowrap}.navbar .navbar-nav .open .dropdown-menu a:hover{text-decoration:underline;color:#fed000}a#order-call-link{color:#FC6E51}.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#333}.navbar .navbar-nav .open .dropdown-menu>.active>a,.navbar .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar .navbar-nav .open .dropdown-menu>li>a:focus,.navbar .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff!important;background-color:#428bca!important}.navbar .navbar-nav .open .dropdown-menu>.disabled>a,.navbar .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#999!important;background-color:transparent!important}.navbar-form{float:left;width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;box-shadow:none}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}.navbar-container{padding:0}.dropdown-menu{min-width:720px!important}.navbar{margin-bottom:0!important}.main-container{padding:20px 0 100px}.index-goods{margin-top:20px}.index-goods .thumbnail{padding-bottom:10px!important;box-shadow:none;border:0}.index-goods .title{height:40px;overflow:hidden}.index-goods .title a{font-weight:700;color:#0074D9;font-size:12px}.index-goods .price{font-size:18px;font-weight:700;margin-bottom:5px}.index-goods .state-yes{color:#2ECC40;font-size:11px;margin-bottom:10px}.index-goods .state-no{color:#FF4136;font-size:11px;margin-bottom:10px}.index-goods a.cart-link{color:#111}.index-goods a.cart-link:hover{text-decoration:none;color:#111}footer .footer-col{margin-top:10px;background:0 0;border-left:1px #5e5e5e solid;height:100px}footer .footer-col.col-last{border-right:1px #5e5e5e solid}footer .footer-top{height:30px;margin-top:-40px;background-color:#fed000}footer .footer-bottom{height:330px;color:#fff;font-size:12px}footer .footer-bottom .title{color:#fed000;font-weight:700}footer .footer-bottom a{color:#fff}footer .footer-bottom a:hover{color:#fed000}html{position:relative!important;min-height:100%!important}body{font-family:"Open Sans",Arial,sans-serif;margin-bottom:360px!important;background-color:#f1f2f6}.footer{position:absolute!important;bottom:0!important;width:100%!important;height:360px!important}.navbar-inverse{background-image:linear-gradient(to bottom,#434a54 0,#535b68 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff434a54', endColorstr='#ff535b68', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse a{color:#fff!important;border-right:1px #707c8d solid;font-weight:700;font-size:9pt}.navbar-inverse a:hover{color:#fed000!important;text-decoration:none}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.open>a{background-image:linear-gradient(to bottom,#080808 0,#0f0f0f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);box-shadow:inset 0 3px 9px rgba(0,0,0,.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,.25)}h1,h2,h3,h4,h5,h6{text-align:center}.well-lg form{margin:10px 0}.alert h4{text-align:left}.navbar-container.affix{top:0}.panel-filter ul{text-align:left;list-style-type:none;list-style-position:inherit;padding:0;margin:0}.panel-filter ul .icheckbox_square-blue{margin-right:5px}.panel-filter ul label{font-weight:400}hr.dashed{border:none;height:1px;width:100%;border-top:1px dashed #ccc}.category-filter-title{text-transform:uppercase;font-size:12px;font-weight:700;margin-bottom:15px}.category-paginator{font-size:12px;line-height:25px;background:#434a54;height:50px;color:#fff;margin-bottom:20px;border-radius:4px}.category-paginator .category-paginator-top{padding:0 10px;height:25px;border-bottom:1px #BDC3C7 solid}.category-paginator .category-paginator-bottom{height:20px;padding:0 10px}.category-paginator select{color:#000}.category-items{margin:0}.breadcrumb-arrow li a::before{border-left-color:#fed000}.breadcrumb-arrow li a::after{border-left:11px solid #e5bb00}.breadcrumb-arrow li a{background-color:#fed000;border:1px solid #e5bb00;color:#434a54}.breadcrumb-arrow li a:focus::before,.breadcrumb-arrow li a:hover::before{border-left-color:#fed000}.breadcrumb-arrow li a:focus,.breadcrumb-arrow li a:hover{background-color:#fed000;border:1px solid #fed000}.breadcrumb-arrow li a:active::after,.breadcrumb-arrow li a:active::before{border-left-color:#fed000}.breadcrumb-arrow li a:active{background-color:#fed000;border:1px solid #fed000}.category-paginator a,.category-paginator a:active,.category-paginator a:hover{color:#fed000}.product-min-thumbnails img{margin-bottom:10px}.product-big-thumbnail .product-big-thumbnail-container{width:400px;height:400px;min-width:400px;min-height:400px;max-width:400px;max-height:400px;background:#fff;border:1px solid #ddd;border-radius:4px;text-align:center;line-height:400px}.product-big-thumbnail .product-big-thumbnail-container img{width:396px;margin-top:2px}.product-short-description{padding-left:35px}.product-short-description h4{text-align:left;margin-top:0;padding-top:0}.product-short-description .product-detail-price{font-size:41px;font-weight:700}#cart-itogo,#cart-itogo-up,#order-itogo-amount,#order-itogo-amount-up,#order-itogo-delivery,#order-itogo-delivery-up,.product-in-stock .itogo,.table .table-cart-itogo{font-size:20px}.product-not-in-stock{color:#FF4136;font-style:italic;display:none}table.table-cart input{width:70px;text-align:left;float:right}table.table-cart tbody td{padding-top:45px}table.table-cart tbody td.table-cart-image{padding-top:8px}table.table-cart tbody td .form-control{margin-top:-8px}.breadcrumbs,ol.breadcrumb.breadcrumb-arrow{overflow:hidden!important}.table thead tr th{background:#434a54;color:#fff;border-right:1px gray solid}.table thead tr th:last-child{border-right:none}.table thead tr th:last-of-type{border-right:none}.table thead tr th:last{border-right:none}.table tbody td{border-right:1px #ddd solid}.table tbody td:last-child{border-right:none}.table tbody td:last-of-type{border-right:none}.table tbody td:last{border-right:none}ul.messages{display:none}.product-description{margin-top:40px;padding-top:20px;border-top:1px #ddd solid}.order-data .radio{margin-left:15px}.well-large{padding:40px}.news-container .comment{overflow:auto}.news-container .media{background:#F5F7FA;padding:15px}.call-form,.order-form{background:#FFF;padding:20px 30px;text-align:left;max-width:500px;margin:40px auto;position:relative}.sale-percent-block{background:#E9573F;width:50px;height:50px;text-align:center;color:#fff;top:0;font-size:20px;line-height:50px}.radio img{margin-top:10px;margin-bottom:10px}.radio label{margin-left:0!important;padding-left:0!important}.radio label input{margin-left:0!important;position:relative!important}
\ No newline at end of file
+.navbar-container,.navbar-container.affix{z-index:5000;width:100%}.bg-navy{background-color:#001F3F}.bg-blue{background-color:#0074D9}.bg-aqua{background-color:#7FDBFF}.bg-teal{background-color:#39CCCC}.bg-olive{background-color:#3D9970}.bg-green{background-color:#2ECC40}.bg-lime{background-color:#01FF70}.bg-yellow{background-color:#FFDC00}.bg-orange{background-color:#FF851B}.bg-red{background-color:#FF4136}.bg-fuchsia{background-color:#F012BE}.bg-purple{background-color:#B10DC9}.bg-maroon{background-color:#85144B}.bg-white{background-color:#fff}.bg-gray{background-color:#aaa}.bg-silver{background-color:#ddd}.bg-black{background-color:#111}.navy{color:#001F3F}.blue{color:#0074D9}.aqua{color:#7FDBFF}.teal{color:#39CCCC}.olive{color:#3D9970}.green{color:#2ECC40}.lime{color:#01FF70}.yellow{color:#FFDC00}.orange{color:#FF851B}.red{color:#FF4136}.fuchsia{color:#F012BE}.purple{color:#B10DC9}.maroon{color:#85144B}.white{color:#fff}.silver{color:#ddd}.gray{color:#aaa}.black{color:#111}.border--navy{border-color:#001F3F}.border--blue{border-color:#0074D9}.border--aqua{border-color:#7FDBFF}.border--teal{border-color:#39CCCC}.border--olive{border-color:#3D9970}.border--green{border-color:#2ECC40}.border--lime{border-color:#01FF70}.border--yellow{border-color:#FFDC00}.border--orange{border-color:#FF851B}.border--red{border-color:#FF4136}.border--fuchsia{border-color:#F012BE}.border--purple{border-color:#B10DC9}.border--maroon{border-color:#85144B}.border--white{border-color:#fff}.border--gray{border-color:#aaa}.border--silver{border-color:#ddd}.border--black{border-color:#111}.fill-navy{fill:#001F3F}.fill-blue{fill:#0074D9}.fill-aqua{fill:#7FDBFF}.fill-teal{fill:#39CCCC}.fill-olive{fill:#3D9970}.fill-green{fill:#2ECC40}.fill-lime{fill:#01FF70}.fill-yellow{fill:#FFDC00}.fill-orange{fill:#FF851B}.fill-red{fill:#FF4136}.fill-fuchsia{fill:#F012BE}.fill-purple{fill:#B10DC9}.fill-maroon{fill:#85144B}.fill-white{fill:#fff}.fill-gray{fill:#aaa}.fill-silver{fill:#ddd}.fill-black{fill:#111}.stroke-navy{stroke:#001F3F}.stroke-blue{stroke:#0074D9}.stroke-aqua{stroke:#7FDBFF}.stroke-teal{stroke:#39CCCC}.stroke-olive{stroke:#3D9970}.stroke-green{stroke:#2ECC40}.stroke-lime{stroke:#01FF70}.stroke-yellow{stroke:#FFDC00}.stroke-orange{stroke:#FF851B}.stroke-red{stroke:#FF4136}.stroke-fuchsia{stroke:#F012BE}.stroke-purple{stroke:#B10DC9}.stroke-maroon{stroke:#85144B}.stroke-white{stroke:#fff}.stroke-gray{stroke:#aaa}.stroke-silver{stroke:#ddd}.stroke-black{stroke:#111}.yamm .collapse,.yamm .dropdown,.yamm .dropup,.yamm .nav{position:static}.yamm .container{position:relative}.yamm .dropdown-menu{left:auto}.yamm .nav.navbar-right .dropdown-menu{left:auto;right:0}.yamm .yamm-content{padding:10px 20px;text-transform:uppercase}.yamm .dropdown.yamm-fw .dropdown-menu{left:0;right:0}.navbar-item__roballen{background:#027BC1}.navbar-item__currency{float:left;height:50px;font-size:14px!important;width:34px}.navbar-item__currency:after{clear:both;display:table;content:" "}.currency-icon,.currency-item__link{display:block;font-family:'PT Sans',serif}.open .currency-icon{background-image:linear-gradient(to bottom,#080808 0,#0f0f0f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);box-shadow:inset 0 3px 9px rgba(0,0,0,.25)}.currency-menu,.navbar .navbar-nav .open .dropdown-menu{position:absolute;box-shadow:0 6px 12px rgba(0,0,0,.175)}.currency-icon{margin-left:0;width:49px;text-align:center;line-height:50px;background:#E9573F}.header-top,.header-top .container{line-height:40px;height:40px}.currency-menu{width:50px;left:inherit!important;margin:0;float:left;background-color:#434a54;color:#fff;border-width:0 1px 1px;border-radius:0 0 2px 2px}.header-top .container .top-left-links a,span.yellow{color:#fed000}.currency-menu .yamm-content{padding:10px}.currency-item{margin-bottom:15px;text-align:center}.currency-item:last-child{margin-bottom:0}.currency-item__link{padding:0!important;border:0!important;font-size:14px!important}.price__currency{font-family:'PT Sans',serif}.price__currency_up{font-size:20px}.navbar,body{min-width:970px!important}.nav .lead{font-size:13px;text-transform:uppercase;font-weight:700}.container{width:970px!important;max-width:none!important}.header-top{background-color:#434a54}.header-top .container .top-left-links{float:left;text-align:left;color:#fed000;font-size:10pt}.header-top .container .top-right-links{float:right;text-align:right;color:#fff;font-weight:700;font-size:10pt}.header-top .container .top-right-links a{color:#fff}.header-middle{background-color:#fed000;height:130px}.header-middle .logo-container{line-height:130px;float:left;text-align:left}.header-middle .quick-access-container{float:right;text-align:right}.navbar-header,.navbar-nav>li{float:left}.header-middle .quick-access-container form{margin-top:30px}.header-middle .quick-access-container form input{background-color:#ffda32;border:1px solid #cba600;width:245px;height:30px;padding:5px}.header-middle .quick-access-container form button{background:0 0;border:none}.header-middle .quick-access-container .small-welcome{font-size:10pt;margin-top:10px}.header-middle .quick-access-container .quick-links{font-size:10pt;color:#434a54}.header-middle .quick-access-container .quick-links a{color:#434a54}.navbar-fixed-bottom,.navbar-static-top,body{min-width:970px}.lead{font-size:14px;font-weight:700}.page-header{margin-bottom:30px}.page-header .lead{margin-bottom:10px}.container .navbar-collapse,.container .navbar-header{margin-right:0;margin-left:0}.navbar-collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important;visibility:visible!important;border-top:0}.navbar-toggle{display:none}.navbar-form .form-control-static,.navbar-form .form-group{display:inline-block}.navbar-brand{margin-left:-15px}.navbar-nav{float:left;margin:0}.navbar-nav>li>a{padding:15px}.navbar-nav.navbar-right{float:right}.navbar .navbar-nav .open .dropdown-menu{float:left;background-color:#434a54;color:#fff;border-width:0 1px 1px;border-radius:0 0 2px 2px}.navbar .navbar-nav .open .dropdown-menu ul{list-style-type:none;padding:0;margin:0 0 15px}.navbar-form .control-label,.navbar-form .form-group{margin-bottom:0;vertical-align:middle}.navbar .navbar-nav .open .dropdown-menu a{color:#fff;border:none;font-weight:700;font-size:11px}.navbar .navbar-nav .open .dropdown-menu a.title{color:#fed000!important;font-weight:700;font-size:12px;white-space:nowrap}.navbar .navbar-nav .open .dropdown-menu a:hover{text-decoration:underline;color:#fed000}a#order-call-link{color:#FC6E51}.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#333}.navbar .navbar-nav .open .dropdown-menu>.active>a,.navbar .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar .navbar-nav .open .dropdown-menu>li>a:focus,.navbar .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff!important;background-color:#428bca!important}.navbar .navbar-nav .open .dropdown-menu>.disabled>a,.navbar .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#999!important;background-color:transparent!important}.navbar-form{float:left;width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;box-shadow:none}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}.navbar-container{padding:0}.dropdown-menu{min-width:720px!important}.navbar{margin-bottom:0!important}.main-container{padding:20px 0 100px}.index-goods{margin-top:20px}.index-goods .thumbnail{padding-bottom:10px!important;box-shadow:none;border:0}.index-goods .title{height:40px;overflow:hidden}.index-goods .title a{font-weight:700;color:#0074D9;font-size:12px}.index-goods .price{font-size:18px;font-weight:700;margin-bottom:5px}.index-goods .state-yes{color:#2ECC40;font-size:11px;margin-bottom:10px}.index-goods .state-no{color:#FF4136;font-size:11px;margin-bottom:10px}.index-goods a.cart-link{color:#111}.index-goods a.cart-link:hover{text-decoration:none;color:#111}footer .footer-col{margin-top:10px;background:0 0;border-left:1px #5e5e5e solid;height:100px}footer .footer-col.col-last{border-right:1px #5e5e5e solid}footer .footer-top{height:30px;margin-top:-40px;background-color:#fed000}footer .footer-bottom{height:330px;color:#fff;font-size:12px}footer .footer-bottom .title{color:#fed000;font-weight:700}footer .footer-bottom a{color:#fff}footer .footer-bottom a:hover{color:#fed000}html{position:relative!important;min-height:100%!important}body{font-family:"Open Sans",Arial,sans-serif;margin-bottom:360px!important;background-color:#f1f2f6}.footer{position:absolute!important;bottom:0!important;width:100%!important;height:360px!important}.navbar-inverse{background-image:linear-gradient(to bottom,#434a54 0,#535b68 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff434a54', endColorstr='#ff535b68', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse a{color:#fff!important;border-right:1px #707c8d solid;font-weight:700;font-size:9pt}.navbar-inverse a:hover{color:#fed000!important;text-decoration:none}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.open>a{background-image:linear-gradient(to bottom,#080808 0,#0f0f0f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);box-shadow:inset 0 3px 9px rgba(0,0,0,.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,.25)}h1,h2,h3,h4,h5,h6{text-align:center}.well-lg form{margin:10px 0}.alert h4{text-align:left}.navbar-container.affix{top:0}.panel-filter ul{text-align:left;list-style-type:none;list-style-position:inherit;padding:0;margin:0}.panel-filter ul .icheckbox_square-blue{margin-right:5px}.panel-filter ul label{font-weight:400}hr.dashed{border:none;height:1px;width:100%;border-top:1px dashed #ccc}.category-filter-title{text-transform:uppercase;font-size:12px;font-weight:700;margin-bottom:15px}.category-paginator{font-size:12px;line-height:25px;background:#434a54;height:50px;color:#fff;margin-bottom:20px;border-radius:4px}.category-paginator .category-paginator-top{padding:0 10px;height:25px;border-bottom:1px #BDC3C7 solid}.category-paginator .category-paginator-bottom{height:20px;padding:0 10px}.category-paginator select{color:#000}.category-items{margin:0}.breadcrumb-arrow li a::before{border-left-color:#fed000}.breadcrumb-arrow li a::after{border-left:11px solid #e5bb00}.breadcrumb-arrow li a{background-color:#fed000;border:1px solid #e5bb00;color:#434a54}.breadcrumb-arrow li a:focus::before,.breadcrumb-arrow li a:hover::before{border-left-color:#fed000}.breadcrumb-arrow li a:focus,.breadcrumb-arrow li a:hover{background-color:#fed000;border:1px solid #fed000}.breadcrumb-arrow li a:active::after,.breadcrumb-arrow li a:active::before{border-left-color:#fed000}.breadcrumb-arrow li a:active{background-color:#fed000;border:1px solid #fed000}.category-paginator a,.category-paginator a:active,.category-paginator a:hover{color:#fed000}.product-min-thumbnails img{margin-bottom:10px}.product-big-thumbnail .product-big-thumbnail-container{width:400px;height:400px;min-width:400px;min-height:400px;max-width:400px;max-height:400px;background:#fff;border:1px solid #ddd;border-radius:4px;text-align:center;line-height:400px}.product-big-thumbnail .product-big-thumbnail-container img{width:396px;margin-top:2px}.product-short-description{padding-left:35px}.product-short-description h4{text-align:left;margin-top:0;padding-top:0}.product-short-description .product-detail-price{font-size:41px;font-weight:700}#cart-itogo,#cart-itogo-up,#order-itogo-amount,#order-itogo-amount-up,#order-itogo-delivery,#order-itogo-delivery-up,.product-in-stock .itogo,.table .table-cart-itogo{font-size:20px}.product-not-in-stock{color:#FF4136;font-style:italic;display:none}table.table-cart input{width:70px;text-align:left;float:right}table.table-cart tbody td{padding-top:45px}table.table-cart tbody td.table-cart-image{padding-top:8px}table.table-cart tbody td .form-control{margin-top:-8px}.breadcrumbs,ol.breadcrumb.breadcrumb-arrow{overflow:hidden!important}.table thead tr th{background:#434a54;color:#fff;border-right:1px gray solid}.table thead tr th:last-child{border-right:none}.table thead tr th:last-of-type{border-right:none}.table thead tr th:last{border-right:none}.table tbody td{border-right:1px #ddd solid}.table tbody td:last-child{border-right:none}.table tbody td:last-of-type{border-right:none}.table tbody td:last{border-right:none}ul.messages{display:none}.product-description{margin-top:40px;padding-top:20px;border-top:1px #ddd solid}.order-data .radio{margin-left:15px}.well-large{padding:40px}.news-container .comment{overflow:auto}.news-container .media{background:#F5F7FA;padding:15px}.call-form,.order-form{background:#FFF;padding:20px 30px;text-align:left;max-width:500px;margin:40px auto;position:relative}.sale-percent-block{background:#E9573F;width:50px;height:50px;text-align:center;color:#fff;top:0;font-size:20px;line-height:50px}.radio img{margin-top:10px;margin-bottom:10px}.radio label{margin-left:0!important;padding-left:0!important}.radio label input{margin-left:0!important;position:relative!important}.required:after{content:"*";color:red}
\ No newline at end of file
diff --git a/store/forms.py b/store/forms.py
index 0ed5cbe..a7e57d8 100644
--- a/store/forms.py
+++ b/store/forms.py
@@ -5,6 +5,8 @@ from store.models import OrderData, ProductFeedback
 
 
 class OrderForm(forms.ModelForm):
+    required_css_class = 'required'
+
     class Meta:
         model = OrderData
         fields = ['first_name', 'last_name', 'phone', 'email', ]#'city', 'address', 'deliv_type']
diff --git a/store/views.py b/store/views.py
index 8cc7876..07bb166 100644
--- a/store/views.py
+++ b/store/views.py
@@ -296,8 +296,6 @@ class CartDetailView(TemplateView):
                             order.deliv_type,
                     ))
                     order.amount = order_amount['AmountPlusFSAmount'] + cart.total
-
-
                     order.address = request.POST['alemtat_address']
 
                 elif deliv_service == 'kazpost':
@@ -306,6 +304,9 @@ class CartDetailView(TemplateView):
                     order.kazpost_city = int(request.POST['kazpost_city'])
                     order.address = request.POST['kazpost_address']
 
+                elif deliv_service == 'pickup':
+                    order.amount = cart.total
+
                 profile = None
 
                 try: