From 339a1c1f5deff7ae4bb8e9823d3ce8aaa61739b8 Mon Sep 17 00:00:00 2001 From: bashmak Date: Sat, 15 Apr 2017 15:33:02 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B2=20=D1=83=D1=81=D0=BB=D1=83=D0=B3=D0=B8=20=D0=B3=D0=B0?= =?UTF-8?q?=D0=BB=D0=BA=D1=83=20"=D0=90=D0=B4=D0=BC=D0=B8=D0=BD=D0=B8?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D1=82=D0=B8=D0=B2=D0=BD=D1=8B=D0=B9"?= =?UTF-8?q?=20=D1=87=D1=82=D0=BE=D0=B1=20=D0=BD=D0=B5=20=D0=BF=D0=BE=D0=BA?= =?UTF-8?q?=D0=B0=D0=B7=D1=8B=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B2=20=D0=BA?= =?UTF-8?q?=D0=B0=D0=B1=D0=B8=D0=BD=D0=B5=D1=82=D0=B5=20=D0=BA=D0=BB=D0=B8?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=B0=20=D0=B1=D0=B5=D1=81=D0=BF=D0=BB=D0=B0?= =?UTF-8?q?=D1=82=D0=BD=D1=8B=D0=B5=20=D1=83=D1=81=D0=BB=D1=83=D0=B3=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clientsideapp/views.py | 2 +- tariff_app/migrations/0003_tariff_is_admin.py | 20 +++++++++++++++++++ tariff_app/models.py | 1 + .../templates/tariff_app/editTarif.html | 4 ++++ tariff_app/views.py | 2 +- 5 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 tariff_app/migrations/0003_tariff_is_admin.py 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 @@ +
+ +
+