diff --git a/api/v1/serializers/payment.py b/api/v1/serializers/payment.py
index 4e9e8709..186ff899 100644
--- a/api/v1/serializers/payment.py
+++ b/api/v1/serializers/payment.py
@@ -3,7 +3,7 @@ from rest_framework import serializers
from apps.payment.models import (
AuthorBalance, Payment,
CoursePayment, SchoolPayment,
- GiftCertificatePayment, UserBonus,)
+ GiftCertificatePayment, UserBonus, DrawingCampPayment)
from .user import UserSerializer
from .course import CourseSerializer
@@ -116,6 +116,8 @@ class PaymentSerializer(serializers.ModelSerializer):
return SchoolPaymentSerializer(instance, context=self.context).to_representation(instance)
elif isinstance(instance, GiftCertificatePayment):
return GiftCertificatePaymentSerializer(instance, context=self.context).to_representation(instance)
+ elif isinstance(instance, DrawingCampPayment):
+ return DrawingCampPaymentSerializer(instance, context=self.context).to_representation(instance)
class CoursePaymentCreateSerializer(serializers.ModelSerializer):
@@ -202,6 +204,41 @@ class GiftCertificatePaymentSerializer(serializers.ModelSerializer):
)
+class DrawingCampPaymentCreateSerializer(serializers.ModelSerializer):
+
+ class Meta:
+ model = DrawingCampPayment
+ fields = BASE_PAYMENT_FIELDS + (
+ 'date_start',
+ 'date_end',
+ )
+ read_only_fields = (
+ 'id',
+ 'user',
+ 'course',
+ 'created_at',
+ 'update_at',
+ )
+
+
+class DrawingCampPaymentSerializer(serializers.ModelSerializer):
+ user = UserSerializer()
+
+ class Meta:
+ model = DrawingCampPayment
+ fields = BASE_PAYMENT_FIELDS + (
+ 'date_start',
+ 'date_end',
+ )
+ read_only_fields = (
+ 'id',
+ 'user',
+ 'course',
+ 'created_at',
+ 'update_at',
+ )
+
+
class UserBonusCreateSerializer(serializers.ModelSerializer):
class Meta:
model = UserBonus
diff --git a/api/v1/views.py b/api/v1/views.py
index 03db74f6..2a9c1b0f 100644
--- a/api/v1/views.py
+++ b/api/v1/views.py
@@ -40,7 +40,7 @@ from .serializers.school import (
from .serializers.payment import (
AuthorBalanceSerializer, AuthorBalanceCreateSerializer,
PaymentSerializer, UserBonusSerializer, UserBonusCreateSerializer,
- CoursePaymentCreateSerializer, SchoolPaymentCreateSerializer)
+ CoursePaymentCreateSerializer, SchoolPaymentCreateSerializer, DrawingCampPaymentCreateSerializer)
from .serializers.user import (
AuthorRequestSerializer,
UserSerializer, UserPhotoSerializer,
@@ -69,7 +69,7 @@ from apps.content.models import (
from apps.payment.models import (
AuthorBalance, Payment,
CoursePayment, SchoolPayment, UserBonus,
-)
+ DrawingCampPayment)
from apps.school.models import SchoolSchedule, LiveLesson
from apps.user.models import AuthorRequest, EmailLog
from project.pusher import pusher
@@ -623,6 +623,8 @@ class PaymentViewSet(viewsets.ModelViewSet):
serializer_class = CoursePaymentCreateSerializer
elif isinstance(instance, SchoolPayment):
serializer_class = SchoolPaymentCreateSerializer
+ elif isinstance(instance, DrawingCampPayment):
+ serializer_class = DrawingCampPaymentCreateSerializer
kwargs['context'] = self.get_serializer_context()
return serializer_class(instance, *args, **kwargs)
diff --git a/apps/school/templates/drawing_camp/about.html b/apps/school/templates/drawing_camp/about.html
index 9b0d87ba..c8bfe325 100644
--- a/apps/school/templates/drawing_camp/about.html
+++ b/apps/school/templates/drawing_camp/about.html
@@ -11,7 +11,10 @@
Что такое «Рисовальный Лагерь»?
Это месяц фантазии, красок, карандашей и необычных заданий!
- Любой ребёнок из любой точки мира в удобное время может порисовать с профессиональными преподавателями.
+ Старт - 3 июня. По понедельникам, средам и пятницам. Уроки выходят в 17:00 по московскому времени.
+ Запись урока хранится неделю. То есть вы можете заниматься тогда, когда вам удобно.
+
+ Любой ребёнок из любой точки мира в удобное время может порисовать с профессиональными преподавателями.
Мы поговорим о направлениях в живописи. О стилях и жанрах. Рассмотрим великие полотна,
познакомимся с художниками. И, конечно, создадим собственные работы в их стиле.
diff --git a/apps/school/templates/school/drawing_camp.html b/apps/school/templates/school/drawing_camp.html
index 1f7b2b3c..0b461c38 100644
--- a/apps/school/templates/school/drawing_camp.html
+++ b/apps/school/templates/school/drawing_camp.html
@@ -1,6 +1,7 @@
{% extends "templates/lilcity/index.html" %} {% load static %}
{% block title %}Рисовальный лагерь LilCity{% endblock title%}
-{% block ogimage %}http://{{request.META.HTTP_HOST}}{% static 'img/og_main.jpg' %}{% endblock %}
+{% block ogimage %}http://{{request.META.HTTP_HOST}}{% static 'img/og_camp.jpg' %}{% endblock %}
+{% block ogsite-name %}Первая образовательная онлайн-платформа креативного мышления для детей{% endblock ogsite-name %}
{% block content %}
{% if not is_purchased and not prev_school_payments_exists %}
{% include "../drawing_camp/promo.html" %}
diff --git a/project/templates/lilcity/layer.html b/project/templates/lilcity/layer.html
index a94ffab0..112c8ad0 100644
--- a/project/templates/lilcity/layer.html
+++ b/project/templates/lilcity/layer.html
@@ -21,7 +21,7 @@
-
+
{% comment %} {% endcomment %}
diff --git a/project/templates/lilcity/links.html b/project/templates/lilcity/links.html
index 54445428..c36c145a 100644
--- a/project/templates/lilcity/links.html
+++ b/project/templates/lilcity/links.html
@@ -33,10 +33,10 @@
href="{% url 'index' %}?utm_source=posadochnaya_stranica&utm_medium=probniy_urok&utm_campaign=probniy_urok">
Бесплатный пробный урок
- Онлайн школа
+ href="{% url 'school:drawing-camp' %}?utm_source=posadochnaya_stranica&utm_medium=camp&utm_campaign=camp">
+ Рисовальный лагерь
+ href="{% url 'courses' %}?utm_source=posadochnaya_stranica&utm_medium=Videokursy&utm_campaign=Videokursy">
Видеокурсы
diff --git a/web/src/img/og_camp.jpg b/web/src/img/og_camp.jpg
new file mode 100644
index 00000000..2adc8a7a
Binary files /dev/null and b/web/src/img/og_camp.jpg differ