|
|
@ -83,7 +83,7 @@ class AbonStreet(models.Model): |
|
|
|
|
|
|
|
|
class AbonManager(MyUserManager): |
|
|
class AbonManager(MyUserManager): |
|
|
def get_queryset(self): |
|
|
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): |
|
|
def filter_ip_address(self, group_ids: tuple, nas_id: int): |
|
|
nas_id = int(nas_id) |
|
|
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) |
|
|
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): |
|
|
def active_tariff(self): |
|
|
return self.current_tariff |
|
|
return self.current_tariff |
|
|
|
|
|
|
|
|
@ -438,9 +435,6 @@ class InvoiceForPayment(models.Model): |
|
|
self.status = True |
|
|
self.status = True |
|
|
self.date_pay = timezone.now() |
|
|
self.date_pay = timezone.now() |
|
|
|
|
|
|
|
|
def get_prev_invoice(self): |
|
|
|
|
|
return self.objects.order |
|
|
|
|
|
|
|
|
|
|
|
class Meta: |
|
|
class Meta: |
|
|
ordering = ('date_create',) |
|
|
ordering = ('date_create',) |
|
|
db_table = 'abonent_inv_pay' |
|
|
db_table = 'abonent_inv_pay' |
|
|
|