diff --git a/static/js/_.js b/static/js/_.js index 779d660..7d04bf7 100644 --- a/static/js/_.js +++ b/static/js/_.js @@ -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'); diff --git a/store/alemtat.py b/store/alemtat.py index 74e58d6..d815545 100644 --- a/store/alemtat.py +++ b/store/alemtat.py @@ -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): - retval = map(lambda cities: (cities['LocalCode'], '{} - {}'.format(cities['LocalityName'].title(), cities[ - 'Region'].capitalize())), self.get_cities()) - return tuple(retval) + 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() - cache.set(cache_key, retval, 60 * 60 * 24 * 7) - return filter(lambda s: s['LocalCode'] in ['E', 'T'], retval) + 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()) diff --git a/store/views.py b/store/views.py index 668f775..8cc7876 100644 --- a/store/views.py +++ b/store/views.py @@ -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