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