Merge branch 'master' of https://gitlab.com/lilcity/backend into hotfix/lil-606

apps/school/views.py

@@ -181,7 +181,8 @@ class SummerSchoolView(TemplateView):
         is_previous = 'is_previous' in self.request.GET
         date_now = now().date()
         yesterday = date_now - timedelta(days=1)
-        month_start = date_now.replace(day=1)
+        # month_start = date_now.replace(day=1)
+        month_start = datetime(2018, 7, 1).date()
         now_time = now()
         try:
             school_schedule = SchoolSchedule.objects.get(weekday=now_time.isoweekday())
@@ -211,7 +212,7 @@ class SummerSchoolView(TemplateView):
             ).annotate(
                 joined_weekdays=Func(F('weekdays'), function='unnest',)
             ).distinct().values_list('joined_weekdays', flat=True)
-            all_schedules_purchased = map(lambda x: 1 if x == 7 else x+1, all_schedules_purchased)
+            all_schedules_purchased = list(map(lambda x: 1 if x == 7 else x+1, all_schedules_purchased))
 
             school_payment = SchoolPayment.objects.filter(
                 user=self.request.user,

project/templates/blocks/promo.html

@@ -11,7 +11,7 @@
     <div class="main__title">
       <span class="main__bold">Lil School</span> — первая образовательная онлайн-платформа креативного мышления для детей
     </div>
-    {% if user.is_authenticated and online %}
+    {% if False and user.is_authenticated and online %}
       <div class="main__content">
         Сейчас идёт прямой эфир урока «{{ school_schedule.title }}, {{ school_schedule.current_live_lesson.title }}»
       </div>
@@ -26,7 +26,7 @@
           class="main__btn btn"
           >{% if not is_purchased %}Получить доступ{% else %}Смотреть урок{% endif %}</a>
       </div>
-    {% elif user.is_authenticated and online_coming_soon and school_schedule and school_schedule.start_at_humanize %}
+    {% elif False and user.is_authenticated and online_coming_soon and school_schedule and school_schedule.start_at_humanize %}
       <div class="">
         Урок «{{ school_schedule.title }}, {{ school_schedule.current_live_lesson.title }}» начнётся
       </div>