From 2cd1b32b4cc6cad7e76c5e2bfad948e4fc8f59d7 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Wed, 29 Aug 2018 13:08:37 +0500
Subject: [PATCH 01/15] =?UTF-8?q?LIL-641=20=D0=9A=D0=BE=D0=BD=D0=BA=D1=83?=
 =?UTF-8?q?=D1=80=D1=81.=20=D0=93=D0=B0=D0=BB=D0=B5=D1=80=D0=B5=D1=8F=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=B3=D1=80=D1=83=D0=B6=D0=B0=D0=B5=D1=82?=
 =?UTF-8?q?=D1=81=D1=8F=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=82=D0=BD=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/content/blocks/video.html       |  4 +--
 project/templates/blocks/lil_store_js.html    |  1 +
 web/src/components/ContestWorks.vue           | 29 +++++++++++++++++--
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/apps/content/templates/content/blocks/video.html b/apps/content/templates/content/blocks/video.html
index 72bc8f86..791920b1 100644
--- a/apps/content/templates/content/blocks/video.html
+++ b/apps/content/templates/content/blocks/video.html
@@ -6,10 +6,10 @@
     <div class="content-block__video iframe__container">
       {% if 'youtube.com' in content.url or 'youtu.be' in content.url %}
       <iframe src="https://www.youtube.com/embed/{{ content.video_index }}" frameborder="0" allow="autoplay; encrypted-media"
-        allowfullscreen></iframe>
+        webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
       {% elif 'vimeo.com' in content.url %}
       <iframe src="https://player.vimeo.com/video/{{ content.video_index }}" frameborder="0" webkitallowfullscreen
-        mozallowfullscreen allowfullscree>
+        mozallowfullscreen allowfullscreen>
       </iframe>
       {% endif %}
     </div>
