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 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 %}
{{ live_lesson.date }}
{% endif %} - -
-
{{ school_schedule.start_at }} (МСК)
- {% if school_schedule.weekday in school_schedules_purchased %} - {% if live_lesson and live_lesson.title %} - {% include './open_lesson.html' %} +
+
{{ school_schedule.start_at }} (МСК)
+ {% 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 %} +
{% comment %} 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 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