From e6d4988b9e9e1991e223ff4d0692b008b8b1b5a5 Mon Sep 17 00:00:00 2001 From: Evgeniy Shabanov Date: Mon, 19 Mar 2018 14:58:06 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=9F=D0=BE=D0=B2=D1=82=D0=BE=D1=80=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=BF=D0=BB=D0=B0=D1=82=D0=B5=D0=B6=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- finance/admin.py | 7 +++++- finance/models.py | 2 ++ finance/signals.py | 4 ++-- finance/tasks.py | 54 ++++++++++++++++++++++++++++++++++++++++++++++ finance/views.py | 7 ++++++ 5 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 finance/tasks.py diff --git a/finance/admin.py b/finance/admin.py index 04b13c6..8143c83 100755 --- a/finance/admin.py +++ b/finance/admin.py @@ -3,5 +3,10 @@ from django.contrib import admin from finance.models import Bill, Invoice + +class InvoiceAdmin(admin.ModelAdmin): + list_display = ('__str__', 'rebilling_on', 'rebilling') + + admin.site.register(Bill) -admin.site.register(Invoice) \ No newline at end of file +admin.site.register(Invoice, InvoiceAdmin) diff --git a/finance/models.py b/finance/models.py index 9516873..9d12e5c 100755 --- a/finance/models.py +++ b/finance/models.py @@ -54,6 +54,8 @@ class Invoice(models.Model): bill = models.ForeignKey(to=Bill, verbose_name="Связный счёт") is_open = models.BooleanField(default=True, verbose_name="Открывает ли платёж курс") date = models.DateTimeField(auto_now_add=True) + rebilling_on = models.BooleanField(verbose_name='Повторять платеж', default=False, editable=False) + rebilling = models.BooleanField(verbose_name='Повторный платеж', default=False, editable=False) def __str__(self): return '%s:%s %s' % (self.id, self.get_status_display(), self.bill.user) diff --git a/finance/signals.py b/finance/signals.py index 110a4f5..85e9d02 100644 --- a/finance/signals.py +++ b/finance/signals.py @@ -16,7 +16,7 @@ def invoice_signal(instance, **kwargs): course = Course.objects.get(token=instance.bill.course_token) - if instance.yandex_pay and instance.method == 'Y' and instance.status == 'P': + if instance.yandex_pay and instance.method == 'Y' and instance.status == 'P' and not instance.rebilling: msg = EmailMessage( 'Вам выставлен новый счёт', '''Вам выставлен счёт, для оплаты перейдите по ссылке @@ -28,7 +28,7 @@ def invoice_signal(instance, **kwargs): ) msg.send() - if instance.status == 'F': + if instance.status == 'F' and not instance.rebilling: if instance.is_open: try: Progress.objects.get( diff --git a/finance/tasks.py b/finance/tasks.py new file mode 100644 index 0000000..8b04a8a --- /dev/null +++ b/finance/tasks.py @@ -0,0 +1,54 @@ +import json +from datetime import datetime, timedelta + +from django_celery_beat.models import CrontabSchedule, PeriodicTask +from yandex_money.models import Payment + +from finance.models import Invoice +from lms import celery_app + + +def setup_periodic_billing(invoice_id): + # TODO: настроить периодичность и срок окончания + schedule, _ = CrontabSchedule.objects.get_or_create( + minute='*', + hour='*', + day_of_week='*', + day_of_month='*', + month_of_year='*' + ) + PeriodicTask.objects.create( + crontab=schedule, + name='Periodic billing #{}'.format(invoice_id), + task='finance.tasks.periodic_billing', + args=json.dumps([invoice_id]), + expires=datetime.utcnow() + timedelta(minutes=5) + ) + + +@celery_app.task +def periodic_billing(invoice_id): + try: + sample = Invoice.objects.get(id=invoice_id) + except Invoice.DoesNotExist: + raise ValueError('Платеж с id={} не найден'.format(invoice_id)) + bill = sample.bill + invoice = Invoice.objects.create( + status='P', + price=sample.price, + method=sample.method, + rebilling=True, + bill=bill + ) + if invoice.method == 'Y': + user = bill.user + yandex_pay = Payment.objects.create( + invoice_id=sample.yandex_pay.invoice_id, + order_amount=invoice.price, + customer_number=user.id, + user=user, + cps_email=user.email + ) + invoice.yandex_pay = yandex_pay + invoice.save() + # TODO: запрос repeatCardPayment diff --git a/finance/views.py b/finance/views.py index c97513f..7cb7489 100644 --- a/finance/views.py +++ b/finance/views.py @@ -17,6 +17,7 @@ from django.conf import settings from courses.api import CourseParamsApi from finance.models import Bill, Invoice from finance.serializers import BillSerializer, InvoiceSerializer +from finance.tasks import setup_periodic_billing from lms.global_decorators import transaction_decorator from lms.tools import get_real_name from django.utils import timezone @@ -155,6 +156,7 @@ class YandexPay(APIView): 'customerNumber': pay.customer_number, 'orderNumber': pay.order_number, 'cps_email': pay.cps_email, + 'rebillingOn': pay.invoice.rebilling_on, 'shopSuccessURL': settings.YANDEX_MONEY_SUCCESS_URL, 'shopFailURL': settings.YANDEX_MONEY_FAIL_URL, }) @@ -273,12 +275,17 @@ class YandexAvisoView(APIView): pay.shop_amount = data['shopSumAmount'] pay.status = Payment.STATUS.SUCCESS + pay.invoice_id = data['invoiceId'] pay.save() xml_res = """ """ % (pay.performed_datetime, str(data['invoiceId']), str(pay.shop_id)) logger_yandex.info(xml_res) + invoice = pay.invoice + if invoice.rebilling_on: + setup_periodic_billing(invoice.id) + return HttpResponse(xml_res, content_type='application/xml') From 6c61b81e13fff92946017376b18914f3bded8839 Mon Sep 17 00:00:00 2001 From: Evgeniy Shabanov Date: Wed, 21 Mar 2018 13:13:50 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9F=D0=BE=D0=B2=D1=82=D0=BE=D1=80=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=BF=D0=BB=D0=B0=D1=82=D0=B5=D0=B6=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- finance/tasks.py | 54 ++++++++++++++++++++++++++++++++++++++---------- finance/views.py | 5 ++--- lms/settings.py | 3 +++ 3 files changed, 48 insertions(+), 14 deletions(-) diff --git a/finance/tasks.py b/finance/tasks.py index 8b04a8a..a28b3ae 100644 --- a/finance/tasks.py +++ b/finance/tasks.py @@ -1,38 +1,51 @@ import json from datetime import datetime, timedelta +import logging + +import os +import requests from django_celery_beat.models import CrontabSchedule, PeriodicTask from yandex_money.models import Payment from finance.models import Invoice from lms import celery_app +from django.conf import settings + + +logger_yandex = logging.getLogger('yandex_money') -def setup_periodic_billing(invoice_id): +def setup_periodic_billing(order_number): # TODO: настроить периодичность и срок окончания + # 12:00 первого числа каждого месяца schedule, _ = CrontabSchedule.objects.get_or_create( - minute='*', - hour='*', + minute='0', + hour='12', day_of_week='*', - day_of_month='*', + day_of_month='1', month_of_year='*' ) PeriodicTask.objects.create( crontab=schedule, - name='Periodic billing #{}'.format(invoice_id), + name='Periodic billing (order_number={})'.format(order_number), task='finance.tasks.periodic_billing', - args=json.dumps([invoice_id]), - expires=datetime.utcnow() + timedelta(minutes=5) + kwargs=json.dumps({ + 'order_number': order_number + }), + expires=datetime.utcnow() + timedelta(days=180) # в течение полугода ) @celery_app.task -def periodic_billing(invoice_id): +def periodic_billing(order_number): try: - sample = Invoice.objects.get(id=invoice_id) + sample = Invoice.objects.get(yandex_pay__order_number=order_number) except Invoice.DoesNotExist: - raise ValueError('Платеж с id={} не найден'.format(invoice_id)) + raise ValueError('Номер заказа {} не найден'.format(order_number)) + bill = sample.bill + invoice = Invoice.objects.create( status='P', price=sample.price, @@ -40,6 +53,7 @@ def periodic_billing(invoice_id): rebilling=True, bill=bill ) + if invoice.method == 'Y': user = bill.user yandex_pay = Payment.objects.create( @@ -51,4 +65,22 @@ def periodic_billing(invoice_id): ) invoice.yandex_pay = yandex_pay invoice.save() - # TODO: запрос repeatCardPayment + + repeat_card_payment(invoice) + + +def repeat_card_payment(invoice): + resp = requests.post(settings.YANDEX_MONEY_MWS_URL + 'repeatCardPayment', + data={ + 'clientOrderId': invoice.id, # уникальное возрастающее целое число + 'invoiceId': invoice.yandex_pay.invoice_id, + 'amount': invoice.price, + 'orderNumber': invoice.yandex_pay.order_number + }, + cert=( + os.path.join(settings.SSL_ROOT, 'skillbox.cer'), + os.path.join(settings.SSL_ROOT, 'skillbox.key') + ), + verify=os.path.join(settings.SSL_ROOT, 'yamoney_chain.cer')) + + logger_yandex.info(resp.text) diff --git a/finance/views.py b/finance/views.py index 7cb7489..0445e70 100644 --- a/finance/views.py +++ b/finance/views.py @@ -282,9 +282,8 @@ class YandexAvisoView(APIView): logger_yandex.info(xml_res) - invoice = pay.invoice - if invoice.rebilling_on: - setup_periodic_billing(invoice.id) + if pay.invoice.rebilling_on: + setup_periodic_billing(pay.order_number) return HttpResponse(xml_res, content_type='application/xml') diff --git a/lms/settings.py b/lms/settings.py index b4ae38d..56153dd 100644 --- a/lms/settings.py +++ b/lms/settings.py @@ -57,6 +57,7 @@ YANDEX_MONEY_SHOP_ID = '157133' YANDEX_MONEY_SHOP_PASSWORD = 'nu5Xefise' YANDEX_MONEY_FAIL_URL = '%s/api/v1/finance/yandex/fail/' % DOMAIN YANDEX_MONEY_SUCCESS_URL = '%s/' % DOMAIN +YANDEX_MONEY_MWS_URL = 'https://penelope.yamoney.ru/webservice/mws/api/' # информировать о случаях, когда модуль вернул Яндекс.Кассе ошибку YANDEX_MONEY_MAIL_ADMINS_ON_PAYMENT_ERROR = True # Application definition @@ -190,6 +191,8 @@ STATIC_ROOT = os.path.join(BASE_DIR, 'static') STATIC_URL = '/static/' +SSL_ROOT = os.path.join(BASE_DIR, 'ssl') + RAVEN_CONFIG = { 'dsn': 'http://1a09557dbd144e52af4b14bea569c114:fbb5dfaa39e64f02a1b4cc7ac665d7d7@sentry.skillbox.ru/7' } From 3976bbf2ff7660a6ee9326886f79c270d88186d1 Mon Sep 17 00:00:00 2001 From: Evgeniy Shabanov Date: Thu, 22 Mar 2018 14:21:36 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=9C=D0=B8=D0=B3=D1=80=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- finance/migrations/0004_auto_20180321_1653.py | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 finance/migrations/0004_auto_20180321_1653.py diff --git a/finance/migrations/0004_auto_20180321_1653.py b/finance/migrations/0004_auto_20180321_1653.py new file mode 100644 index 0000000..b00a881 --- /dev/null +++ b/finance/migrations/0004_auto_20180321_1653.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.6 on 2018-03-21 16:53 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('finance', '0003_auto_20180315_1358'), + ] + + operations = [ + migrations.AddField( + model_name='invoice', + name='rebilling', + field=models.BooleanField(default=False, editable=False, verbose_name='Повторный платеж'), + ), + migrations.AddField( + model_name='invoice', + name='rebilling_on', + field=models.BooleanField(default=False, editable=False, verbose_name='Повторять платеж'), + ), + ]