diff --git a/project/templates/blocks/lil_store_js.html b/project/templates/blocks/lil_store_js.html
index cb5eb6f8..e1698df0 100644
--- a/project/templates/blocks/lil_store_js.html
+++ b/project/templates/blocks/lil_store_js.html
@@ -3,6 +3,7 @@
   window.LIL_STORE = {
     staticUrl: '{% static "" %}',
     accessToken: '{{ request.user.auth_token }}',
+    isMobile: {{ request.user_agent.is_mobile|yesno:"true,false" }},
     user: {
       id: {{ request.user.id|default:'null' }},
     }
diff --git a/web/src/components/ContestWorks.vue b/web/src/components/ContestWorks.vue
index 18bb1fc8..7a02e968 100644
--- a/web/src/components/ContestWorks.vue
+++ b/web/src/components/ContestWorks.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="contest-works">
-    <div class="contest-works__works">
+    <div class="contest-works__works" v-if="! $root.store.isMobile">
       <div class="contest-works__column">
         <contest-work v-for="contestWork in columns[0]" :key="contestWork.id" :contest-work="contestWork"></contest-work>
       </div>
@@ -11,6 +11,9 @@
         <contest-work v-for="contestWork in columns[2]" :key="contestWork.id" :contest-work="contestWork"></contest-work>
       </div>
     </div>
+    <div class="contest-works__works" v-if="$root.store.isMobile" style="display: block;">
+      <contest-work v-for="contestWork in contestWorks" :key="contestWork.id" :contest-work="contestWork"></contest-work>
+    </div>
     <div v-show="loading" class="contest-works__loader"><div class="loading-loader"></div></div>
     <div v-if="loaded && !contestWorks.length"  class="contest-works__no-works">Здесь вы сможете увидеть работы участников после их добавления</div>
   </div>
@@ -48,12 +51,33 @@
     },
     computed: {
       columns() {
+        const columnWidth = 300;
+        const heights = [0, 0, 0];
         const first = [];
         const second = [];
         const third = [];
+        let index = 0;
         for(let i=0; i < this.contestWorks.length; i++) {
           const work = this.contestWorks[i];
-          [first, second, third][i % 3].push(work);
+          let column = index % 3;
+          const workHeight = work.img_height / work.img_width * columnWidth + 50;
+          let minHeight = 0;
+          if(i > 3){
+            for(let j=0; j < 3; j++){
+              let col = j % 3;
+              if(! minHeight || heights[j] < minHeight){
+                  minHeight = heights[j];
+                  if(heights[column] - heights[j] > workHeight * 0.1){
+                    column = j;
+                    index += j - column;
+                  }
+              }
+            }
+          }
+          
+          heights[column] += workHeight; 
+          [first, second, third][column].push(work);
+          index++;
         }
         return [first, second, third];
       }
@@ -97,6 +121,7 @@
       display: flex;
       flex-direction: column;
       margin-right: 20px;
+      width: 300px;
     }
     .contest-works__loader {
       width: 100%;

From ef434f50d13e7bef76fc4e0f80ddbc0f617280d6 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Thu, 30 Aug 2018 03:45:33 +0500
Subject: [PATCH 02/15] =?UTF-8?q?LIL-639=20=D0=9F=D1=80=D0=B8=20=D0=BE?=
 =?UTF-8?q?=D0=BF=D0=BB=D0=B0=D1=82=D0=B5=20=D0=B4=D0=B1=20=D0=B2=D1=8B?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA?=
 =?UTF-8?q?=D0=BE=20=D1=82=D0=BE=D1=82=20=D0=B4=D0=B5=D0=BD=D1=8C(=D1=83?=
 =?UTF-8?q?=D1=80=D0=BE=D0=BA),=20=D0=BD=D0=B0=20=D0=BA=D0=BE=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D1=8B=D0=B9=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=20=D0=BD=D0=B0=D0=B6=D0=B0=D0=BB?=
 =?UTF-8?q?=C2=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/school/templates/blocks/day_pay_btn.html |  1 +
 apps/school/templates/blocks/schedule.html    |  2 +-
 web/src/js/modules/popup.js                   | 15 ++++++++-------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/school/templates/blocks/day_pay_btn.html b/apps/school/templates/blocks/day_pay_btn.html
index f4cd2f40..9f90c17d 100644
--- a/apps/school/templates/blocks/day_pay_btn.html
+++ b/apps/school/templates/blocks/day_pay_btn.html
@@ -1,5 +1,6 @@
 <a
   data-popup=".js-popup-buy"
   class="timing__btn btn"
+  data-day="{{ school_schedule.weekday }}"
   href="{% url 'school-checkout' %}?weekdays={{ school_schedule.weekday }}&add_days=true"
 >купить</a>
diff --git a/apps/school/templates/blocks/schedule.html b/apps/school/templates/blocks/schedule.html
index 5f088511..ab97055f 100644
--- a/apps/school/templates/blocks/schedule.html
+++ b/apps/school/templates/blocks/schedule.html
@@ -10,7 +10,7 @@
         {% endfor %}
       </div>
       <div class="timing__foot">
-        <!--{% include './pay_btn.html' %}-->
+        {# include './pay_btn.html' #}
         <a target="_blank" class="timing__print" href="{% url 'school:school_schedules-print' %}">Распечатать расписание
           <span class="bold">чтобы не забыть</span>
           <svg class="icon icon-print">
diff --git a/web/src/js/modules/popup.js b/web/src/js/modules/popup.js
index b3d98b21..280551d3 100644
--- a/web/src/js/modules/popup.js
+++ b/web/src/js/modules/popup.js
@@ -34,7 +34,8 @@ $(document).ready(function () {
         popup;
 
     body.on('click', '[data-popup]', function(e){
-        let data = $(this).data('popup');
+        const $this = $(this);
+        let data = $this.data('popup');
         if(! data) {
           return true;
         }
@@ -50,7 +51,7 @@ $(document).ready(function () {
             console.log('reset selected');
             $('[data-day]').prop('checked', false);
 
-            if ($(this).text() === 'продлить') {
+            if ($this.text() === 'продлить') {
                 //data-purchased
                 //restore purchased selection
                 console.log('restore purchased');
@@ -72,19 +73,19 @@ $(document).ready(function () {
             }
         }
         if( data === '.js-popup-auth') {
-            let nextUrl = $(this).data('auth-next-url');
+            let nextUrl = $this.data('auth-next-url');
             if(nextUrl === 'href') {
-                nextUrl = $(this).attr('href');
+                nextUrl = $this.attr('href');
             }
             popup.data('next-url', nextUrl);
         }
 
-        if($(this).data('day')) {
-            let day = $(this).data('day');
+        if($this.data('day')) {
+            let day = $this.data('day');
             $('[data-day='+day+']').prop('checked', true);
         }
 
-        if(!is_extend && !$(this).data('day')) {
+        if(!is_extend && !$this.data('day')) {
             console.log('check all');
             $('[data-day]').each(function(){
                 $(this).prop('checked', true);

From 86584ecfad8ebdc912a2ac10cb6c80f1ca54ced8 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Thu, 30 Aug 2018 23:32:58 +0500
Subject: [PATCH 03/15] =?UTF-8?q?LIL-647=20=D0=9F=D0=B5=D1=80=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20=D0=B2=20=D1=87?=
 =?UTF-8?q?=D0=B0=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/templates/lilcity/index.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html
index af7eb6c3..8d4ebf95 100644
--- a/project/templates/lilcity/index.html
+++ b/project/templates/lilcity/index.html
@@ -42,6 +42,9 @@
     <script type="text/javascript">
     window.__lc = window.__lc || {};
     window.__lc.license = 9917240;
+    {% if request.user.is_authenticated %}
+    window.__lc.visitor = { name: '{{ request.user.get_full_name }}', email: '{{ request.user.email }}' };
+    {% endif %}
     (function() {
       var lc = document.createElement('script'); lc.type = 'text/javascript'; lc.async = true;
       lc.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'cdn.livechatinc.com/tracking.js';

From fba356dc9cb7e1083671f84edf2519db240831a3 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Fri, 31 Aug 2018 00:20:05 +0500
Subject: [PATCH 04/15] =?UTF-8?q?LIL-633=20=D0=9A=D0=BE=D1=80=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BA=D1=82=D0=BD=D0=BE=20=D1=81=D1=87=D0=B8=D1=82=D0=B0=D1=82?=
 =?UTF-8?q?=D1=8C=20=D0=B7=D0=B0=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BE=D0=BA?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=B5=D0=BF=D0=BE=D0=B4=D0=B0=D0=B2=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BB=D1=8F=20=D0=B2=20=D0=B5=D0=B3=D0=BE=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D1=84=D0=B8=D0=BB=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commands/payment_fix_amounts.py           | 22 +++++++++++++++++++
 apps/payment/views.py                         |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 apps/payment/management/commands/payment_fix_amounts.py

diff --git a/apps/payment/management/commands/payment_fix_amounts.py b/apps/payment/management/commands/payment_fix_amounts.py
new file mode 100644
index 00000000..e4ca313e
--- /dev/null
+++ b/apps/payment/management/commands/payment_fix_amounts.py
@@ -0,0 +1,22 @@
+from decimal import Decimal
+from django.core.management.base import BaseCommand
+from django.db.models import F
+
+from apps.payment.models import Payment, AuthorBalance
+
+
+class Command(BaseCommand):
+    help = 'Fix payment and author balance amount based on payment.data.effective_price_amount'
+
+    def handle(self, *args, **options):
+
+        for payment in Payment.objects.exclude(data__effective_price_amount=''):
+            if payment.data.get('effective_price_amount'):
+                payment.amount = Decimal(payment.data.get('effective_price_amount'))
+                payment.save()
+
+        for ab in AuthorBalance.objects.exclude(payment__amount=F('amount')).select_related('payment'):
+            ab.amount = ab.payment.amount
+            ab.save()
+
+
diff --git a/apps/payment/views.py b/apps/payment/views.py
index 1c705609..846b5a4a 100644
--- a/apps/payment/views.py
+++ b/apps/payment/views.py
@@ -201,7 +201,7 @@ class PaymentwallCallbackView(View):
             payment.status = pingback.get_type()
             payment.data = payment_raw_data
             if pingback.is_deliverable():
-                effective_amount = pingback.get_parameter('effective_price_amount')
+                effective_amount = payment_raw_data.get('effective_price_amount')
 
                 if effective_amount:
                     payment.amount = effective_amount

From 221c1c153f5affe71a8afd34ca1eb261cddde1c6 Mon Sep 17 00:00:00 2001
From: nikita <cfwm@yandex.ru>
Date: Fri, 31 Aug 2018 13:36:25 +0300
Subject: [PATCH 05/15] =?UTF-8?q?=D0=9F=D0=BE=D0=BA=D0=B0=D0=B7=D1=8B?=
 =?UTF-8?q?=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BA=D0=B0=D1=80=D1=82=D0=B8=D0=BD?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=B8=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=20=D0=B8?=
 =?UTF-8?q?=D0=B7=20=D1=80=D0=B0=D1=81=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F,=20=D0=B0=20=D0=BD=D0=B5=20=D0=B8=D0=B7=20=D1=83=D1=80?=
 =?UTF-8?q?=D0=BE=D0=BA=D0=B0=20=D1=88=D0=BA=D0=BE=D0=BB=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/school/templates/blocks/schedule_item.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/school/templates/blocks/schedule_item.html b/apps/school/templates/blocks/schedule_item.html
index e4774339..931c6829 100644
--- a/apps/school/templates/blocks/schedule_item.html
+++ b/apps/school/templates/blocks/schedule_item.html
@@ -32,13 +32,15 @@
   <div style="display: flex; width: 100%;">
     <div class="timing__cell timing__cell--preview">
         <div class="timing__preview">
+          {% comment %}
           {% thumbnail live_lesson.cover.image "70x70" crop="center" as im %}
           <img class="timing__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />
           {% empty %}
+          {% endcomment %}
           <img class="timing__pic"
                src="{% if school_schedule.cover %}{{ school_schedule.cover.image_thumbnail.url }}{% else %}{% static 'img/no_cover.png' %}{% endif %}"
                style="width: 70px; height: 70px;" />
-          {% endthumbnail %}
+          {% comment %}{% endthumbnail %}{% endcomment %}
         </div>
     </div>
     <div class="timing__cell timing__cell--content" {% if print %}style="flex: 1 0 0;"{% endif %}>
@@ -47,11 +49,13 @@
         {% endif %}
       </div>
       <div class="timing__content">
+      {% comment %}
       {% if live_lesson and live_lesson.short_description %}
         {{ live_lesson.short_description }}
       {% else %}
+      {% endcomment %}
         {{ school_schedule.description }}
-      {% endif %}
+      {% comment %}{% endif %}{% endcomment %}
       </div>
       <div class="timing__more">
         <div class="timing__head">Материалы</div>

From 823867dc345dacc3d1f96dc1ef2e62ff6563a0d9 Mon Sep 17 00:00:00 2001
From: nikita <cfwm@yandex.ru>
Date: Fri, 31 Aug 2018 23:42:53 +0300
Subject: [PATCH 06/15] Contest off

---
 project/templates/blocks/header.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/project/templates/blocks/header.html b/project/templates/blocks/header.html
index c7f3e8e6..312d06ec 100644
--- a/project/templates/blocks/header.html
+++ b/project/templates/blocks/header.html
@@ -41,9 +41,6 @@
           <div class="header__group">
             <a class="header__section" href="https://blog.lil.school">БЛОГ</a>
           </div>
-          <div class="header__group">
-            <a class="header__section" href="{% url 'contest' 'august' %}">КОНКУРС</a>
-          </div>
         </nav>
       </div>
       {% include 'templates/blocks/user_menu.html' %}

From 73be6abf295528223749f3cfa49913e18b5f27bb Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Sat, 1 Sep 2018 03:16:00 +0500
Subject: [PATCH 07/15] =?UTF-8?q?LIL-649=20=D0=9F=D1=80=D0=BE=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=80=D0=BA=D0=B0/=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=86?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B8=20=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D0=BF=D0=BE=D0=B4=D0=BF=D0=B8?=
 =?UTF-8?q?=D1=81=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/school/templates/blocks/schedule_item.html |  6 +++---
 apps/user/views.py                              |  2 +-
 project/templates/blocks/promo.html             | 10 +++++-----
 project/views.py                                | 13 ++++++-------
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/apps/school/templates/blocks/schedule_item.html b/apps/school/templates/blocks/schedule_item.html
index 931c6829..63dde442 100644
--- a/apps/school/templates/blocks/schedule_item.html
+++ b/apps/school/templates/blocks/schedule_item.html
@@ -6,12 +6,12 @@
         {{ school_schedule }}
       </div>
       {% if is_purchased and live_lesson %}
-      <div class="timing__date">{{ live_lesson.date }}</div>
+      <div class="timing__date">{{ live_lesson.date|date:"j E" }}</div>
       {% endif %}
       <div class="timing__time">{{ school_schedule.start_at }} (МСК)</div>
       <div class="timing__buy">
-        {% if is_purchased %}
-          {% if school_schedule.weekday in school_schedules_purchased and live_lesson and live_lesson.title %}
+        {% if is_purchased and school_schedule.weekday in school_schedules_purchased %}
+          {% if live_lesson and live_lesson.title %}
             {% include './open_lesson.html' %}
           {% endif %}
         {% else %}
diff --git a/apps/user/views.py b/apps/user/views.py
index a14daef6..4f2d424e 100644
--- a/apps/user/views.py
+++ b/apps/user/views.py
@@ -73,7 +73,7 @@ class ProfileView(TemplateView):
         school_payment = SchoolPayment.objects.filter(
             user=self.object,
             date_start__lte=now(),
-            date_end__gt=now(),
+            date_end__gte=now(),
             status__in=[
                 Pingback.PINGBACK_TYPE_REGULAR,
                 Pingback.PINGBACK_TYPE_GOODWILL,
diff --git a/project/templates/blocks/promo.html b/project/templates/blocks/promo.html
index f6f49349..58b06c89 100644
--- a/project/templates/blocks/promo.html
+++ b/project/templates/blocks/promo.html
@@ -11,22 +11,22 @@
     <div class="main__title">
       <span class="main__bold">Lil School</span> — первая образовательная онлайн-платформа креативного мышления для детей
     </div>
-    {% if False and user.is_authenticated and online %}
+    {% if user.is_authenticated and online %}
       <div class="main__content">
         Сейчас идёт прямой эфир урока «{{ school_schedule.title }}, {{ school_schedule.current_live_lesson.title }}»
       </div>
       <div class="main__actions">
         <a
-          {% if not is_purchased %}
+          {% if not school_schedule.weekday in school_schedules_purchased %}
             data-popup=".js-popup-buy"
             href='#'
           {% else %}
             href="{{ school_schedule.current_live_lesson.get_absolute_url }}"
           {% endif %}
           class="main__btn btn"
-          >{% if not is_purchased %}Получить доступ{% else %}Смотреть урок{% endif %}</a>
+          >{% if not school_schedule.weekday in school_schedules_purchased %}Получить доступ{% else %}Смотреть урок{% endif %}</a>
       </div>
-    {% elif False and user.is_authenticated and online_coming_soon and school_schedule and school_schedule.start_at_humanize %}
+    {% elif 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>
@@ -35,7 +35,7 @@
       </div>
       <div class="main__actions">
         <a
-          {% if not is_purchased %}
+          {% if not school_schedule.weekday in school_schedules_purchased %}
             data-popup=".js-popup-buy"
             href='#'
           {% else %}
diff --git a/project/views.py b/project/views.py
index 73e6877a..c3277a98 100644
--- a/project/views.py
+++ b/project/views.py
@@ -1,6 +1,6 @@
 from datetime import datetime, timedelta
 
-from django.db.models import Min
+from django.db.models import Min, Func, F
 from django.contrib.auth import get_user_model
 from django.views.generic import TemplateView
 from django.utils.timezone import now
@@ -38,12 +38,10 @@ class IndexView(TemplateView):
             )
             online_coming_soon = (
                 school_schedule.start_at > now_time.time() and
-                (
-                    datetime.combine(datetime.today(), school_schedule.start_at) - timedelta(hours=12)
-                ).time() <= now_time.time() and
+                datetime.combine(datetime.today(), school_schedule.start_at) - timedelta(hours=12)
+                <= datetime.combine(datetime.today(), now_time.time()) and
                 school_schedule.current_live_lesson
             )
-
         date_now = now_time.date()
         if self.request.user.is_authenticated:
             school_payment = SchoolPayment.objects.filter(
@@ -52,8 +50,9 @@ class IndexView(TemplateView):
                 date_end__gte=date_now
             )
             school_payment_exists = school_payment.exists()
-            school_schedules_purchased = school_payment.values_list('weekdays', flat=True)
-            school_schedules_purchased = school_schedules_purchased[0] if school_schedules_purchased else []
+            school_schedules_purchased = school_payment.annotate(
+                joined_weekdays=Func(F('weekdays'), function='unnest',)
+            ).values_list('joined_weekdays', flat=True).distinct()
 
             school_payment_future = SchoolPayment.objects.filter(
                 user=self.request.user,

From aa77721e0d2082f026c502c50d3d069ff5a9a22f Mon Sep 17 00:00:00 2001
From: nikita <cfwm@yandex.ru>
Date: Sat, 1 Sep 2018 14:19:45 +0300
Subject: [PATCH 08/15] Fix

---
 project/templates/blocks/promo.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/templates/blocks/promo.html b/project/templates/blocks/promo.html
index 58b06c89..32a9cde6 100644
--- a/project/templates/blocks/promo.html
+++ b/project/templates/blocks/promo.html
@@ -42,7 +42,7 @@
             href="{{ school_schedule.current_live_lesson.get_absolute_url }}"
           {% endif %}
           class="main__btn btn"
-          >{% if not is_purchased %}Получить доступ{% else %}Смотреть урок{% endif %}</a>
+          >{% if not school_schedule.weekday in school_schedules_purchased %}Получить доступ{% else %}Смотреть урок{% endif %}</a>
       </div>
     {% else %}
     <div class="main__subtitle">

From b66cb07f0d81cbc0323b8cd701bd926e63027170 Mon Sep 17 00:00:00 2001
From: nikita <cfwm@yandex.ru>
Date: Sat, 1 Sep 2018 14:27:39 +0300
Subject: [PATCH 09/15] Highlight today on purchase button click

---
 project/templates/blocks/promo.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project/templates/blocks/promo.html b/project/templates/blocks/promo.html
index 32a9cde6..b2c644ce 100644
--- a/project/templates/blocks/promo.html
+++ b/project/templates/blocks/promo.html
@@ -52,6 +52,7 @@
       {% if not is_purchased and not is_purchased_future %}
         <a
             data-popup=".js-popup-buy"
+            data-day="{{ school_schedule.weekday }}"
             class="main__btn btn"
             href="#"
         >

From ded9e584fe8935985bc0aac5103ca80b4d1989c3 Mon Sep 17 00:00:00 2001
From: nikita <cfwm@yandex.ru>
Date: Sat, 1 Sep 2018 14:29:49 +0300
Subject: [PATCH 10/15] Highlight today on purchase button click

---
 project/templates/blocks/promo.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/templates/blocks/promo.html b/project/templates/blocks/promo.html
index b2c644ce..f02cf6ed 100644
--- a/project/templates/blocks/promo.html
+++ b/project/templates/blocks/promo.html
@@ -19,6 +19,7 @@
         <a
           {% if not school_schedule.weekday in school_schedules_purchased %}
             data-popup=".js-popup-buy"
+            data-day="{{ school_schedule.weekday }}"
             href='#'
           {% else %}
             href="{{ school_schedule.current_live_lesson.get_absolute_url }}"
@@ -37,6 +38,7 @@
         <a
           {% if not school_schedule.weekday in school_schedules_purchased %}
             data-popup=".js-popup-buy"
+            data-day="{{ school_schedule.weekday }}"
             href='#'
           {% else %}
             href="{{ school_schedule.current_live_lesson.get_absolute_url }}"
@@ -52,7 +54,6 @@
       {% if not is_purchased and not is_purchased_future %}
         <a
             data-popup=".js-popup-buy"
-            data-day="{{ school_schedule.weekday }}"
             class="main__btn btn"
             href="#"
         >

From 8ea56da114b3e2eb63faeb3ade544db6a5b89a1f Mon Sep 17 00:00:00 2001
From: nikita <cfwm@yandex.ru>
Date: Sat, 1 Sep 2018 14:42:09 +0300
Subject: [PATCH 11/15] New lines

---
 apps/course/templates/course/lesson.html            | 2 +-
 apps/school/templates/school/livelesson_detail.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/course/templates/course/lesson.html b/apps/course/templates/course/lesson.html
index 9cc570c1..9c6b1583 100644
--- a/apps/course/templates/course/lesson.html
+++ b/apps/course/templates/course/lesson.html
@@ -36,7 +36,7 @@
         </div>
         <div>
           <div class="lesson__subtitle subtitle">{{ lesson.title }}</div>
-          <div class="lesson__content">{{ lesson.short_description }}</div>
+          <div class="lesson__content">{{ lesson.short_description | linebreaks }}</div>
           <a href="{% url 'user' lesson.author.id %}">
             <div class="lesson__user user">
               {% if lesson.author.photo %}
diff --git a/apps/school/templates/school/livelesson_detail.html b/apps/school/templates/school/livelesson_detail.html
index 26e785f9..cfa77ba3 100644
--- a/apps/school/templates/school/livelesson_detail.html
+++ b/apps/school/templates/school/livelesson_detail.html
@@ -7,7 +7,7 @@
   <div class="section__center center center_sm">
     <div class="lesson">
       <div class="lesson__subtitle subtitle">{{ livelesson.title }}</div>
-      <div class="lesson__content">{{ livelesson.short_description }}</div>
+      <div class="lesson__content">{{ livelesson.short_description | linebreaks }}</div>
       <div class="lesson__video video">
         {% if livelesson.stream_index %}
         <iframe class="lesson__video_frame" src="https://player.vimeo.com/video/{{ livelesson.stream_index }}?autoplay=1" frameborder="0" webkitallowfullscreen

From 58d35309df2d2350f4dc6042294e8ac007609ef1 Mon Sep 17 00:00:00 2001
From: nikita <cfwm@yandex.ru>
Date: Sat, 1 Sep 2018 15:10:50 +0300
Subject: [PATCH 12/15] Add day logic fix

---
 apps/school/templates/blocks/day_pay_btn.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/school/templates/blocks/day_pay_btn.html b/apps/school/templates/blocks/day_pay_btn.html
index 9f90c17d..f4cd2f40 100644
--- a/apps/school/templates/blocks/day_pay_btn.html
+++ b/apps/school/templates/blocks/day_pay_btn.html
@@ -1,6 +1,5 @@
 <a
   data-popup=".js-popup-buy"
   class="timing__btn btn"
-  data-day="{{ school_schedule.weekday }}"
   href="{% url 'school-checkout' %}?weekdays={{ school_schedule.weekday }}&add_days=true"
 >купить</a>

From e174a92df0669fa239c611047384997d39dae50b Mon Sep 17 00:00:00 2001
From: nikita <cfwm@yandex.ru>
Date: Sat, 1 Sep 2018 15:12:54 +0300
Subject: [PATCH 13/15] Add day logic fix

---
 apps/school/templates/blocks/day_pay_btn.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/school/templates/blocks/day_pay_btn.html b/apps/school/templates/blocks/day_pay_btn.html
index f4cd2f40..11363d09 100644
--- a/apps/school/templates/blocks/day_pay_btn.html
+++ b/apps/school/templates/blocks/day_pay_btn.html
@@ -1,5 +1,4 @@
 <a
-  data-popup=".js-popup-buy"
   class="timing__btn btn"
   href="{% url 'school-checkout' %}?weekdays={{ school_schedule.weekday }}&add_days=true"
 >купить</a>

From d77d16a87db63ad30e93705d0dd48581715fe447 Mon Sep 17 00:00:00 2001
From: nikita <cfwm@yandex.ru>
Date: Sat, 1 Sep 2018 15:16:00 +0300
Subject: [PATCH 14/15] Revert add day logic fix

---
 apps/school/templates/blocks/day_pay_btn.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/school/templates/blocks/day_pay_btn.html b/apps/school/templates/blocks/day_pay_btn.html
index 11363d09..9f90c17d 100644
--- a/apps/school/templates/blocks/day_pay_btn.html
+++ b/apps/school/templates/blocks/day_pay_btn.html
@@ -1,4 +1,6 @@
 <a
+  data-popup=".js-popup-buy"
   class="timing__btn btn"
+  data-day="{{ school_schedule.weekday }}"
   href="{% url 'school-checkout' %}?weekdays={{ school_schedule.weekday }}&add_days=true"
 >купить</a>

From dd39e63e792a3eb4d490ced4917fcfb330c28976 Mon Sep 17 00:00:00 2001
From: nikita <cfwm@yandex.ru>
Date: Sun, 2 Sep 2018 11:37:52 +0300
Subject: [PATCH 15/15] Temp hotfix

---
 project/templates/blocks/promo.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/templates/blocks/promo.html b/project/templates/blocks/promo.html
index f02cf6ed..904fb142 100644
--- a/project/templates/blocks/promo.html
+++ b/project/templates/blocks/promo.html
@@ -22,7 +22,7 @@
             data-day="{{ school_schedule.weekday }}"
             href='#'
           {% else %}
-            href="{{ school_schedule.current_live_lesson.get_absolute_url }}"
+            href="{% url 'school:school' %}"
           {% endif %}
           class="main__btn btn"
           >{% if not school_schedule.weekday in school_schedules_purchased %}Получить доступ{% else %}Смотреть урок{% endif %}</a>
@@ -41,7 +41,7 @@
             data-day="{{ school_schedule.weekday }}"
             href='#'
           {% else %}
-            href="{{ school_schedule.current_live_lesson.get_absolute_url }}"
+            href="{% url 'school:school' %}"
           {% endif %}
           class="main__btn btn"
           >{% if not school_schedule.weekday in school_schedules_purchased %}Получить доступ{% else %}Смотреть урок{% endif %}</a>