diff --git a/abonapp/locale/ru/LC_MESSAGES/django.po b/abonapp/locale/ru/LC_MESSAGES/django.po index 4a46d07..2d77f35 100644 --- a/abonapp/locale/ru/LC_MESSAGES/django.po +++ b/abonapp/locale/ru/LC_MESSAGES/django.po @@ -195,8 +195,8 @@ msgid "Service already activated" msgstr "Услуга уже подключена" #: models.py:174 -msgid "not enough money" -msgstr "Не хватает денег на счету" +msgid "%s not enough money for service %s" +msgstr "%s не имеет достаточно средств для %s" #: models.py:190 msgid "Buy service default log" @@ -939,8 +939,8 @@ msgstr "Квитанция на оплату была создана" #: views.py:419 #, python-format -msgid "Service '%(service_name)s' has connected via admin" -msgstr "Услуга '%(service_name)s' подключена администратором" +msgid "Service '%(service_name)s' has connected via admin until %(deadline)s" +msgstr "Услуга '%(service_name)s' подключена администратором до %(deadline)s" #: views.py:429 msgid "Tariff has been picked" diff --git a/abonapp/models.py b/abonapp/models.py index 7878895..0d063b9 100644 --- a/abonapp/models.py +++ b/abonapp/models.py @@ -239,7 +239,9 @@ class Abon(BaseAccount): # if not enough money if self.ballance < amount: - raise LogicError(_('not enough money')) + raise LogicError(_('%s not enough money for service %s') % ( + self.username, tariff.title + )) with transaction.atomic(): new_abtar = AbonTariff.objects.create( diff --git a/periodic.py b/periodic.py index 52731e0..1d08ce8 100755 --- a/periodic.py +++ b/periodic.py @@ -37,7 +37,7 @@ def main(): signals.pre_delete.disconnect(abontariff_pre_delete, sender=AbonTariff) AbonTariff.objects.filter(abon=None).delete() now = timezone.now() - fields = ('id', 'tariff__title', 'abon__id') + fields = ('id', 'tariff__title', 'abon__id', 'abon__username') expired_services = AbonTariff.objects.exclude(abon=None).filter( deadline__lt=now, abon__autoconnect_service=False @@ -51,8 +51,9 @@ def main(): amount=0, author=None, date=now, - comment="Срок действия услуги '%(service_name)s' истёк" % { - 'service_name': ex_srv['tariff__title'] + comment="Срок действия услуги '%(service_name)s' для '%(username)s' истёк" % { + 'service_name': ex_srv['tariff__title'], + 'username': ex_srv['abon__username'] } ) print(log)