From b288acb9d027149d460f97635b4ee09ab17f9a28 Mon Sep 17 00:00:00 2001 From: gzbender Date: Mon, 2 Sep 2019 17:34:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=91=D0=B0=D0=B3=20/=20=D0=9F=D1=80=D0=B8=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D0=B8=20=D1=83=D1=80?= =?UTF-8?q?=D0=BE=D0=BA=D0=B0=20=D1=88=D0=BA=D0=BE=D0=BB=D1=8B=20500=20?= =?UTF-8?q?=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/school/views.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/school/views.py b/apps/school/views.py index c737f199..a5621682 100644 --- a/apps/school/views.py +++ b/apps/school/views.py @@ -103,14 +103,14 @@ class LiveLessonsDetailView(DetailView): raise Http404() if request.user.is_authenticated: if self.object.is_camp: - is_purchased = DrawingCampPayment.objects.all() + is_purchased = DrawingCampPayment.objects.paid() else: - is_purchased = SchoolPayment.objects.filter(weekdays__contains=[self.object.date.weekday() + 1],) - is_purchased = is_purchased.paid().filter( + is_purchased = SchoolPayment.objects.paid().filter(weekdays__contains=[self.object.date.weekday() + 1],) + is_purchased = is_purchased.filter( user=request.user, date_start__lte=now(), date_end__gte=now() - timedelta(days=7), - ).exists() or is_purchased.paid().filter( + ).exists() or is_purchased.filter( user=request.user, date_start__lte=now(), date_end__gte=now() - timedelta(days=30),