From 0d0652463f1d13e9baed961a6ab1df05f580a59f Mon Sep 17 00:00:00 2001 From: nikita Date: Tue, 3 Jul 2018 08:21:20 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D1=81=D0=BC=D0=BE=D1=82=D1=80=D0=B5=D1=82?= =?UTF-8?q?=D1=8C=20=D1=83=D1=80=D0=BE=D0=BA=20=D1=82=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=BA=D0=BE=20=D0=B4=D0=BB=D1=8F=20=D0=B7=D0=B0=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D0=BD=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BA=D1=83=D1=80?= =?UTF-8?q?=D1=81=D0=BE=D0=B2=20=D0=9F=D0=BE=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D0=B4=D0=B0=D1=82=D1=83=20=D1=83=D1=80?= =?UTF-8?q?=D0=BE=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../school/templates/blocks/_schedule_purchased_item.html | 8 +++++--- .../school/templates/summer/_schedule_purchased_item.html | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/apps/school/templates/blocks/_schedule_purchased_item.html b/apps/school/templates/blocks/_schedule_purchased_item.html index 5690d7aa..00656e4a 100644 --- a/apps/school/templates/blocks/_schedule_purchased_item.html +++ b/apps/school/templates/blocks/_schedule_purchased_item.html @@ -11,10 +11,12 @@
{{ school_schedule.start_at }} (МСК)
- {% if school_schedule.weekday in school_schedules_purchased and live_lesson and live_lesson.title %} - {% include './open_lesson.html' %} + {% 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' %} + {% include './day_pay_btn.html' %} {% endif %}
{% comment %} diff --git a/apps/school/templates/summer/_schedule_purchased_item.html b/apps/school/templates/summer/_schedule_purchased_item.html index 5690d7aa..00656e4a 100644 --- a/apps/school/templates/summer/_schedule_purchased_item.html +++ b/apps/school/templates/summer/_schedule_purchased_item.html @@ -11,10 +11,12 @@
{{ school_schedule.start_at }} (МСК)
- {% if school_schedule.weekday in school_schedules_purchased and live_lesson and live_lesson.title %} - {% include './open_lesson.html' %} + {% 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' %} + {% include './day_pay_btn.html' %} {% endif %}
{% comment %}