From 42e3b6a6c3a1c8489d76f913c5e86b5f213f2446 Mon Sep 17 00:00:00 2001
From: http <http@localhost.localdomain>
Date: Thu, 1 Jun 2017 15:32:41 +0300
Subject: [PATCH 1/3] =?UTF-8?q?=D0=B2=D1=8B=D0=BA=D0=BB=D1=8E=D1=87=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D1=83=20=D0=B2=D1=8B?=
 =?UTF-8?q?=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=83=D1=81?=
 =?UTF-8?q?=D0=BB=D1=83=D0=B3=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 clientsideapp/templates/clientsideapp/services.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clientsideapp/templates/clientsideapp/services.html b/clientsideapp/templates/clientsideapp/services.html
index b900a28..c9e39a7 100644
--- a/clientsideapp/templates/clientsideapp/services.html
+++ b/clientsideapp/templates/clientsideapp/services.html
@@ -21,8 +21,8 @@
                             <li class="list-group-item">
                                 <div class="btn-group">
                                     {% if abon_tariff == current_service %}
-                                        <a href="{% url 'client_side:complete_service' abon_tariff.pk %}"
-                                           class="btn btn-xs btn-danger btn-modal" title="Завершить услугу досрочно">
+                                        <a href="#{% url 'client_side:complete_service' abon_tariff.pk %}"
+                                           class="btn btn-xs btn-danger btn-modal disabled" title="Завершить услугу досрочно">
                                             <span class="glyphicon glyphicon-remove"></span>
                                         </a>
                                     {% else %}

From 8c51ec3b1e2efaac649843bd73452d51f5693a67 Mon Sep 17 00:00:00 2001
From: http <http@localhost.localdomain>
Date: Thu, 1 Jun 2017 15:33:20 +0300
Subject: [PATCH 2/3] FIXBUG

---
 abonapp/forms.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/abonapp/forms.py b/abonapp/forms.py
index fc07833..2bb9bad 100644
--- a/abonapp/forms.py
+++ b/abonapp/forms.py
@@ -11,7 +11,6 @@ from .formfields import MACAddressField
 
 def generate_random_username(length=6, chars=digits, split=2, delimiter=''):
     username = ''.join([choice(chars) for i in range(length)])
-    username = str(int(username))
 
     if split:
         username = delimiter.join([username[start:start+split] for start in range(0, len(username), split)])

From c6e309e4781b87ec29877e54ab35594353425f23 Mon Sep 17 00:00:00 2001
From: http <http@localhost.localdomain>
Date: Thu, 1 Jun 2017 15:34:08 +0300
Subject: [PATCH 3/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=20=D0=B0=D1=82=D0=BE=D0=BC=D0=B0=D1=80=D0=BD=D1=83=D1=8E=20?=
 =?UTF-8?q?=D1=82=D1=80=D0=B0=D0=BD=D0=B7=D0=B0=D0=BA=D1=86=D0=B8=D1=8E=20?=
 =?UTF-8?q?=D0=B2=20=D0=BF=D0=BB=D0=B0=D1=82=D1=91=D0=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 abonapp/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/abonapp/views.py b/abonapp/views.py
index 1152242..6de44c6 100644
--- a/abonapp/views.py
+++ b/abonapp/views.py
@@ -4,6 +4,7 @@ from django.contrib.gis.shortcuts import render_to_text
 from django.core.exceptions import PermissionDenied
 from django.db import IntegrityError, ProgrammingError
 from django.db.models import Count, Q
+from django.db.transaction import atomic
 from django.shortcuts import render, redirect, get_object_or_404, resolve_url
 from django.contrib.auth.decorators import login_required, permission_required
 from django.utils import timezone
@@ -351,7 +352,7 @@ def opt82(request, gid, uid):
     return redirect('abonapp:abon_home', gid=gid, uid=uid)
 
 
-@mydefs.require_ssl
+@atomic
 def terminal_pay(request):
     from .pay_systems import allpay
     ret_text = allpay(request)