add check authorization in alemtat, comment function call api alemtat on frontend

mitri4
Dmitriy Shesterkin 9 years ago
parent 38f3fdd4cc
commit 4b8cdcbb1f
  1. 3
      static/js/_.js
  2. 10
      store/alemtat.py
  3. 2
      store/views.py

@ -320,7 +320,8 @@ $(document).ready(function () {
break;
}
});
selectCity();
// not needed
// selectCity();
selectKazpostCity();
$('#call-form').on('submit', function () {
var f_name = $('#call-form #id_name');

@ -69,17 +69,20 @@ class AlemTat(object):
retval = cache.get(cache_key, None)
if not retval:
url = self._build_url(
'http://api.alemtat.kz/web/{ext}/Catalog/getCitiesByCountry?CountryLocalCode={}'.format(
self.COUNTRY_CODE, ext=self.API_KEY))
'http://api.alemtat.kz/web/{ext}/Catalog/getCitiesByCountry?CountryLocalCode={code}'.format(
code=self.COUNTRY_CODE, ext=self.API_KEY))
r = requests.get(url)
retval = r.json()
cache.set(cache_key, retval, 60 * 60 * 24 * 7)
return retval
def get_cities_tuple(self):
if self.get_cities()['Message'] != 'Для этого запроса отказано в авторизации.':
retval = map(lambda cities: (cities['LocalCode'], '{} - {}'.format(cities['LocalityName'].title(), cities[
'Region'].capitalize())), self.get_cities())
return tuple(retval)
else:
return tuple()
def get_services(self):
cache_key = 'alemtat_services'
@ -89,8 +92,11 @@ class AlemTat(object):
'http://api.alemtat.kz/web/{ext}/Catalog/getServices'.format(ext=self.API_KEY))
r = requests.get(url)
retval = r.json()
if retval['Message'] != 'Для этого запроса отказано в авторизации.':
cache.set(cache_key, retval, 60 * 60 * 24 * 7)
return filter(lambda s: s['LocalCode'] in ['E', 'T'], retval)
else:
return list()
def get_services_tuple(self):
retval = map(lambda services: (services['LocalCode'], services['Name'],), self.get_services())

@ -273,7 +273,6 @@ class CartDetailView(TemplateView):
cart = Cart(self.request)
cart.update_items()
if 'order_next' in self.request.POST:
deliv_service = request.POST['deliv_service']
form = OrderForm(self.request.POST)
@ -375,6 +374,7 @@ def get_order_amount(request):
return JsonResponse(_retval)
def get_kazpost_tarif(weight, to):
import requests

Loading…
Cancel
Save