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

abonapp/forms.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from django.http import QueryDict
 from datetime import datetime
 from django.utils.translation import ugettext as _
 from django import forms
@@ -27,6 +28,17 @@ def generate_random_password():
 
 
 class AbonForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super(AbonForm, self).__init__(*args, **kwargs)
+        if self.instance is not None and self.instance.group is not None:
+            abon_group_queryset = models.AbonStreet.objects.filter(group=self.instance.group)
+        elif 'group' in self.initial.keys() and self.initial['group'] is not None:
+            abon_group_queryset = models.AbonStreet.objects.filter(group=self.initial['group'])
+        else:
+            abon_group_queryset = None
+        if abon_group_queryset is not None:
+            self.fields['street'].queryset = abon_group_queryset
+
     username = forms.CharField(max_length=127, required=False, initial=generate_random_username, widget=forms.TextInput(attrs={
         'placeholder': _('login'),
         'class': "form-control",

abonapp/locale/ru/LC_MESSAGES/django.po

@@ -43,10 +43,6 @@ msgstr "Пополнение счёта"
 msgid "not enough money"
 msgstr "Не хватает денег на счету"
 
-#: abonapp/models.py:125
-msgid "service finish log"
-msgstr "Завершение и оплата услуги по истечению срока действия"
-
 #: abonapp/models.py:144
 msgid "finish service perm"
 msgstr "Снятие со счёта средств"

abonapp/models.py

@@ -123,7 +123,7 @@ class AbonTariff(models.Model):
         # считаем дату завершения услуги
         self.deadline = calc_obj.calc_deadline()
         # снимаем деньги за услугу
-        self.abon.make_pay(current_user, amnt, u_comment=_('service finish log'))
+        self.abon.make_pay(current_user, amnt)
         self.save()
 
     # Используется-ли услуга сейчас, если время старта есть то он активирован
@@ -235,13 +235,7 @@ class Abon(UserProfile):
         )
 
     # Платим за что-то
-    def make_pay(self, curuser, how_match_to_pay=0.0, u_comment=_('pay log')):
-        AbonLog.objects.create(
-            abon=self,
-            amount=-how_match_to_pay,
-            author=curuser,
-            comment=u_comment
-        )
+    def make_pay(self, curuser, how_match_to_pay=0.0):
         self.ballance -= how_match_to_pay
         self.save(update_fields=['ballance'])
 

clientsideapp/views.py

@@ -175,7 +175,7 @@ def debt_buy(request, d_id):
             if abon.ballance < debt.amount:
                 raise LogicError('Не достаточно средств на счету')
 
-            abon.make_pay(request.user, debt.amount, debt.comment)
+            abon.make_pay(request.user, debt.amount)
             debt.set_ok()
             abon.save(update_fields=['ballance'])
             debt.save(update_fields=['status', 'date_pay'])