Merge remote-tracking branch 'origin/master'

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>

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">

project/templates/lilcity/index.html

@@ -38,6 +38,21 @@
     {% endcompress %}
 
     <link rel="shortcut icon" type="image/png" href="{% static 'img/favicon.png' %}"/>
+    <!-- Start of LiveChat (www.livechatinc.com) code -->
+    <script type="text/javascript">
+    window.__lc = window.__lc || {};
+    window.__lc.license = 9917240;
+    (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';
+      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>
         var viewportmeta = document.querySelector('meta[name="viewport"]');
         if (viewportmeta) {

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);