Merge branch 'master' of https://gitlab.com/lilcity/backend into feature/LIL-559

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

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 %}
     <!-- это нужно чтобы в попапе продления школы всегда знать какие дни выбраны(куплены) -->

docker/.env.review

@@ -1,4 +1,4 @@
-# DEBUG=True
+DEBUG=True
 ALLOWED_HOSTS=*
 PORT=8000
 CORS_ORIGIN_WHITELIST=lilcity.9ev.ru:8080

web/src/sass/_common.sass

@@ -3852,7 +3852,6 @@ a.grey-link
     .icon
       font-size: 8px
       fill: $pink
-  &__buy,
   &__more
     display: none
   &__more