Merge branch 'master' of https://gitlab.com/lilcity/backend into hotfix/LIL-645

api/v1/views.py

@@ -72,7 +72,7 @@ User = get_user_model()
 
 class AuthorBalanceViewSet(ExtendedModelViewSet):
     queryset = AuthorBalance.objects.filter(
-        author__role__in=[User.AUTHOR_ROLE, User.ADMIN_ROLE],
+        author__role__in=[User.AUTHOR_ROLE, User.ADMIN_ROLE, User.TEACHER_ROLE],
     )
     serializer_class = AuthorBalanceCreateSerializer
     serializer_class_map = {

apps/payment/models.py

@@ -193,8 +193,9 @@ class CoursePayment(Payment):
         verbose_name_plural = 'Платежи за курсы'
 
     def save(self, *args, **kwargs):
-        amount_data = Payment.calc_amount(course_payment=self)
+        if self.status is None:
-        self.amount = amount_data.get('amount')
+            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:
@@ -226,8 +227,9 @@ class SchoolPayment(Payment):
         return days
 
     def save(self, *args, **kwargs):
-        amount_data = Payment.calc_amount(school_payment=self)
+        if self.status is None:
-        self.amount = amount_data.get('amount')
+            amount_data = Payment.calc_amount(school_payment=self)
+            self.amount = amount_data.get('amount')
         super().save(*args, **kwargs)
 
     @property

apps/payment/views.py

@@ -1,3 +1,5 @@
+from decimal import Decimal
+
 import arrow
 import json
 import logging
@@ -206,7 +208,7 @@ class PaymentwallCallbackView(View):
                 effective_amount = payment_raw_data.get('effective_price_amount')
 
                 if effective_amount:
-                    payment.amount = effective_amount
+                    payment.amount = Decimal(effective_amount)
 
                 transaction_to_mixpanel.delay(
                     payment.user.id,

apps/school/templates/school/summer_school.html

@@ -1,6 +1,6 @@
 {% extends "templates/lilcity/index.html" %} {% load static %}
 {% block title %}Онлайн-школа LilCity{% endblock title%}
-{% block ogimage %}http://{{request.META.HTTP_HOST}}{% static 'img/og_summer_school.jpg' %}{% endblock %}
+{% block ogimage %}http://{{request.META.HTTP_HOST}}{% static 'img/og_main.jpg' %}{% endblock %}
 {% block content %}
 {% if not is_purchased %}
 {% include "../summer/promo.html" %}