Merge branch 'feature/bonus-payment' into 'master'

Feature/bonus payment

See merge request lilschool/site!383

apps/user/models.py

@@ -114,8 +114,9 @@ class User(AbstractUser):
 
     @property
     def ref_url(self):
-        return 'https://%s%s?referrer=%s' % (
-            settings.MAIN_HOST, reverse('index'), short_url.encode_url(self.id)
+        code = short_url.encode_url(self.id)
+        return 'https://%s%s?referrer=%s&utm_source=referral&utm_medium=referral&utm_content=%s&utm_campaign=ref_campaign' % (
+            settings.MAIN_HOST, reverse('index'), code, code
         ) if self.id else ''
 
     def serialized(self):
@@ -155,7 +156,7 @@ class User(AbstractUser):
         last_bonus = self.bonuses.filter(
             Q(payment__isnull=False, payment__status__in=Payment.PW_PAID_STATUSES) | Q(is_service=True),
         ).order_by('-created_at').first()
-        return bool(last_bonus) and not last_bonus.notified_at
+        return bool(last_bonus) and last_bonus.amount > 0 and not last_bonus.notified_at
 
     @property
     def paid_one_more(self):

project/templates/blocks/footer.html

@@ -21,8 +21,8 @@
         <div class="footer__title">Продукты</div>
         <nav class="footer__nav">
           <div>
-            <!-- <a class="footer__link" href="{% url 'school:school' %}">Онлайн-школа</a> -->
-            <a class="footer__link" href="{% url 'school:drawing-camp' %}">Рисовальный лагерь</a>
+             <a class="footer__link" href="{% url 'school:school' %}">Онлайн-школа</a>
+            <!--<a class="footer__link" href="{% url 'school:drawing-camp' %}">Рисовальный лагерь</a>-->
             <a class="footer__link" href="{% url 'courses' %}">Видео-курсы</a>
             <a class="footer__link" href="{% url 'gift-certificates' %}">Сертификаты</a>
             <a class="footer__link" href="https://blog.lil.school">Блог</a>

web/src/sass/_common.sass

@@ -1018,6 +1018,9 @@ a[name]
     border-radius: 10px
     box-shadow: 0 11px 20px 0 rgba(0, 0, 0, 0.1)
 
+  & .btn:before
+    border-radius: 10px
+
   &_main
     padding: 80px 0
     +m