From 7425023feab6c78c705476dd1358de44bbbadf4a Mon Sep 17 00:00:00 2001 From: gzbender Date: Sat, 18 Aug 2018 22:22:47 +0500 Subject: [PATCH 01/11] =?UTF-8?q?LIL-622=20=D0=9E=D1=82=D0=BA=D1=80=D1=8B?= =?UTF-8?q?=D1=82=D1=8C=20=D1=88=D0=BA=D0=BE=D0=BB=D1=83=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D0=BA=D1=83=D0=BF=D0=BA=D0=B8=20=D1=83?= =?UTF-8?q?=D1=80=D0=BE=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, From 43eb30ac18110b48327af38fb7ca5803e1fa946a Mon Sep 17 00:00:00 2001 From: gzbender Date: Sat, 18 Aug 2018 22:43:27 +0500 Subject: [PATCH 02/11] =?UTF-8?q?LIL-622=20=D0=9E=D1=82=D0=BA=D1=80=D1=8B?= =?UTF-8?q?=D1=82=D1=8C=20=D1=88=D0=BA=D0=BE=D0=BB=D1=83=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D0=BA=D1=83=D0=BF=D0=BA=D0=B8=20=D1=83?= =?UTF-8?q?=D1=80=D0=BE=D0=BA=D0=BE=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/school/templates/blocks/online.html | 2 +- apps/school/templates/blocks/promo.html | 2 +- apps/school/templates/summer/online.html | 2 +- apps/school/templates/summer/promo.html | 2 +- project/templates/blocks/about.html | 2 +- project/templates/blocks/last_courses.html | 2 +- project/templates/blocks/live.html | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/school/templates/blocks/online.html b/apps/school/templates/blocks/online.html index c4c82931..549dad08 100644 --- a/apps/school/templates/blocks/online.html +++ b/apps/school/templates/blocks/online.html @@ -1,7 +1,7 @@ {% load static %}
-
ПРЯМОЙ ЭФИР
+
ВИДЕОУРОКИ
Каждый день в 17.00 (по Мск)
Кроме выходных. Запись эфира доступна по завершению трансляции
diff --git a/apps/school/templates/blocks/promo.html b/apps/school/templates/blocks/promo.html index 72137dbb..86f1f1df 100644 --- a/apps/school/templates/blocks/promo.html +++ b/apps/school/templates/blocks/promo.html @@ -17,7 +17,7 @@
-
Прямой эфир
+
Видеоуроки
С понедельника по пятницу кроме выходных
diff --git a/apps/school/templates/summer/online.html b/apps/school/templates/summer/online.html index 3599afcc..d062abfb 100644 --- a/apps/school/templates/summer/online.html +++ b/apps/school/templates/summer/online.html @@ -1,7 +1,7 @@ {% load static %}
-
ПРЯМОЙ ЭФИР
+
ВИДЕОУРОКИ
В 17.00 (по Мск)
Понедельник, среда, пятница.
diff --git a/apps/school/templates/summer/promo.html b/apps/school/templates/summer/promo.html index 7bdf1178..dcab64a8 100644 --- a/apps/school/templates/summer/promo.html +++ b/apps/school/templates/summer/promo.html @@ -32,7 +32,7 @@
-
Прямой эфир
+
Видеоуроки
Понедельник, среда, пятница
diff --git a/project/templates/blocks/about.html b/project/templates/blocks/about.html index 5fefa4ca..93416110 100644 --- a/project/templates/blocks/about.html +++ b/project/templates/blocks/about.html @@ -12,7 +12,7 @@
-
Прямой эфир
+
Видеоуроки
Понедельник, среда, пятница
diff --git a/project/templates/blocks/last_courses.html b/project/templates/blocks/last_courses.html index 0b080bb8..9eee94ce 100644 --- a/project/templates/blocks/last_courses.html +++ b/project/templates/blocks/last_courses.html @@ -2,7 +2,7 @@
Видео-курсы без расписания
-
Если вам не совсем удобно заниматься с нами в прямом эфире каждый день как в нашей онлайн-школе, специально для вас мы +
Если вам не совсем удобно заниматься с нами каждый день в нашей онлайн-школе, специально для вас мы делаем отдельные уроки в записи, которые вы можете проходить когда вам будем удобно.
Учите и развивайте креативное мышление когда и где угодно
diff --git a/project/templates/blocks/live.html b/project/templates/blocks/live.html index 3599afcc..d062abfb 100644 --- a/project/templates/blocks/live.html +++ b/project/templates/blocks/live.html @@ -1,7 +1,7 @@ {% load static %}
-
ПРЯМОЙ ЭФИР
+
ВИДЕОУРОКИ
В 17.00 (по Мск)
Понедельник, среда, пятница.
From f9e2d4a72a0bedb451ea627daf3d2e03b3f662e9 Mon Sep 17 00:00:00 2001 From: gzbender Date: Mon, 20 Aug 2018 22:19:15 +0500 Subject: [PATCH 03/11] LIL-622 --- apps/payment/views.py | 16 +++++----------- .../templates/summer/schedule_purchased.html | 2 -- apps/school/views.py | 6 ------ project/templates/blocks/about.html | 2 -- project/templates/blocks/header.html | 8 ++++---- 5 files changed, 9 insertions(+), 25 deletions(-) diff --git a/apps/payment/views.py b/apps/payment/views.py index ba2cd5f0..5008010b 100644 --- a/apps/payment/views.py +++ b/apps/payment/views.py @@ -100,8 +100,6 @@ 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') @@ -110,8 +108,6 @@ 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, @@ -135,8 +131,6 @@ 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}', @@ -181,6 +175,7 @@ class PaymentwallCallbackView(View): def get(self, request, *args, **kwargs): payment_raw_data = request.GET.copy() pingback = Pingback(payment_raw_data, self.get_request_ip()) + september2018 = datetime.date(2018, 9, 1) if pingback.validate(): product_type_name, payment_id = pingback.get_product().get_id().split('_') @@ -229,16 +224,15 @@ class PaymentwallCallbackView(View): ).last() if school_payment: if payment.add_days: - date_start = self.add_months(sourcedate=now().replace(hour=0, minute=0, day=1), months=1) + date_start = now().date() date_end = school_payment.date_end else: date_start = arrow.get(school_payment.date_end, settings.TIME_ZONE).shift(days=1).datetime date_end = arrow.get(date_start, settings.TIME_ZONE).shift(months=1).datetime else: - #month = 0 if now().day >= 1 and now().day <= 10 else 1 - # Логика июльского лагеря: до конца июля приобретаем только на текущий месяц - month = 0 - date_start = self.add_months(sourcedate=now().replace(hour=0, minute=0, day=1), months=month) + date_start = now().date() + if date_start < september2018: + date_start = september2018 date_end = arrow.get(date_start, settings.TIME_ZONE).shift(months=1, minutes=-1).datetime payment.date_start = date_start payment.date_end = date_end diff --git a/apps/school/templates/summer/schedule_purchased.html b/apps/school/templates/summer/schedule_purchased.html index b6e183a1..e2645b89 100644 --- a/apps/school/templates/summer/schedule_purchased.html +++ b/apps/school/templates/summer/schedule_purchased.html @@ -26,14 +26,12 @@
Новые уроки
{% endif %} - {% comment %} запись уроков новые уроки - {% endcomment %}
{% endif %}
diff --git a/apps/school/views.py b/apps/school/views.py index 62d5e1a9..11a4c439 100644 --- a/apps/school/views.py +++ b/apps/school/views.py @@ -171,12 +171,6 @@ class SchoolView(TemplateView): class SummerSchoolView(TemplateView): template_name = 'school/summer_school.html' - def get(self, request, *args, **kwargs): - context = self.get_context_data(**kwargs) - if not context.get('is_purchased'): - return redirect('/') - return self.render_to_response(context) - def get_context_data(self): context = super().get_context_data() is_previous = 'is_previous' in self.request.GET diff --git a/project/templates/blocks/about.html b/project/templates/blocks/about.html index 5fefa4ca..8deec906 100644 --- a/project/templates/blocks/about.html +++ b/project/templates/blocks/about.html @@ -44,7 +44,6 @@
- {% comment %} {% if not is_purchased and not is_purchased_future %} {% endif %} - {% endcomment %}
diff --git a/project/templates/blocks/header.html b/project/templates/blocks/header.html index 38d314bf..675cf0ea 100644 --- a/project/templates/blocks/header.html +++ b/project/templates/blocks/header.html @@ -25,15 +25,14 @@