From 8d47365cf8a8f766605acb5a4e4e87e74648970f Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Tue, 10 Jul 2018 16:00:12 +0500
Subject: [PATCH 1/3] =?UTF-8?q?LIL-560=20=D0=9A=D0=BD=D0=BE=D0=BF=D0=BA?=
 =?UTF-8?q?=D1=83=20=C2=AB=D0=A1=D0=BC=D0=BE=D1=82=D1=80=D0=B5=D1=82=D1=8C?=
 =?UTF-8?q?=20=D1=83=D1=80=D0=BE=D0=BA=C2=BB=20=D0=BF=D0=BE=D0=B4=D0=BD?=
 =?UTF-8?q?=D1=8F=D1=82=D1=8C=20=D0=B2=D1=8B=D1=88=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../summer/_schedule_purchased_item.html       | 18 +++++++++---------
 web/src/sass/_common.sass                      |  1 -
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/apps/school/templates/summer/_schedule_purchased_item.html b/apps/school/templates/summer/_schedule_purchased_item.html
index b9d1db1f..4620367c 100644
--- a/apps/school/templates/summer/_schedule_purchased_item.html
+++ b/apps/school/templates/summer/_schedule_purchased_item.html
@@ -8,16 +8,16 @@
       {% if live_lesson %}
       <div class="timing__date">{{ live_lesson.date }}</div>
       {% endif %}
-    </div>
-    <div class="timing__buy">
-      <div class="timing__time">{{ school_schedule.start_at }} (МСК)</div>
-      {% if school_schedule.weekday in school_schedules_purchased %}
-        {% if live_lesson and live_lesson.title %}
-          {% include './open_lesson.html' %}
+      <div class="timing__buy">
+        <div class="timing__time">{{ school_schedule.start_at }} (МСК)</div>
+        {% if school_schedule.weekday in school_schedules_purchased %}
+          {% if live_lesson and live_lesson.title %}
+            {% include './open_lesson.html' %}
+          {% endif %}
+        {% else %}
+          {% include './day_pay_btn.html' %}
         {% endif %}
-      {% else %}
-        {% include './day_pay_btn.html' %}
-      {% endif %}
+      </div>
     </div>
     {% comment %}
     <!-- это нужно чтобы в попапе продления школы всегда знать какие дни выбраны(куплены) -->
diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass
index 7e5a870a..033ce477 100755
--- a/web/src/sass/_common.sass
+++ b/web/src/sass/_common.sass
@@ -3852,7 +3852,6 @@ a.grey-link
     .icon
       font-size: 8px
       fill: $pink
-  &__buy,
   &__more
     display: none
   &__more

From 3776d53464f9a8851b180c16ad13abfb70c44426 Mon Sep 17 00:00:00 2001
From: nikita <cfwm@yandex.ru>
Date: Tue, 10 Jul 2018 16:36:33 +0300
Subject: [PATCH 2/3] Review env debug on

---
 docker/.env.review | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/.env.review b/docker/.env.review
index bc750b18..351dc795 100644
--- a/docker/.env.review
+++ b/docker/.env.review
@@ -1,4 +1,4 @@
-# DEBUG=True
+DEBUG=True
 ALLOWED_HOSTS=*
 PORT=8000
 CORS_ORIGIN_WHITELIST=lilcity.9ev.ru:8080

From d1d8d4bccdf2eb54411ec93576d9a8b29ef4fa71 Mon Sep 17 00:00:00 2001
From: nikita <cfwm@yandex.ru>
Date: Wed, 11 Jul 2018 12:38:51 +0300
Subject: [PATCH 3/3] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BA=D1=83=D0=BF=D0=BE=D0=BA=20=D0=B4=D0=BB=D1=8F=20=D0=BB?=
 =?UTF-8?q?=D0=B5=D1=82=D0=BD=D0=B5=D0=B3=D0=BE=20=D0=BB=D0=B0=D0=B3=D0=B5?=
 =?UTF-8?q?=D1=80=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/payment/views.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/payment/views.py b/apps/payment/views.py
index 4f4a958a..2f70df36 100644
--- a/apps/payment/views.py
+++ b/apps/payment/views.py
@@ -222,7 +222,9 @@ class PaymentwallCallbackView(View):
                             date_start = arrow.get(school_payment.date_end).shift(days=1).datetime
                             date_end = arrow.get(date_start).shift(months=1).datetime
                     else:
-                        month = 0 if now().day >= 1 and now().day <= 10 else 1
+                        #month = 0 if now().day >= 1 and now().day <= 10 else 1
+                        # Логика июльского лагеря: до конца июля приобретаем только на текущий месяц
+                        month = 0
                         date_start = self.add_months(sourcedate=now().replace(hour=0, minute=0, day=1), months=month)
                         date_end = arrow.get(date_start).shift(months=1, minutes=-1).datetime
                     payment.date_start = date_start