From dad77389d6227e61f03686780a6c28f514af518f Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 14 Nov 2017 11:03:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=AF=D0=BD=D0=B4=D0=B5=D0=BA=D1=81=20=D0=B4?= =?UTF-8?q?=D0=B5=D0=BD=D1=8C=D0=B3=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- finance/serializers.py | 11 ++--------- finance/signals.py | 3 +-- finance/tasks.py | 16 ++++++++-------- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/finance/serializers.py b/finance/serializers.py index 70f6367..6efb77b 100644 --- a/finance/serializers.py +++ b/finance/serializers.py @@ -1,6 +1,6 @@ from rest_framework import serializers -from finance.models import Bill, Invoice, Payment +from finance.models import Bill, Invoice class BillSerializer(serializers.ModelSerializer): @@ -24,11 +24,4 @@ class InvoiceSerializer(serializers.ModelSerializer): class Meta: model = Invoice - exclude = ('bill', ) - - -class PaymentSerializer(serializers.ModelSerializer): - - class Meta: - model = Payment - exclude = '__all__' + exclude = ('bill', ) \ No newline at end of file diff --git a/finance/signals.py b/finance/signals.py index e6df77f..d8b39af 100644 --- a/finance/signals.py +++ b/finance/signals.py @@ -3,11 +3,10 @@ from django.db.models.signals import pre_save from django.dispatch import receiver from finance.models import Invoice -from finance.serializers import PaymentSerializer @receiver(pre_save, sender=Invoice) def delete_dependencies(instance, **kwargs): """Отправка сообщения после сохранения платежа""" if instance.yandex_pay and instance.method == 'Y' and instance.status == 'P': - send_to_yandex.delay(PaymentSerializer(instance.yandex_pay).data) + send_to_yandex.delay(**instance.yandex_pay.__dict__) diff --git a/finance/tasks.py b/finance/tasks.py index 10009ed..d417544 100644 --- a/finance/tasks.py +++ b/finance/tasks.py @@ -5,20 +5,20 @@ from django.core.mail import send_mail @shared_task -def send_to_yandex(pay): +def send_to_yandex(**pay): r = requests.post('https://money.yandex.ru/eshop.xml', data={ - 'shopId': pay.shop_id, - 'scid': pay.scid, - 'sum': pay.order_amount, - 'customerNumber': pay.customer_number, - 'orderNumber': pay.order_number, - 'cps_email': pay.cps_email, + 'shopId': pay['shop_id'], + 'scid': pay['scid'], + 'sum': pay['order_amount'], + 'customerNumber': pay['customer_number'], + 'orderNumber': pay['order_number'], + 'cps_email': pay['cps_email'], }) body = { "subject": 'Спасибо за регистрацию', "message": '''Вам выставлен счёт, для оплаты перейдите по ссылке %s''' % r.url, "from_email": 'robo@skillbox.ru', - "recipient_list": [pay.cps_email], + "recipient_list": [pay['cps_email']], } send_mail(