Merge branch 'dev' into 'yandex_rebiling'

# Conflicts: # finance/views.py
8 years ago · cce1109c19
parent 5be5f6ecf7 a63a40eefd
commit cce1109c19
1 changed files with 1 additions and 1 deletions
--- a/finance/views.py
+++ b/finance/views.py
@ -268,7 +268,7 @@ class YandexPay(APIView):
            pay = Payment.objects.get(id=pk)
            try:
                inv = InvoiceRebilling.objects.get(yandex_pay=pay)
-            except InvoiceRebilling:
+            except InvoiceRebilling.DoesNotExist:
                inv = None
            r = requests.post('https://money.yandex.ru/eshop.xml', data={
                'shopId': pay.shop_id,