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

apps/school/templates/blocks/_schedule_purchased_item.html

@@ -6,15 +6,17 @@
         {{ school_schedule }}
       </div>
       {% if live_lesson %}
-      <!--<div class="timing__date">{{ live_lesson.date }}</div>-->
+      <div class="timing__date">{{ live_lesson.date }}</div>
       {% endif %}
     </div>
     <div class="timing__buy">
       <div class="timing__time">{{ school_schedule.start_at }} (МСК)</div>
-      {% if school_schedule.weekday in school_schedules_purchased and live_lesson %}
-      {% include './open_lesson.html' %}
+      {% if school_schedule.weekday in school_schedules_purchased %}
+        {% if live_lesson and live_lesson.title %}
+          {% include './open_lesson.html' %}
+        {% endif %}
       {% else %}
-      {% include './day_pay_btn.html' %}
+        {% include './day_pay_btn.html' %}
       {% endif %}
     </div>
     {% comment %}
@@ -34,12 +36,12 @@
     </div>
   </div>
   <div class="timing__cell">
-    <div class="timing__title">{{ school_schedule.title }}{% if live_lesson %},
+    <div class="timing__title">{{ school_schedule.title }}{% if live_lesson and live_lesson.title %},
       <span class="bold">{{ live_lesson.title }}</span>
       {% endif %}
     </div>
     <div class="timing__content">
-    {% if live_lesson %}
+    {% if live_lesson and live_lesson.short_description %}
       {{ live_lesson.short_description }}
     {% else %}
       {{ school_schedule.description }}

apps/school/templates/summer/_schedule_purchased_item.html

@@ -6,15 +6,17 @@
         {{ school_schedule }}
       </div>
       {% if live_lesson %}
-      <!--<div class="timing__date">{{ live_lesson.date }}</div>-->
+      <div class="timing__date">{{ live_lesson.date }}</div>
       {% endif %}
     </div>
     <div class="timing__buy">
       <div class="timing__time">{{ school_schedule.start_at }} (МСК)</div>
-      {% if school_schedule.weekday in school_schedules_purchased and live_lesson %}
-      {% include './open_lesson.html' %}
+      {% if school_schedule.weekday in school_schedules_purchased %}
+        {% if live_lesson and live_lesson.title %}
+          {% include './open_lesson.html' %}
+        {% endif %}
       {% else %}
-      {% include './day_pay_btn.html' %}
+        {% include './day_pay_btn.html' %}
       {% endif %}
     </div>
     {% comment %}
@@ -34,12 +36,12 @@
     </div>
   </div>
   <div class="timing__cell">
-    <div class="timing__title">{{ school_schedule.title }}{% if live_lesson %},
+    <div class="timing__title">{{ school_schedule.title }}{% if live_lesson and live_lesson.title %},
       <span class="bold">{{ live_lesson.title }}</span>
       {% endif %}
     </div>
     <div class="timing__content">
-    {% if live_lesson %}
+    {% if live_lesson and live_lesson.short_description %}
       {{ live_lesson.short_description }}
     {% else %}
       {{ school_schedule.description }}

project/templates/blocks/about.html

@@ -44,21 +44,19 @@
       </div>
     </div>
     <div class="letsgo">
-      <a
-              {% if not is_purchased_future %}
+        {% if not is_purchased and not is_purchased_future %}
+          <a
               {% if not user.is_authenticated %}
               data-popup=".js-popup-auth"
               {% else %}
               data-popup=".js-popup-buy"
               {% endif %}
-              {% endif %}
               class="main__btn btn"
               href="#"
-      >
-        {% if not is_purchased and not is_purchased_future %}купить доступ от {{ min_school_price }} руб./месяц{% endif %}
-        {% if is_purchased_future and not is_purchased %}ваша подписка начинается {{school_purchased_future.date_start}}{% endif %}
-        {% if is_purchased %}ваша подписка истекает {{ subscription_ends_humanize }}<br/>перейти к оплате{% endif %}
-      </a>
+          >
+          купить доступ от {{ min_school_price }} руб./месяц
+          </a>
+        {% endif %}
     </div>
   </div>
 </div>