From 397bc9c2d3471fd943356bebd9e80782bc7f8dbf Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Sun, 29 Jul 2018 18:45:00 +0500
Subject: [PATCH 01/13] =?UTF-8?q?LIL-583=20=D1=80=D0=B5=D1=84=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D0=BD=D0=B0=D1=8F=20=D1=81=D0=B8=D1=81=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BC=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/v1/serializers/config.py                  |  4 +++
 .../migrations/0009_auto_20180729_0503.py     | 23 +++++++++++++++
 apps/config/models.py                         |  4 +++
 apps/user/migrations/0023_referral.py         | 29 +++++++++++++++++++
 apps/user/models.py                           | 11 +++++++
 project/templates/blocks/popup_auth.html      | 17 +++++++++--
 project/views.py                              | 10 +++++++
 requirements.txt                              |  1 +
 8 files changed, 96 insertions(+), 3 deletions(-)
 create mode 100644 apps/config/migrations/0009_auto_20180729_0503.py
 create mode 100644 apps/user/migrations/0023_referral.py

diff --git a/api/v1/serializers/config.py b/api/v1/serializers/config.py
index 4c1028b2..46cb40b2 100644
--- a/api/v1/serializers/config.py
+++ b/api/v1/serializers/config.py
@@ -20,6 +20,8 @@ class ConfigSerializer(serializers.ModelSerializer):
     MAIN_PAGE_TOP_IMAGE = serializers.SerializerMethodField()
     # SCHOOL_LOGO_IMAGE = serializers.ImageField(required=False, allow_null=True)
     # MAIN_PAGE_TOP_IMAGE = serializers.ImageField(required=False, allow_null=True)
+    REFERRER_CASHBACK = serializers.IntegerField()
+    REFERRAL_DISCOUNT = serializers.IntegerField()
 
     class Meta:
         model = Config
@@ -37,6 +39,8 @@ class ConfigSerializer(serializers.ModelSerializer):
             'INSTAGRAM_PROFILE_URL',
             'SCHOOL_LOGO_IMAGE',
             'MAIN_PAGE_TOP_IMAGE',
+            'REFERRER_CASHBACK',
+            'REFERRAL_DISCOUNT',
         )
 
     def get_SCHOOL_LOGO_IMAGE(self, config):
diff --git a/apps/config/migrations/0009_auto_20180729_0503.py b/apps/config/migrations/0009_auto_20180729_0503.py
new file mode 100644
index 00000000..6a55aee1
--- /dev/null
+++ b/apps/config/migrations/0009_auto_20180729_0503.py
@@ -0,0 +1,23 @@
+# Generated by Django 2.0.6 on 2018-07-29 05:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('config', '0008_auto_20180425_1451'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='config',
+            name='REFERRAL_DISCOUNT',
+            field=models.IntegerField(default=10),
+        ),
+        migrations.AddField(
+            model_name='config',
+            name='REFERRER_CASHBACK',
+            field=models.IntegerField(default=10),
+        ),
+    ]
diff --git a/apps/config/models.py b/apps/config/models.py
index c6be681d..8baa4c86 100644
--- a/apps/config/models.py
+++ b/apps/config/models.py
@@ -17,6 +17,8 @@ class Config(models.Model):
     SERVICE_DISCOUNT = models.IntegerField(default=1000)
     SCHOOL_LOGO_IMAGE = models.ImageField(null=True, blank=True)
     MAIN_PAGE_TOP_IMAGE = models.ImageField(null=True, blank=True)
+    REFERRER_CASHBACK = models.IntegerField(default=10)
+    REFERRAL_DISCOUNT = models.IntegerField(default=10)
 
     def save(self, *args, **kwargs):
         self.pk = 1
@@ -45,5 +47,7 @@ class Config(models.Model):
                 'SERVICE_DISCOUNT': '',
                 'SCHOOL_LOGO_IMAGE': '',
                 'MAIN_PAGE_TOP_IMAGE': '',
+                'REFERRER_CASHBACK': '',
+                'REFERRAL_DISCOUNT': '',
             }
         return obj
diff --git a/apps/user/migrations/0023_referral.py b/apps/user/migrations/0023_referral.py
new file mode 100644
index 00000000..2edf4621
--- /dev/null
+++ b/apps/user/migrations/0023_referral.py
@@ -0,0 +1,29 @@
+# Generated by Django 2.0.6 on 2018-07-29 05:24
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0022_user_instagram_hashtag'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Referral',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('discount', models.IntegerField()),
+                ('referrer_cashback', models.IntegerField()),
+                ('referral', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('referrer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='referrals', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'Реферал',
+                'verbose_name_plural': 'Рефералы',
+            },
+        ),
+    ]
diff --git a/apps/user/models.py b/apps/user/models.py
index 7391b0c8..4884c918 100644
--- a/apps/user/models.py
+++ b/apps/user/models.py
@@ -256,3 +256,14 @@ class EmailSubscription(models.Model):
     email = models.EmailField(_('email address'), unique=True)
     categories = models.ManyToManyField(SubscriptionCategory)
     mailchimp_status = models.PositiveSmallIntegerField(choices=MAILCHIMP_STATUS_CHOICES, default=ERROR)
+
+
+class Referral(models.Model):
+    referral = models.OneToOneField(User, on_delete=models.CASCADE)
+    referrer = models.ForeignKey(User, on_delete=models.CASCADE, related_name='referrals')
+    discount = models.IntegerField()
+    referrer_cashback = models.IntegerField()
+
+    class Meta:
+        verbose_name = 'Реферал'
+        verbose_name_plural = 'Рефералы'
diff --git a/project/templates/blocks/popup_auth.html b/project/templates/blocks/popup_auth.html
index cf01d86b..bce10d61 100644
--- a/project/templates/blocks/popup_auth.html
+++ b/project/templates/blocks/popup_auth.html
@@ -1,5 +1,5 @@
 {% load static %}
-<div class="popup js-popup-auth">
+<div class="popup js-popup-auth {% if referrer %}open visible{% endif %}">
   <div class="popup__wrap js-popup-wrap">
     <button class="popup__close js-popup-close">
       <svg class="icon icon-close">
@@ -10,14 +10,25 @@
       <div class="auth js-auth">
         <div class="auth__login js-auth-login">
           <div class="auth__nav">
-            <a class="auth__type js-auth-type active" href="#">Войти</a>
-            <a class="auth__type js-auth-type" href="#">РЕГИСТРАЦИЯ</a>
+            <a class="auth__type js-auth-type {% if not referrer %}active{% endif %}" href="#">Войти</a>
+            <a class="auth__type js-auth-type {% if referrer %}active{% endif %}" href="#">РЕГИСТРАЦИЯ</a>
           </div>
           <div class="auth__body">
             <form id="learner-auth-form" method="post" action="{% url 'lilcity:login' %}">
               {% csrf_token %}
               <div class="auth__tab js-auth-tab" style="display: block;">
                 <div class="auth__enter js-auth-enter">
+                  {% if referrer %}
+                    <input type="hidden" name="referrer" value="{{ referrer.id }}">
+                    <div style="margin: 0 0 20px;">
+                      <a href="{% url 'user' referrer.id %}" target="_blank" style="
+                        font-family: 'ProximaNova-Bold', serif;
+                        font-size: 10px;
+                        letter-spacing: 1px;
+                        text-transform: uppercase;">
+                        {{ referrer.get_full_name }}</a> дарит вам скидку 10% на первую покупку!
+                    </div>
+                  {% endif %}
                   <div id="learner-auth-field__username" class="auth__field field learner-auth-form__field">
                     <div class="field__label">ПОЧТА</div>
                     <div class="field__wrap">
diff --git a/project/views.py b/project/views.py
index c8400f14..c6b4d152 100644
--- a/project/views.py
+++ b/project/views.py
@@ -1,5 +1,6 @@
 from datetime import datetime, timedelta
 
+import short_url
 from django.db.models import Min
 from django.contrib.auth import get_user_model
 from django.views.generic import TemplateView
@@ -20,6 +21,7 @@ class IndexView(TemplateView):
     template_name = 'templates/lilcity/main.html'
 
     def get_context_data(self):
+        referrer = self.request.GET.get('referrer')
         context = super().get_context_data()
 
         now_time = now()
@@ -70,7 +72,15 @@ class IndexView(TemplateView):
             school_purchased_future = False
             school_schedules_purchased = []
 
