From ef434f50d13e7bef76fc4e0f80ddbc0f617280d6 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Thu, 30 Aug 2018 03:45:33 +0500
Subject: [PATCH] =?UTF-8?q?LIL-639=20=D0=9F=D1=80=D0=B8=20=D0=BE=D0=BF?=
 =?UTF-8?q?=D0=BB=D0=B0=D1=82=D0=B5=20=D0=B4=D0=B1=20=D0=B2=D1=8B=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=BD=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE?=
 =?UTF-8?q?=20=D1=82=D0=BE=D1=82=20=D0=B4=D0=B5=D0=BD=D1=8C(=D1=83=D1=80?=
 =?UTF-8?q?=D0=BE=D0=BA),=20=D0=BD=D0=B0=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80?=
 =?UTF-8?q?=D1=8B=D0=B9=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C=20=D0=BD=D0=B0=D0=B6=D0=B0=D0=BB=C2=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/school/templates/blocks/day_pay_btn.html |  1 +
 apps/school/templates/blocks/schedule.html    |  2 +-
 web/src/js/modules/popup.js                   | 15 ++++++++-------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/school/templates/blocks/day_pay_btn.html b/apps/school/templates/blocks/day_pay_btn.html
index f4cd2f40..9f90c17d 100644
--- a/apps/school/templates/blocks/day_pay_btn.html
+++ b/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>
diff --git a/apps/school/templates/blocks/schedule.html b/apps/school/templates/blocks/schedule.html
index 5f088511..ab97055f 100644
--- a/apps/school/templates/blocks/schedule.html
+++ b/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">
diff --git a/web/src/js/modules/popup.js b/web/src/js/modules/popup.js
index b3d98b21..280551d3 100644
--- a/web/src/js/modules/popup.js
+++ b/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);