Merge branch 'dev' into 'master'

Dev

See merge request lilcity/backend!21

apps/user/templates/user/profile.html

@@ -75,12 +75,42 @@
       </div>
       <div class="tabs__container">
         <div class="tabs__item js-tabs-item">
+          {% if is_purchased %}
           {% include "blocks/schedule_purchased.html" %}
+          {% else %}
+          <div class="center center_xs">
+            <div class="done">
+              <div class="done__title title">Вы не подписаны на школу!</div>
+              <div class="done__foot">
+                <a
+                  {% if not user.is_authenticated %}
+                  data-popup=".js-popup-auth"
+                  {% else %}
+                  data-popup=".js-popup-buy"
+                  {% endif %}
+                  href="#"
+                  class="done__btn btn btn_md btn_stroke"
+                >Купить подписку</a>
+              </div>
+            </div>
+          </div>
+          {% endif %}
         </div>
         <div class="tabs__item js-tabs-item">
           <div class="courses courses_scroll">
             <div class="courses__list">
+              {% if paid.exists %}
               {% include "course/course_items.html" with course_items=paid %}
+              {% else %}
+              <div class="center center_xs">
+                <div class="done">
+                  <div class="done__title title">Нет приобретённых курсов!</div>
+                  <div class="done__foot">
+                    <a class="done__btn btn btn_md btn_stroke" href="{% url 'courses' %}">Купить курсы</a>
+                  </div>
+                </div>
+              </div>
+              {% endif %}
             </div>
           </div>
         </div>
@@ -88,7 +118,18 @@
         <div class="tabs__item js-tabs-item" style="display: block;">
           <div class="courses courses_scroll">
             <div class="courses__list">
+              {% if published.exists %}
               {% include "course/course_items.html" with course_items=published %}
+              {% else %}
+              <div class="center center_xs">
+                <div class="done">
+                  <div class="done__title title">Нет опубликованных курсов!</div>
+                  <div class="done__foot">
+                    <a class="done__btn btn btn_md btn_stroke" href="{% url 'course_create' %}">Добавить курс</a>
+                  </div>
+                </div>
+              </div>
+              {% endif %}
             </div>
           </div>
         </div>

apps/user/views.py

@@ -89,6 +89,7 @@ class UserView(DetailView):
             calk=F('weekday') - now().isoweekday(),
             weight=(7 + F('calk') % 7) % 7,
         ).order_by('weight')
+        context['all_school_schedules'] = SchoolSchedule.objects.all()
 
         return context
 

project/templates/blocks/popup_buy.html

@@ -20,6 +20,28 @@
           </div>
           <div class="buy__col">
             <div class="buy__list">
+              {% if all_school_schedules %}
+              {% for school_schedule in all_school_schedules %}
+              <label class="switch switch_lesson">
+                <input
+                  class="switch__input"
+                  type="checkbox"
+                  data-day="{{school_schedule.weekday}}"
+                  data-price="{{school_schedule.month_price}}"
+                  autocomplete="off"
+                  {% if school_schedule.weekday in school_schedules_purchased or not is_purchased %}
+                  checked
+                  {% endif %}>
+                <span class="switch__content">
+                  <span class="switch__cell">{{ school_schedule }}</span>
+                  {% comment %} dont delete {% endcomment %}
+                  <span class="switch__cell"></span>
+                  <span class="switch__cell">{{ school_schedule.title }}</span>
+                  <span class="switch__cell">{{school_schedule.month_price}}р</span>
+                </span>
+              </label>
+              {% endfor %}
+              {% else %}
               {% for school_schedule in school_schedules %}
               <label class="switch switch_lesson">
                 <input
@@ -40,6 +62,7 @@
                 </span>
               </label>
               {% endfor %}
+              {% endif %}
             </div>
           </div>
           <div class="buy__col">