diff --git a/apps/course/views.py b/apps/course/views.py
index 68fd1b1a..42235e27 100644
--- a/apps/course/views.py
+++ b/apps/course/views.py
@@ -7,6 +7,7 @@ from django.http import JsonResponse, Http404
from django.shortcuts import get_object_or_404
from django.template import loader, Context, Template
from django.views.generic import View, CreateView, DetailView, ListView, TemplateView
+from django.utils.cache import add_never_cache_headers
from django.utils.decorators import method_decorator
from django.views.decorators.csrf import csrf_exempt
from django.views.decorators.http import require_http_methods
@@ -185,7 +186,7 @@ class CourseView(DetailView):
def get(self, request, *args, **kwargs):
response = super().get(request, *args, **kwargs)
context = self.get_context_data()
- if not request.user.is_authenticated or (not request.user.is_authenticated and self.object.status != Course.PUBLISHED) or\
+ if (not request.user.is_authenticated and self.object.status != Course.PUBLISHED) or\
(request.user.is_authenticated and request.user.role not in [User.AUTHOR_ROLE, User.ADMIN_ROLE] and self.object.author != request.user and self.only_lessons and not context['paid']):
raise Http404
return response
@@ -245,12 +246,14 @@ class CoursesView(ListView):
else:
prev_url = None
next_url = None
- return JsonResponse({
+ response = JsonResponse({
'success': True,
'content': html,
'prev_url': prev_url,
'next_url': next_url,
})
+ add_never_cache_headers(response)
+ return response
else:
return super().get(request, args, kwargs)
diff --git a/apps/notification/templates/notification/email/accept_author.html b/apps/notification/templates/notification/email/accept_author.html
new file mode 100644
index 00000000..44221ba5
--- /dev/null
+++ b/apps/notification/templates/notification/email/accept_author.html
@@ -0,0 +1,13 @@
+{% extends "notification/email/_base.html" %}
+
+{% block content %}
+
Поздравляем! Вам одобрено назначение преподавателем!
+
+
Теперь вы можете публиковать курсы.
+ {% if password and email %}
+
Параметры входа:
+
email: {{ email }}
+
пароль: {{ password }}
+ {% endif %}
+
+{% endblock content %}
diff --git a/apps/notification/templates/notification/email/decline_author.html b/apps/notification/templates/notification/email/decline_author.html
new file mode 100644
index 00000000..d67dfe3e
--- /dev/null
+++ b/apps/notification/templates/notification/email/decline_author.html
@@ -0,0 +1,8 @@
+{% extends "notification/email/_base.html" %}
+
+{% block content %}
+
К сожалению вам отказано в назначении преподавателем!
+
+{% endblock content %}
diff --git a/apps/notification/utils.py b/apps/notification/utils.py
index bc206a13..c04b3c0e 100644
--- a/apps/notification/utils.py
+++ b/apps/notification/utils.py
@@ -3,8 +3,10 @@ from twilio.rest import Client
from django.core.mail import EmailMessage
from django.conf import settings
from django.template.loader import get_template
+from project.celery import app
+@app.task
def send_email(subject, to_email, template_name, **kwargs):
html = get_template(template_name).render(kwargs)
email = EmailMessage(subject, html, to=[to_email])
diff --git a/apps/payment/models.py b/apps/payment/models.py
index 5ec8e1ac..d3b42c8c 100644
--- a/apps/payment/models.py
+++ b/apps/payment/models.py
@@ -157,7 +157,7 @@ class SchoolPayment(Payment):
models.Sum('month_price'),
)
month_price_sum = aggregate.get('month_price__sum', 0)
- if len(self.weekdays) > 7:
+ if month_price_sum > config.SERVICE_DISCOUNT_MIN_AMOUNT:
discount = config.SERVICE_DISCOUNT
else:
discount = 0
diff --git a/apps/payment/tasks.py b/apps/payment/tasks.py
new file mode 100644
index 00000000..e5a3f296
--- /dev/null
+++ b/apps/payment/tasks.py
@@ -0,0 +1,18 @@
+from mixpanel import Mixpanel
+
+from django.conf import settings
+
+from project.celery import app
+
+
+@app.task
+def transaction_to_mixpanel(user_id, amount, time, product_type):
+ mix = Mixpanel(settings.MIX_TOKEN)
+ mix.people_track_charge(
+ user_id,
+ amount,
+ {
+ '$time': time,
+ 'product_type': product_type,
+ }
+ )
diff --git a/apps/payment/templates/payment/course_payment_success.html b/apps/payment/templates/payment/course_payment_success.html
new file mode 100644
index 00000000..3edd1879
--- /dev/null
+++ b/apps/payment/templates/payment/course_payment_success.html
@@ -0,0 +1,12 @@
+{% extends "templates/lilcity/index.html" %} {% load static %} {% block content %}
+
+
+
+
Вы успешно приобрели курс!
+
+
+
+
+{% endblock content %}
diff --git a/apps/payment/views.py b/apps/payment/views.py
index 52ccd274..e7490ad9 100644
--- a/apps/payment/views.py
+++ b/apps/payment/views.py
@@ -6,7 +6,7 @@ from datetime import timedelta
from django.contrib import messages
from django.contrib.auth.decorators import login_required
from django.http import HttpResponse
-from django.shortcuts import redirect
+from django.shortcuts import redirect, get_object_or_404
from django.views.generic import View, TemplateView
from django.views.decorators.csrf import csrf_exempt
from django.urls import reverse_lazy
@@ -17,12 +17,27 @@ from paymentwall import Pingback, Product, Widget
from apps.course.models import Course
from apps.school.models import SchoolSchedule
+from apps.payment.tasks import transaction_to_mixpanel
from .models import AuthorBalance, CoursePayment, SchoolPayment
logger = logging.getLogger('django')
+@method_decorator(login_required, name='dispatch')
+class CourseBuySuccessView(TemplateView):
+ template_name = 'payment/course_payment_success.html'
+
+ def get(self, request, pk=None, *args, **kwargs):
+ course = get_object_or_404(Course, pk=pk)
+ return self.render_to_response(context={'course': course})
+
+
+@method_decorator(login_required, name='dispatch')
+class SchoolBuySuccessView(TemplateView):
+ template_name = 'payment/payment_success.html'
+
+
@method_decorator(login_required, name='dispatch')
class CourseBuyView(TemplateView):
template_name = 'payment/paymentwall_widget.html'
@@ -52,7 +67,7 @@ class CourseBuyView(TemplateView):
'evaluation': 1,
'demo': 1,
'test_mode': 1,
- 'success_url': host + str(reverse_lazy('payment-success')),
+ 'success_url': host + str(reverse_lazy('course_payment_success', args=[course.id])),
'failure_url': host + str(reverse_lazy('payment-error')),
}
)
@@ -132,27 +147,35 @@ class PaymentwallCallbackView(View):
logger.info(
json.dumps(payment_raw_data),
)
+
payment.status = pingback.get_type()
payment.data = payment_raw_data
- if pingback.is_deliverable() and product_type_name == 'school':
- school_payment = SchoolPayment.objects.filter(
- user=payment.user,
- date_start__lte=now(),
- date_end__gt=now(),
- status__in=[
- Pingback.PINGBACK_TYPE_REGULAR,
- Pingback.PINGBACK_TYPE_GOODWILL,
- Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
- ],
- ).last()
- if school_payment:
- date_start = school_payment.date_end + timedelta(days=1)
- date_end = date_start + timedelta(days=30)
- else:
- date_start = now()
- date_end = now() + timedelta(days=30)
- payment.date_start = date_start
- payment.date_end = date_end
+ if pingback.is_deliverable():
+ transaction_to_mixpanel.delay(
+ payment.user.id,
+ payment.amount,
+ now().strftime('%Y-%m-%dT%H:%M:%S'),
+ product_type_name,
+ )
+ if product_type_name == 'school':
+ school_payment = SchoolPayment.objects.filter(
+ user=payment.user,
+ date_start__lte=now(),
+ date_end__gt=now(),
+ status__in=[
+ Pingback.PINGBACK_TYPE_REGULAR,
+ Pingback.PINGBACK_TYPE_GOODWILL,
+ Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
+ ],
+ ).last()
+ if school_payment:
+ date_start = school_payment.date_end + timedelta(days=1)
+ date_end = date_start + timedelta(days=30)
+ else:
+ date_start = now()
+ date_end = now() + timedelta(days=30)
+ payment.date_start = date_start
+ payment.date_end = date_end
payment.save()
author_balance = getattr(payment, 'author_balance', None)
diff --git a/apps/user/admin.py b/apps/user/admin.py
index 76e27edc..df3e01d9 100644
--- a/apps/user/admin.py
+++ b/apps/user/admin.py
@@ -3,6 +3,8 @@ from django.contrib.auth import get_user_model
from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
from django.utils.translation import gettext_lazy as _
+from .models import AuthorRequest, EmailSubscription, SubscriptionCategory
+
User = get_user_model()
@@ -13,7 +15,35 @@ class UserAdmin(BaseUserAdmin):
(_('Personal info'), {'fields': ('first_name', 'last_name', 'email', 'gender', 'about', 'photo')}),
('Facebook Auth data', {'fields': ('fb_id', 'fb_data', 'is_email_proved')}),
(_('Permissions'), {'fields': ('role', 'is_active', 'is_staff', 'is_superuser',
- 'groups', 'user_permissions')}),
+ 'groups', 'user_permissions', 'show_in_mainpage')}),
(_('Important dates'), {'fields': ('last_login', 'date_joined')}),
('Social urls', {'fields': ('instagram', 'facebook', 'twitter', 'pinterest', 'youtube', 'vkontakte', )}),
)
+
+
+@admin.register(AuthorRequest)
+class AuthorRequestAdmin(admin.ModelAdmin):
+ list_display = (
+ 'email',
+ 'first_name',
+ 'last_name',
+ 'status',
+ 'accepted_send_at',
+ 'declined_send_at',
+ 'created_at',
+ 'update_at',
+ )
+
+
+@admin.register(SubscriptionCategory)
+class SubscriptionCategoryAdmin(admin.ModelAdmin):
+ list_display = ('title',)
+
+
+@admin.register(EmailSubscription)
+class EmailSubscriptionAdmin(admin.ModelAdmin):
+ list_display = (
+ 'id',
+ 'user',
+ 'email',
+ )
diff --git a/apps/user/fixtures/subscription_categories.json b/apps/user/fixtures/subscription_categories.json
new file mode 100644
index 00000000..07b3fd10
--- /dev/null
+++ b/apps/user/fixtures/subscription_categories.json
@@ -0,0 +1,58 @@
+[
+ {
+ "model": "user.subscriptioncategory",
+ "pk": 1,
+ "fields": {
+ "title": "Новости школы",
+ "auto_add": false
+ }
+ },
+ {
+ "model": "user.subscriptioncategory",
+ "pk": 2,
+ "fields": {
+ "title": "Новые курсы",
+ "auto_add": true
+ }
+ },
+ {
+ "model": "user.subscriptioncategory",
+ "pk": 3,
+ "fields": {
+ "title": "Бонусы от партнёров",
+ "auto_add": false
+ }
+ },
+ {
+ "model": "user.subscriptioncategory",
+ "pk": 4,
+ "fields": {
+ "title": "Акции",
+ "auto_add": true
+ }
+ },
+ {
+ "model": "user.subscriptioncategory",
+ "pk": 5,
+ "fields": {
+ "title": "Партнёрские акции",
+ "auto_add": false
+ }
+ },
+ {
+ "model": "user.subscriptioncategory",
+ "pk": 6,
+ "fields": {
+ "title": "Новости компании",
+ "auto_add": true
+ }
+ },
+ {
+ "model": "user.subscriptioncategory",
+ "pk": 7,
+ "fields": {
+ "title": "Комментарии в которых участвуете",
+ "auto_add": false
+ }
+ }
+]
diff --git a/apps/user/forms.py b/apps/user/forms.py
index 2f75ef68..2445d522 100644
--- a/apps/user/forms.py
+++ b/apps/user/forms.py
@@ -1,5 +1,6 @@
from django import forms
from django.contrib.auth import get_user_model
+from phonenumber_field.formfields import PhoneNumberField
from .fields import CreditCardField
@@ -10,6 +11,7 @@ class UserEditForm(forms.ModelForm):
# first_name = forms.CharField()
# last_name = forms.CharField()
# email = forms.CharField()
+ phone = PhoneNumberField()
# city = forms.CharField()
# country = forms.CharField()
birthday = forms.DateField(input_formats=['%d.%m.%Y'], required=False)
@@ -33,6 +35,7 @@ class UserEditForm(forms.ModelForm):
'first_name',
'last_name',
'email',
+ 'phone',
'city',
'country',
'birthday',
@@ -54,3 +57,11 @@ class UserEditForm(forms.ModelForm):
class WithdrawalForm(forms.Form):
amount = forms.DecimalField(required=True, min_value=2000)
card = CreditCardField(required=True)
+
+
+class AuthorRequesForm(forms.Form):
+ first_name = forms.CharField()
+ last_name = forms.CharField()
+ email = forms.CharField()
+ about = forms.CharField()
+ facebook = forms.URLField(required=False)
diff --git a/apps/user/migrations/0009_authorrequest.py b/apps/user/migrations/0009_authorrequest.py
new file mode 100644
index 00000000..9e10d01c
--- /dev/null
+++ b/apps/user/migrations/0009_authorrequest.py
@@ -0,0 +1,27 @@
+# Generated by Django 2.0.2 on 2018-03-12 14:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('user', '0008_auto_20180212_0750'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='AuthorRequest',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('first_name', models.CharField(max_length=30, verbose_name='first name')),
+ ('last_name', models.CharField(max_length=150, verbose_name='last name')),
+ ('email', models.EmailField(max_length=254, verbose_name='email address')),
+ ('about', models.CharField(blank=True, max_length=1000, null=True, verbose_name='О себе')),
+ ('facebook', models.URLField(blank=True, default='', null=True)),
+ ('status', models.PositiveSmallIntegerField(choices=[(0, 'pending'), (1, 'accepted'), (2, 'declined')], default=0)),
+ ('created_at', models.DateTimeField(auto_now_add=True)),
+ ('update_at', models.DateTimeField(auto_now=True)),
+ ],
+ ),
+ ]
diff --git a/apps/user/migrations/0010_auto_20180312_1610.py b/apps/user/migrations/0010_auto_20180312_1610.py
new file mode 100644
index 00000000..b691deea
--- /dev/null
+++ b/apps/user/migrations/0010_auto_20180312_1610.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.2 on 2018-03-12 16:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('user', '0009_authorrequest'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='authorrequest',
+ name='email',
+ field=models.EmailField(max_length=254, unique=True, verbose_name='email address'),
+ ),
+ ]
diff --git a/apps/user/migrations/0011_auto_20180313_0744.py b/apps/user/migrations/0011_auto_20180313_0744.py
new file mode 100644
index 00000000..3fe91ef7
--- /dev/null
+++ b/apps/user/migrations/0011_auto_20180313_0744.py
@@ -0,0 +1,17 @@
+# Generated by Django 2.0.3 on 2018-03-13 07:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('user', '0010_auto_20180312_1610'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='authorrequest',
+ options={'ordering': ('-created_at',), 'verbose_name': 'Заявка не преподавателя', 'verbose_name_plural': 'Заявки не преподавателя'},
+ ),
+ ]
diff --git a/apps/user/migrations/0012_authorrequest_cause.py b/apps/user/migrations/0012_authorrequest_cause.py
new file mode 100644
index 00000000..fef855a2
--- /dev/null
+++ b/apps/user/migrations/0012_authorrequest_cause.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.3 on 2018-03-13 07:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('user', '0011_auto_20180313_0744'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='authorrequest',
+ name='cause',
+ field=models.TextField(blank=True, null=True, verbose_name='Причина отказа'),
+ ),
+ ]
diff --git a/apps/user/migrations/0013_authorrequest_declined_send_at.py b/apps/user/migrations/0013_authorrequest_declined_send_at.py
new file mode 100644
index 00000000..50a6a738
--- /dev/null
+++ b/apps/user/migrations/0013_authorrequest_declined_send_at.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.3 on 2018-03-13 10:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('user', '0012_authorrequest_cause'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='authorrequest',
+ name='declined_send_at',
+ field=models.DateTimeField(blank=True, null=True),
+ ),
+ ]
diff --git a/apps/user/migrations/0014_authorrequest_accepted_send_at.py b/apps/user/migrations/0014_authorrequest_accepted_send_at.py
new file mode 100644
index 00000000..284c5909
--- /dev/null
+++ b/apps/user/migrations/0014_authorrequest_accepted_send_at.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.3 on 2018-03-13 10:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('user', '0013_authorrequest_declined_send_at'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='authorrequest',
+ name='accepted_send_at',
+ field=models.DateTimeField(blank=True, null=True),
+ ),
+ ]
diff --git a/apps/user/migrations/0015_auto_20180315_0547.py b/apps/user/migrations/0015_auto_20180315_0547.py
new file mode 100644
index 00000000..dddc43d5
--- /dev/null
+++ b/apps/user/migrations/0015_auto_20180315_0547.py
@@ -0,0 +1,45 @@
+# Generated by Django 2.0.3 on 2018-03-15 05:47
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('user', '0014_authorrequest_accepted_send_at'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='EmailSubscription',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('email', models.EmailField(max_length=254, unique=True, verbose_name='email address')),
+ ('mailchimp_status', models.PositiveSmallIntegerField(choices=[(0, 'error'), (1, 'sent')], default=0)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='SubscriptionCategory',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('title', models.CharField(max_length=100)),
+ ],
+ options={
+ 'verbose_name': 'Категория подписки',
+ 'verbose_name_plural': 'Категории подписки',
+ 'ordering': ('title',),
+ },
+ ),
+ migrations.AddField(
+ model_name='emailsubscription',
+ name='categories',
+ field=models.ManyToManyField(to='user.SubscriptionCategory'),
+ ),
+ migrations.AddField(
+ model_name='emailsubscription',
+ name='user',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+ ),
+ ]
diff --git a/apps/user/migrations/0016_auto_20180315_0603.py b/apps/user/migrations/0016_auto_20180315_0603.py
new file mode 100644
index 00000000..3c5d3f47
--- /dev/null
+++ b/apps/user/migrations/0016_auto_20180315_0603.py
@@ -0,0 +1,20 @@
+# Generated by Django 2.0.3 on 2018-03-15 06:03
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('user', '0015_auto_20180315_0547'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='emailsubscription',
+ name='user',
+ field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='email_subscription', to=settings.AUTH_USER_MODEL),
+ ),
+ ]
diff --git a/apps/user/migrations/0017_subscriptioncategory_auto_add.py b/apps/user/migrations/0017_subscriptioncategory_auto_add.py
new file mode 100644
index 00000000..9530f62c
--- /dev/null
+++ b/apps/user/migrations/0017_subscriptioncategory_auto_add.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.3 on 2018-03-15 06:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('user', '0016_auto_20180315_0603'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='subscriptioncategory',
+ name='auto_add',
+ field=models.BooleanField(default=False),
+ ),
+ ]
diff --git a/apps/user/migrations/0018_user_phone.py b/apps/user/migrations/0018_user_phone.py
new file mode 100644
index 00000000..d377bcf5
--- /dev/null
+++ b/apps/user/migrations/0018_user_phone.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.0.3 on 2018-03-15 17:19
+
+from django.db import migrations
+import phonenumber_field.modelfields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('user', '0017_subscriptioncategory_auto_add'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='user',
+ name='phone',
+ field=phonenumber_field.modelfields.PhoneNumberField(blank=True, max_length=128, null=True, unique=True),
+ ),
+ ]
diff --git a/apps/user/migrations/0019_user_show_in_mainpage.py b/apps/user/migrations/0019_user_show_in_mainpage.py
new file mode 100644
index 00000000..e624bba1
--- /dev/null
+++ b/apps/user/migrations/0019_user_show_in_mainpage.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.3 on 2018-03-20 08:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('user', '0018_user_phone'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='user',
+ name='show_in_mainpage',
+ field=models.BooleanField(default=False, verbose_name='Показывать на главной странице'),
+ ),
+ ]
diff --git a/apps/user/models.py b/apps/user/models.py
index 43eac1cd..058df6b6 100644
--- a/apps/user/models.py
+++ b/apps/user/models.py
@@ -1,14 +1,19 @@
+from json import dumps
+from rest_framework.authtoken.models import Token
+from phonenumber_field.modelfields import PhoneNumberField
+
from django.db import models
from django.db.models.signals import post_save
from django.dispatch import receiver
from django.contrib.auth.models import AbstractUser, UserManager
from django.contrib.postgres import fields as pgfields
+from django.utils.timezone import now
from django.utils.translation import gettext_lazy as _
-from rest_framework.authtoken.models import Token
-
-from json import dumps
from api.v1 import serializers
+from apps.notification.utils import send_email
+
+from apps.user.tasks import user_to_mixpanel
class User(AbstractUser):
@@ -29,6 +34,7 @@ class User(AbstractUser):
(FEMALE, 'Женщина'),
)
email = models.EmailField(_('email address'), unique=True)
+ phone = PhoneNumberField(null=True, blank=True, unique=True)
role = models.PositiveSmallIntegerField(
'Роль', default=0, choices=ROLE_CHOICES)
gender = models.CharField(
@@ -49,6 +55,7 @@ class User(AbstractUser):
'Верифицирован по email', default=False
)
photo = models.ImageField('Фото', null=True, blank=True, upload_to='users')
+ show_in_mainpage = models.BooleanField('Показывать на главной странице', default=False)
USERNAME_FIELD = 'email'
REQUIRED_FIELDS = ['username']
@@ -63,7 +70,7 @@ class User(AbstractUser):
@property
def balance(self):
- aggregate = self.balances.aggregate(
+ aggregate = self.balances.filter(type=0).aggregate(
models.Sum('amount'),
models.Sum('commission'),
)
@@ -85,3 +92,144 @@ def create_auth_token(sender, instance=None, created=False, **kwargs):
instance.role not in [User.AUTHOR_ROLE, User.ADMIN_ROLE]
) and hasattr(instance, 'auth_token'):
instance.auth_token.delete()
+
+
+@receiver(post_save, sender=User)
+def send_user_info_to_mixpanel(sender, instance=None, created=False, **kwargs):
+ user_to_mixpanel.delay(
+ instance.id,
+ instance.email,
+ str(instance.phone),
+ instance.first_name,
+ instance.last_name,
+ instance.date_joined,
+ dict(User.ROLE_CHOICES).get(instance.role),
+ [subscription.title.lower() for subscription in instance.email_subscription.categories.all()] if hasattr(instance, 'email_subscription') else [],
+ )
+
+
+@receiver(post_save, sender=User)
+def auto_create_subscription(sender, instance=None, created=False, **kwargs):
+ if not hasattr(instance, 'email_subscription'):
+ instance.email_subscription = EmailSubscription.objects.create(
+ user=instance,
+ email=instance.email,
+ )
+ instance.email_subscription.categories.set(SubscriptionCategory.objects.filter(auto_add=True))
+ instance.save()
+
+
+class AuthorRequestManager(models.Manager):
+ def create_by_user(self, user):
+ obj = self.model(
+ first_name=user.first_name,
+ last_name=user.last_name,
+ email=user.email,
+ about=user.about,
+ facebook=user.facebook,
+ )
+ self._for_write = True
+ obj.save(force_insert=True, using=self.db)
+ return obj
+
+
+class AuthorRequest(models.Model):
+ PENDING = 0
+ ACCEPTED = 1
+ DECLINED = 2
+ STATUS_CHOICES = (
+ (PENDING, 'pending'),
+ (ACCEPTED, 'accepted'),
+ (DECLINED, 'declined'),
+ )
+
+ first_name = models.CharField(_('first name'), max_length=30)
+ last_name = models.CharField(_('last name'), max_length=150)
+ email = models.EmailField(_('email address'), unique=True)
+ about = models.CharField('О себе', max_length=1000, null=True, blank=True)
+ facebook = models.URLField(default='', null=True, blank=True)
+ status = models.PositiveSmallIntegerField(choices=STATUS_CHOICES, default=PENDING)
+ cause = models.TextField('Причина отказа', null=True, blank=True)
+
+ accepted_send_at = models.DateTimeField(null=True, blank=True)
+ declined_send_at = models.DateTimeField(null=True, blank=True)
+ created_at = models.DateTimeField(auto_now_add=True)
+ update_at = models.DateTimeField(auto_now=True)
+
+ objects = AuthorRequestManager()
+
+ class Meta:
+ verbose_name = 'Заявка не преподавателя'
+ verbose_name_plural = 'Заявки не преподавателя'
+ ordering = ('-created_at',)
+
+
+@receiver(post_save, sender=AuthorRequest)
+def handle_authorrequest_update(sender, instance=None, created=False, update_fields=[], **kwargs):
+ if not created:
+ if instance.status == AuthorRequest.DECLINED and not instance.declined_send_at:
+ send_email.delay(
+ 'Отказ заявки на преподавателя',
+ instance.email,
+ 'notification/email/decline_author.html',
+ cause=instance.cause,
+ )
+ instance.declined_send_at = now()
+ instance.save()
+ elif instance.status == AuthorRequest.ACCEPTED and not instance.accepted_send_at:
+ email = None
+ password = None
+ try:
+ user = User.objects.get(email=instance.email)
+ except User.DoesNotExist:
+ email = instance.email
+ password = User.objects.make_random_password()
+ user = User.objects.create(
+ first_name=instance.first_name,
+ last_name=instance.last_name,
+ username=instance.email,
+ email=instance.email,
+ about=instance.about,
+ facebook=instance.facebook,
+ is_active=True,
+ is_email_proved=True,
+ )
+ user.set_password(password)
+ user.role = User.AUTHOR_ROLE
+ user.save()
+ send_email.delay(
+ 'Заявка на преподавателя одобрена',
+ instance.email,
+ 'notification/email/accept_author.html',
+ email=email,
+ password=password,
+ )
+ instance.accepted_send_at = now()
+ instance.save()
+
+
+class SubscriptionCategory(models.Model):
+ title = models.CharField(max_length=100)
+ auto_add = models.BooleanField(default=False)
+
+ class Meta:
+ verbose_name = 'Категория подписки'
+ verbose_name_plural = 'Категории подписки'
+ ordering = ('title',)
+
+ def __str__(self):
+ return self.title
+
+
+class EmailSubscription(models.Model):
+ ERROR = 0
+ SENT = 1
+ MAILCHIMP_STATUS_CHOICES = (
+ (ERROR, 'error'),
+ (SENT, 'sent'),
+ )
+
+ user = models.OneToOneField(User, null=True, blank=True, on_delete=models.CASCADE, related_name='email_subscription')
+ email = models.EmailField(_('email address'), unique=True)
+ categories = models.ManyToManyField(SubscriptionCategory)
+ mailchimp_status = models.PositiveSmallIntegerField(choices=MAILCHIMP_STATUS_CHOICES, default=ERROR)
diff --git a/apps/user/tasks.py b/apps/user/tasks.py
new file mode 100644
index 00000000..a95988be
--- /dev/null
+++ b/apps/user/tasks.py
@@ -0,0 +1,22 @@
+from mixpanel import Mixpanel
+
+from django.conf import settings
+
+from project.celery import app
+
+
+@app.task
+def user_to_mixpanel(user_id, email, phone, first_name, last_name, date_joined, role, subscriptions):
+ mix = Mixpanel(settings.MIX_TOKEN)
+ mix.people_set(
+ user_id,
+ {
+ '$email': email,
+ '$phone': phone,
+ '$first_name': first_name,
+ '$last_name': last_name,
+ '$created': date_joined,
+ 'role': role,
+ 'subscriptions': subscriptions,
+ }
+ )
diff --git a/apps/user/templates/user/become-author-success.html b/apps/user/templates/user/become-author-success.html
new file mode 100644
index 00000000..e6e97f7d
--- /dev/null
+++ b/apps/user/templates/user/become-author-success.html
@@ -0,0 +1,12 @@
+{% extends "templates/lilcity/index.html" %} {% load static %} {% block content %}
+
+
+
+
Ваша заявка отправлена!
+
+
+
+
+{% endblock content %}
diff --git a/apps/user/templates/user/become-author.html b/apps/user/templates/user/become-author.html
new file mode 100644
index 00000000..383b81ab
--- /dev/null
+++ b/apps/user/templates/user/become-author.html
@@ -0,0 +1,69 @@
+{% extends "templates/lilcity/index.html" %} {% load static %} {% block content %} {% if messages %}
+
+{% endif %}
+
+{% endblock content %}
diff --git a/apps/user/templates/user/notification-settings.html b/apps/user/templates/user/notification-settings.html
index e15996e5..3a486926 100644
--- a/apps/user/templates/user/notification-settings.html
+++ b/apps/user/templates/user/notification-settings.html
@@ -24,42 +24,25 @@
{% endif %}
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}
diff --git a/apps/user/templates/user/profile-settings.html b/apps/user/templates/user/profile-settings.html
index 68d41375..f5f2e9fe 100644
--- a/apps/user/templates/user/profile-settings.html
+++ b/apps/user/templates/user/profile-settings.html
@@ -79,7 +79,16 @@
{% if form.email.errors %}
Укажите корректно свои данные
{% endif %}
-
@@ -24,4 +25,5 @@
{% endif %}
- {% else %}
- 
- {% endif %}
+ {% thumbnail course.cover.image "300x170" crop="center" as im %}
+ 
-
+ {% else %}
+ {% endif %}
+