From 6559ad28227935d847f29b6b5619cf1759ee080d Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Sun, 13 Jan 2019 23:47:55 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20=D0=B2=D1=81=D0=B5=20=D0=BB=D0=B8=20=D0=9F=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BA=D0=B8=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD?=
 =?UTF-8?q?=D1=8B,=20=D0=B8=20=D1=83=D0=B1=D1=80=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=B2=20=D0=B0=D1=80=D1=85=D0=B8=D0=B2=20=D0=B2=D1=8B=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5.=20https://dri?=
 =?UTF-8?q?ve.google.com/drive/u/1/folders/1uMOTtwuntNUszTUzl3RThiYn9bKsRG?=
 =?UTF-8?q?2Z=3Fogsrc=3D32?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/templates/blocks/video.html | 3 +--
 project/views.py                    | 3 ++-
 web/src/js/modules/popup.js         | 3 +++
 web/src/sass/_common.sass           | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/project/templates/blocks/video.html b/project/templates/blocks/video.html
index c0eebf5a..1d16b4c5 100644
--- a/project/templates/blocks/video.html
+++ b/project/templates/blocks/video.html
@@ -1,10 +1,9 @@
 <div class="section section_video">
   <div class="section__center center center_sm" style="text-align: center;">
-    <div class="title">Пробный урок</div>
     <img class="main-video-preview js-video-modal" data-video-url="{{ config.MAIN_PAGE_VIDEO_URL }}" data-trial-lesson="1"
          src="{{ config.MAIN_PAGE_VIDEO_PREVIEW_IMG.url }}"/>
     <a href="#" class="btn js-video-modal btn_stroke-black" style="margin: 20px;"
-       data-video-url="{{ config.MAIN_PAGE_VIDEO_URL }}" data-trial-lesson="1">Смотреть бесплатно</a>
+       data-video-url="{{ config.MAIN_PAGE_VIDEO_URL }}" data-trial-lesson="1">Смотреть бесплатно урок</a>
     <div>Много развивающих видео на&nbsp;нашем <a href="{{ config.SERVICE_YOUTUBE_URL }}">YouTube&nbsp;канале</a></div>
   </div>
 </div>
diff --git a/project/views.py b/project/views.py
index 7404e317..a2e5a333 100644
--- a/project/views.py
+++ b/project/views.py
@@ -105,7 +105,8 @@ class IndexView(TemplateView):
             'school_schedules': SchoolSchedule.objects.all(),
             'school_schedules_purchased': set(school_schedules_purchased),
             'teachers': User.objects.filter(role=User.TEACHER_ROLE, show_in_mainpage=True),
-            'works_count': Payment.objects.filter(status__in=Payment.PW_PAID_STATUSES).count() * 5,
+            'works_count': (Payment.objects.filter(status__in=Payment.PW_PAID_STATUSES)
+                            .distinct().order_by('user_id').values_list('user_id').count() * 8 + 40000),
             'subscription_ends': school_payment.filter(add_days=False).first().date_end if school_payment_exists else None,
             'subscription_ends_humanize': school_payment.filter(add_days=False).first().date_end_humanize if school_payment_exists else None,
 
diff --git a/web/src/js/modules/popup.js b/web/src/js/modules/popup.js
index 8d3079ba..d3f6cd27 100644
--- a/web/src/js/modules/popup.js
+++ b/web/src/js/modules/popup.js
@@ -340,6 +340,7 @@ $(document).ready(function () {
         var $order = popup.find('.order');
         var $orderPrice = popup.find('.order_price_text');
         var $orderDates = popup.find('.order__dates');
+        var $orderDays = popup.find('.order__days');
         var dateStart = popup.data('date-start');
         var days = ['', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота', 'Воскресенье'];
         var weekdays = [];
@@ -377,6 +378,7 @@ $(document).ready(function () {
                 } else {
                     text = amount + 'p.';
                 }
+                $orderDays.text(daysText.length == 7 ? 'Понедельник - Воскресенье' : daysText.join(', '));
                 $orderPrice.html(text);
                 $orderDates.text(moment(response.data.date_start).format('D MMM') + ' - ' + moment(response.data.date_end).format('D MMM'));
                 $('.but_btn_popup').attr('href', link+'?'+decodeURIComponent($.param({
@@ -390,6 +392,7 @@ $(document).ready(function () {
         }
         else {
             $orderPrice.html('0p.');
+            $orderDays.text('Ничего не выбрано');
             $bonuses.hide();
         }
 
diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass
index 8d7ffd90..3eafba80 100755
--- a/web/src/sass/_common.sass
+++ b/web/src/sass/_common.sass
@@ -2420,6 +2420,7 @@ a.grey-link
   width: 100%
   height: auto
   cursor: pointer
+  margin-top: -140px;
 
 .head
   display: flex