From 45e5a839ce23e74de49972439007213f3e52f547 Mon Sep 17 00:00:00 2001
From: Andrey <andrey.korolev@skillbox.ru>
Date: Tue, 20 Feb 2018 16:14:25 +0300
Subject: [PATCH 1/2] migrate update

---
 finance/serializers.py |  5 +++++
 finance/views.py       |  2 +-
 finance/yandex.py      | 42 ------------------------------------------
 3 files changed, 6 insertions(+), 43 deletions(-)
 delete mode 100644 finance/yandex.py

diff --git a/finance/serializers.py b/finance/serializers.py
index 0f3d735..6bf4a43 100644
--- a/finance/serializers.py
+++ b/finance/serializers.py
@@ -28,6 +28,7 @@ class BillSerializer(serializers.ModelSerializer):
 class InvoiceSerializer(serializers.ModelSerializer):
     status = serializers.SerializerMethodField()
     method = serializers.SerializerMethodField()
+    yandex_pay_id = serializers.SerializerMethodField()
 
     class Meta:
         model = Invoice
@@ -37,6 +38,10 @@ class InvoiceSerializer(serializers.ModelSerializer):
     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()
\ No newline at end of file
diff --git a/finance/views.py b/finance/views.py
index 13dbc80..0b69a88 100644
--- a/finance/views.py
+++ b/finance/views.py
@@ -153,4 +153,4 @@ def get_invoices(request):
             i.key,
         ])
 
-    return response
\ No newline at end of file
+    return response
diff --git a/finance/yandex.py b/finance/yandex.py
deleted file mode 100644
index 7bb4d51..0000000
--- a/finance/yandex.py
+++ /dev/null
@@ -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

From 3bd9492a76a88cfd7a01d6c39a9ec9e45b15ad1e Mon Sep 17 00:00:00 2001
From: Andrey <andrey.korolev@skillbox.ru>
Date: Tue, 20 Feb 2018 16:14:41 +0300
Subject: [PATCH 2/2] migrate update

---
 config_app/settings/prod.env | 5 +++++
 finance/serializers.py       | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 config_app/settings/prod.env

diff --git a/config_app/settings/prod.env b/config_app/settings/prod.env
new file mode 100644
index 0000000..6f33e00
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/finance/serializers.py b/finance/serializers.py
index 6bf4a43..a166c1c 100644
--- a/finance/serializers.py
+++ b/finance/serializers.py
@@ -32,7 +32,7 @@ class InvoiceSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Invoice
-        exclude = ('bill', )
+        exclude = ('bill',)
 
     @staticmethod
     def get_status(self):