Merge branch 'dev' into 'master'

Dev

See merge request !50

config_app/settings/prod.env

@@ -0,0 +1,5 @@
+DEBUG=False
+SECRET_KEY='!eiquy7_+2#vn3z%zfp51$m-=tmvtcv*cj*@x$!v(_9btq0w=$'
+DATABASE_URL='psql://team:nu5Xefise@127.0.0.1:5432/new_lms'
+EMAIL_URL='smtp+tls://robo@skillbox.ru:nu5Xefise@smtp.gmail.com:587'
+CACHE_URL=rediscache://127.0.0.1:6379/1?client_class=django_redis.client.DefaultClient

finance/serializers.py

@@ -28,15 +28,20 @@ class BillSerializer(serializers.ModelSerializer):
 class InvoiceSerializer(serializers.ModelSerializer):
     status = serializers.SerializerMethodField()
     method = serializers.SerializerMethodField()
+    yandex_pay_id = serializers.SerializerMethodField()
 
     class Meta:
         model = Invoice
-        exclude = ('bill', )
+        exclude = ('bill',)
 
     @staticmethod
     def get_status(self):
         return self.get_status_display()
 
+    @staticmethod
+    def get_yandex_pay_id(self):
+        return None if self.yandex_pay is None else self.yandex_pay.id
+
     @staticmethod
     def get_method(self):
         return self.get_method_display()

finance/views.py

@@ -153,4 +153,4 @@ def get_invoices(request):
             i.key,
         ])
 
-    return response
+    return response

finance/yandex.py

@@ -1,42 +0,0 @@
-# # coding=utf-8
-# import datetime
-# from hashlib import md5
-# from django.shortcuts import render
-# from django.views.decorators.csrf import csrf_exempt
-#
-# from lms.settings import YANDEX_MONEY_SHOP_PASSWORD
-#
-#
-# # coding=utf-8
-# import datetime
-# from hashlib import md5
-# from django.shortcuts import render
-# from django.views.decorators.csrf import csrf_exempt
-#
-# from finance.models import Bill, YandexKassaHistory
-# from lms.settings import YANDEX_MONEY_SHOP_PASSWORD
-#
-#
-# def gen_md5(cd):
-#     return md5(';'.join((
-#         cd['action'],
-#         cd['orderSumAmount'],
-#         cd['orderSumCurrencyPaycash'],
-#         cd['orderSumBankPaycash'],
-#         cd['shopId'],
-#         cd['invoiceId'],
-#         cd['customerNumber'],
-#         YANDEX_MONEY_SHOP_PASSWORD,
-#     )).encode('utf-8')).hexdigest().upper()
-#
-#
-# @csrf_exempt
-# def aviso(request):
-#     # Страница получения результата о платежах
-#     data = request.POST
-#
-#
-#
-# @csrf_exempt
-# def check(request):
-#     data = request.POST