|
|
|
|
@ -1,10 +1,9 @@ |
|
|
|
|
import csv |
|
|
|
|
import logging |
|
|
|
|
import datetime |
|
|
|
|
import dicttoxml |
|
|
|
|
|
|
|
|
|
import requests |
|
|
|
|
from django.contrib.auth import get_user_model |
|
|
|
|
from django.core.mail import EmailMessage |
|
|
|
|
from django.db.models import Q |
|
|
|
|
from django.http import HttpResponse, HttpResponseForbidden |
|
|
|
|
from django.shortcuts import redirect |
|
|
|
|
@ -14,6 +13,7 @@ from rest_framework.views import APIView |
|
|
|
|
from yandex_money.models import Payment |
|
|
|
|
from django.conf import settings |
|
|
|
|
|
|
|
|
|
from courses.models import Course |
|
|
|
|
from courses.api import CourseParamsApi |
|
|
|
|
from finance.models import Bill, Invoice |
|
|
|
|
from finance.serializers import BillSerializer, InvoiceSerializer |
|
|
|
|
@ -237,9 +237,6 @@ class YandexCheckView(APIView): |
|
|
|
|
% (pay.order_amount, data['orderSumAmount'])) |
|
|
|
|
return Response(status=204) |
|
|
|
|
|
|
|
|
|
# TODO Нужно решение |
|
|
|
|
# pay.invoice_id = int(data['invoiceId']) |
|
|
|
|
# pay.save() |
|
|
|
|
now = timezone.now() |
|
|
|
|
pay.performed_datetime = now.isoformat() |
|
|
|
|
pay.save() |
|
|
|
|
@ -249,6 +246,17 @@ class YandexCheckView(APIView): |
|
|
|
|
|
|
|
|
|
logger_yandex.info(xml_res) |
|
|
|
|
|
|
|
|
|
msg = EmailMessage( |
|
|
|
|
'Списание средств с карты пользователя.', |
|
|
|
|
'''Пользователь "%s", переволит %s рублей. Номер платежа в яндекс кассе %s''' |
|
|
|
|
% (pay.invoice.bill.user.email, str(pay.invoice.real_price), str(data['invoiceId'])), |
|
|
|
|
'robo@skillbox.ru', |
|
|
|
|
[pay.invoice.bill.opener.email], |
|
|
|
|
bcc='dmitry.dolya@skillbox.ru', |
|
|
|
|
) |
|
|
|
|
|
|
|
|
|
msg.send() |
|
|
|
|
|
|
|
|
|
return HttpResponse(xml_res, content_type='application/xml') |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -281,6 +289,17 @@ class YandexAvisoView(APIView): |
|
|
|
|
|
|
|
|
|
logger_yandex.info(xml_res) |
|
|
|
|
|
|
|
|
|
msg = EmailMessage( |
|
|
|
|
'Успешная оплата.', |
|
|
|
|
'''Пользователь "%s", перевёл %s рублей. Номер платежа в яндекс кассе %s''' |
|
|
|
|
% (pay.invoice.bill.user.email, str(pay.invoice.price), str(data['invoiceId'])), |
|
|
|
|
'robo@skillbox.ru', |
|
|
|
|
[pay.invoice.bill.opener.email], |
|
|
|
|
bcc='dmitry.dolya@skillbox.ru', |
|
|
|
|
) |
|
|
|
|
|
|
|
|
|
msg.send() |
|
|
|
|
|
|
|
|
|
return HttpResponse(xml_res, content_type='application/xml') |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|