Merge branch 'hotfix/prev_lessons_fix-4-02-19' into 'master'

пользователь видит записи уроков больше 1 недели + GA code + мелкие правки

See merge request lilschool/site!259

apps/school/views.py

@@ -140,7 +140,7 @@ class SchoolView(TemplateView):
         school_schedules_purchased = []
         school_purchased_future = False
         prev_school_payments = None
-        prev_range = [date_now - timedelta(days=8), date_now - timedelta(days=1)]
+        prev_range = [date_now - timedelta(days=7), date_now - timedelta(days=1)]
         if self.request.user.is_authenticated:
             school_payment = SchoolPayment.objects.filter(
                 user=self.request.user,

project/templates/blocks/footer.html

@@ -50,8 +50,8 @@
           <div>
             {% if config.SERVICE_OK_URL != '#' %}<a class="footer__link" href="{{ config.SERVICE_OK_URL }}">Odnoklassniki</a>{% endif %}
             {% if config.SERVICE_VK_URL != '#' %}<a class="footer__link" href="{{ config.SERVICE_VK_URL }}">VKontakte</a>{% endif %}
-            <a class="footer__link" href='mailto:school@lil.city'>Email по&nbsp;общим вопросам</a>
-            <a class="footer__link" href='mailto:partnership@lil.city'>Сотрудничество</a>
+            <a class="footer__link" href='mailto:school@lil.school'>Email по&nbsp;общим вопросам</a>
+            <a class="footer__link" href='mailto:partnership@lil.school'>Сотрудничество</a>
           </div>
         </nav>
       </div>

project/templates/lilcity/index.html

@@ -46,10 +46,6 @@
       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(lc, s);
     })();
     </script>
-    <noscript>
-    <a href="https://www.livechatinc.com/chat-with/9917240/">Напишите нам</a>,
-    powered by <a href="https://www.livechatinc.com/?welcome" rel="noopener" target="_blank">LiveChat</a>
-    </noscript>
     <!-- End of LiveChat code -->
     <script src="https://js.pusher.com/4.1/pusher.min.js"></script>
     <script>
@@ -90,14 +86,13 @@
       &noscript=1"/>
     </noscript>
     <!-- End Facebook Pixel Code -->
-    <!-- Global site tag (gtag.js) - Google Analytics -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-121923960-1"></script>
+    <!-- Global site tag (gtag.js) - Google Ads: 808701460 -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=AW-808701460"></script>
     <script>
-      window.dataLayer = window.dataLayer || [];
-      function gtag(){dataLayer.push(arguments);}
-      gtag('js', new Date());
-
-      gtag('config', 'UA-121923960-1');
+       window.dataLayer = window.dataLayer || [];
+       function gtag(){dataLayer.push(arguments);}
+       gtag('js', new Date());
+       gtag('config', 'AW-808701460');
     </script>
     <!-- Yandex.Metrika counter -->
     <script type="text/javascript" >