diff --git a/clientsideapp/views.py b/clientsideapp/views.py index afc7530..a59b053 100644 --- a/clientsideapp/views.py +++ b/clientsideapp/views.py @@ -28,7 +28,7 @@ def pays(request): @login_required def services(request): abon = Abon.objects.get(pk=request.user.pk) - all_tarifs = abon.group.tariffs.all() + all_tarifs = abon.group.tariffs.filter(is_admin=False) own_abon_tariffs = AbonTariff.objects.filter(abon=abon) current_service = own_abon_tariffs.exclude(time_start=None) current_service = current_service[0] if current_service.count() > 0 else None diff --git a/tariff_app/migrations/0003_tariff_is_admin.py b/tariff_app/migrations/0003_tariff_is_admin.py new file mode 100644 index 0000000..39a8848 --- /dev/null +++ b/tariff_app/migrations/0003_tariff_is_admin.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-04-15 12:16 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('tariff_app', '0002_tariff_descr'), + ] + + operations = [ + migrations.AddField( + model_name='tariff', + name='is_admin', + field=models.BooleanField(default=False), + ), + ] diff --git a/tariff_app/models.py b/tariff_app/models.py index 508276a..9347a51 100644 --- a/tariff_app/models.py +++ b/tariff_app/models.py @@ -21,6 +21,7 @@ class Tariff(models.Model): amount = models.FloatField(default=0.0) time_of_action = models.IntegerField(default=30) calc_type = models.CharField(max_length=2, default=TARIFF_CHOICES[0][0], choices=_TariffChoicesAdapter()) + is_admin = models.BooleanField(default=False) # Возвращает потомок класса TariffBase, методы которого дают нужную логику оплаты по тарифу def get_calc_type(self): diff --git a/tariff_app/templates/tariff_app/editTarif.html b/tariff_app/templates/tariff_app/editTarif.html index 6ba3a42..50caaa8 100644 --- a/tariff_app/templates/tariff_app/editTarif.html +++ b/tariff_app/templates/tariff_app/editTarif.html @@ -86,6 +86,10 @@ +
+ +
+