diff --git a/access/views.py b/access/views.py index 8542bc7..c3e69dd 100644 --- a/access/views.py +++ b/access/views.py @@ -237,7 +237,7 @@ class ChangePasswordView(APIView): @staticmethod def post(request): - if request.user.is_authenticated() or not request.user.check_password(request.JSON['old_password']): + if request.user.is_authenticated() and not request.user.check_password(request.JSON['old_password']): return Response("Неверный пароль", status=400) request.user.set_password(request.JSON['new_password']) request.user.save() diff --git a/finance/urls.py b/finance/urls.py index 5b875b5..7a83d74 100644 --- a/finance/urls.py +++ b/finance/urls.py @@ -9,4 +9,5 @@ urlpatterns = [ url(r'yandex/fail/$', views.YandexFailView.as_view()), url(r'invoice/([0-9]{1,99})/$', views.InvoiceDetailView.as_view()), url(r'invoices/$', views.get_invoices), + url(r'test/pay/$', views.test_pay), ] \ No newline at end of file diff --git a/finance/views.py b/finance/views.py index 788e47a..c550fda 100644 --- a/finance/views.py +++ b/finance/views.py @@ -7,7 +7,7 @@ from django.core.mail import EmailMessage from django.db import IntegrityError from django.db.models import Q from django.http import HttpResponse, HttpResponseForbidden -from django.shortcuts import redirect +from django.shortcuts import redirect, render_to_response from rest_framework.renderers import JSONRenderer from rest_framework.response import Response from rest_framework.views import APIView @@ -29,6 +29,11 @@ from django.utils import timezone logger_yandex = logging.getLogger('yandex_money') +def test_pay(request): + return render_to_response('yandex/test_pay.html', context={ + 'shop_id': settings.YANDEX_MONEY_SHOP_ID, 'sc_id': settings.YANDEX_MONEY_SCID}) + + class BillListView(APIView): renderer_classes = (JSONRenderer,) diff --git a/templates/yandex/test_pay.html b/templates/yandex/test_pay.html new file mode 100644 index 0000000..774ef80 --- /dev/null +++ b/templates/yandex/test_pay.html @@ -0,0 +1,21 @@ + + +
+ +