Merge branch 'dev' into 'master'

Dev See merge request !325
8 years ago · 5f1e130200
parent c500405271 922430124e
commit 5f1e130200
4 changed files with 29 additions and 2 deletions
--- 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()
--- 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),
 ]
--- 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,)

--- a/templates/yandex/test_pay.html
+++ b/templates/yandex/test_pay.html
@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Тестовый платёж</title>
+</head>
+<body>
+  <form action=" https://demomoney.yandex.ru/shop.xml" method="post">
+      <input name="shopId" value="{{ shop_id }}" type="text"/>
+      <input name="scid" value="{{ sc_id }}" type="text"/>
+      <input name="sum" value="100.50" type="text">
+      <input name="customerNumber" value="abc000" type="text"/>
+      <input name="paymentType" value="AC" type="text"/>
+      <input name="orderNumber" value="abc1111111" type="text"/>
+      <input name="cps_phone" value="79110000000" type="text"/>
+      <input name="cps_email" value="user@domain.com" type="text"/>
+      <input name="rebillingOn" type="checkbox"/>
+      <input type="submit" value="Заплатить"/>
+  </form>
+</body>
+</html>