+        if referrer:
+            try:
+                referrer = short_url.decode_url(referrer)
+                referrer = User.objects.get(pk=referrer)
+            except:
+                referrer = None
+
         context.update({
+            'referrer': referrer,
             'online': online,
             'online_coming_soon': online_coming_soon,
             'school_schedule': school_schedule,
diff --git a/requirements.txt b/requirements.txt
index 05894ddd..e5022bb7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -28,4 +28,5 @@ git+https://github.com/ivlevdenis/python-instagram.git
 django-user-agents==0.3.2
 user-agents==1.1.0
 ua-parser==0.8.0
+short_url
 

From d63709b2529eb01857fc4f075466a5026ff8557f Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Tue, 31 Jul 2018 15:06:53 +0500
Subject: [PATCH 02/13] =?UTF-8?q?LIL-583=20=D1=80=D0=B5=D1=84=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D0=BD=D0=B0=D1=8F=20=D1=81=D0=B8=D1=81=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BC=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/v1/views.py                          |  12 ++-
 apps/auth/views.py                       |   7 ++
 apps/payment/models.py                   | 103 +++++++++++++++++------
 apps/user/models.py                      |   8 +-
 project/context_processors.py            |  14 +++
 project/settings.py                      |   1 +
 project/templates/blocks/popup_auth.html |  32 +++----
 project/templates/lilcity/index.html     |   9 ++
 project/templates/lilcity/main.html      |  10 +++
 project/views.py                         |   5 +-
 web/src/js/modules/api.js                |   8 ++
 web/src/js/modules/popup.js              |  27 ++++--
 12 files changed, 179 insertions(+), 57 deletions(-)

diff --git a/api/v1/views.py b/api/v1/views.py
index 41cd881a..271d907f 100644
--- a/api/v1/views.py
+++ b/api/v1/views.py
@@ -1,7 +1,7 @@
 from django.contrib.auth import get_user_model
 
 from rest_framework import status, views, viewsets, generics
-from rest_framework.decorators import detail_route, list_route
+from rest_framework.decorators import detail_route, list_route, action
 from rest_framework.response import Response
 
 from . import ExtendedModelViewSet
@@ -429,3 +429,13 @@ class PaymentViewSet(ExtendedModelViewSet):
         'amount', 'created_at',
     )
     search_fields = ('user__email', 'user__first_name', 'user__last_name',)
+
+    @action(methods=['get'], detail=False, url_path='calc-amount')
+    def calc_amount(self, request, pk=None):
+        user = request.query_params.get('user')
+        course = request.query_params.get('course')
+        weekdays = request.query_params.getlist('weekdays[]')
+        user = user and User.objects.get(pk=user)
+        course = course and Course.objects.get(pk=course)
+
+        return Response(Payment.calc_amount(user=user, course=course, weekdays=weekdays))
diff --git a/apps/auth/views.py b/apps/auth/views.py
index f6105e75..284d0dd5 100644
--- a/apps/auth/views.py
+++ b/apps/auth/views.py
@@ -19,6 +19,7 @@ from django.shortcuts import redirect
 
 from apps.notification.utils import send_email
 from apps.config.models import Config
+from apps.user.models import Referral
 
 from .forms import LearnerRegistrationForm
 from .tokens import verification_email_token
@@ -51,6 +52,11 @@ class LearnerRegistrationView(FormView):
         user.last_name = last_name
 
         user.set_password(password)
+        referrer = self.request.session.get('referrer')
+        if referrer:
+            Referral.objects.create(referral=user, referrer=referrer, discount=Config.REFERRAL_DISCOUNT,
+                                    referrer_cashback=Config.REFERRER_CASHBACK)
+            self.request.session['referrer'] = None
         user.save()
         login(self.request, user)
 
@@ -81,6 +87,7 @@ class LoginView(FormView):
 
     def form_valid(self, form):
         login(self.request, form.get_user())
+        self.request.session['referrer'] = None
         return JsonResponse({"success": True})
 
     def form_invalid(self, form):
diff --git a/apps/payment/models.py b/apps/payment/models.py
index 32d7a0e9..17c75bb1 100644
--- a/apps/payment/models.py
+++ b/apps/payment/models.py
@@ -1,5 +1,5 @@
+from decimal import Decimal
 import arrow
-
 from paymentwall import Pingback
 from polymorphic.models import PolymorphicModel
 from polymorphic.managers import PolymorphicManager
@@ -108,6 +108,62 @@ class Payment(PolymorphicModel):
         verbose_name_plural = 'Платежи'
         ordering = ('created_at',)
 
+    @classmethod
+    def calc_amount(cls, course_payment=None, school_payment=None, user=None, course=None, weekdays=None,
+                    add_days=False, date_start=None, date_end=None):
+        if course_payment:
+            course = course_payment.course
+            user = course_payment.user
+        if school_payment:
+            user = school_payment.user
+            weekdays = school_payment.weekdays
+            add_days = school_payment.add_days
+            date_start = school_payment.date_start
+            date_end = school_payment.date_end
+        referral_discount = 0
+        referrer_cashback = 0
+        if hasattr(user, 'referral') and not user.referral.payment:
+            referral_discount = user.referral.discount
+            referrer_cashback = user.referral.referrer_cashback
+        discount = 0
+        if course:
+            price = course.price
+        else:
+            aggregate = SchoolSchedule.objects.filter(
+                weekday__in=weekdays,
+            ).aggregate(
+                models.Sum('month_price'),
+            )
+            if add_days:
+                _school_payment = SchoolPayment.objects.filter(
+                    add_days=False,
+                    date_start__lte=date_start,
+                    date_end__gte=date_end,
+                    status__in=[
+                        Pingback.PINGBACK_TYPE_REGULAR,
+                        Pingback.PINGBACK_TYPE_GOODWILL,
+                        Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
+                    ],
+                ).last()
+                weekday_count = weekday_in_date_range(date_start, date_end, weekdays[0])
+                all_weekday_count = weekday_in_date_range(_school_payment.date_start, _school_payment.date_end,
+                                                          weekdays[0])
+                price = Decimal(aggregate.get('month_price__sum', 0) * weekday_count // all_weekday_count)
+            else:
+                price = Decimal(aggregate.get('month_price__sum', 0))
+            if price >= config.SERVICE_DISCOUNT_MIN_AMOUNT:
+                discount = config.SERVICE_DISCOUNT
+        referral_discount = (price - discount) * referral_discount / 100
+        referrer_cashback = (price - discount) * referrer_cashback / 100
+        amount = price - discount - referral_discount
+        return {
+            'price': price,
+            'amount': amount,
+            'referral_discount': referral_discount,
+            'referrer_cashback': referrer_cashback,
+            'discount': discount,
+        }
+
     def calc_commission(self):
         return self.amount * config.SERVICE_COMMISSION / 100
 
@@ -136,7 +192,8 @@ class CoursePayment(Payment):
         verbose_name_plural = 'Платежи за курсы'
 
     def save(self, *args, **kwargs):
-        self.amount = self.course.price
+        amount_data = Payment.calc_amount(course_payment=self)
+        self.amount = amount_data.get('amount')
         super().save(*args, **kwargs)
         author_balance = getattr(self, 'authorbalance', None)
         if not author_balance:
@@ -148,6 +205,13 @@ class CoursePayment(Payment):
         else:
             author_balance.amount = self.amount
             author_balance.save()
+        # Если юзер реферал и нет платежа, где применялась скидка
+        if hasattr(self.user, 'referral') and not self.user.referral.payment:
+            # Отправляем кэшбэк
+            self.user.referral.cashback(amount_data.get('referrer_cashback'))
+            # Платеж - как сигнал, что скидка применилась
+            self.user.referral.payment = self
+            self.user.referral.save()
 
 
 class SchoolPayment(Payment):
@@ -168,33 +232,16 @@ class SchoolPayment(Payment):
         return days
 
     def save(self, *args, **kwargs):
-        aggregate = SchoolSchedule.objects.filter(
-            weekday__in=self.weekdays,
-        ).aggregate(
-            models.Sum('month_price'),
-        )
-        if self.add_days:
-            _school_payment = SchoolPayment.objects.filter(
-                add_days=False,
-                date_start__lte=self.date_start,
-                date_end__gte=self.date_end,
-                status__in=[
-                    Pingback.PINGBACK_TYPE_REGULAR,
-                    Pingback.PINGBACK_TYPE_GOODWILL,
-                    Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
-                ],
-            ).last()
-            weekday_count = weekday_in_date_range(self.date_start, self.date_end, self.weekdays[0])
-            all_weekday_count = weekday_in_date_range(_school_payment.date_start, _school_payment.date_end, self.weekdays[0])
-            month_price_sum = aggregate.get('month_price__sum', 0) * weekday_count // all_weekday_count
-        else:
-            month_price_sum = aggregate.get('month_price__sum', 0)
-        if month_price_sum >= config.SERVICE_DISCOUNT_MIN_AMOUNT:
-            discount = config.SERVICE_DISCOUNT
-        else:
-            discount = 0
-        self.amount = month_price_sum - discount
+        amount_data = Payment.calc_amount(school_payment=self)
+        self.amount = amount_data.get('amount')
         super().save(*args, **kwargs)
+        # Если юзер реферал и нет платежа, где применялась скидка
+        if not self.add_days and hasattr(self.user, 'referral') and not self.user.referral.payment:
+            # Отправляем кэшбэк
+            self.user.referral.cashback(amount_data.get('referrer_cashback'))
+            # Платеж - как сигнал, что скидка применилась
+            self.user.referral.payment = self
+            self.user.referral.save()
 
     @property
     def date_end_humanize(self):
diff --git a/apps/user/models.py b/apps/user/models.py
index 4884c918..286c61c3 100644
--- a/apps/user/models.py
+++ b/apps/user/models.py
@@ -12,7 +12,6 @@ from django.utils.translation import gettext_lazy as _
 
 from api.v1 import serializers
 from apps.notification.utils import send_email
-
 from apps.user.tasks import user_to_mixpanel
 
 
@@ -259,11 +258,16 @@ class EmailSubscription(models.Model):
 
 
 class Referral(models.Model):
-    referral = models.OneToOneField(User, on_delete=models.CASCADE)
+    referral = models.OneToOneField(User, on_delete=models.CASCADE, related_name='referral')
     referrer = models.ForeignKey(User, on_delete=models.CASCADE, related_name='referrals')
     discount = models.IntegerField()
     referrer_cashback = models.IntegerField()
+    payment = models.OneToOneField('payment.Payment', null=True, blank=True, on_delete=models.CASCADE)
 
     class Meta:
         verbose_name = 'Реферал'
         verbose_name_plural = 'Рефералы'
+
+    def cashback(self, amount):
+        # TODO
+        pass
diff --git a/project/context_processors.py b/project/context_processors.py
index 0e7e9d32..2af515c3 100644
--- a/project/context_processors.py
+++ b/project/context_processors.py
@@ -1,6 +1,10 @@
+from django.contrib.auth import get_user_model
+
 from apps.config.models import Config
 from apps.content.models import Baner
 
+User = get_user_model()
+
 
 def config(request):
     return {"config": Config.load()}
@@ -8,3 +12,13 @@ def config(request):
 
 def baner(request):
     return {'baner': Baner.objects.filter(use=True).first()}
+
+
+def referrer(request):
+    referrer = request.session.get('referrer')
+    if referrer:
+        try:
+            referrer = User.objects.get(pk=referrer)
+        except:
+            referrer = None
+    return {'referrer': referrer}
diff --git a/project/settings.py b/project/settings.py
index 9323745c..b5a947cc 100644
--- a/project/settings.py
+++ b/project/settings.py
@@ -93,6 +93,7 @@ TEMPLATES = [
             'context_processors': [
                 'project.context_processors.config',
                 'project.context_processors.baner',
+                'project.context_processors.referrer',
                 'django.template.context_processors.debug',
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
diff --git a/project/templates/blocks/popup_auth.html b/project/templates/blocks/popup_auth.html
index bce10d61..058a2205 100644
--- a/project/templates/blocks/popup_auth.html
+++ b/project/templates/blocks/popup_auth.html
@@ -1,5 +1,5 @@
 {% load static %}
-<div class="popup js-popup-auth {% if referrer %}open visible{% endif %}">
+<div class="popup js-popup-auth {% if is_registration %}open visible{% endif %}">
   <div class="popup__wrap js-popup-wrap">
     <button class="popup__close js-popup-close">
       <svg class="icon icon-close">
@@ -10,25 +10,14 @@
       <div class="auth js-auth">
         <div class="auth__login js-auth-login">
           <div class="auth__nav">
-            <a class="auth__type js-auth-type {% if not referrer %}active{% endif %}" href="#">Войти</a>
-            <a class="auth__type js-auth-type {% if referrer %}active{% endif %}" href="#">РЕГИСТРАЦИЯ</a>
+            <a class="auth__type js-auth-type {% if not is_registration %}active{% endif %}" href="#">Войти</a>
+            <a class="auth__type js-auth-type {% if is_registration %}active{% endif %}" href="#">РЕГИСТРАЦИЯ</a>
           </div>
           <div class="auth__body">
             <form id="learner-auth-form" method="post" action="{% url 'lilcity:login' %}">
               {% csrf_token %}
-              <div class="auth__tab js-auth-tab" style="display: block;">
+              <div class="auth__tab js-auth-tab" {% if not is_registration %}style="display: block;"{% endif %}>
                 <div class="auth__enter js-auth-enter">
-                  {% if referrer %}
-                    <input type="hidden" name="referrer" value="{{ referrer.id }}">
-                    <div style="margin: 0 0 20px;">
-                      <a href="{% url 'user' referrer.id %}" target="_blank" style="
-                        font-family: 'ProximaNova-Bold', serif;
-                        font-size: 10px;
-                        letter-spacing: 1px;
-                        text-transform: uppercase;">
-                        {{ referrer.get_full_name }}</a> дарит вам скидку 10% на первую покупку!
-                    </div>
-                  {% endif %}
                   <div id="learner-auth-field__username" class="auth__field field learner-auth-form__field">
                     <div class="field__label">ПОЧТА</div>
                     <div class="field__wrap">
@@ -74,7 +63,18 @@
             </form>
             <form id="learner-registration-form" method="post" action="{% url 'lilcity:registration-learner' %}">
               {% csrf_token %}
-              <div class="auth__tab js-auth-tab">
+              <div class="auth__tab js-auth-tab" {% if is_registration %}style="display: block;"{% endif %}>
+                {% if referrer %}
+                  <input type="hidden" name="referrer" value="{{ referrer.id }}">
+                  <div style="margin: 0 0 20px;">
+                    <a href="{% url 'user' referrer.id %}" target="_blank" style="
+                      font-family: 'ProximaNova-Bold', serif;
+                      font-size: 10px;
+                      letter-spacing: 1px;
+                      text-transform: uppercase;">
+                      {{ referrer.get_full_name }}</a> дарит вам скидку 10% на первую покупку!
+                  </div>
+                {% endif %}
                 <div class="auth__fieldset">
                   <div id="learner-registration-field__first-name" class="auth__field field learner-registration-form__field">
                     <div class="field__label">ИМЯ</div>
diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html
index 5d7b9d2d..8b5febc4 100644
--- a/project/templates/lilcity/index.html
+++ b/project/templates/lilcity/index.html
@@ -130,6 +130,14 @@
       {% include "templates/blocks/popup_course_lock.html" %}
       {% include "templates/blocks/popup_subscribe.html" %}
     </div>
+    <script>
+      window.STORE = {
+        accessToken: '{{ request.user.auth_token }}',
+        user: {
+          id: '{{ request.user.id }}',
+        }
+      };
+    </script>
     <script type="text/javascript" src={% static "app.js" %}></script>
     <script>
       var schoolDiscount = parseFloat({{ config.SERVICE_DISCOUNT }});
@@ -140,5 +148,6 @@
       (function(w, d, s, h, id) { w.roistatProjectId = id; w.roistatHost = h; var p = d.location.protocol == "https:" ? "https://" : "http://"; var u = /^.*roistat_visit=[^;]+(.*)?$/.test(d.cookie) ? "/dist/module.js" : "/api/site/1.0/"+id+"/init"; var js = d.createElement(s); js.charset="UTF-8"; js.async = 1; js.src = p+h+u; var js2 = d.getElementsByTagName(s)[0]; js2.parentNode.insertBefore(js, js2);})(window, document, 'script', 'cloud.roistat.com', '{% setting "ROISTAT_COUNTER_ID" %}');
     </script>
     {% block foot %}{% endblock foot %}
+    {% block body_js %}{% endblock body_js %}
   </body>
 </html>
diff --git a/project/templates/lilcity/main.html b/project/templates/lilcity/main.html
index 4227d9ec..09397932 100644
--- a/project/templates/lilcity/main.html
+++ b/project/templates/lilcity/main.html
@@ -13,3 +13,13 @@
   {% include "templates/blocks/teachers.html" %}
   {% include "templates/blocks/partners.html" %}
 {% endblock content %}
+
+{% block body_js %}
+  {% if is_registration %}
+    <script>
+      $(document).ready(function () {
+        $('.js-header-enter').click();
+      });
+    </script>
+  {% endif %}
+{% endblock body_js %}
diff --git a/project/views.py b/project/views.py
index c6b4d152..112b128b 100644
--- a/project/views.py
+++ b/project/views.py
@@ -75,12 +75,13 @@ class IndexView(TemplateView):
         if referrer:
             try:
                 referrer = short_url.decode_url(referrer)
-                referrer = User.objects.get(pk=referrer)
+                referrer = User.objects.get(pk=referrer).id
             except:
                 referrer = None
+            self.request.session['referrer'] = referrer
 
         context.update({
-            'referrer': referrer,
+            'is_registration': bool(referrer),
             'online': online,
             'online_coming_soon': online_coming_soon,
             'school_schedule': school_schedule,
diff --git a/web/src/js/modules/api.js b/web/src/js/modules/api.js
index 990ac7b2..d27c2f8a 100644
--- a/web/src/js/modules/api.js
+++ b/web/src/js/modules/api.js
@@ -502,4 +502,12 @@ export const api = {
             }
         });
     },
+    getPaymentAmount: (params) => {
+        return api.get('/api/v1/payments/calc-amount', {
+            params: params,
+            headers: {
+                'Authorization': `Token ${window.STORE.accessToken}`,
+            }
+        });
+    }
 };
diff --git a/web/src/js/modules/popup.js b/web/src/js/modules/popup.js
index f4bb5e94..f8fcaa4c 100644
--- a/web/src/js/modules/popup.js
+++ b/web/src/js/modules/popup.js
@@ -1,9 +1,10 @@
 import $ from 'jquery';
+import {api} from './api';
 
 var selectedWeekdays = {};
 $(document).ready(function () {
     let body = $('body'),
-        popup;
+        popup = $('.popup.visible.open');
 
     body.on('click', '[data-popup]', function(e){
         e.preventDefault();
@@ -100,6 +101,7 @@ $(document).ready(function () {
     });
 
     function updateCart(){
+        var $orderPrice = $('.order_price_text');
         var days = ['', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота', 'Воскресенье'];
         var weekdays = [], daysText = [], price = 0;
         for(var i in selectedWeekdays) {
@@ -108,13 +110,22 @@ $(document).ready(function () {
             daysText.push(days[i]);
         }
 
-        var text = '';
-        if(schoolAmountForDiscount <= price) {
-            text = '<del>'+price+'</del> '+(price-schoolDiscount)+'р.';
-        } else {
-            text = price+'p.';
+        if(weekdays.length){
+            api.getPaymentAmount({ user: window.STORE.user.id, weekdays: weekdays })
+            .then((response) => {
+                var text = '';
+                if(response.data.price != response.data.amount) {
+                    text = '<del>'+response.data.price+'</del> '+response.data.amount+'р.';
+                } else {
+                    text = response.data.amount+'p.';
+                }
+                $orderPrice.html(text);
+            });
         }
-        $('.order_price_text').html(text);
+        else {
+            $orderPrice.html('0p.');
+        }
+
         $('.order__days').html((daysText.length) ? daysText.join(', '):'Ничего не выбрано');
 
         var link = $('.but_btn_popup').data('link');
@@ -124,4 +135,4 @@ $(document).ready(function () {
     }
 
     updateCart();
-});
\ No newline at end of file
+});

From eb216ffe8fcff685beeed8a1cebca3d0c513e07a Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Tue, 31 Jul 2018 15:17:27 +0500
Subject: [PATCH 03/13] LIL-583 Referral.payment

---
 apps/user/migrations/0024_referral_payment.py | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 apps/user/migrations/0024_referral_payment.py

diff --git a/apps/user/migrations/0024_referral_payment.py b/apps/user/migrations/0024_referral_payment.py
new file mode 100644
index 00000000..f68f7632
--- /dev/null
+++ b/apps/user/migrations/0024_referral_payment.py
@@ -0,0 +1,20 @@
+# Generated by Django 2.0.6 on 2018-07-30 18:24
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('payment', '0019_payment_roistat_visit'),
+        ('user', '0023_referral'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='referral',
+            name='payment',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='payment.Payment'),
+        ),
+    ]

From 0586a97ad3d88f134a0ae5e63f602c50aebdd464 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Fri, 3 Aug 2018 13:09:57 +0500
Subject: [PATCH 04/13] =?UTF-8?q?LIL-583=20=D0=9F=D1=80=D0=B8=20=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D1=8B=D0=B2=D0=B0=D0=B5=D1=82?=
 =?UTF-8?q?=D1=81=D1=8F=20=D1=80=D0=B5=D1=84=D0=B5=D1=80=D0=B0=D0=BB,=20?=
 =?UTF-8?q?=D0=B2=20=D0=BF=D0=BE=D0=BF=D0=B0=D0=BF=D0=B5=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BA=D1=83=D0=BF=D0=BA=D0=B8=20=D0=BB=D0=B0=D0=B3=D0=B5=D1=80?=
 =?UTF-8?q?=D1=8F=20=D1=86=D0=B5=D0=BD=D0=B0=20=D0=B1=D0=B5=D1=80=D0=B5?=
 =?UTF-8?q?=D1=82=D1=81=D1=8F=20=D0=B8=D0=B7=20=D0=90=D0=9F=D0=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/auth/views.py          | 25 ++++++++++++++++++-------
 project/views.py            |  4 +++-
 web/src/js/modules/auth.js  |  8 ++++----
 web/src/js/modules/popup.js | 30 +++++++++---------------------
 4 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/apps/auth/views.py b/apps/auth/views.py
index 284d0dd5..6272dbac 100644
--- a/apps/auth/views.py
+++ b/apps/auth/views.py
@@ -32,6 +32,7 @@ class LearnerRegistrationView(FormView):
     template_name = "auth/registration-learner.html"
 
     def form_valid(self, form):
+        config = Config.load()
         first_name = form.cleaned_data['first_name']
         last_name = form.cleaned_data['last_name']
         email = form.cleaned_data['email']
@@ -52,21 +53,21 @@ class LearnerRegistrationView(FormView):
         user.last_name = last_name
 
         user.set_password(password)
+        user.save()
         referrer = self.request.session.get('referrer')
         if referrer:
-            Referral.objects.create(referral=user, referrer=referrer, discount=Config.REFERRAL_DISCOUNT,
-                                    referrer_cashback=Config.REFERRER_CASHBACK)
+            Referral.objects.create(referral=user, referrer_id=referrer, discount=config.REFERRAL_DISCOUNT,
+                                    referrer_cashback=config.REFERRER_CASHBACK)
+            # TODO: email admins? мб реферера уже нет, старая ссылка
             self.request.session['referrer'] = None
-        user.save()
         login(self.request, user)
 
         # fixme: change email text
         # fixme: async send email
-        config = Config.load()
-        refferer = urlsplit(self.request.META.get('HTTP_REFERER'))
-        refferer = str(refferer[0]) + '://' + str(refferer[1])
+        http_referer = urlsplit(self.request.META.get('HTTP_REFERER'))
+        http_referer = str(http_referer[0]) + '://' + str(http_referer[1])
         token = verification_email_token.make_token(user)
-        url = refferer + str(reverse_lazy('lilcity:verification-email', args=[token, user.id]))
+        url = http_referer + str(reverse_lazy('lilcity:verification-email', args=[token, user.id]))
         send_email('Вы успешно прошли регистрацию', email, "notification/email/verification_email.html", url=url, config=config)
 
         return JsonResponse({"success": True}, status=201)
@@ -104,6 +105,7 @@ class VerificationEmailView(View):
             user.is_email_proved = True
             user.save()
             login(request, user)
+            self.request.session['referrer'] = None
             return redirect(reverse_lazy('lilcity:success-verification-email'))
         else:
             return JsonResponse({"success": False}, status=400)
@@ -192,6 +194,14 @@ class FacebookLoginOrRegistration(View):
                         user.photo.save(fname, photo, save=True)
                     user.save()
 
+                referrer = self.request.session.get('referrer')
+                if referrer:
+                    config = Config.load()
+                    Referral.objects.create(referral=user, referrer_id=referrer, discount=config.REFERRAL_DISCOUNT,
+                                            referrer_cashback=config.REFERRER_CASHBACK)
+                    # TODO: email admins? мб реферера уже нет, старая ссылка
+                    self.request.session['referrer'] = None
+
                 login(requests, user=user)
                 return JsonResponse({"success": True})
         else:
@@ -200,4 +210,5 @@ class FacebookLoginOrRegistration(View):
                 fname = str(fb_id) + '.jpg'
                 user.photo.save(fname, photo, save=True)
             login(requests, user=user)
+            self.request.session['referrer'] = None
             return JsonResponse({"success": True})
diff --git a/project/views.py b/project/views.py
index 112b128b..4239d641 100644
--- a/project/views.py
+++ b/project/views.py
@@ -72,13 +72,15 @@ class IndexView(TemplateView):
             school_purchased_future = False
             school_schedules_purchased = []
 
-        if referrer:
+        if referrer and not self.request.user.is_authenticated:
             try:
                 referrer = short_url.decode_url(referrer)
                 referrer = User.objects.get(pk=referrer).id
             except:
                 referrer = None
             self.request.session['referrer'] = referrer
+        else:
+            referrer = None
 
         context.update({
             'is_registration': bool(referrer),
diff --git a/web/src/js/modules/auth.js b/web/src/js/modules/auth.js
index 07f65cda..0d7dab55 100644
--- a/web/src/js/modules/auth.js
+++ b/web/src/js/modules/auth.js
@@ -40,7 +40,7 @@ $(document).ready(function () {
 
         pass.hide();
         // login.fadeIn();
-        window.location.reload();
+        window.location.href = '/';
     });
 
     $('#password-reset__success-hide').on('click', function (e) {
@@ -153,7 +153,7 @@ $(document).ready(function () {
         })
             .done(function (data) {
                 if (data.success === true) {
-                    location.reload();
+                    location.href = '/';
                 } else {
                     authButton.removeClass('loading');
                 }
@@ -234,7 +234,7 @@ $(document).ready(function () {
         })
             .done(function (data) {
                 if (data.success === true) {
-                    location.reload();
+                    location.href = '/';
                 } else {
                     registrationButton.removeClass('loading');
                 }
@@ -312,7 +312,7 @@ function login_with_facebook(accessToken) {
     })
         .done(function (data) {
             if (data.success === true) {
-                location.reload();
+                location.href = '/';
             }
         })
         .fail(function (xhr) {
diff --git a/web/src/js/modules/popup.js b/web/src/js/modules/popup.js
index f8fcaa4c..5e339bd9 100644
--- a/web/src/js/modules/popup.js
+++ b/web/src/js/modules/popup.js
@@ -42,8 +42,7 @@ $(document).ready(function () {
                 $(this).prop('checked', true);
             });
         }
-
-        $('[data-day]').trigger('change');
+        updateCart();
     });
 
     $('.js-popup-close').on('click', function(e){
@@ -86,29 +85,20 @@ $(document).ready(function () {
     }
 
     $(document).on('change', '[data-day]', function(){
-        console.log('on change data-day');
-        var weekday = $(this).data('day');
-        var price = $(this).data('price');
-        if($(this).is(':checked')) {
-            // console.log('checked');
-            selectedWeekdays[weekday] = {price:price};
-        } else {
-            // console.log('not checked');
-            delete selectedWeekdays[weekday];
-        }
-
         updateCart();
     });
 
     function updateCart(){
         var $orderPrice = $('.order_price_text');
         var days = ['', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота', 'Воскресенье'];
-        var weekdays = [], daysText = [], price = 0;
-        for(var i in selectedWeekdays) {
-            price += parseInt(selectedWeekdays[i].price);
-            weekdays.push(i);
-            daysText.push(days[i]);
-        }
+        var weekdays = [], daysText = [];
+        $('[data-day]').each(function() {
+            var weekday = $(this).data('day');
+            if($(this).is(':checked')) {
+                weekdays.push(weekday);
+                daysText.push(days[weekday]);
+            }
+        });
 
         if(weekdays.length){
             api.getPaymentAmount({ user: window.STORE.user.id, weekdays: weekdays })
@@ -133,6 +123,4 @@ $(document).ready(function () {
         link = link+'?'+decodeURIComponent($.param({weekdays: weekdays}, true));
         $('.but_btn_popup').attr('href', link);
     }
-
-    updateCart();
 });

From a8b8e0b83af7ead7bf148f3f4e41ec6516506dda Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Mon, 20 Aug 2018 21:44:29 +0500
Subject: [PATCH 05/13] lil-583

---
 .../migrations/0010_auto_20180820_0853.py     | 23 ++++++++
 apps/config/models.py                         |  4 +-
 apps/payment/migrations/0020_userbonus.py     | 28 ++++++++++
 apps/payment/models.py                        | 10 ++++
 .../migrations/0025_auto_20180820_0651.py     | 20 +++++++
 apps/user/models.py                           |  4 ++
 apps/user/templates/blocks/menu.html          |  9 ++++
 apps/user/templates/user/bonus-history.html   | 54 +++++++++++++++++++
 apps/user/templates/user/payment-history.html | 10 +---
 apps/user/views.py                            | 15 ++++++
 project/context_processors.py                 |  4 ++
 project/settings.py                           |  2 +
 project/templates/blocks/user_menu.html       | 31 ++++++-----
 project/urls.py                               |  3 +-
 14 files changed, 192 insertions(+), 25 deletions(-)
 create mode 100644 apps/config/migrations/0010_auto_20180820_0853.py
 create mode 100644 apps/payment/migrations/0020_userbonus.py
 create mode 100644 apps/user/migrations/0025_auto_20180820_0651.py
 create mode 100644 apps/user/templates/blocks/menu.html
 create mode 100644 apps/user/templates/user/bonus-history.html

diff --git a/apps/config/migrations/0010_auto_20180820_0853.py b/apps/config/migrations/0010_auto_20180820_0853.py
new file mode 100644
index 00000000..0b9af168
--- /dev/null
+++ b/apps/config/migrations/0010_auto_20180820_0853.py
@@ -0,0 +1,23 @@
+# Generated by Django 2.0.6 on 2018-08-20 08:53
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('config', '0009_auto_20180729_0503'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='config',
+            old_name='REFERRAL_DISCOUNT',
+            new_name='REFERRAL_BONUS',
+        ),
+        migrations.RenameField(
+            model_name='config',
+            old_name='REFERRER_CASHBACK',
+            new_name='REFERRER_BONUS',
+        ),
+    ]
diff --git a/apps/config/models.py b/apps/config/models.py
index 8baa4c86..7e7e833a 100644
--- a/apps/config/models.py
+++ b/apps/config/models.py
@@ -17,8 +17,8 @@ class Config(models.Model):
     SERVICE_DISCOUNT = models.IntegerField(default=1000)
     SCHOOL_LOGO_IMAGE = models.ImageField(null=True, blank=True)
     MAIN_PAGE_TOP_IMAGE = models.ImageField(null=True, blank=True)
-    REFERRER_CASHBACK = models.IntegerField(default=10)
-    REFERRAL_DISCOUNT = models.IntegerField(default=10)
+    REFERRER_BONUS = models.IntegerField(default=10)
+    REFERRAL_BONUS = models.IntegerField(default=10)
 
     def save(self, *args, **kwargs):
         self.pk = 1
diff --git a/apps/payment/migrations/0020_userbonus.py b/apps/payment/migrations/0020_userbonus.py
new file mode 100644
index 00000000..4b029f87
--- /dev/null
+++ b/apps/payment/migrations/0020_userbonus.py
@@ -0,0 +1,28 @@
+# Generated by Django 2.0.6 on 2018-08-20 06:51
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0025_auto_20180820_0651'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('payment', '0019_payment_roistat_visit'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='UserBonus',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('amount', models.DecimalField(decimal_places=2, default=0, editable=False, max_digits=8)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('payment', models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, to='payment.Payment')),
+                ('referral', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='user.Referral')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bonuses', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]
diff --git a/apps/payment/models.py b/apps/payment/models.py
index ec3936e2..9f8d4d31 100644
--- a/apps/payment/models.py
+++ b/apps/payment/models.py
@@ -11,6 +11,7 @@ from django.core.validators import RegexValidator
 from django.utils.timezone import now
 from django.conf import settings
 
+from apps.user.models import Referral
 from project.utils import weekday_in_date_range
 
 from apps.course.models import Course
@@ -247,3 +248,12 @@ class SchoolPayment(Payment):
     @property
     def date_end_humanize(self):
         return arrow.get(self.date_end, settings.TIME_ZONE).humanize(locale='ru')
+
+
+class UserBonus(models.Model):
+    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='bonuses')
+    amount = models.DecimalField(max_digits=8, decimal_places=2, default=0, editable=False)
+    payment = models.OneToOneField(Payment, on_delete=models.SET_NULL, null=True)
+    referral = models.ForeignKey(Referral, on_delete=models.SET_NULL, null=True)
+    created_at = models.DateTimeField(auto_now_add=True)
+
diff --git a/apps/user/migrations/0025_auto_20180820_0651.py b/apps/user/migrations/0025_auto_20180820_0651.py
new file mode 100644
index 00000000..ad53086e
--- /dev/null
+++ b/apps/user/migrations/0025_auto_20180820_0651.py
@@ -0,0 +1,20 @@
+# Generated by Django 2.0.6 on 2018-08-20 06:51
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0024_referral_payment'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='referral',
+            name='referral',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='referral', to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/apps/user/models.py b/apps/user/models.py
index 286c61c3..230d99d1 100644
--- a/apps/user/models.py
+++ b/apps/user/models.py
@@ -102,6 +102,10 @@ class User(AbstractUser):
         commission = aggregate.get('commission__sum') or 0
         return amount - commission
 
+    @property
+    def bonus(self):
+        return self.balances.aggregate(models.Sum('amount')).get('amount__sum') or 0
+
 
 @receiver(post_save, sender=User)
 def create_auth_token(sender, instance=None, created=False, **kwargs):
diff --git a/apps/user/templates/blocks/menu.html b/apps/user/templates/blocks/menu.html
new file mode 100644
index 00000000..35c4df2d
--- /dev/null
+++ b/apps/user/templates/blocks/menu.html
@@ -0,0 +1,9 @@
+<div class="section section_gray section_menu">
+  <div class="section__center center center_xs">
+    <div class="menu">
+      <a class="menu__link" href="{% url 'user-edit-profile' %}">Профиль</a>
+      <a class="menu__link" href="{% url 'user-edit-notifications' user.id %}">Уведомления</a>
+      <a class="menu__link active" href="{% url 'user-edit-payments' user.id %}">Платежи</a>
+    </div>
+  </div>
+</div>
diff --git a/apps/user/templates/user/bonus-history.html b/apps/user/templates/user/bonus-history.html
new file mode 100644
index 00000000..b4095470
--- /dev/null
+++ b/apps/user/templates/user/bonus-history.html
@@ -0,0 +1,54 @@
+{% extends "templates/lilcity/index.html" %}
+{% load static %}
+{% load rupluralize from plural %}
+
+{% block content %}
+{% include "../blocks/menu.html" %}
+
+<div class="section section_gray">
+  <div class="section__center center center_xs">
+    <div class="title title_sm">Бонусы</div>
+    <div class="text">У вас {{ request.user.bonus|rupluralize:"бонус,бонуса,бонусов" }}</div>
+    <div>
+      Вы можете пригласить своих друзей в наш сервис, за это вы получите {{ config.REFERRER_BONUS }} % от суммы
+      их первой покупки и они получат {{ config.REFERRAL_BONUS }} % от суммы покупки на свой бонусный счет <br>
+      Просто отправьте им эту ссылку, по которой они смогут зарегестрироваться:
+    </div>
+    <div class="text">{{ referrer_url }}</div>
+  </div>
+</div>
+
+<div class="section section_gray">
+  <div class="section__center center center_xs">
+    <div class="title title_sm">История бонусов</div>
+    <div class="transactions">
+      <div class="transactions__wrap">
+        {% for bonus in bonuses %}
+        <div class="transactions__row">
+          {% with payment=bonus.payment %}
+          {% if payment.course %}
+          <div class="transactions__cell">Курс. {{ payment.course.title }}</div>
+          {% else %}
+          <div class="transactions__cell">
+            Школа. {% if payment.date_start and payment.date_end %}{{ payment.date_start }} - {{ payment.date_end }}{% endif %}
+          </div>
+          {% endif %}
+          {% if payment.balance %}
+          <div class="transactions__cell">{{payment.balance.amount}}</div>
+          {% else %}
+          <div class="transactions__cell">{{payment.amount}}</div>
+          {% endif %}
+          {% if bonus.referral %}
+          <div class="transactions__cell"><a href="{% url 'user' id=bonus.referral.id %}">{{ bonus.referral.get_full_name }}</a></div>
+          {% endif %}
+          <div class="transactions__cell">{{ bonus.amount }}</div>
+          {% endwith %}
+        </div>
+        {% empty %}
+        Нет истории бонусов
+        {% endfor %}
+      </div>
+    </div>
+  </div>
+</div>
+{% endblock content %}
diff --git a/apps/user/templates/user/payment-history.html b/apps/user/templates/user/payment-history.html
index c27a3faa..75773722 100644
--- a/apps/user/templates/user/payment-history.html
+++ b/apps/user/templates/user/payment-history.html
@@ -1,13 +1,5 @@
 {% extends "templates/lilcity/index.html" %} {% load static %} {% block content %}
-<div class="section section_gray section_menu">
-  <div class="section__center center center_xs">
-    <div class="menu">
-      <a class="menu__link" href="{% url 'user-edit-profile' %}">Профиль</a>
-      <a class="menu__link" href="{% url 'user-edit-notifications' user.id %}">Уведомления</a>
-      <a class="menu__link active" href="{% url 'user-edit-payments' user.id %}">Платежи</a>
-    </div>
-  </div>
-</div>
+{% include "../blocks/menu.html" %}
 {% if not user.is_email_proved %}
 <div class="section section_confirm">
   <div class="section__center center center_xs">
diff --git a/apps/user/views.py b/apps/user/views.py
index 309fb0e0..ed9cc404 100644
--- a/apps/user/views.py
+++ b/apps/user/views.py
@@ -4,6 +4,7 @@ from uuid import uuid4
 from os.path import splitext
 from datetime import timedelta
 from paymentwall import Pingback
+import short_url
 
 from django.conf import settings
 from django.contrib.auth import login
@@ -297,3 +298,17 @@ class AuthorRequestView(FormView):
                 'facebook': self.request.user.facebook,
             }
         return super().get_context_data(**kwargs)
+
+
+@method_decorator(login_required, name='dispatch')
+class BonusHistoryView(TemplateView):
+    model = User
+    template_name = 'user/bonus-history.html'
+
+    def get(self, request, *args, **kwargs):
+        context = self.get_context_data(**kwargs)
+        context['bonuses'] = request.user.bonuses.all()
+        context['referrer_url'] = '%s%s?referrer=%s' % (
+            settings.MAIN_HOST, reverse('index'), short_url.encode(request.user.id)
+        )
+        return self.render_to_response(context)
diff --git a/project/context_processors.py b/project/context_processors.py
index 738e5b3c..ee33ef54 100644
--- a/project/context_processors.py
+++ b/project/context_processors.py
@@ -1,6 +1,7 @@
 from django.utils.timezone import now
 from paymentwall.pingback import Pingback
 from django.contrib.auth import get_user_model
+from django.conf import settings
 from apps.config.models import Config
 from apps.content.models import Baner
 from apps.payment.models import SchoolPayment
@@ -41,3 +42,6 @@ def referrer(request):
             referrer = None
     return {'referrer': referrer}
 
+
+def settings(request):
+    return {'settings': settings}
diff --git a/project/settings.py b/project/settings.py
index 1228211c..837df261 100644
--- a/project/settings.py
+++ b/project/settings.py
@@ -31,6 +31,7 @@ SECRET_KEY = os.getenv('SECRET_KEY', 'jelm*91lj(_-o20+6^a+bgv!4s6e_efry^#+f#=1ak
 DEBUG = os.getenv('DEBUG', False)
 
 ALLOWED_HOSTS = os.getenv('ALLOWED_HOSTS', '*').split(',')
+MAIN_HOST = 'lil.school'
 
 # Application definition
 
@@ -96,6 +97,7 @@ TEMPLATES = [
                 'project.context_processors.baner',
                 'project.context_processors.is_summer_school_purchased',
                 'project.context_processors.referrer',
+                'project.context_processors.settings',
                 'django.template.context_processors.debug',
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
diff --git a/project/templates/blocks/user_menu.html b/project/templates/blocks/user_menu.html
index 95e2b7d3..1e20df2d 100644
--- a/project/templates/blocks/user_menu.html
+++ b/project/templates/blocks/user_menu.html
@@ -1,4 +1,5 @@
 {% load static %} {% load thumbnail %}
+{% load rupluralize from plural %}
 {% if request.user.is_authenticated %}
 <div class="header__login">
   <a class="header__ava ava" href="{% if request.user_agent.is_touch_capable %}#{% else %}{% url 'user-profile' %}{% endif %}">
@@ -9,22 +10,26 @@
     {% endthumbnail %}
   </a>
   <div class="header__drop">
+    {# FIXME #}
     {% if request.user.role >= request.user.AUTHOR_ROLE %}
-    <a class="header__link header__link_border" href="{% url 'user-edit-payments' request.user.id %}">
-      {{ request.user.balance }} руб.
-    </a>
-    {% if request.user.auth_token %}
-    {% if request.user.role >= request.user.AUTHOR_ROLE %}
-    <a class="header__link header__link_green" href="{% url 'course_create' %}">
-      <div class="header__title">ДОБАВИТЬ КУРС</div>
-    </a>
+      <a class="header__link header__link_border" href="{% url 'user-edit-payments' request.user.id %}">
+        {{ request.user.balance }} руб.
+      </a>
     {% endif %}
-    {% if request.user.role >= request.user.TEACHER_ROLE %}
-    <a class="header__link" href="{% url 'school:lessons' %}">
-      <div class="header__title">УРОКИ ШКОЛЫ</div>
+    <a class="header__link header__link_border" href="{% url 'user-bonuses' %}">
+      {{ request.user.bonus|rupluralize:"бонус,бонуса,бонусов" }}
     </a>
-    {% endif %}
-    {% endif %}
+    {% if request.user.auth_token %}
+      {% if request.user.role >= request.user.AUTHOR_ROLE %}
+      <a class="header__link header__link_green" href="{% url 'course_create' %}">
+        <div class="header__title">ДОБАВИТЬ КУРС</div>
+      </a>
+      {% endif %}
+      {% if request.user.role >= request.user.TEACHER_ROLE %}
+      <a class="header__link" href="{% url 'school:lessons' %}">
+        <div class="header__title">УРОКИ ШКОЛЫ</div>
+      </a>
+      {% endif %}
     {% endif %}
     <a class="header__link" href="{% url 'user-profile' %}">
       <div class="header__title">ПРОФИЛЬ</div>
diff --git a/project/urls.py b/project/urls.py
index 9e6f5992..28237eb9 100644
--- a/project/urls.py
+++ b/project/urls.py
@@ -30,7 +30,7 @@ from apps.user.views import (
     ProfileEditView, NotificationEditView,
     PaymentHistoryView, resend_email_verify,
     SubscribeView, ProfileView,
-)
+    BonusHistoryView)
 from apps.payment.views import (
     CourseBuySuccessView, CourseBuyView,
     PaymentwallCallbackView, SchoolBuySuccessView,
@@ -72,6 +72,7 @@ urlpatterns = [
     path('user/<int:pk>/', UserView.as_view(), name='user'),
     path('user/<int:pk>/notifications', NotificationEditView.as_view(), name='user-edit-notifications'),
     path('user/<int:pk>/payments', PaymentHistoryView.as_view(), name='user-edit-payments'),
+    path('user/bonuses', BonusHistoryView.as_view(), name='user-bonuses'),
     path('user/resend-email-verify', resend_email_verify, name='resend-email-verify'),
     path('subscribe', SubscribeView.as_view(), name='subscribe'),
     path('subscribe/success', TemplateView.as_view(template_name='templates/lilcity/subscribe_success.html'), name='subscribe-success'),

From 65bbde0ede62e2963813fc0ba69d75eaf240a4c0 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Fri, 31 Aug 2018 14:41:12 +0500
Subject: [PATCH 06/13] lil-583

---
 api/v1/views.py                               |  1 +
 apps/payment/models.py                        | 29 +++++++++----------
 apps/user/models.py                           | 11 +++----
 .../blocks/{menu.html => profile-menu.html}   |  0
 apps/user/templates/user/bonus-history.html   | 16 ++++++----
 .../templates/user/notification-settings.html | 10 +------
 apps/user/templates/user/payment-history.html |  2 +-
 .../user/templates/user/profile-settings.html | 10 +------
 apps/user/views.py                            |  2 +-
 project/templates/blocks/lil_store_js.html    |  1 +
 project/templates/lilcity/main.html           | 10 -------
 web/src/js/modules/common.js                  |  4 +++
 web/src/js/modules/profile.js                 |  4 +++
 13 files changed, 44 insertions(+), 56 deletions(-)
 rename apps/user/templates/blocks/{menu.html => profile-menu.html} (100%)

diff --git a/api/v1/views.py b/api/v1/views.py
index 63dc2ea1..ca551de4 100644
--- a/api/v1/views.py
+++ b/api/v1/views.py
@@ -486,6 +486,7 @@ class PaymentViewSet(ExtendedModelViewSet):
 
         return Response(Payment.calc_amount(user=user, course=course, weekdays=weekdays))
 
+
 class ContestViewSet(ExtendedModelViewSet):
     queryset = Contest.objects.all()
     serializer_class = ContestCreateSerializer
diff --git a/apps/payment/models.py b/apps/payment/models.py
index 9f8d4d31..016646a7 100644
--- a/apps/payment/models.py
+++ b/apps/payment/models.py
@@ -11,7 +11,6 @@ from django.core.validators import RegexValidator
 from django.utils.timezone import now
 from django.conf import settings
 
-from apps.user.models import Referral
 from project.utils import weekday_in_date_range
 
 from apps.course.models import Course
@@ -122,11 +121,11 @@ class Payment(PolymorphicModel):
             add_days = school_payment.add_days
             date_start = school_payment.date_start
             date_end = school_payment.date_end
-        referral_discount = 0
-        referrer_cashback = 0
+        referral_bonus = 0
+        referrer_bonus = 0
         if hasattr(user, 'referral') and not user.referral.payment:
-            referral_discount = user.referral.discount
-            referrer_cashback = user.referral.referrer_cashback
+            referral_bonus = user.referral.bonus
+            referrer_bonus = user.referral.referrer_bonus
         discount = 0
         if course:
             price = course.price
@@ -155,14 +154,14 @@ class Payment(PolymorphicModel):
                 price = Decimal(aggregate.get('month_price__sum', 0))
             if price >= config.SERVICE_DISCOUNT_MIN_AMOUNT:
                 discount = config.SERVICE_DISCOUNT
-        referral_discount = (price - discount) * referral_discount / 100
-        referrer_cashback = (price - discount) * referrer_cashback / 100
-        amount = price - discount - referral_discount
+        amount = price - discount
+        referral_bonus = round(amount * referral_bonus / 100)
+        referrer_bonus = round(amount * referrer_bonus / 100)
         return {
             'price': price,
             'amount': amount,
-            'referral_discount': referral_discount,
-            'referrer_cashback': referrer_cashback,
+            'referral_bonus': referral_bonus,
+            'referrer_bonus': referrer_bonus,
             'discount': discount,
         }
 
@@ -209,11 +208,11 @@ class CoursePayment(Payment):
             author_balance.save()
         # Если юзер реферал и нет платежа, где применялась скидка
         if hasattr(self.user, 'referral') and not self.user.referral.payment:
-            # Отправляем кэшбэк
-            self.user.referral.cashback(amount_data.get('referrer_cashback'))
             # Платеж - как сигнал, что скидка применилась
             self.user.referral.payment = self
             self.user.referral.save()
+            # Отправляем кэшбэк
+            self.user.referral.send_bonuses(amount_data.get('referral_bonus'), amount_data.get('referrer_bonus'))
 
 
 class SchoolPayment(Payment):
@@ -239,11 +238,11 @@ class SchoolPayment(Payment):
         super().save(*args, **kwargs)
         # Если юзер реферал и нет платежа, где применялась скидка
         if not self.add_days and hasattr(self.user, 'referral') and not self.user.referral.payment:
-            # Отправляем кэшбэк
-            self.user.referral.cashback(amount_data.get('referrer_cashback'))
             # Платеж - как сигнал, что скидка применилась
             self.user.referral.payment = self
             self.user.referral.save()
+            # Отправляем кэшбэк
+            self.user.referral.send_bonuses(amount_data.get('referral_bonus'), amount_data.get('referrer_bonus'))
 
     @property
     def date_end_humanize(self):
@@ -254,6 +253,6 @@ class UserBonus(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='bonuses')
     amount = models.DecimalField(max_digits=8, decimal_places=2, default=0, editable=False)
     payment = models.OneToOneField(Payment, on_delete=models.SET_NULL, null=True)
-    referral = models.ForeignKey(Referral, on_delete=models.SET_NULL, null=True)
+    referral = models.ForeignKey('user.Referral', on_delete=models.SET_NULL, null=True)
     created_at = models.DateTimeField(auto_now_add=True)
 
diff --git a/apps/user/models.py b/apps/user/models.py
index 1c070240..c2fcf3cd 100644
--- a/apps/user/models.py
+++ b/apps/user/models.py
@@ -265,14 +265,15 @@ class EmailSubscription(models.Model):
 class Referral(models.Model):
     referral = models.OneToOneField(User, on_delete=models.CASCADE, related_name='referral')
     referrer = models.ForeignKey(User, on_delete=models.CASCADE, related_name='referrals')
-    discount = models.IntegerField()
-    referrer_cashback = models.IntegerField()
+    bonus = models.IntegerField()
+    referrer_bonus = models.IntegerField()
     payment = models.OneToOneField('payment.Payment', null=True, blank=True, on_delete=models.CASCADE)
 
     class Meta:
         verbose_name = 'Реферал'
         verbose_name_plural = 'Рефералы'
 
-    def cashback(self, amount):
-        # TODO
-        pass
+    def send_bonuses(self, referral_bonus, referrer_bonus):
+        from apps.payment.models import UserBonus
+        UserBonus.objects.create(user=self.referral, amount=referral_bonus, payment=self.payment, referral=self)
+        UserBonus.objects.create(user=self.referrer, amount=referrer_bonus, payment=self.payment, referral=self)
diff --git a/apps/user/templates/blocks/menu.html b/apps/user/templates/blocks/profile-menu.html
similarity index 100%
rename from apps/user/templates/blocks/menu.html
rename to apps/user/templates/blocks/profile-menu.html
diff --git a/apps/user/templates/user/bonus-history.html b/apps/user/templates/user/bonus-history.html
index b4095470..72be8b05 100644
--- a/apps/user/templates/user/bonus-history.html
+++ b/apps/user/templates/user/bonus-history.html
@@ -3,18 +3,22 @@
 {% load rupluralize from plural %}
 
 {% block content %}
-{% include "../blocks/menu.html" %}
+{% include "../blocks/profile-menu.html" %}
 
-<div class="section section_gray">
+<div class="section section_gray" style="padding-bottom: 0;">
   <div class="section__center center center_xs">
     <div class="title title_sm">Бонусы</div>
     <div class="text">У вас {{ request.user.bonus|rupluralize:"бонус,бонуса,бонусов" }}</div>
     <div>
-      Вы можете пригласить своих друзей в наш сервис, за это вы получите {{ config.REFERRER_BONUS }} % от суммы
-      их первой покупки и они получат {{ config.REFERRAL_BONUS }} % от суммы покупки на свой бонусный счет <br>
-      Просто отправьте им эту ссылку, по которой они смогут зарегестрироваться:
+      Вы можете пригласить своих друзей в наш сервис, за это вы получите {{ config.REFERRER_BONUS }}% от суммы
+      их первой покупки и они получат {{ config.REFERRAL_BONUS }}% от суммы первой покупки на свой бонусный счет <br>
+      Просто отправьте им эту ссылку, по которой они смогут зарегистрироваться:
+    </div>
+    <div class="form__field field" style="margin-bottom: 0;">
+      <div class="field__wrap">
+        <input id="referrer-url" class="field__input" type="text" value="{{ referrer_url }}" readonly="readonly">
+      </div>
     </div>
-    <div class="text">{{ referrer_url }}</div>
   </div>
 </div>
 
diff --git a/apps/user/templates/user/notification-settings.html b/apps/user/templates/user/notification-settings.html
index 40c679e5..725922bd 100644
--- a/apps/user/templates/user/notification-settings.html
+++ b/apps/user/templates/user/notification-settings.html
@@ -1,13 +1,5 @@
 {% extends "templates/lilcity/index.html" %} {% load static %} {% block content %}
-<div class="section section_gray section_menu">
-  <div class="section__center center center_xs">
-    <div class="menu">
-      <a class="menu__link" href="{% url 'user-edit-profile' %}">Профиль</a>
-      <a class="menu__link active" href="{% url 'user-edit-notifications' user.id %}">Уведомления</a>
-      <a class="menu__link" href="{% url 'user-edit-payments' user.id %}">Платежи</a>
-    </div>
-  </div>
-</div>
+{% include "../blocks/profile-menu.html" %}
 {% if not user.is_email_proved %}
 <div class="section section_confirm">
   <div class="section__center center center_xs">
diff --git a/apps/user/templates/user/payment-history.html b/apps/user/templates/user/payment-history.html
index 75773722..798ffb2b 100644
--- a/apps/user/templates/user/payment-history.html
+++ b/apps/user/templates/user/payment-history.html
@@ -1,5 +1,5 @@
 {% extends "templates/lilcity/index.html" %} {% load static %} {% block content %}
-{% include "../blocks/menu.html" %}
+{% include "../blocks/profile-menu.html" %}
 {% if not user.is_email_proved %}
 <div class="section section_confirm">
   <div class="section__center center center_xs">
diff --git a/apps/user/templates/user/profile-settings.html b/apps/user/templates/user/profile-settings.html
index 90470b96..1d0619cf 100644
--- a/apps/user/templates/user/profile-settings.html
+++ b/apps/user/templates/user/profile-settings.html
@@ -1,13 +1,5 @@
 {% extends "templates/lilcity/index.html" %} {% load static %} {% load thumbnail %} {% block content %}
-<div class="section section_gray section_menu">
-  <div class="section__center center center_xs">
-    <div class="menu">
-      <a class="menu__link active" href="{% url 'user-edit-profile' %}">Профиль</a>
-      <a class="menu__link" href="{% url 'user-edit-notifications' user.id %}">Уведомления</a>
-      <a class="menu__link" href="{% url 'user-edit-payments' user.id %}">Платежи</a>
-    </div>
-  </div>
-</div>
+{% include "../blocks/profile-menu.html" %}
 {% if not user.is_email_proved %}
 <div class="section section_confirm">
   <div class="section__center center center_xs">
diff --git a/apps/user/views.py b/apps/user/views.py
index d7470fee..e26cb579 100644
--- a/apps/user/views.py
+++ b/apps/user/views.py
@@ -314,6 +314,6 @@ class BonusHistoryView(TemplateView):
         context = self.get_context_data(**kwargs)
         context['bonuses'] = request.user.bonuses.all()
         context['referrer_url'] = '%s%s?referrer=%s' % (
-            settings.MAIN_HOST, reverse('index'), short_url.encode(request.user.id)
+            settings.MAIN_HOST, reverse('index'), short_url.encode_url(request.user.id)
         )
         return self.render_to_response(context)
diff --git a/project/templates/blocks/lil_store_js.html b/project/templates/blocks/lil_store_js.html
index 32da4573..02faca8f 100644
--- a/project/templates/blocks/lil_store_js.html
+++ b/project/templates/blocks/lil_store_js.html
@@ -1,6 +1,7 @@
 {% load static %}
 <script>
   window.LIL_STORE = {
+    isRegistration: {{ is_registration|yesno:"true,false" }},
     staticUrl: '{% static "" %}',
     accessToken: '{{ request.user.auth_token }}',
     user: {
diff --git a/project/templates/lilcity/main.html b/project/templates/lilcity/main.html
index 09397932..4227d9ec 100644
--- a/project/templates/lilcity/main.html
+++ b/project/templates/lilcity/main.html
@@ -13,13 +13,3 @@
   {% include "templates/blocks/teachers.html" %}
   {% include "templates/blocks/partners.html" %}
 {% endblock content %}
-
-{% block body_js %}
-  {% if is_registration %}
-    <script>
-      $(document).ready(function () {
-        $('.js-header-enter').click();
-      });
-    </script>
-  {% endif %}
-{% endblock body_js %}
diff --git a/web/src/js/modules/common.js b/web/src/js/modules/common.js
index 1b22c165..d4b6b4b8 100644
--- a/web/src/js/modules/common.js
+++ b/web/src/js/modules/common.js
@@ -40,6 +40,10 @@ $(document).ready(function () {
                 $('.banner').slideUp();
             })
     });
+
+    if(window.LIL_STORE.isRegistration && ! window.LIL_STORE.user.id){
+        $('.js-header-enter').click();
+    }
 });
 
 function updateHeader() {
diff --git a/web/src/js/modules/profile.js b/web/src/js/modules/profile.js
index da9a229e..585c35cb 100644
--- a/web/src/js/modules/profile.js
+++ b/web/src/js/modules/profile.js
@@ -11,4 +11,8 @@ $(document).ready(function () {
     $(`[data-gender=${currentGender}]`).addClass('active');
     genderInput.val(currentGender)
   });
+
+  $('#referrer-url').select().click(function(){
+    $(this).select();
+  });
 })

From b3c499481cdee482bc75d7c7c5f393acecd673cf Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Tue, 4 Sep 2018 03:35:49 +0500
Subject: [PATCH 07/13] lil-583

---
 api/v1/serializers/config.py                  |  8 +-
 api/v1/views.py                               |  2 +-
 apps/auth/views.py                            |  8 +-
 apps/config/models.py                         |  4 +-
 apps/payment/migrations/0020_userbonus.py     | 28 -------
 apps/payment/models.py                        | 77 ++++++++-----------
 apps/user/migrations/0023_referral.py         | 29 -------
 apps/user/migrations/0024_referral_payment.py | 20 -----
 .../migrations/0025_auto_20180820_0651.py     | 20 -----
 apps/user/models.py                           |  8 +-
 apps/user/templates/user/bonus-history.html   |  6 +-
 apps/user/views.py                            |  7 +-
 project/templates/blocks/lil_store_js.html    |  4 +-
 project/views.py                              |  2 +-
 web/src/js/modules/api.js                     |  2 +-
 web/src/js/modules/common.js                  |  4 +-
 web/src/js/modules/popup.js                   |  2 +-
 17 files changed, 65 insertions(+), 166 deletions(-)
 delete mode 100644 apps/payment/migrations/0020_userbonus.py
 delete mode 100644 apps/user/migrations/0023_referral.py
 delete mode 100644 apps/user/migrations/0024_referral_payment.py
 delete mode 100644 apps/user/migrations/0025_auto_20180820_0651.py

diff --git a/api/v1/serializers/config.py b/api/v1/serializers/config.py
index 46cb40b2..e494f861 100644
--- a/api/v1/serializers/config.py
+++ b/api/v1/serializers/config.py
@@ -20,8 +20,8 @@ class ConfigSerializer(serializers.ModelSerializer):
     MAIN_PAGE_TOP_IMAGE = serializers.SerializerMethodField()
     # SCHOOL_LOGO_IMAGE = serializers.ImageField(required=False, allow_null=True)
     # MAIN_PAGE_TOP_IMAGE = serializers.ImageField(required=False, allow_null=True)
-    REFERRER_CASHBACK = serializers.IntegerField()
-    REFERRAL_DISCOUNT = serializers.IntegerField()
+    REFERRER_BONUS = serializers.IntegerField()
+    REFERRAL_BONUS = serializers.IntegerField()
 
     class Meta:
         model = Config
@@ -39,8 +39,8 @@ class ConfigSerializer(serializers.ModelSerializer):
             'INSTAGRAM_PROFILE_URL',
             'SCHOOL_LOGO_IMAGE',
             'MAIN_PAGE_TOP_IMAGE',
-            'REFERRER_CASHBACK',
-            'REFERRAL_DISCOUNT',
+            'REFERRER_BONUS',
+            'REFERRAL_BONUS',
         )
 
     def get_SCHOOL_LOGO_IMAGE(self, config):
diff --git a/api/v1/views.py b/api/v1/views.py
index ca551de4..7620244b 100644
--- a/api/v1/views.py
+++ b/api/v1/views.py
@@ -476,7 +476,7 @@ class PaymentViewSet(ExtendedModelViewSet):
 
         return queryset.filter(status__isnull=False).order_by('-created_at')
 
-    @action(methods=['get'], detail=False, url_path='calc-amount')
+    @action(methods=['get'], detail=False, url_path='calc-amount', authentication_classes=[], permission_classes=[])
     def calc_amount(self, request, pk=None):
         user = request.query_params.get('user')
         course = request.query_params.get('course')
diff --git a/apps/auth/views.py b/apps/auth/views.py
index f83a9269..c9ae8dfc 100644
--- a/apps/auth/views.py
+++ b/apps/auth/views.py
@@ -56,8 +56,8 @@ class LearnerRegistrationView(FormView):
         user.save()
         referrer = self.request.session.get('referrer')
         if referrer:
-            Referral.objects.create(referral=user, referrer_id=referrer, discount=config.REFERRAL_DISCOUNT,
-                                    referrer_cashback=config.REFERRER_CASHBACK)
+            Referral.objects.create(referral=user, referrer_id=referrer, bonus=config.REFERRAL_BONUS,
+                                    referrer_bonus=config.REFERRER_BONUS)
             # TODO: email admins? мб реферера уже нет, старая ссылка
             self.request.session['referrer'] = None
         login(self.request, user)
@@ -198,8 +198,8 @@ class FacebookLoginOrRegistration(View):
                 referrer = self.request.session.get('referrer')
                 if referrer:
                     config = Config.load()
-                    Referral.objects.create(referral=user, referrer_id=referrer, discount=config.REFERRAL_DISCOUNT,
-                                            referrer_cashback=config.REFERRER_CASHBACK)
+                    Referral.objects.create(referral=user, referrer_id=referrer, bonus=config.REFERRAL_BONUS,
+                                    referrer_bonus=config.REFERRER_BONUS)
                     # TODO: email admins? мб реферера уже нет, старая ссылка
                     self.request.session['referrer'] = None
 
diff --git a/apps/config/models.py b/apps/config/models.py
index 7e7e833a..498dd00f 100644
--- a/apps/config/models.py
+++ b/apps/config/models.py
@@ -47,7 +47,7 @@ class Config(models.Model):
                 'SERVICE_DISCOUNT': '',
                 'SCHOOL_LOGO_IMAGE': '',
                 'MAIN_PAGE_TOP_IMAGE': '',
-                'REFERRER_CASHBACK': '',
-                'REFERRAL_DISCOUNT': '',
+                'REFERRER_BONUS': '',
+                'REFERRAL_BONUS': '',
             }
         return obj
diff --git a/apps/payment/migrations/0020_userbonus.py b/apps/payment/migrations/0020_userbonus.py
deleted file mode 100644
index 4b029f87..00000000
--- a/apps/payment/migrations/0020_userbonus.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated by Django 2.0.6 on 2018-08-20 06:51
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('user', '0025_auto_20180820_0651'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('payment', '0019_payment_roistat_visit'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='UserBonus',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('amount', models.DecimalField(decimal_places=2, default=0, editable=False, max_digits=8)),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('payment', models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, to='payment.Payment')),
-                ('referral', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='user.Referral')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bonuses', to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-    ]
diff --git a/apps/payment/models.py b/apps/payment/models.py
index 016646a7..81acf8e7 100644
--- a/apps/payment/models.py
+++ b/apps/payment/models.py
@@ -110,17 +110,17 @@ class Payment(PolymorphicModel):
         ordering = ('created_at',)
 
     @classmethod
-    def calc_amount(cls, course_payment=None, school_payment=None, user=None, course=None, weekdays=None,
+    def calc_amount(cls, payment=None, user=None, course=None, weekdays=None,
                     add_days=False, date_start=None, date_end=None):
-        if course_payment:
-            course = course_payment.course
-            user = course_payment.user
-        if school_payment:
-            user = school_payment.user
-            weekdays = school_payment.weekdays
-            add_days = school_payment.add_days
-            date_start = school_payment.date_start
-            date_end = school_payment.date_end
+        if isinstance(payment, CoursePayment):
+            course = payment.course
+            user = payment.user
+        if isinstance(payment, SchoolPayment):
+            user = payment.user
+            weekdays = payment.weekdays
+            add_days = payment.add_days
+            date_start = payment.date_start
+            date_end = payment.date_end
         referral_bonus = 0
         referrer_bonus = 0
         if hasattr(user, 'referral') and not user.referral.payment:
@@ -184,30 +184,25 @@ class Payment(PolymorphicModel):
             Pingback.PINGBACK_TYPE_RISK_REVIEWED_DECLINED,
         ]
 
-
-class CoursePayment(Payment):
-    course = models.ForeignKey(Course, on_delete=models.CASCADE, verbose_name='Курс', related_name='payments')
-
-    class Meta:
-        verbose_name = 'Платеж за курс'
-        verbose_name_plural = 'Платежи за курсы'
-
     def save(self, *args, **kwargs):
-        amount_data = Payment.calc_amount(course_payment=self)
+        amount_data = Payment.calc_amount(payment=self)
         self.amount = amount_data.get('amount')
         super().save(*args, **kwargs)
-        author_balance = getattr(self, 'authorbalance', None)
-        if not author_balance:
-            AuthorBalance.objects.create(
-                author=self.course.author,
-                amount=self.amount,
-                payment=self,
-            )
-        else:
-            author_balance.amount = self.amount
-            author_balance.save()
+        if isinstance(self, CoursePayment):
+            author_balance = getattr(self, 'authorbalance', None)
+            if not author_balance:
+                AuthorBalance.objects.create(
+                    author=self.course.author,
+                    amount=self.amount,
+                    payment=self,
+                )
+            else:
+                author_balance.amount = self.amount
+                author_balance.save()
         # Если юзер реферал и нет платежа, где применялась скидка
-        if hasattr(self.user, 'referral') and not self.user.referral.payment:
+        if hasattr(self.user, 'referral') and not self.user.referral.payment\
+            and self.status in [Pingback.PINGBACK_TYPE_REGULAR, Pingback.PINGBACK_TYPE_GOODWILL,
+                            Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,]:
             # Платеж - как сигнал, что скидка применилась
             self.user.referral.payment = self
             self.user.referral.save()
@@ -215,6 +210,14 @@ class CoursePayment(Payment):
             self.user.referral.send_bonuses(amount_data.get('referral_bonus'), amount_data.get('referrer_bonus'))
 
 
+class CoursePayment(Payment):
+    course = models.ForeignKey(Course, on_delete=models.CASCADE, verbose_name='Курс', related_name='payments')
+
+    class Meta:
+        verbose_name = 'Платеж за курс'
+        verbose_name_plural = 'Платежи за курсы'
+
+
 class SchoolPayment(Payment):
     weekdays = ArrayField(models.IntegerField(), size=7, verbose_name='Дни недели')
     add_days = models.BooleanField('Докупленные дни', default=False)
@@ -232,18 +235,6 @@ class SchoolPayment(Payment):
         ])
         return days
 
-    def save(self, *args, **kwargs):
-        amount_data = Payment.calc_amount(school_payment=self)
-        self.amount = amount_data.get('amount')
-        super().save(*args, **kwargs)
-        # Если юзер реферал и нет платежа, где применялась скидка
-        if not self.add_days and hasattr(self.user, 'referral') and not self.user.referral.payment:
-            # Платеж - как сигнал, что скидка применилась
-            self.user.referral.payment = self
-            self.user.referral.save()
-            # Отправляем кэшбэк
-            self.user.referral.send_bonuses(amount_data.get('referral_bonus'), amount_data.get('referrer_bonus'))
-
     @property
     def date_end_humanize(self):
         return arrow.get(self.date_end, settings.TIME_ZONE).humanize(locale='ru')
@@ -252,7 +243,7 @@ class SchoolPayment(Payment):
 class UserBonus(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='bonuses')
     amount = models.DecimalField(max_digits=8, decimal_places=2, default=0, editable=False)
-    payment = models.OneToOneField(Payment, on_delete=models.SET_NULL, null=True)
+    payment = models.ForeignKey(Payment, on_delete=models.SET_NULL, null=True)
     referral = models.ForeignKey('user.Referral', on_delete=models.SET_NULL, null=True)
     created_at = models.DateTimeField(auto_now_add=True)
 
diff --git a/apps/user/migrations/0023_referral.py b/apps/user/migrations/0023_referral.py
deleted file mode 100644
index 2edf4621..00000000
--- a/apps/user/migrations/0023_referral.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated by Django 2.0.6 on 2018-07-29 05:24
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('user', '0022_user_instagram_hashtag'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Referral',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('discount', models.IntegerField()),
-                ('referrer_cashback', models.IntegerField()),
-                ('referral', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-                ('referrer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='referrals', to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'verbose_name': 'Реферал',
-                'verbose_name_plural': 'Рефералы',
-            },
-        ),
-    ]
diff --git a/apps/user/migrations/0024_referral_payment.py b/apps/user/migrations/0024_referral_payment.py
deleted file mode 100644
index f68f7632..00000000
--- a/apps/user/migrations/0024_referral_payment.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 2.0.6 on 2018-07-30 18:24
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('payment', '0019_payment_roistat_visit'),
-        ('user', '0023_referral'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='referral',
-            name='payment',
-            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='payment.Payment'),
-        ),
-    ]
diff --git a/apps/user/migrations/0025_auto_20180820_0651.py b/apps/user/migrations/0025_auto_20180820_0651.py
deleted file mode 100644
index ad53086e..00000000
--- a/apps/user/migrations/0025_auto_20180820_0651.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 2.0.6 on 2018-08-20 06:51
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('user', '0024_referral_payment'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='referral',
-            name='referral',
-            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='referral', to=settings.AUTH_USER_MODEL),
-        ),
-    ]
diff --git a/apps/user/models.py b/apps/user/models.py
index c2fcf3cd..887167ad 100644
--- a/apps/user/models.py
+++ b/apps/user/models.py
@@ -1,4 +1,6 @@
 from json import dumps
+
+from django.utils.functional import cached_property
 from rest_framework.authtoken.models import Token
 from phonenumber_field.modelfields import PhoneNumberField
 
@@ -89,7 +91,7 @@ class User(AbstractUser):
         user_data = dumps(user_data, ensure_ascii=False)
         return user_data
 
-    @property
+    @cached_property
     def balance(self):
         aggregate = self.balances.filter(
                 type=0,
@@ -103,9 +105,9 @@ class User(AbstractUser):
         commission = aggregate.get('commission__sum') or 0
         return amount - commission
 
-    @property
+    @cached_property
     def bonus(self):
-        return self.balances.aggregate(models.Sum('amount')).get('amount__sum') or 0
+        return int(self.bonuses.aggregate(models.Sum('amount')).get('amount__sum')) or 0
 
 
 @receiver(post_save, sender=User)
diff --git a/apps/user/templates/user/bonus-history.html b/apps/user/templates/user/bonus-history.html
index 72be8b05..43e45fbd 100644
--- a/apps/user/templates/user/bonus-history.html
+++ b/apps/user/templates/user/bonus-history.html
@@ -40,12 +40,12 @@
           {% if payment.balance %}
           <div class="transactions__cell">{{payment.balance.amount}}</div>
           {% else %}
-          <div class="transactions__cell">{{payment.amount}}</div>
+          <div class="transactions__cell">{{payment.amount|floatformat }}</div>
           {% endif %}
           {% if bonus.referral %}
-          <div class="transactions__cell"><a href="{% url 'user' id=bonus.referral.id %}">{{ bonus.referral.get_full_name }}</a></div>
+          <div class="transactions__cell"><a href="{% url 'user' pk=bonus.referral.referral.id %}">{{ bonus.referral.referral.get_full_name }}</a></div>
           {% endif %}
-          <div class="transactions__cell">{{ bonus.amount }}</div>
+          <div class="transactions__cell">{{ bonus.amount|floatformat }}</div>
           {% endwith %}
         </div>
         {% empty %}
diff --git a/apps/user/views.py b/apps/user/views.py
index df52c724..7ff653b5 100644
--- a/apps/user/views.py
+++ b/apps/user/views.py
@@ -5,6 +5,7 @@ from os.path import splitext
 from datetime import timedelta
 from paymentwall import Pingback
 import short_url
+from urllib.parse import urljoin
 
 from django.conf import settings
 from django.contrib.auth import login
@@ -313,7 +314,7 @@ class BonusHistoryView(TemplateView):
     def get(self, request, *args, **kwargs):
         context = self.get_context_data(**kwargs)
         context['bonuses'] = request.user.bonuses.all()
-        context['referrer_url'] = '%s%s?referrer=%s' % (
-            settings.MAIN_HOST, reverse('index'), short_url.encode_url(request.user.id)
-        )
+        context['referrer_url'] = urljoin(settings.MAIN_HOST, '%s?referrer=%s' % (
+            reverse('index'), short_url.encode_url(request.user.id)
+        ))
         return self.render_to_response(context)
diff --git a/project/templates/blocks/lil_store_js.html b/project/templates/blocks/lil_store_js.html
index ac729e61..04f69e59 100644
--- a/project/templates/blocks/lil_store_js.html
+++ b/project/templates/blocks/lil_store_js.html
@@ -1,12 +1,14 @@
 {% load static %}
 <script>
   window.LIL_STORE = {
-    isRegistration: {{ is_registration|yesno:"true,false" }},
     staticUrl: '{% static "" %}',
     accessToken: '{{ request.user.auth_token }}',
     isMobile: {{ request.user_agent.is_mobile|yesno:"true,false" }},
     user: {
       id: '{{ request.user.id|default:'' }}',
+    },
+    flags: {
+      isReferralRegistration: '{{ is_referral_registration|yesno:"true,false" }}',
     }
   };
 </script>
diff --git a/project/views.py b/project/views.py
index abf81bcc..bc00f173 100644
--- a/project/views.py
+++ b/project/views.py
@@ -82,7 +82,7 @@ class IndexView(TemplateView):
             referrer = None
 
         context.update({
-            'is_registration': bool(referrer),
+            'is_referral_registration': bool(referrer),
             'online': online,
             'online_coming_soon': online_coming_soon,
             'school_schedule': school_schedule,
diff --git a/web/src/js/modules/api.js b/web/src/js/modules/api.js
index d27c2f8a..63c8412a 100644
--- a/web/src/js/modules/api.js
+++ b/web/src/js/modules/api.js
@@ -506,7 +506,7 @@ export const api = {
         return api.get('/api/v1/payments/calc-amount', {
             params: params,
             headers: {
-                'Authorization': `Token ${window.STORE.accessToken}`,
+                'Authorization': `Token ${window.LIL_STORE.accessToken}`,
             }
         });
     }
diff --git a/web/src/js/modules/common.js b/web/src/js/modules/common.js
index d4b6b4b8..af1601ec 100644
--- a/web/src/js/modules/common.js
+++ b/web/src/js/modules/common.js
@@ -41,7 +41,7 @@ $(document).ready(function () {
             })
     });
 
-    if(window.LIL_STORE.isRegistration && ! window.LIL_STORE.user.id){
+    if(window.LIL_STORE.flags.isReferralRegistration && ! window.LIL_STORE.user.id){
         $('.js-header-enter').click();
     }
 });
@@ -71,4 +71,4 @@ function updateHeader() {
             headerElement.css('top', '');
         }
     }
-}
\ No newline at end of file
+}
diff --git a/web/src/js/modules/popup.js b/web/src/js/modules/popup.js
index 73335575..25295f7b 100644
--- a/web/src/js/modules/popup.js
+++ b/web/src/js/modules/popup.js
@@ -158,7 +158,7 @@ $(document).ready(function () {
         });
 
         if(weekdays.length){
-            api.getPaymentAmount({ user: window.STORE.user.id, weekdays: weekdays })
+            api.getPaymentAmount({ user: window.LIL_STORE.user.id, weekdays: weekdays })
             .then((response) => {
                 var text = '';
                 if(response.data.price != response.data.amount) {

From 195a9e0c8481be468e7aaf5f8f0bf3aa6383a6b6 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Wed, 5 Sep 2018 16:07:10 +0500
Subject: [PATCH 08/13] lil-583

---
 apps/payment/views.py                         |  7 +++---
 apps/user/templates/blocks/profile-menu.html  | 11 ++++++---
 apps/user/templates/user/bonus-history.html   |  8 ++-----
 .../templates/user/notification-settings.html |  2 +-
 apps/user/templates/user/payment-history.html |  2 +-
 .../user/templates/user/profile-settings.html |  2 +-
 apps/user/views.py                            |  4 ++--
 project/templates/blocks/popup_buy.html       | 12 ++++++++--
 project/templates/blocks/user_menu.html       |  2 +-
 project/urls.py                               |  4 ++--
 web/src/js/modules/popup.js                   | 23 +++++++++++++++----
 11 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/apps/payment/views.py b/apps/payment/views.py
index 846b5a4a..8b1c2544 100644
--- a/apps/payment/views.py
+++ b/apps/payment/views.py
@@ -98,16 +98,17 @@ class SchoolBuyView(TemplateView):
         host = urlsplit(self.request.META.get('HTTP_REFERER'))
         host = str(host[0]) + '://' + str(host[1])
         weekdays = set(request.GET.getlist('weekdays', []))
+        use_bonuses = request.GET.get('use_bonuses')
         add_days = 'add_days' in request.GET
         roistat_visit = request.COOKIES.get('roistat_visit', None)
         if not weekdays:
             messages.error(request, 'Выберите несколько дней недели.')
-            return redirect('school:summer-school')
+            return redirect('school:school')
         try:
             weekdays = [int(weekday) for weekday in weekdays]
         except ValueError:
             messages.error(request, 'Ошибка выбора дней недели.')
-            return redirect('school:summer-school')
+            return redirect('school:school')
         if add_days:
             _school_payment = SchoolPayment.objects.filter(
                 user=request.user,
@@ -128,7 +129,7 @@ class SchoolBuyView(TemplateView):
             )
             if school_payment.amount <= 0:
                 messages.error(request, 'Выбранные дни отсутствуют в оставшемся периоде подписки')
-                return redirect(reverse_lazy('school:summer-school'))
+                return redirect(reverse_lazy('school:school'))
         else:
             school_payment = SchoolPayment.objects.create(
                 user=request.user,
diff --git a/apps/user/templates/blocks/profile-menu.html b/apps/user/templates/blocks/profile-menu.html
index 35c4df2d..9db83d44 100644
--- a/apps/user/templates/blocks/profile-menu.html
+++ b/apps/user/templates/blocks/profile-menu.html
@@ -1,9 +1,14 @@
 <div class="section section_gray section_menu">
   <div class="section__center center center_xs">
     <div class="menu">
-      <a class="menu__link" href="{% url 'user-edit-profile' %}">Профиль</a>
-      <a class="menu__link" href="{% url 'user-edit-notifications' user.id %}">Уведомления</a>
-      <a class="menu__link active" href="{% url 'user-edit-payments' user.id %}">Платежи</a>
+      <a class="menu__link {% if active == 'profile' %}active{% endif %}"
+         href="{% url 'user-edit-profile' %}">Профиль</a>
+      <a class="menu__link {% if active == 'notifications' %}active{% endif %}"
+         href="{% url 'user-edit-notifications' %}">Уведомления</a>
+      <a class="menu__link {% if active == 'payments' %}active{% endif %}"
+         href="{% url 'user-edit-payments' %}">Платежи</a>
+      <a class="menu__link {% if active == 'bonuses' %}active{% endif %}"
+         href="{% url 'user-bonuses' %}">Бонусы</a>
     </div>
   </div>
 </div>
diff --git a/apps/user/templates/user/bonus-history.html b/apps/user/templates/user/bonus-history.html
index 43e45fbd..b5461970 100644
--- a/apps/user/templates/user/bonus-history.html
+++ b/apps/user/templates/user/bonus-history.html
@@ -3,7 +3,7 @@
 {% load rupluralize from plural %}
 
 {% block content %}
-{% include "../blocks/profile-menu.html" %}
+{% include "../blocks/profile-menu.html" with active="bonuses" %}
 
 <div class="section section_gray" style="padding-bottom: 0;">
   <div class="section__center center center_xs">
@@ -37,11 +37,7 @@
             Школа. {% if payment.date_start and payment.date_end %}{{ payment.date_start }} - {{ payment.date_end }}{% endif %}
           </div>
           {% endif %}
-          {% if payment.balance %}
-          <div class="transactions__cell">{{payment.balance.amount}}</div>
-          {% else %}
-          <div class="transactions__cell">{{payment.amount|floatformat }}</div>
-          {% endif %}
+          <div class="transactions__cell">{{payment.amount }}</div>
           {% if bonus.referral %}
           <div class="transactions__cell"><a href="{% url 'user' pk=bonus.referral.referral.id %}">{{ bonus.referral.referral.get_full_name }}</a></div>
           {% endif %}
diff --git a/apps/user/templates/user/notification-settings.html b/apps/user/templates/user/notification-settings.html
index 725922bd..b73bb35d 100644
--- a/apps/user/templates/user/notification-settings.html
+++ b/apps/user/templates/user/notification-settings.html
@@ -1,5 +1,5 @@
 {% extends "templates/lilcity/index.html" %} {% load static %} {% block content %}
-{% include "../blocks/profile-menu.html" %}
+{% include "../blocks/profile-menu.html" with active="notifications" %}
 {% if not user.is_email_proved %}
 <div class="section section_confirm">
   <div class="section__center center center_xs">
diff --git a/apps/user/templates/user/payment-history.html b/apps/user/templates/user/payment-history.html
index 798ffb2b..8b7d332c 100644
--- a/apps/user/templates/user/payment-history.html
+++ b/apps/user/templates/user/payment-history.html
@@ -1,5 +1,5 @@
 {% extends "templates/lilcity/index.html" %} {% load static %} {% block content %}
-{% include "../blocks/profile-menu.html" %}
+{% include "../blocks/profile-menu.html" with active="payments" %}
 {% if not user.is_email_proved %}
 <div class="section section_confirm">
   <div class="section__center center center_xs">
diff --git a/apps/user/templates/user/profile-settings.html b/apps/user/templates/user/profile-settings.html
index 1d0619cf..08e56da8 100644
--- a/apps/user/templates/user/profile-settings.html
+++ b/apps/user/templates/user/profile-settings.html
@@ -1,5 +1,5 @@
 {% extends "templates/lilcity/index.html" %} {% load static %} {% load thumbnail %} {% block content %}
-{% include "../blocks/profile-menu.html" %}
+{% include "../blocks/profile-menu.html" with active="profile" %}
 {% if not user.is_email_proved %}
 <div class="section section_confirm">
   <div class="section__center center center_xs">
diff --git a/apps/user/views.py b/apps/user/views.py
index 7ff653b5..ee027821 100644
--- a/apps/user/views.py
+++ b/apps/user/views.py
@@ -158,7 +158,7 @@ class NotificationEditView(TemplateView):
         request.user.email_subscription.categories.set(
             SubscriptionCategory.objects.filter(id__in=categories)
         )
-        return redirect('user-edit-notifications', request.user.id)
+        return redirect('user-edit-notifications')
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -195,7 +195,7 @@ class PaymentHistoryView(FormView):
             return self.form_invalid(form)
 
     def get_success_url(self):
-        success_url = reverse_lazy('user-edit-payments', args=[self.request.user.id])
+        success_url = reverse_lazy('user-edit-payments')
         return success_url
 
 
diff --git a/project/templates/blocks/popup_buy.html b/project/templates/blocks/popup_buy.html
index 0321b2ea..cf21ff64 100644
--- a/project/templates/blocks/popup_buy.html
+++ b/project/templates/blocks/popup_buy.html
@@ -88,11 +88,19 @@
                 </div>
                 <div class="order__info">
                   <div class="order__label">ШКОЛА</div>
-                  <div class="order__days">Вторник, Четверг, Воскресенье</div>
+                  <div class="order__days"></div>
+                  {% if request.user.bonuses %}
+                  <label class="buy__bonuses switch" style="display: none;">
+                    <input class="switch__input" type="checkbox" data-bonuses="{{ request.user.bonus }}">
+                    <span class="switch__content">
+                      <span class="switch__cell">Оплатить бонусами</span>
+                    </span>
+                  </label>
+                  {% endif %}
                 </div>
                 <div class="order__foot">
                   <div class="order__subtitle">Итого, за месяц:</div>
-                  <div class="order__total order_price_text">1800р.</div>
+                  <div class="order__total order_price_text"></div>
                 </div>
               </div>
             </div>
diff --git a/project/templates/blocks/user_menu.html b/project/templates/blocks/user_menu.html
index 1e20df2d..a1fdbca8 100644
--- a/project/templates/blocks/user_menu.html
+++ b/project/templates/blocks/user_menu.html
@@ -12,7 +12,7 @@
   <div class="header__drop">
     {# FIXME #}
     {% if request.user.role >= request.user.AUTHOR_ROLE %}
-      <a class="header__link header__link_border" href="{% url 'user-edit-payments' request.user.id %}">
+      <a class="header__link header__link_border" href="{% url 'user-edit-payments' %}">
         {{ request.user.balance }} руб.
       </a>
     {% endif %}
diff --git a/project/urls.py b/project/urls.py
index 88966a06..fc5f9ee2 100644
--- a/project/urls.py
+++ b/project/urls.py
@@ -70,8 +70,8 @@ urlpatterns = [
     path('user/profile/', ProfileView.as_view(), name='user-profile'),
     path('user/profile/edit', ProfileEditView.as_view(), name='user-edit-profile'),
     path('user/<int:pk>/', UserView.as_view(), name='user'),
-    path('user/<int:pk>/notifications', NotificationEditView.as_view(), name='user-edit-notifications'),
-    path('user/<int:pk>/payments', PaymentHistoryView.as_view(), name='user-edit-payments'),
+    path('user/notifications', NotificationEditView.as_view(), name='user-edit-notifications'),
+    path('user/payments', PaymentHistoryView.as_view(), name='user-edit-payments'),
     path('user/bonuses', BonusHistoryView.as_view(), name='user-bonuses'),
     path('user/resend-email-verify', resend_email_verify, name='resend-email-verify'),
     path('subscribe', SubscribeView.as_view(), name='subscribe'),
diff --git a/web/src/js/modules/popup.js b/web/src/js/modules/popup.js
index 25295f7b..b303d7a6 100644
--- a/web/src/js/modules/popup.js
+++ b/web/src/js/modules/popup.js
@@ -145,10 +145,18 @@ $(document).ready(function () {
         updateCart();
     });
 
+    $(document).on('change', '[data-bonuses]', function(){
+        updateCart();
+    });
+
     function updateCart(){
         var $orderPrice = $('.order_price_text');
         var days = ['', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота', 'Воскресенье'];
         var weekdays = [], daysText = [];
+        var $bonuses = $('.buy__bonuses');
+        var $bonusesCheckbox = $('[data-bonuses]');
+        var useBonuses = $bonusesCheckbox.prop('checked');
+        var bonuses = +$bonusesCheckbox.data('bonuses');
         $('[data-day]').each(function() {
             var weekday = $(this).data('day');
             if($(this).is(':checked')) {
@@ -161,10 +169,17 @@ $(document).ready(function () {
             api.getPaymentAmount({ user: window.LIL_STORE.user.id, weekdays: weekdays })
             .then((response) => {
                 var text = '';
-                if(response.data.price != response.data.amount) {
-                    text = '<del>'+response.data.price+'</del> '+response.data.amount+'р.';
+                var amount = +response.data.amount;
+                if(bonuses && bonuses >= amount){
+                  $bonuses.show();
+                }
+                if(useBonuses){
+                    amount = 0;
+                }
+                if(response.data.price != amount) {
+                    text = '<del>' + response.data.price+'</del> ' + amount + 'р.';
                 } else {
-                    text = response.data.amount+'p.';
+                    text = amount + 'p.';
                 }
                 $orderPrice.html(text);
             });
@@ -177,7 +192,7 @@ $(document).ready(function () {
 
         var link = $('.but_btn_popup').data('link');
 
-        link = link+'?'+decodeURIComponent($.param({weekdays: weekdays}, true));
+        link = link+'?'+decodeURIComponent($.param({weekdays: weekdays, use_bonuses: useBonuses || ''}, true));
         $('.but_btn_popup').attr('href', link);
     }
 

From 75f46a1065a6a5eea8a71fa6b1f451879feeeb28 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Thu, 6 Sep 2018 19:48:56 +0500
Subject: [PATCH 09/13] lil-583

---
 apps/payment/models.py                        | 28 +++++++---
 apps/payment/views.py                         | 30 ++++++-----
 apps/user/models.py                           |  2 +-
 apps/user/templates/user/bonus-history.html   | 28 ++++++----
 apps/user/templates/user/payment-history.html | 26 ++++-----
 project/templates/blocks/lil_store_js.html    |  2 +-
 project/templates/blocks/popup_auth.html      | 18 ++-----
 web/src/js/modules/common.js                  |  4 +-
 web/src/sass/_common.sass                     | 54 +++++++++++--------
 9 files changed, 113 insertions(+), 79 deletions(-)

diff --git a/apps/payment/models.py b/apps/payment/models.py
index c200dc26..69eaf54c 100644
--- a/apps/payment/models.py
+++ b/apps/payment/models.py
@@ -103,6 +103,7 @@ class Payment(PolymorphicModel):
     roistat_visit = models.PositiveIntegerField('Номер визита Roistat', null=True, editable=False)
     created_at = models.DateTimeField(auto_now_add=True)
     update_at = models.DateTimeField(auto_now=True)
+    bonus = models.ForeignKey('payment.UserBonus', null=True, on_delete=models.SET_NULL, related_name='purchase_payments')
 
     objects = PaymentManger()
 
@@ -111,6 +112,15 @@ class Payment(PolymorphicModel):
         verbose_name_plural = 'Платежи'
         ordering = ('created_at',)
 
+    @classmethod
+    def add_months(cls, sourcedate, months=1):
+        result = arrow.get(sourcedate, settings.TIME_ZONE).shift(months=months)
+        if months == 1:
+            if (sourcedate.month == 2 and sourcedate.day >= 28) or (sourcedate.day == 31 and result.day <= 30)\
+                or (sourcedate.month == 1 and sourcedate.day >= 29 and result.day == 28):
+                result = result.replace(day=1, month=result.month + 1)
+        return result.datetime
+
     @classmethod
     def calc_amount(cls, payment=None, user=None, course=None, weekdays=None):
         if isinstance(payment, CoursePayment):
@@ -134,7 +144,6 @@ class Payment(PolymorphicModel):
                     user=user,
                     date_start__lte=now().date(),
                     date_end__gte=now().date(),
-                    add_days=False,
                     status__in=[
                         Pingback.PINGBACK_TYPE_REGULAR,
                         Pingback.PINGBACK_TYPE_GOODWILL,
@@ -144,8 +153,8 @@ class Payment(PolymorphicModel):
                 school_schedules_purchased = school_payments.annotate(
                     joined_weekdays=Func(F('weekdays'), function='unnest', )
                 ).values_list('joined_weekdays', flat=True).distinct()
-                weekdays = set(map(int, weekdays)) - set(school_schedules_purchased)
-                prev_school_payment = school_payments.last()
+                weekdays = list(set(map(int, weekdays)) - set(school_schedules_purchased))
+                prev_school_payment = school_payments.filter(add_days=False).last()
                 add_days = bool(prev_school_payment)
             else:
                 add_days = False
@@ -173,6 +182,7 @@ class Payment(PolymorphicModel):
             'referral_bonus': referral_bonus,
             'referrer_bonus': referrer_bonus,
             'discount': discount,
+            'weekdays': weekdays,
         }
 
     def calc_commission(self):
@@ -197,10 +207,14 @@ class Payment(PolymorphicModel):
     def save(self, *args, **kwargs):
         amount_data = Payment.calc_amount(payment=self)
         self.amount = amount_data.get('amount')
+        if isinstance(self, SchoolPayment):
+            self.weekdays = amount_data.get('weekdays')
         super().save(*args, **kwargs)
+        paid = self.status in [Pingback.PINGBACK_TYPE_REGULAR, Pingback.PINGBACK_TYPE_GOODWILL,
+                            Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,]
         if isinstance(self, CoursePayment):
             author_balance = getattr(self, 'authorbalance', None)
-            if not author_balance:
+            if not author_balance and paid:
                 AuthorBalance.objects.create(
                     author=self.course.author,
                     amount=self.amount,
@@ -210,9 +224,7 @@ class Payment(PolymorphicModel):
                 author_balance.amount = self.amount
                 author_balance.save()
         # Если юзер реферал и нет платежа, где применялась скидка
-        if hasattr(self.user, 'referral') and not self.user.referral.payment\
-            and self.status in [Pingback.PINGBACK_TYPE_REGULAR, Pingback.PINGBACK_TYPE_GOODWILL,
-                            Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,]:
+        if hasattr(self.user, 'referral') and not self.user.referral.payment and paid:
             # Платеж - как сигнал, что скидка применилась
             self.user.referral.payment = self
             self.user.referral.save()
@@ -258,3 +270,5 @@ class UserBonus(models.Model):
     referral = models.ForeignKey('user.Referral', on_delete=models.SET_NULL, null=True)
     created_at = models.DateTimeField(auto_now_add=True)
 
+    class Meta:
+        ordering = ('created_at',)
diff --git a/apps/payment/views.py b/apps/payment/views.py
index 975d1eec..abca9736 100644
--- a/apps/payment/views.py
+++ b/apps/payment/views.py
@@ -25,7 +25,7 @@ from apps.course.models import Course
 from apps.school.models import SchoolSchedule
 from apps.payment.tasks import transaction_to_mixpanel, product_payment_to_mixpanel, transaction_to_roistat
 
-from .models import AuthorBalance, CoursePayment, SchoolPayment
+from .models import AuthorBalance, CoursePayment, SchoolPayment, Payment, UserBonus
 
 logger = logging.getLogger('django')
 
@@ -118,7 +118,7 @@ class SchoolBuyView(TemplateView):
                 Pingback.PINGBACK_TYPE_GOODWILL,
                 Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
             ],
-        ).first()  # ??? first?
+        ).last()
         add_days = bool(prev_school_payment)
         if add_days:
             school_payment = SchoolPayment.objects.create(
@@ -129,6 +129,7 @@ class SchoolBuyView(TemplateView):
                 add_days=True,
                 roistat_visit=roistat_visit,
             )
+            # Если произойдет ошибка и оплату бонусами повторят еще раз на те же дни, то вернет ошибку
             if school_payment.amount <= 0:
                 messages.error(request, 'Выбранные дни отсутствуют в оставшемся периоде подписки')
                 return redirect(reverse_lazy('school:school'))
@@ -138,6 +139,19 @@ class SchoolBuyView(TemplateView):
                 weekdays=weekdays,
                 roistat_visit=roistat_visit,
             )
+        if use_bonuses:
+            if request.user.bonus >= school_payment.amount:
+                bonus = UserBonus.objects.create(amount=- school_payment.amount, user=request.user, payment=school_payment)
+                school_payment.status = Pingback.PINGBACK_TYPE_REGULAR
+                school_payment.bonus = bonus
+                if not add_days:
+                    school_payment.date_start = now().date()
+                    school_payment.date_end = Payment.add_months(school_payment.date_start)
+                school_payment.save()
+                return redirect(reverse_lazy('payment-success'))
+            else:
+                messages.error(request, 'Недостаточно бонусов для оплаты')
+                return redirect(reverse_lazy('school:school'))
         product = Product(
             f'school_{school_payment.id}',
             school_payment.amount,
@@ -163,14 +177,6 @@ class SchoolBuyView(TemplateView):
 @method_decorator(csrf_exempt, name='dispatch')
 class PaymentwallCallbackView(View):
 
-    def add_months(self, sourcedate, months=1):
-        result = arrow.get(sourcedate, settings.TIME_ZONE).shift(months=months)
-        if months == 1:
-            if (sourcedate.month == 2 and sourcedate.day >= 28) or (sourcedate.day == 31 and result.day <= 30)\
-                or (sourcedate.month == 1 and sourcedate.day >= 29 and result.day == 28):
-                result = result.replace(day=1, month=result.month + 1)
-        return result.datetime
-
     def get_request_ip(self):
         x_forwarded_for = self.request.META.get('HTTP_X_FORWARDED_FOR')
         if x_forwarded_for:
@@ -234,10 +240,10 @@ class PaymentwallCallbackView(View):
                             date_end = school_payment.date_end
                         else:
                             date_start = arrow.get(school_payment.date_end, settings.TIME_ZONE).shift(days=1).datetime
-                            date_end = self.add_months(date_start)
+                            date_end = Payment.add_months(date_start)
                     else:
                         date_start = now().date()
-                        date_end = self.add_months(date_start)
+                        date_end = Payment.add_months(date_start)
                     payment.date_start = date_start
                     payment.date_end = date_end
             if product_type_name == 'course':
diff --git a/apps/user/models.py b/apps/user/models.py
index 887167ad..3320adb2 100644
--- a/apps/user/models.py
+++ b/apps/user/models.py
@@ -107,7 +107,7 @@ class User(AbstractUser):
 
     @cached_property
     def bonus(self):
-        return int(self.bonuses.aggregate(models.Sum('amount')).get('amount__sum')) or 0
+        return int(self.bonuses.aggregate(models.Sum('amount')).get('amount__sum') or 0)
 
 
 @receiver(post_save, sender=User)
diff --git a/apps/user/templates/user/bonus-history.html b/apps/user/templates/user/bonus-history.html
index b5461970..91dea322 100644
--- a/apps/user/templates/user/bonus-history.html
+++ b/apps/user/templates/user/bonus-history.html
@@ -23,25 +23,35 @@
 </div>
 
 <div class="section section_gray">
-  <div class="section__center center center_xs">
+  <div class="section__center center center_sm">
     <div class="title title_sm">История бонусов</div>
-    <div class="transactions">
+    <div class="transactions transactions_bonuses">
       <div class="transactions__wrap">
+        <div class="transactions__row">
+          <div class="transactions__cell transactions__product">Продукт</div>
+          <div class="transactions__cell transactions__amount">Сумма покупки</div>
+          <div class="transactions__cell transactions__user">Реферал</div>
+          <div class="transactions__cell transactions__amount">Сумма бонусов</div>
+        </div>
         {% for bonus in bonuses %}
         <div class="transactions__row">
           {% with payment=bonus.payment %}
           {% if payment.course %}
-          <div class="transactions__cell">Курс. {{ payment.course.title }}</div>
+          <div class="transactions__cell transactions__product">Курс. {{ payment.course.title }}</div>
           {% else %}
-          <div class="transactions__cell">
+          <div class="transactions__cell transactions__product">
+            {% if request.user_agent.is_mobile %}
+            Школа. {% if payment.date_start and payment.date_end %}{{ payment.date_start|date:"" }} - {{ payment.date_end }}{% endif %}
+            {% else %}
             Школа. {% if payment.date_start and payment.date_end %}{{ payment.date_start }} - {{ payment.date_end }}{% endif %}
+            {% endif %}
           </div>
           {% endif %}
-          <div class="transactions__cell">{{payment.amount }}</div>
-          {% if bonus.referral %}
-          <div class="transactions__cell"><a href="{% url 'user' pk=bonus.referral.referral.id %}">{{ bonus.referral.referral.get_full_name }}</a></div>
-          {% endif %}
-          <div class="transactions__cell">{{ bonus.amount|floatformat }}</div>
+          <div class="transactions__cell transactions__amount">{{payment.amount }}</div>
+          <div class="transactions__cell transactions__user">
+            {% if bonus.referral %}{{ bonus.referral.referral.get_full_name }}{% endif %}
+          </div>
+          <div class="transactions__cell transactions__amount">{{ bonus.amount|floatformat }}</div>
           {% endwith %}
         </div>
         {% empty %}
diff --git a/apps/user/templates/user/payment-history.html b/apps/user/templates/user/payment-history.html
index 8b7d332c..ab152901 100644
--- a/apps/user/templates/user/payment-history.html
+++ b/apps/user/templates/user/payment-history.html
@@ -65,42 +65,42 @@
 <div class="section section_gray">
   <div class="section__center center center_xs">
     <div class="title title_sm">История платежей</div>
-    <div class="transactions">
+    <div class="transactions transactions_payments">
       <div class="transactions__wrap">
         {% if request.user.payments.all.exists %}
           {% for payment in request.user.payments.all %}
           <div class="transactions__row">
             {% if payment.course %}
-            <div class="transactions__cell">Курс. {{payment.course.title}}</div>
+            <div class="transactions__cell transactions__product">Курс. {{payment.course.title}}</div>
             {% else %}
-            <div class="transactions__cell">
+            <div class="transactions__cell transactions__product">
               Школа. {% if payment.date_start and payment.date_end %}{{ payment.date_start }} - {{ payment.date_end }}{% endif %}
             </div>
             {% endif %}
             {% if payment.balance %}
-            <div class="transactions__cell">{{payment.balance.amount}}</div>
+            <div class="transactions__cell transactions__amount">{{payment.balance.amount}}</div>
             {% else %}
-            <div class="transactions__cell">{{payment.amount}}</div>
+            <div class="transactions__cell transactions__amount">{{payment.amount}}</div>
             {% endif %}
             {% if payment.balance.type == 1 %}
-            <div class="transactions__cell">
+            <div class="transactions__cell transactions__status">
               {% if payment.balance.status == 0 %}
-              <span class="transactions__cell__pending">Ожидается подтверждение выплаты</span>
+              <span class="transactions__status_pending">Ожидается подтверждение выплаты</span>
               {% elif payment.balance.status == 1 %}
-              <span class="transactions__cell__success">Выплачено</span>
+              <span class="transactions__status_success">Выплачено</span>
               {% else %}
-              <span class="transactions__cell__error">Выплата отменена</span>
+              <span class="transactions__status_error">Выплата отменена</span>
               Причина: "{{ payment.balance.cause }}
               {% endif %}
             </div>
             {% else %}
-            <div class="transactions__cell">
+            <div class="transactions__cell transactions__status">
               {% if payment.is_deliverable %}
-              <span class="transactions__cell__success">Оплачено</span>
+              <span class="transactions__status_success">Оплачено</span>
               {% elif payment.is_under_review %}
-              <span class="transactions__cell__pending">Ожидается подтверждение оплаты</span>
+              <span class="transactions__status_pending">Ожидается подтверждение оплаты</span>
               {% else %}
-              <span class="transactions__cell__error">Ошибка оплаты</span>
+              <span class="transactions__status_error">Ошибка оплаты</span>
               {% endif %}
             </div>
             {% endif %}
diff --git a/project/templates/blocks/lil_store_js.html b/project/templates/blocks/lil_store_js.html
index 04f69e59..cb882e96 100644
--- a/project/templates/blocks/lil_store_js.html
+++ b/project/templates/blocks/lil_store_js.html
@@ -8,7 +8,7 @@
       id: '{{ request.user.id|default:'' }}',
     },
     flags: {
-      isReferralRegistration: '{{ is_referral_registration|yesno:"true,false" }}',
+      isReferralRegistration: {{ is_referral_registration|yesno:"true,false" }},
     }
   };
 </script>
diff --git a/project/templates/blocks/popup_auth.html b/project/templates/blocks/popup_auth.html
index 3e6c5c75..e2064381 100644
--- a/project/templates/blocks/popup_auth.html
+++ b/project/templates/blocks/popup_auth.html
@@ -1,5 +1,5 @@
 {% load static %}
-<div class="popup js-popup-auth {% if is_registration %}open visible{% endif %}">
+<div class="popup js-popup-auth {% if is_referral_registration %}open visible{% endif %}">
   <div class="popup__wrap js-popup-wrap">
     <button class="popup__close js-popup-close">
       <svg class="icon icon-close">
@@ -10,13 +10,13 @@
       <div class="auth js-auth">
         <div class="auth__login js-auth-login">
           <div class="auth__nav">
-            <a class="auth__type js-auth-type {% if not is_registration %}active{% endif %}" href="#">Войти</a>
-            <a class="auth__type js-auth-type {% if is_registration %}active{% endif %}" href="#">РЕГИСТРАЦИЯ</a>
+            <a class="auth__type js-auth-type {% if not is_referral_registration %}active{% endif %}" href="#">Войти</a>
+            <a class="auth__type js-auth-type {% if is_referral_registration %}active{% endif %}" href="#">РЕГИСТРАЦИЯ</a>
           </div>
           <div class="auth__body">
             <form id="learner-auth-form" method="post" action="{% url 'lilcity:login' %}">
               {% csrf_token %}
-              <div class="auth__tab js-auth-tab" {% if not is_registration %}style="display: block;"{% endif %}>
+              <div class="auth__tab js-auth-tab" {% if not is_referral_registration %}style="display: block;"{% endif %}>
                 <div class="auth__enter js-auth-enter">
                   <div id="learner-auth-field__username" class="auth__field field learner-auth-form__field">
                     <div class="field__label">ПОЧТА</div>
@@ -63,17 +63,9 @@
             </form>
             <form id="learner-registration-form" method="post" action="{% url 'lilcity:registration-learner' %}">
               {% csrf_token %}
-              <div class="auth__tab js-auth-tab" {% if is_registration %}style="display: block;"{% endif %}>
+              <div class="auth__tab js-auth-tab" {% if is_referral_registration %}style="display: block;"{% endif %}>
                 {% if referrer %}
                   <input type="hidden" name="referrer" value="{{ referrer.id }}">
-                  <div style="margin: 0 0 20px;">
-                    <a href="{% url 'user' referrer.id %}" target="_blank" style="
-                      font-family: 'ProximaNova-Bold', serif;
-                      font-size: 10px;
-                      letter-spacing: 1px;
-                      text-transform: uppercase;">
-                      {{ referrer.get_full_name }}</a> дарит вам скидку 10% на первую покупку!
-                  </div>
                 {% endif %}
                 <div class="auth__fieldset">
                   <div id="learner-registration-field__first-name" class="auth__field field learner-registration-form__field">
diff --git a/web/src/js/modules/common.js b/web/src/js/modules/common.js
index af1601ec..735c453a 100644
--- a/web/src/js/modules/common.js
+++ b/web/src/js/modules/common.js
@@ -42,7 +42,9 @@ $(document).ready(function () {
     });
 
     if(window.LIL_STORE.flags.isReferralRegistration && ! window.LIL_STORE.user.id){
-        $('.js-header-enter').click();
+        setTimeout(() => {
+            $('.js-header-enter').click();
+        });
     }
 });
 
diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass
index c959b913..8aacd9d1 100755
--- a/web/src/sass/_common.sass
+++ b/web/src/sass/_common.sass
@@ -3213,31 +3213,41 @@ a.grey-link
   &__cell
     padding: 0 10px
     font-size: 13px
-    &__success
+  &__product
+    +fb
+    font-size: 12px
+    text-transform: uppercase
+    letter-spacing: 2px
+    flex: 0 0 60%
+    +m
+      flex: 0 0 75%
+  &__amount
+    flex: 0 0 20%
+    text-align: right
+    +m
+      flex: 0 0 25%
+  &__status
+    flex: 0 0 20%
+    text-align: right
+    color: $green-light
+    +m
+      flex: 0 0 100%
+    &_success
       color: $green
-    &__pending
+    &_pending
       color: $gray
-    &__error
+    &_error
       color: $pink
-    &:first-child
-      +fb
-      font-size: 12px
-      text-transform: uppercase
-      letter-spacing: 2px
-      flex: 0 0 60%
-      +m
-        flex: 0 0 75%
-    &:nth-child(2),
-    &:last-child
-      flex: 0 0 20%
-      text-align: right
-    &:nth-child(2)
-      +m
-        flex: 0 0 25%
-    &:last-child
-      color: $green-light
-      +m
-        flex: 0 0 100%
+.transactions_bonuses .transactions
+  &__product
+    flex: 0 0 60%;
+    +m
+      flex: 0 0 40%;
+  &__amount
+    flex: 0 0 10%;
+  &__user
+    flex: 0 0 20%;
+
 
 .empty
   max-width: 300px

From ae2ca57135a5600c573647bd97354cf10329e64d Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Fri, 7 Sep 2018 16:32:29 +0500
Subject: [PATCH 10/13] lil-583 migrations

---
 apps/payment/migrations/0020_userbonus.py     | 23 ++++++++++++++
 .../migrations/0021_auto_20180903_2257.py     | 27 ++++++++++++++++
 .../migrations/0022_auto_20180904_0106.py     | 19 ++++++++++++
 apps/payment/migrations/0023_payment_bonus.py | 19 ++++++++++++
 apps/user/migrations/0024_referral.py         | 31 +++++++++++++++++++
 5 files changed, 119 insertions(+)
 create mode 100644 apps/payment/migrations/0020_userbonus.py
 create mode 100644 apps/payment/migrations/0021_auto_20180903_2257.py
 create mode 100644 apps/payment/migrations/0022_auto_20180904_0106.py
 create mode 100644 apps/payment/migrations/0023_payment_bonus.py
 create mode 100644 apps/user/migrations/0024_referral.py

diff --git a/apps/payment/migrations/0020_userbonus.py b/apps/payment/migrations/0020_userbonus.py
new file mode 100644
index 00000000..eaf9f835
--- /dev/null
+++ b/apps/payment/migrations/0020_userbonus.py
@@ -0,0 +1,23 @@
+# Generated by Django 2.0.6 on 2018-09-03 22:57
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('payment', '0019_payment_roistat_visit'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='UserBonus',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('amount', models.DecimalField(decimal_places=2, default=0, editable=False, max_digits=8)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('payment', models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, to='payment.Payment')),
+            ],
+        ),
+    ]
diff --git a/apps/payment/migrations/0021_auto_20180903_2257.py b/apps/payment/migrations/0021_auto_20180903_2257.py
new file mode 100644
index 00000000..381eebd8
--- /dev/null
+++ b/apps/payment/migrations/0021_auto_20180903_2257.py
@@ -0,0 +1,27 @@
+# Generated by Django 2.0.6 on 2018-09-03 22:57
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0024_referral'),
+        ('payment', '0020_userbonus'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userbonus',
+            name='referral',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='user.Referral'),
+        ),
+        migrations.AddField(
+            model_name='userbonus',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bonuses', to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/apps/payment/migrations/0022_auto_20180904_0106.py b/apps/payment/migrations/0022_auto_20180904_0106.py
new file mode 100644
index 00000000..d0b3dc03
--- /dev/null
+++ b/apps/payment/migrations/0022_auto_20180904_0106.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.0.6 on 2018-09-04 01:06
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('payment', '0021_auto_20180903_2257'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userbonus',
+            name='payment',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='payment.Payment'),
+        ),
+    ]
diff --git a/apps/payment/migrations/0023_payment_bonus.py b/apps/payment/migrations/0023_payment_bonus.py
new file mode 100644
index 00000000..3cc2a771
--- /dev/null
+++ b/apps/payment/migrations/0023_payment_bonus.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.0.6 on 2018-09-05 23:37
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('payment', '0022_auto_20180904_0106'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='payment',
+            name='bonus',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='purchase_payments', to='payment.UserBonus'),
+        ),
+    ]
diff --git a/apps/user/migrations/0024_referral.py b/apps/user/migrations/0024_referral.py
new file mode 100644
index 00000000..f16eeed5
--- /dev/null
+++ b/apps/user/migrations/0024_referral.py
@@ -0,0 +1,31 @@
+# Generated by Django 2.0.6 on 2018-09-03 22:57
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('payment', '0020_userbonus'),
+        ('user', '0023_user_trial_lesson'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Referral',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('bonus', models.IntegerField()),
+                ('referrer_bonus', models.IntegerField()),
+                ('payment', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='payment.Payment')),
+                ('referral', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='referral', to=settings.AUTH_USER_MODEL)),
+                ('referrer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='referrals', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'Реферал',
+                'verbose_name_plural': 'Рефералы',
+            },
+        ),
+    ]

From 8d645159c7fdeafbdfa8d6a3cc1fa6ae9ea40eee Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Wed, 12 Sep 2018 21:29:01 +0500
Subject: [PATCH 11/13] lil-583

---
 apps/payment/models.py |  4 ++--
 apps/user/views.py     | 14 +++++---------
 project/settings.py    |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/apps/payment/models.py b/apps/payment/models.py
index a0fa11d3..f1613793 100644
--- a/apps/payment/models.py
+++ b/apps/payment/models.py
@@ -213,9 +213,9 @@ class Payment(PolymorphicModel):
         if isinstance(self, SchoolPayment):
             self.weekdays = amount_data.get('weekdays')
         super().save(*args, **kwargs)
-        if isinstance(self, CoursePayment):
+        if isinstance(self, CoursePayment) and paid:
             author_balance = getattr(self, 'authorbalance', None)
-            if not author_balance and paid:
+            if not author_balance :
                 AuthorBalance.objects.create(
                     author=self.course.author,
                     amount=self.amount,
diff --git a/apps/user/views.py b/apps/user/views.py
index 9d3361a3..b2765a79 100644
--- a/apps/user/views.py
+++ b/apps/user/views.py
@@ -5,19 +5,15 @@ from os.path import splitext
 from datetime import timedelta
 from paymentwall import Pingback
 import short_url
-from urllib.parse import urljoin
 
 from django.conf import settings
 from django.contrib.auth import login
-from django.core.exceptions import ValidationError
-from django.shortcuts import render, reverse, redirect
+from django.shortcuts import reverse, redirect
 from django.views import View
 from django.views.generic import DetailView, UpdateView, TemplateView, FormView
 from django.contrib import messages
 from django.contrib.auth import get_user_model
-from django.contrib.auth.decorators import login_required, permission_required
-from django.contrib.auth.hashers import check_password, make_password
-from django.http import Http404
+from django.contrib.auth.decorators import login_required
 from django.db.models import F, Func
 from django.urls import reverse_lazy
 from django.utils.decorators import method_decorator
@@ -308,7 +304,7 @@ class BonusHistoryView(TemplateView):
     def get(self, request, *args, **kwargs):
         context = self.get_context_data(**kwargs)
         context['bonuses'] = request.user.bonuses.all()
-        context['referrer_url'] = urljoin(settings.MAIN_HOST, '%s?referrer=%s' % (
-            reverse('index'), short_url.encode_url(request.user.id)
-        ))
+        context['referrer_url'] = '%s%s?referrer=%s' % (
+            settings.MAIN_HOST, reverse('index'), short_url.encode_url(request.user.id)
+        )
         return self.render_to_response(context)
diff --git a/project/settings.py b/project/settings.py
index 837df261..cb9ac8d4 100644
--- a/project/settings.py
+++ b/project/settings.py
@@ -31,7 +31,7 @@ SECRET_KEY = os.getenv('SECRET_KEY', 'jelm*91lj(_-o20+6^a+bgv!4s6e_efry^#+f#=1ak
 DEBUG = os.getenv('DEBUG', False)
 
 ALLOWED_HOSTS = os.getenv('ALLOWED_HOSTS', '*').split(',')
-MAIN_HOST = 'lil.school'
+MAIN_HOST = os.getenv('MAIN_HOST', 'lil.school')
 
 # Application definition
 

From 3813c74251af7464f0685b2eeeb7018b61c17327 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Tue, 18 Sep 2018 00:50:47 +0500
Subject: [PATCH 12/13] lil-583

---
 apps/user/templates/user/bonus-history.html | 11 ++++++++--
 project/templates/blocks/lil_store_js.html  |  4 +++-
 project/templates/blocks/popup_auth.html    | 15 +++++++++-----
 project/views.py                            |  8 ++++---
 web/src/js/modules/auth.js                  |  2 +-
 web/src/js/modules/common.js                | 23 +++++++++++++++++----
 6 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/apps/user/templates/user/bonus-history.html b/apps/user/templates/user/bonus-history.html
index 91dea322..fc671f00 100644
--- a/apps/user/templates/user/bonus-history.html
+++ b/apps/user/templates/user/bonus-history.html
@@ -10,8 +10,15 @@
     <div class="title title_sm">Бонусы</div>
     <div class="text">У вас {{ request.user.bonus|rupluralize:"бонус,бонуса,бонусов" }}</div>
     <div>
-      Вы можете пригласить своих друзей в наш сервис, за это вы получите {{ config.REFERRER_BONUS }}% от суммы
-      их первой покупки и они получат {{ config.REFERRAL_BONUS }}% от суммы первой покупки на свой бонусный счет <br>
+      Вы можете пригласить своих друзей в наш сервис, за это
+      {% if config.REFERRER_BONUS == config.REFERRAL_BONUS %}
+      вы и они получите по {{ config.REFERRER_BONUS }}%
+      {% else %}
+      вы получите {{ config.REFERRER_BONUS }}%, а они {{ config.REFERRAL_BONUS }}%
+      {% endif %}
+      от суммы их первой покупки на бонусный счет. Приглашайте друзей, накапливайте бонусные баллы, тратьте бонусы
+      на приобретения доступа к школе и курсам. Оплата услуг возможна только, если вы накопили баллов на стоимость услуги.
+      <br>
       Просто отправьте им эту ссылку, по которой они смогут зарегистрироваться:
     </div>
     <div class="form__field field" style="margin-bottom: 0;">
diff --git a/project/templates/blocks/lil_store_js.html b/project/templates/blocks/lil_store_js.html
index cb882e96..43fb92bd 100644
--- a/project/templates/blocks/lil_store_js.html
+++ b/project/templates/blocks/lil_store_js.html
@@ -8,7 +8,9 @@
       id: '{{ request.user.id|default:'' }}',
     },
     flags: {
-      isReferralRegistration: {{ is_referral_registration|yesno:"true,false" }},
+      referrer: '{{ referrer.id|default:'' }}',
+      referrerName: '{% if referrer %}{{ referrer.get_full_name }}{% endif %}',
+      isReferralUrl: {{ is_referral_url|yesno:"true,false" }},
     }
   };
 </script>
diff --git a/project/templates/blocks/popup_auth.html b/project/templates/blocks/popup_auth.html
index e2064381..5fbca404 100644
--- a/project/templates/blocks/popup_auth.html
+++ b/project/templates/blocks/popup_auth.html
@@ -1,5 +1,5 @@
 {% load static %}
-<div class="popup js-popup-auth {% if is_referral_registration %}open visible{% endif %}">
+<div class="popup js-popup-auth">
   <div class="popup__wrap js-popup-wrap">
     <button class="popup__close js-popup-close">
       <svg class="icon icon-close">
@@ -10,13 +10,13 @@
       <div class="auth js-auth">
         <div class="auth__login js-auth-login">
           <div class="auth__nav">
-            <a class="auth__type js-auth-type {% if not is_referral_registration %}active{% endif %}" href="#">Войти</a>
-            <a class="auth__type js-auth-type {% if is_referral_registration %}active{% endif %}" href="#">РЕГИСТРАЦИЯ</a>
+            <a class="auth__type js-auth-type_login js-auth-type" href="#">Войти</a>
+            <a class="auth__type js-auth-type_registration js-auth-type" href="#">РЕГИСТРАЦИЯ</a>
           </div>
           <div class="auth__body">
             <form id="learner-auth-form" method="post" action="{% url 'lilcity:login' %}">
               {% csrf_token %}
-              <div class="auth__tab js-auth-tab" {% if not is_referral_registration %}style="display: block;"{% endif %}>
+              <div class="auth__tab js-auth-tab js-auth-tab_login">
                 <div class="auth__enter js-auth-enter">
                   <div id="learner-auth-field__username" class="auth__field field learner-auth-form__field">
                     <div class="field__label">ПОЧТА</div>
@@ -63,9 +63,14 @@
             </form>
             <form id="learner-registration-form" method="post" action="{% url 'lilcity:registration-learner' %}">
               {% csrf_token %}
-              <div class="auth__tab js-auth-tab" {% if is_referral_registration %}style="display: block;"{% endif %}>
+              <div class="auth__tab js-auth-tab js-auth-tab_registration">
                 {% if referrer %}
                   <input type="hidden" name="referrer" value="{{ referrer.id }}">
+                  <div class="auth__text">
+                    Спасибо за&nbsp;то, что&nbsp;вы&nbsp;с&nbsp;нами! Вас&nbsp;пригласил ваш&nbsp;друг {{ referrer.get_full_name }}.
+                    При&nbsp;первой покупке {{ config.REFERRAL_BONUS }}% от&nbsp;суммы услуги будут зачислены на&nbsp;ваш бонусный счет.
+                    Приятного обучения!
+                  </div>
                 {% endif %}
                 <div class="auth__fieldset">
                   <div id="learner-registration-field__first-name" class="auth__field field learner-registration-form__field">
diff --git a/project/views.py b/project/views.py
index 8783b220..5cb9e46a 100644
--- a/project/views.py
+++ b/project/views.py
@@ -23,6 +23,7 @@ class IndexView(TemplateView):
 
     def get_context_data(self):
         referrer = self.request.GET.get('referrer')
+        is_referral_url = bool(referrer)
         context = super().get_context_data()
 
         now_time = now()
@@ -69,15 +70,16 @@ class IndexView(TemplateView):
         if referrer and not self.request.user.is_authenticated:
             try:
                 referrer = short_url.decode_url(referrer)
-                referrer = User.objects.get(pk=referrer).id
+                referrer = User.objects.get(pk=referrer)
             except:
                 referrer = None
-            self.request.session['referrer'] = referrer
+            self.request.session['referrer'] = referrer and referrer.id
         else:
             referrer = None
 
         context.update({
-            'is_referral_registration': bool(referrer),
+            'referrer': referrer,
+            'is_referral_url': is_referral_url,
             'online': online,
             'online_coming_soon': online_coming_soon,
             'school_schedule': school_schedule,
diff --git a/web/src/js/modules/auth.js b/web/src/js/modules/auth.js
index f575c85f..9557a78a 100644
--- a/web/src/js/modules/auth.js
+++ b/web/src/js/modules/auth.js
@@ -246,7 +246,7 @@ $(document).ready(function () {
                         window.location.href = nextUrl;
                     }
                     else{
-                        window.location.reload();
+                        window.location = '/';
                     }
                 } else {
                     registrationButton.removeClass('loading');
diff --git a/web/src/js/modules/common.js b/web/src/js/modules/common.js
index 735c453a..775c4aea 100644
--- a/web/src/js/modules/common.js
+++ b/web/src/js/modules/common.js
@@ -1,13 +1,17 @@
 import $ from 'jquery';
+import {showNotification} from "./notification"
 import Inputmask from "inputmask";
 import SmoothScroll from 'smooth-scroll/dist/js/smooth-scroll';
 import baguetteBox from 'baguettebox.js'
+import createHistory from 'history/createBrowserHistory'
 
 window.$ = window.jQuery = jQuery = $;
 window.Inputmask = Inputmask;
 window.baguetteBox = baguetteBox;
 
 $(document).ready(function () {
+    const $popupAuth = $('.js-popup-auth');
+    let authPopupActiveTab = 'login'
     baguetteBox.run('.gallery');
     // Добавляем заголовок X-CSRFToken для всех AJAX запросов JQuery.
     $.ajaxSetup({
@@ -41,11 +45,22 @@ $(document).ready(function () {
             })
     });
 
-    if(window.LIL_STORE.flags.isReferralRegistration && ! window.LIL_STORE.user.id){
-        setTimeout(() => {
-            $('.js-header-enter').click();
-        });
+    if(window.LIL_STORE.flags.isReferralUrl){
+        if(window.LIL_STORE.user.id){
+            showNotification('error', 'Извините, вы уже зарегестрировались на нашем сервисе, получить бонусные баллы возможно только для новых пользователей');
+            // Создаем объект history API
+            const history = createHistory();
+            history.replace('/');
+        }
+        else if(window.LIL_STORE.flags.referrer){
+            authPopupActiveTab = 'registration';
+            setTimeout(() => {
+                $('.js-header-enter').click();
+            });
+        }
     }
+    $popupAuth.find(authPopupActiveTab == 'login' ? '.js-auth-type_login' : '.js-auth-type_registration').addClass('active');
+    $popupAuth.find(authPopupActiveTab == 'login' ? '.js-auth-tab_login' : '.js-auth-tab_registration').show();
 });
 
 function updateHeader() {

From 481e283b9ff4739b1e2d2a905ebba72be1e5929d Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Tue, 25 Sep 2018 16:00:14 +0500
Subject: [PATCH 13/13] =?UTF-8?q?LIL-674=20=D0=98=D0=B7=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D1=81=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=BB=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/payment/models.py                      |  6 ++--
 apps/payment/views.py                       | 18 ++++++------
 apps/user/templates/user/bonus-history.html |  2 +-
 project/templates/blocks/popup_buy.html     |  7 +++--
 web/src/js/modules/popup.js                 | 31 ++++++++++++++-------
 web/src/js/utils.js                         |  5 ++++
 web/src/sass/_common.sass                   |  8 +++++-
 7 files changed, 52 insertions(+), 25 deletions(-)
 create mode 100644 web/src/js/utils.js

diff --git a/apps/payment/models.py b/apps/payment/models.py
index 4811f489..b59269c9 100644
--- a/apps/payment/models.py
+++ b/apps/payment/models.py
@@ -131,13 +131,13 @@ class Payment(PolymorphicModel):
         if isinstance(payment, SchoolPayment):
             user = payment.user
             weekdays = payment.weekdays
+            date_start = payment.date_start
         price = 0
         referral_bonus = 0
         referrer_bonus = 0
         if hasattr(user, 'referral') and not user.referral.payment:
             referral_bonus = user.referral.bonus
             referrer_bonus = user.referral.referrer_bonus
-            date_start = school_payment.date_start
         discount = 0
         if course:
             price = course.price
@@ -214,7 +214,9 @@ class Payment(PolymorphicModel):
         paid = self.status in [Pingback.PINGBACK_TYPE_REGULAR, Pingback.PINGBACK_TYPE_GOODWILL,
                             Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,]
         amount_data = Payment.calc_amount(payment=self)
-        if self.status is None:
+        print('amount_data', amount_data)
+        if self.status is None and not self.bonus:
+            print(123)
             self.amount = amount_data.get('amount')
         if isinstance(self, SchoolPayment):
             self.weekdays = amount_data.get('weekdays')
diff --git a/apps/payment/views.py b/apps/payment/views.py
index 3e004a20..5663df39 100644
--- a/apps/payment/views.py
+++ b/apps/payment/views.py
@@ -147,17 +147,17 @@ class SchoolBuyView(TemplateView):
             )
         if use_bonuses:
             if request.user.bonus >= school_payment.amount:
-                bonus = UserBonus.objects.create(amount=- school_payment.amount, user=request.user, payment=school_payment)
+                bonus = UserBonus.objects.create(amount= -school_payment.amount, user=request.user, payment=school_payment)
+                school_payment.amount = 0
                 school_payment.status = Pingback.PINGBACK_TYPE_REGULAR
-                school_payment.bonus = bonus
-                if not add_days:
-                    school_payment.date_start = now().date()
-                    school_payment.date_end = Payment.add_months(school_payment.date_start)
-                school_payment.save()
-                return redirect(reverse_lazy('payment-success'))
             else:
-                messages.error(request, 'Недостаточно бонусов для оплаты')
-                return redirect(reverse_lazy('school:school'))
+                bonus = UserBonus.objects.create(amount= -request.user.bonus, user=request.user,
+                                                 payment=school_payment)
+                school_payment.amount -= request.user.bonus
+            school_payment.bonus = bonus
+            school_payment.save()
+            if school_payment.status == Pingback.PINGBACK_TYPE_REGULAR:
+                return redirect(reverse_lazy('payment-success'))
         product = Product(
             f'school_{school_payment.id}',
             school_payment.amount,
diff --git a/apps/user/templates/user/bonus-history.html b/apps/user/templates/user/bonus-history.html
index fc671f00..d4f32bcb 100644
--- a/apps/user/templates/user/bonus-history.html
+++ b/apps/user/templates/user/bonus-history.html
@@ -48,7 +48,7 @@
           {% else %}
           <div class="transactions__cell transactions__product">
             {% if request.user_agent.is_mobile %}
-            Школа. {% if payment.date_start and payment.date_end %}{{ payment.date_start|date:"" }} - {{ payment.date_end }}{% endif %}
+            Школа. {% if payment.date_start and payment.date_end %}{{ payment.date_start|date:"j b" }} - {{ payment.date_end|date:"j b" }}{% endif %}
             {% else %}
             Школа. {% if payment.date_start and payment.date_end %}{{ payment.date_start }} - {{ payment.date_end }}{% endif %}
             {% endif %}
diff --git a/project/templates/blocks/popup_buy.html b/project/templates/blocks/popup_buy.html
index b2f81760..093b19ac 100644
--- a/project/templates/blocks/popup_buy.html
+++ b/project/templates/blocks/popup_buy.html
@@ -74,14 +74,17 @@
                   <label class="buy__bonuses switch" style="display: none;">
                     <input class="switch__input" type="checkbox" data-bonuses="{{ request.user.bonus }}">
                     <span class="switch__content">
-                      <span class="switch__cell">Оплатить бонусами</span>
+                      <span class="switch__cell">Использовать <span class="buy__bonuses-count"></span></span>
                     </span>
                   </label>
                   {% endif %}
                 </div>
                 <div class="order__foot">
                   <div class="order__subtitle">Итого, за месяц:</div>
-                  <div class="order__total order_price_text"></div>
+                  <div class="order__total">
+                    <div class="loading-loader"></div>
+                    <span class="order_price_text"></span>
+                  </div>
                 </div>
               </div>
             </div>
diff --git a/web/src/js/modules/popup.js b/web/src/js/modules/popup.js
index b6469075..adfa7510 100644
--- a/web/src/js/modules/popup.js
+++ b/web/src/js/modules/popup.js
@@ -1,6 +1,7 @@
 import $ from 'jquery';
 import moment from 'moment';
 import {api} from './api';
+import {rupluralize} from '../utils';
 
 moment.locale('ru');
 
@@ -155,13 +156,16 @@ $(document).ready(function () {
 
     function updateCart(){
         var link = $('.but_btn_popup').data('link');
+        var $order = $('.order');
         var $orderPrice = $('.order_price_text');
         var $orderDates = $('.order__dates');
         var dateStart = popup.data('date-start');
         var days = ['', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота', 'Воскресенье'];
-        var weekdays = [], daysText = [];
+        var weekdays = [];
+        var daysText = [];
         var $bonuses = $('.buy__bonuses');
         var $bonusesCheckbox = $('[data-bonuses]');
+        var $bonusesCount = $('.buy__bonuses-count');
         var useBonuses = $bonusesCheckbox.prop('checked');
         var bonuses = +$bonusesCheckbox.data('bonuses');
         $('[data-day]').each(function() {
@@ -173,15 +177,19 @@ $(document).ready(function () {
         });
 
         if(weekdays.length){
+            $order.addClass('order--loading');
+            $orderPrice.html('');
             api.getPaymentAmount({ user: window.LIL_STORE.user.id, weekdays: weekdays, date_start: dateStart})
-            .then((response) => {
+            .then(response => {
+                $order.removeClass('order--loading');
                 var text = '';
                 var amount = +response.data.amount;
-                if(bonuses && bonuses >= amount){
-                  $bonuses.show();
-                }
-                if(useBonuses){
-                    amount = 0;
+                if(bonuses){
+                    $bonusesCount.text(rupluralize(bonuses > amount ? amount : bonuses, ['бонус', 'бонуса', 'бонусов']));
+                    $bonuses.show();
+                    if(useBonuses) {
+                        amount = bonuses > amount ? 0 : amount - bonuses;
+                    }
                 }
                 if(response.data.price != amount) {
                     text = '<del>' + response.data.price+'</del> ' + amount + 'р.';
@@ -191,14 +199,17 @@ $(document).ready(function () {
                 $orderPrice.html(text);
                 $orderDates.text(moment(response.data.date_start).format('D MMM') + ' - ' + moment(response.data.date_end).format('D MMM'));
                 $('.but_btn_popup').attr('href', link+'?'+decodeURIComponent($.param({
-                  weekdays: weekdays,
-                  date_start: moment(response.data.date_start).format('YYYY-MM-DD'),
-                  use_bonuses: useBonuses || '',
+                    weekdays: weekdays,
+                    date_start: moment(response.data.date_start).format('YYYY-MM-DD'),
+                    use_bonuses: useBonuses || '',
                 }, true)));
+            }).catch(() => {
+                $order.removeClass('order--loading');
             });
         }
         else {
             $orderPrice.html('0p.');
+            $bonuses.hide();
         }
 
     }
diff --git a/web/src/js/utils.js b/web/src/js/utils.js
new file mode 100644
index 00000000..0039ba47
--- /dev/null
+++ b/web/src/js/utils.js
@@ -0,0 +1,5 @@
+export const rupluralize = (value, args) => {
+    let digit = Math.trunc(value) + '';
+    digit = digit[digit.length - 1];
+    return value + ' ' + args[digit == '1' ? 0 : ('234'.search(digit) > -1 ? 1 : 2)];
+}
diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass
index 10a2f713..56747a04 100755
--- a/web/src/sass/_common.sass
+++ b/web/src/sass/_common.sass
@@ -3091,8 +3091,14 @@ a.grey-link
       padding: 20px 20px 0
   &__total
     margin-left: auto
+    position: relative
     del
       color: #a0a0a0
+  & .loading-loader
+    display: none
+    margin-left: -40px
+  &--loading .loading-loader
+    display: block
 
 .lock
   padding: 50px 60px 40px
@@ -3326,7 +3332,7 @@ a.grey-link
   &__product
     flex: 0 0 60%;
     +m
-      flex: 0 0 40%;
+      flex: 1 0 40%;
   &__amount
     flex: 0 0 10%;
   &__user