migrate update

feature/fix_generate_pass
Andrey 8 years ago
parent 3b44ca21ef
commit 45e5a839ce
  1. 5
      finance/serializers.py
  2. 2
      finance/views.py
  3. 42
      finance/yandex.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()

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

@ -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
Loading…
Cancel
Save