From 0b39caa8c94d10c1a49374514a4b1452255a6614 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Wed, 28 Nov 2018 14:14:50 +0300 Subject: [PATCH 1/2] prevent autoconnect admin services --- periodic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/periodic.py b/periodic.py index 2fd3806..1b01d99 100755 --- a/periodic.py +++ b/periodic.py @@ -102,7 +102,7 @@ def main(): current_tariff=None ).exclude(last_connected_tariff=None).iterator(): tariff = ab.last_connected_tariff - if tariff is None: + if tariff is None or tariff.is_admin: continue ab.pick_tariff( tariff, None, From e51f1aeaee516e8b39e97d60af616bc0ec1ce4a7 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Wed, 28 Nov 2018 14:17:17 +0300 Subject: [PATCH 2/2] prevent autoconnect admin services --- periodic.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/periodic.py b/periodic.py index 1b01d99..52731e0 100755 --- a/periodic.py +++ b/periodic.py @@ -101,13 +101,16 @@ def main(): is_active=True, current_tariff=None ).exclude(last_connected_tariff=None).iterator(): - tariff = ab.last_connected_tariff - if tariff is None or tariff.is_admin: - continue - ab.pick_tariff( - tariff, None, - "Автоматическое продление услуги '%s'" % tariff.title - ) + try: + tariff = ab.last_connected_tariff + if tariff is None or tariff.is_admin: + continue + ab.pick_tariff( + tariff, None, + "Автоматическое продление услуги '%s'" % tariff.title + ) + except LogicError as e: + print(e) # manage periodic pays ppays = PeriodicPayForId.objects.filter(next_pay__lt=now) \