From b110eaad87d984d4243d3104ddd756c60dddd9cb Mon Sep 17 00:00:00 2001
From: Ivlev Denis <di-erz@yandex.ru>
Date: Thu, 19 Jul 2018 15:38:04 +0300
Subject: [PATCH 1/2] LIL-596. Fix non paid schedule template

(cherry picked from commit 6760feb)
---
 apps/school/templates/blocks/schedule.html | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/school/templates/blocks/schedule.html b/apps/school/templates/blocks/schedule.html
index 2e4c6457..89ce9222 100644
--- a/apps/school/templates/blocks/schedule.html
+++ b/apps/school/templates/blocks/schedule.html
@@ -8,21 +8,25 @@
         {% for school_schedule in school_schedules %}
         {% with current_live_lesson=school_schedule.current_live_lesson %}
         <div class="timing__item{% if school_schedule.weekday > 5 %} timing__item_bg{% endif %} js-timing-item js-timing-toggle">
-          <div class="timing__cell">
+          <div class="timing__cell timing__cell--info">
             <div class="timing__info">
               <div class="timing__day{% if school_schedule.is_online %} active{% endif %}">
                 {{ school_schedule }}
               </div>
+              {% comment %}
               {% if current_live_lesson %}
-              <!--<div class="timing__date">{{ current_live_lesson.date }}</div>-->
+              <div class="timing__date">{{ current_live_lesson.date }}</div>
               {% endif %}
+              {% endcomment %}
             </div>
             <div class="timing__buy">
               <div class="timing__time">{{ school_schedule.start_at }} (МСК)</div>
-              <!--{% include './pay_btn.html' %}-->
+              {% comment %}
+              {% include './pay_btn.html' %}
+              {% endcomment %}
             </div>
           </div>
-          <div class="timing__cell">
+          <div class="timing__cell timing__cell--preview">
             <div class="timing__preview">
               {% thumbnail current_live_lesson.cover.image "70x70" crop="center" as im %}
               <img class="timing__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"/>
@@ -31,7 +35,7 @@
               {% endthumbnail %}
             </div>
           </div>
-          <div class="timing__cell">
+          <div class="timing__cell timing__cell--content">
             <div class="timing__title">{{ school_schedule.title }}
               {% if current_live_lesson and current_live_lesson.title %}
                 , <span class="bold">{{ current_live_lesson.title }}</span>

From 90f5eebcb7f19cca69694726668dc842d2a89a32 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Sat, 21 Jul 2018 01:36:05 +0500
Subject: [PATCH 2/2] =?UTF-8?q?LIL-597=20=D0=9F=D0=BE=D0=BA=D0=B0=D0=B7?=
 =?UTF-8?q?=D1=8B=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81?=
 =?UTF-8?q?=D0=B8=20=D1=83=D1=80=D0=BE=D0=BA=D0=BE=D0=B2=20=D0=B7=D0=B0=20?=
 =?UTF-8?q?=D0=B2=D1=81=D1=91=20=D0=B2=D1=80=D0=B5=D0=BC=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/school/views.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/school/views.py b/apps/school/views.py
index 7f4ab734..90602ec0 100644
--- a/apps/school/views.py
+++ b/apps/school/views.py
@@ -223,8 +223,7 @@ class SummerSchoolView(TemplateView):
             school_schedules_purchased = []
         if school_payment_exists and is_previous:
             live_lessons = LiveLesson.objects.filter(
-                date__gte=school_payment.last().date_start,
-                date__range=[(now_time - timedelta(days=8)).date(), (now_time - timedelta(days=1)).date()],
+                date__lt=(now_time - timedelta(days=1)).date(),
                 deactivated_at__isnull=True,
             )
             live_lessons_exists = live_lessons.exists()