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

add pickup delivery

Browse Source
mitri4
Dmitriy Shesterkin 9 years ago
parent 1ac9be661d
commit c2e492b40c
8 changed files with 47 additions and 17 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. 4
      batiskaf/templates/jinja2/base.jinja
  2. 13
      batiskaf/templates/jinja2/cart_detail.jinja
  3. 22
      static/js/_.js
  4. 8
      static/less/_.css
  5. 6
      static/less/_.less
  6. 2
      static/less/_.min.css
  7. 2
      store/forms.py
  8. 5
      store/views.py

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

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

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

@ -93,8 +93,13 @@
доставки</label></div> доставки</label></div>
<div class="radio"> <div class="radio">
<label> <label>
<input type="radio" name="deliv_service" id="deliv_service1" value="kazpost" <input type="radio" name="deliv_service" id="deliv_service3" value="pickup" checked>
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"> Казпочта <br><img src="/static/img/kazpost.jpg" alt="" width="150">
</label> </label>
</div> </div>
@ -139,11 +144,11 @@
</div> </div>
<div class="kazpost_block"> <div class="kazpost_block" style="display: none;">
<div class="form-group"> <div class="form-group">
<label class="control-label" for="id_city">Ближайшее областное отделение</label> <label class="control-label" for="id_city">Ближайшее областное отделение</label>
<div> <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 %} {% for city in kazpost_cities %}
<option value="{{ city[0] }}" {% if request.POST['kazpost_city'] %}selected{% endif %}>{{ city[1] }}</option> <option value="{{ city[0] }}" {% if request.POST['kazpost_city'] %}selected{% endif %}>{{ city[1] }}</option>
{% endfor %} {% endfor %}

22
static/js/_.js
Unescape View File

@ -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 () { $('input[name=deliv_service]').change(function () {
switch ($(this).val()) { switch ($(this).val()) {
case 'pickup' :
selectPickup();
$('.alemtat_block').hide();
$('.kazpost_block').hide();
break;
case 'kazpost' : case 'kazpost' :
selectKazpostCity(); selectKazpostCity();
$('.alemtat_block').hide(); $('.alemtat_block').hide();
@ -322,7 +337,8 @@ $(document).ready(function () {
}); });
// not needed // not needed
// selectCity(); // selectCity();
selectKazpostCity();
//selectKazpostCity();
$('#call-form').on('submit', function () { $('#call-form').on('submit', function () {
var f_name = $('#call-form #id_name'); var f_name = $('#call-form #id_name');
var f_phone = $('#call-form #id_phone'); var f_phone = $('#call-form #id_phone');
@ -410,11 +426,11 @@ $(document).ready(function () {
} }
//form-group has-error //form-group has-error
return false; return false;
}) });
$('input[name=stars]').each(function () { $('input[name=stars]').each(function () {
var star = $(this); var star = $(this);
star.parent('label').replaceWith(star); star.parent('label').replaceWith(star);
}) });
$('input[name=stars]').rating(); $('input[name=stars]').rating();
$('.star-rating-control').append('<div class="clearfix"></div><br>'); $('.star-rating-control').append('<div class="clearfix"></div><br>');
$('.star').rating(); $('.star').rating();

8
static/less/_.css
Unescape View File

@ -1030,8 +1030,8 @@ ul.messages {
margin-bottom: 10px; margin-bottom: 10px;
} }
.radio label { .radio label {
margin-left: 0px !important; margin-left: 0 !important;
padding-left: 0px !important; padding-left: 0 !important;
} }
.radio label input { .radio label input {
margin-left: 0 !important; margin-left: 0 !important;
@ -1040,3 +1040,7 @@ ul.messages {
.yamm .yamm-content { .yamm .yamm-content {
text-transform: uppercase; text-transform: uppercase;
} }
.required:after {
content: "*";
color: red;
}

6
static/less/_.less
Unescape View File

@ -862,8 +862,8 @@ ul.messages {
margin-bottom: 10px; margin-bottom: 10px;
} }
label { label {
margin-left: 0px !important; margin-left: 0 !important;
padding-left: 0px !important; padding-left: 0 !important;
input { input {
margin-left: 0 !important; margin-left: 0 !important;
position: relative !important; position: relative !important;
@ -874,3 +874,5 @@ ul.messages {
.yamm .yamm-content { .yamm .yamm-content {
text-transform: uppercase; text-transform: uppercase;
} }
.required:after { content:"*"; color: red; }

2
static/less/_.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
store/forms.py
Unescape View File

@ -5,6 +5,8 @@ from store.models import OrderData, ProductFeedback
class OrderForm(forms.ModelForm): class OrderForm(forms.ModelForm):
required_css_class = 'required'
class Meta: class Meta:
model = OrderData model = OrderData
fields = ['first_name', 'last_name', 'phone', 'email', ]#'city', 'address', 'deliv_type'] fields = ['first_name', 'last_name', 'phone', 'email', ]#'city', 'address', 'deliv_type']

5
store/views.py
Unescape View File

@ -296,8 +296,6 @@ class CartDetailView(TemplateView):
order.deliv_type, order.deliv_type,
)) ))
order.amount = order_amount['AmountPlusFSAmount'] + cart.total order.amount = order_amount['AmountPlusFSAmount'] + cart.total
order.address = request.POST['alemtat_address'] order.address = request.POST['alemtat_address']
elif deliv_service == 'kazpost': elif deliv_service == 'kazpost':
@ -306,6 +304,9 @@ class CartDetailView(TemplateView):
order.kazpost_city = int(request.POST['kazpost_city']) order.kazpost_city = int(request.POST['kazpost_city'])
order.address = request.POST['kazpost_address'] order.address = request.POST['kazpost_address']
elif deliv_service == 'pickup':
order.amount = cart.total
profile = None profile = None
try: try:

Write Preview
Loading…
Cancel
Save