exeption alemtat api

stepan-k
Dmitriy Shesterkin 9 years ago
parent c2e492b40c
commit d415ddfda6
  1. 13
      store/alemtat.py
  2. 27
      store/views.py

@ -122,11 +122,14 @@ class AlemTat(object):
Contract=self.CONTRACT, Contract=self.CONTRACT,
) )
r = requests.post(url, data=post_data) r = requests.post(url, data=post_data)
if r.json()['AmountPlusFSAmount'] > 0: try:
return r.json() if r.json()['AmountPlusFSAmount'] > 0:
else: return r.json()
return self.get_amount_alternative(to, places, weight, service) else:
return self.get_amount_alternative(to, places, weight, service)
except KeyError:
return 0
ZONES_E = ( ZONES_E = (
(0.3, ( (0.3, (
(1, 1480), (1, 1480),

@ -360,19 +360,20 @@ class CartDetailView(TemplateView):
def get_order_amount(request): def get_order_amount(request):
retval = None retval = None
_currency = _Currency(request) _currency = _Currency(request)
try:
a = AlemTat() a = AlemTat()
cart = Cart(request) cart = Cart(request)
retval = dict(a.get_amount( retval = dict(a.get_amount(
request.GET['city'], request.GET['city'],
len(cart.items), len(cart.items),
cart.weight, cart.weight,
request.GET['deliv'], request.GET['deliv'],
)) ))
_retval = {k: _currency.get_price(v) for k, v in retval.items() if k != 'FS'} _retval = {k: _currency.get_price(v) for k, v in retval.items() if k != 'FS'}
_retval['FS'] = retval['FS'] _retval['FS'] = retval['FS']
except:
_retval = {}
return JsonResponse(_retval) return JsonResponse(_retval)

Loading…
Cancel
Save