Merge branch 'dev' into 'master'

Dev

See merge request !205

finance/views.py

@@ -19,6 +19,7 @@ from finance.models import Bill, Invoice
 from finance.serializers import BillSerializer, InvoiceSerializer
 from lms.global_decorators import transaction_decorator
 from lms.tools import get_real_name
+from django.utils import timezone
 
 logger_yandex = logging.getLogger('yandex_money')
 
@@ -239,9 +240,12 @@ class YandexCheckView(APIView):
         # TODO Нужно решение
         # pay.invoice_id = int(data['invoiceId'])
         # pay.save()
+        now = timezone.now()
+        pay.performed_datetime = now.isoformat()
+        pay.save()
 
         xml_res = """<checkOrderResponse performedDatetime="%s" code="0" invoiceId="%s" shopId="%s"/>
-        """ % (datetime.datetime.now(), str(data['invoiceId']), str(pay.shop_id))
+        """ % (pay.performed_datetime, str(data['invoiceId']), str(pay.shop_id))
 
         logger_yandex.info(xml_res)
 
@@ -270,17 +274,8 @@ class YandexAvisoView(APIView):
         pay.shop_amount = data['shopSumAmount']
         pay.status = Payment.STATUS.SUCCESS
         pay.save()
-
+        xml_res = """<paymentAvisoResponse performedDatetime="%s" code="0" invoiceId="%s" shopId="%s"/>
-        xml_res = dicttoxml.dicttoxml({
+                """ % (pay.performed_datetime, str(data['invoiceId']), str(pay.shop_id))
-            'code': 0,
-            'shopId':int(pay.shop_id),
-            'invoiceId': int(data['invoiceId']),
-            'orderSumAmount': pay.order_amount,
-            'performedDatetime': datetime.datetime.now(),
-        })
-
-        """<paymentAvisoResponse performedDatetime="%s" code="0" invoiceId="%s" shopId="%s"/>
-        """ % (datetime.datetime.now(), str(data['invoiceId']), str(pay.shop_id))
 
         logger_yandex.info(xml_res)