Browse Source

more informative logs

devel
Dmitry Novikov 7 years ago
parent
commit
e264943ac4
  1. 8
      abonapp/locale/ru/LC_MESSAGES/django.po
  2. 4
      abonapp/models.py
  3. 7
      periodic.py

8
abonapp/locale/ru/LC_MESSAGES/django.po

@ -195,8 +195,8 @@ msgid "Service already activated"
msgstr "Услуга уже подключена" msgstr "Услуга уже подключена"
#: models.py:174 #: models.py:174
msgid "not enough money"
msgstr "Не хватает денег на счету"
msgid "%s not enough money for service %s"
msgstr "%s не имеет достаточно средств для %s"
#: models.py:190 #: models.py:190
msgid "Buy service default log" msgid "Buy service default log"
@ -939,8 +939,8 @@ msgstr "Квитанция на оплату была создана"
#: views.py:419 #: views.py:419
#, python-format #, 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 #: views.py:429
msgid "Tariff has been picked" msgid "Tariff has been picked"

4
abonapp/models.py

@ -239,7 +239,9 @@ class Abon(BaseAccount):
# if not enough money # if not enough money
if self.ballance < amount: 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(): with transaction.atomic():
new_abtar = AbonTariff.objects.create( new_abtar = AbonTariff.objects.create(

7
periodic.py

@ -37,7 +37,7 @@ def main():
signals.pre_delete.disconnect(abontariff_pre_delete, sender=AbonTariff) signals.pre_delete.disconnect(abontariff_pre_delete, sender=AbonTariff)
AbonTariff.objects.filter(abon=None).delete() AbonTariff.objects.filter(abon=None).delete()
now = timezone.now() 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( expired_services = AbonTariff.objects.exclude(abon=None).filter(
deadline__lt=now, deadline__lt=now,
abon__autoconnect_service=False abon__autoconnect_service=False
@ -51,8 +51,9 @@ def main():
amount=0, amount=0,
author=None, author=None,
date=now, 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) print(log)

Loading…
Cancel
Save