- {% trans 'Auto continue service.' %} - - ? -
{% if abon_tariff.tariff.descr %}{{ abon_tariff.tariff.descr }}
{% endif %} diff --git a/forward_pay.php b/forward_pay.php deleted file mode 100755 index 90bc3c6..0000000 --- a/forward_pay.php +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/env php - 1, - "PAY_ACCOUNT" => $user_id_pairs[$pay_account] - ]; - return send_to($pay); - }else if($act == 4) - { - $pay = [ - "ACT" => 4, - "PAY_ACCOUNT" => $user_id_pairs[$pay_account], - "TRADE_POINT" => $trade_point, - "RECEIPT_NUM" => $receipt_num, - "PAY_ID" => $pay_id, - "PAY_AMOUNT" => $pay_amount, - "SERVICE_ID" => $service_id - ]; - return send_to($pay); - }else if($act == 7) - { - $pay = [ - "ACT" => 7, - "PAY_ID" => $pay_id, - "SERVICE_ID" => $service_id - ]; - return send_to($pay); - } - -} - -# Request -echo forward_pay_request(1, '1234', null, null, null, null, null); - -# Add cash -echo forward_pay_request('4', '1234', 'mypaysrv', '3432', '289473', '897879-989-68669', '1'); - -# check cash -echo forward_pay_request(7, null, 'mypaysrv', null, null, '897879-989-68669', null); - -?> diff --git a/periodic.py b/periodic.py index b1963d0..f239c2c 100755 --- a/periodic.py +++ b/periodic.py @@ -38,8 +38,10 @@ def main(): AbonTariff.objects.filter(abon=None).delete() now = timezone.now() fields = ('id', 'tariff__title', 'abon__id') - expired_services = AbonTariff.objects.exclude(abon=None).filter(deadline__lt=now, - abon__autoconnect_service=False) + expired_services = AbonTariff.objects.exclude(abon=None).filter( + deadline__lt=now, + abon__autoconnect_service=False + ) # finishing expires services with transaction.atomic(): @@ -57,8 +59,10 @@ def main(): expired_services.delete() # Automatically connect new service - for ex in AbonTariff.objects.filter(deadline__lt=now, abon__autoconnect_service=True).exclude( - abon=None).iterator(): + for ex in AbonTariff.objects.filter( + deadline__lt=now, + abon__autoconnect_service=True + ).exclude(abon=None).iterator(): abon = ex.abon trf = ex.tariff amount = round(trf.amount, 2) @@ -68,7 +72,8 @@ def main(): abon.ballance -= amount ex.time_start = now ex.deadline = None # Deadline sets automatically in signal pre_save - ex.save(update_fields=('time_start', 'deadline')) + ex.is_active = True + ex.save(update_fields=('time_start', 'deadline', 'is_active')) abon.save(update_fields=('ballance',)) # make log about it l = AbonLog.objects.create( @@ -91,7 +96,19 @@ def main(): ) print(l.comment) - # signals.pre_delete.connect(abontariff_pre_delete, sender=AbonTariff) + # Post connect service + # connect service when autoconnect is True, and user have enough money + for ab in Abon.objects.filter( + is_active=True, + current_tariff=None + ).exclude(last_connected_tariff=None).iterator(): + tariff = ab.last_connected_tariff + if tariff is None: + continue + ab.pick_tariff( + tariff, None, + "Автоматическое продление услуги '%s'" % tariff.title + ) # manage periodic pays ppays = PeriodicPayForId.objects.filter(next_pay__lt=now) \ @@ -102,7 +119,7 @@ def main(): # sync subscribers on GW threads = tuple(NasSyncThread(nas) for nas in NASModel.objects. annotate(usercount=Count('abon')). - filter(usercount__gt=0)) + filter(usercount__gt=0, enabled=True)) for t in threads: t.start() for t in threads: diff --git a/tariff_app/migrations/0003_auto_20181115_1206.py b/tariff_app/migrations/0003_auto_20181115_1206.py new file mode 100644 index 0000000..75882af --- /dev/null +++ b/tariff_app/migrations/0003_auto_20181115_1206.py @@ -0,0 +1,17 @@ +# Generated by Django 2.1 on 2018-11-15 12:06 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('tariff_app', '0002_auto_20180807_1548'), + ] + + operations = [ + migrations.AlterModelOptions( + name='periodicpay', + options={'ordering': ('-id',), 'verbose_name': 'Periodic pay', 'verbose_name_plural': 'Periodic pays'}, + ), + ]