From 7425023feab6c78c705476dd1358de44bbbadf4a Mon Sep 17 00:00:00 2001 From: gzbender Date: Sat, 18 Aug 2018 22:22:47 +0500 Subject: [PATCH] =?UTF-8?q?LIL-622=20=D0=9E=D1=82=D0=BA=D1=80=D1=8B=D1=82?= =?UTF-8?q?=D1=8C=20=D1=88=D0=BA=D0=BE=D0=BB=D1=83=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BA=D1=83=D0=BF=D0=BA=D0=B8=20=D1=83=D1=80=D0=BE?= =?UTF-8?q?=D0=BA=D0=BE=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/payment/views.py | 6 ++++++ apps/school/views.py | 1 + 2 files changed, 7 insertions(+) diff --git a/apps/payment/views.py b/apps/payment/views.py index afe2b8ac..ba2cd5f0 100644 --- a/apps/payment/views.py +++ b/apps/payment/views.py @@ -100,6 +100,8 @@ class SchoolBuyView(TemplateView): weekdays = set(request.GET.getlist('weekdays', [])) add_days = 'add_days' in request.GET roistat_visit = request.COOKIES.get('roistat_visit', None) + date_start = now().date() + september2018 = datetime.date(2018, 9, 1) if not weekdays: messages.error(request, 'Выберите несколько дней недели.') return redirect('school:summer-school') @@ -108,6 +110,8 @@ class SchoolBuyView(TemplateView): except ValueError: messages.error(request, 'Ошибка выбора дней недели.') return redirect('school:summer-school') + if date_start < september2018: + date_start = september2018 if add_days: _school_payment = SchoolPayment.objects.get( user=request.user, @@ -131,6 +135,8 @@ class SchoolBuyView(TemplateView): user=request.user, weekdays=weekdays, roistat_visit=roistat_visit, + date_start=date_start, + date_end=date_start + timedelta(days=30) ) product = Product( f'school_{school_payment.id}', diff --git a/apps/school/views.py b/apps/school/views.py index 3f269067..62d5e1a9 100644 --- a/apps/school/views.py +++ b/apps/school/views.py @@ -61,6 +61,7 @@ class LiveLessonsDetailView(DetailView): def get(self, request, pk=None): response = super().get(request, pk=pk) + # ??? где проверка? #try: # school_payment = SchoolPayment.objects.get( # user=request.user,