Merge branch 'devel' of https://github.com/nerosketch/djing into devel

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)])

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 %}