From 93940005e925932c9b69ddb3e57d7d00363a8840 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 21 Mar 2017 22:02:17 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B2?= =?UTF-8?q?=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B5=20=D0=B4=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D1=83=D0=BF=D0=BD=D1=8B=D1=85=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=B0=20=D1=83=D1=81=D0=BB=D1=83?= =?UTF-8?q?=D0=B3=20=D0=B1=D1=83=D0=B4=D1=83=D1=82=20=D1=82=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=BA=D0=BE=20=D1=82=D0=B5=20=D1=87=D1=82=D0=BE=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=D0=B2=D1=8F=D0=B7=D0=B0=D0=BD=D1=8B=20=D0=BA=20?= =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B5=20=D0=B2=20=D0=BA=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=BE=D0=B9=20=D0=BD=D0=B0=D1=85=D0=BE=D0=B4?= =?UTF-8?q?=D0=B8=D1=82=D1=81=D1=8F=20=D0=B0=D0=B1=D0=BE=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clientsideapp/views.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/clientsideapp/views.py b/clientsideapp/views.py index 0aa8e32..1d00f33 100644 --- a/clientsideapp/views.py +++ b/clientsideapp/views.py @@ -27,8 +27,9 @@ def pays(request): @login_required def services(request): - all_tarifs = Tariff.objects.all() - own_abon_tariffs = AbonTariff.objects.filter(abon_id=request.user.id) + abon = Abon.objects.get(pk=request.user.pk) + all_tarifs = abon.group.tariffs.all() + 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 @@ -41,8 +42,8 @@ def services(request): @login_required def buy_service(request, srv_id): - abon = get_object_or_404(Abon, id=request.user.pk) - service = get_object_or_404(Tariff, id=srv_id) + abon = get_object_or_404(Abon, pk=request.user.pk) + service = get_object_or_404(Tariff, pk=srv_id) try: current_service = abon.active_tariff() if request.method == 'POST':