Merge branch 'dev' into 'master'

Dev

See merge request !187
master
Andrey 8 years ago
commit 1a0aeca720
  1. 4
      finance/views.py
  2. 1
      storage/api.py

@ -251,7 +251,7 @@ class YandexCheckView(APIView):
})
logger_yandex.info(xml_res)
return Response(xml_res, status=200)
return HttpResponse(xml_res, content_type='application/xml')
class YandexAvisoView(APIView):
@ -286,7 +286,7 @@ class YandexAvisoView(APIView):
})
logger_yandex.info(xml_res)
return Response(xml_res, status=200)
return HttpResponse(xml_res, content_type='application/xml')
class YandexFailView(APIView):

@ -5,6 +5,7 @@ def upload_file(ext=None, original=None, name=None, base64=None, **_kwargs) -> F
if original:
new_file = File.objects.create(original=original)
else:
ext = name.split('.')[1] if ext is None else ext
new_file = File.objects.upload_as_base64(base64, ext)
if name:

Loading…
Cancel
Save