LIL-622

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

apps/school/templates/summer/schedule_purchased.html

@@ -26,14 +26,12 @@
           <div class="casing__title title">Новые уроки</div>
           {% endif %}
 
-          {% comment %}
           <label class="casing__switcher switcher">
             <span class="switcher__wrap">
               <a href="{% url 'school:summer-school' %}?is_previous=true" class="switcher__item{% if is_previous %} active{% endif %}">запись уроков</a>
               <a href="{% url 'school:summer-school' %}" class="switcher__item{% if not is_previous %} active{% endif %}">новые уроки</a>
             </span>
           </label>
-          {% endcomment %}
         </div>
         {% endif %}
         <div class="casing__timing timing js-timing">

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

project/templates/blocks/about.html

@@ -44,7 +44,6 @@
       </div>
     </div>
     <div class="letsgo">
-        {% comment %}
         {% if not is_purchased and not is_purchased_future %}
           <a
               {% if not user.is_authenticated %}
@@ -58,7 +57,6 @@
           купить доступ от {{ min_school_price }} руб./месяц
           </a>
         {% endif %}
-        {% endcomment %}
     </div>
   </div>
 </div>

project/templates/blocks/header.html

@@ -25,15 +25,14 @@
           </form>
         </div>
         <nav class="header__nav">
-          {% if is_summer_school_purchased %}
           <div class="header__group">
-            <a class="header__section {% active_link 'school:summer-school' %}" href="{% url 'school:summer-school' %}?is_previous=true">
-              ЛАГЕРЬ {% if online or livelesson.is_online %}
+            <a class="header__section {% active_link 'school:summer-school' %}" href="{% url 'school:summer-school' %}">
+              ОНЛАЙН-ШКОЛА {% if online or livelesson.is_online %}
               <div class="header__dot"></div>
               {% endif %}
             </a>
           </div>
-          {% endif %}
+          {% comment %}
           <div class="header__group">
             <a class="header__section {% active_link 'school:school' %}" href="{% url 'school:school' %}">
               ОНЛАЙН-ШКОЛА {% if online or livelesson.is_online %}
@@ -41,6 +40,7 @@
               {% endif %}
             </a>
           </div>
+          {% endcomment %}
           <div class="header__group">
             <a class="header__section header__section_sub js-header-section {% active_link 'courses' %}" href="{% url 'courses' %}">ВИДЕО-КУРСЫ</a>
             <div class="header__list js-header-list">