From 02b8437eab866911d1a91e29e4c85794910c5faa Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Tue, 28 May 2019 23:44:00 +0300 Subject: [PATCH] some refactoring --- abonapp/models.py | 8 +------- abonapp/tasks.py | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/abonapp/models.py b/abonapp/models.py index 2a4be2b..f0ece28 100644 --- a/abonapp/models.py +++ b/abonapp/models.py @@ -83,7 +83,7 @@ class AbonStreet(models.Model): class AbonManager(MyUserManager): def get_queryset(self): - return super(MyUserManager, self).get_queryset().filter(is_admin=False) + return super(AbonManager, self).get_queryset().filter(is_admin=False) def filter_ip_address(self, group_ids: tuple, nas_id: int): nas_id = int(nas_id) @@ -188,9 +188,6 @@ class Abon(BaseAccount): """ return tuple("m-%s" % name for name, state in self.markers if state) - def is_markers_empty(self): - return int(self.markers) == 0 - def active_tariff(self): return self.current_tariff @@ -438,9 +435,6 @@ class InvoiceForPayment(models.Model): self.status = True self.date_pay = timezone.now() - def get_prev_invoice(self): - return self.objects.order - class Meta: ordering = ('date_create',) db_table = 'abonent_inv_pay' diff --git a/abonapp/tasks.py b/abonapp/tasks.py index 22e8773..5d8cfff 100644 --- a/abonapp/tasks.py +++ b/abonapp/tasks.py @@ -12,7 +12,6 @@ def customer_nas_command(customer_uid: int, command: str): return 'Command required' try: cust = Abon.objects.get(pk=customer_uid) - print(cust, command) if command == 'sync': r = cust.nas_sync_self() if isinstance(r, Exception):