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

apps/payment/management/commands/payment_fix_amounts.py

@@ -0,0 +1,22 @@
+from decimal import Decimal
+from django.core.management.base import BaseCommand
+from django.db.models import F
+
+from apps.payment.models import Payment, AuthorBalance
+
+
+class Command(BaseCommand):
+    help = 'Fix payment and author balance amount based on payment.data.effective_price_amount'
+
+    def handle(self, *args, **options):
+
+        for payment in Payment.objects.exclude(data__effective_price_amount=''):
+            if payment.data.get('effective_price_amount'):
+                payment.amount = Decimal(payment.data.get('effective_price_amount'))
+                payment.save()
+
+        for ab in AuthorBalance.objects.exclude(payment__amount=F('amount')).select_related('payment'):
+            ab.amount = ab.payment.amount
+            ab.save()
+
+

apps/payment/views.py

@@ -203,7 +203,7 @@ class PaymentwallCallbackView(View):
             payment.status = pingback.get_type()
             payment.data = payment_raw_data
             if pingback.is_deliverable():
-                effective_amount = pingback.get_parameter('effective_price_amount')
+                effective_amount = payment_raw_data.get('effective_price_amount')
 
                 if effective_amount:
                     payment.amount = effective_amount

project/templates/blocks/promo.html

@@ -22,7 +22,7 @@
             data-day="{{ school_schedule.weekday }}"
             href='#'
           {% else %}
-            href="{{ school_schedule.current_live_lesson.get_absolute_url }}"
+            href="{% url 'school:school' %}"
           {% endif %}
           class="main__btn btn"
           >{% if not school_schedule.weekday in school_schedules_purchased %}Получить доступ{% else %}Смотреть урок{% endif %}</a>
@@ -41,7 +41,7 @@
             data-day="{{ school_schedule.weekday }}"
             href='#'
           {% else %}
-            href="{{ school_schedule.current_live_lesson.get_absolute_url }}"
+            href="{% url 'school:school' %}"
           {% endif %}
           class="main__btn btn"
           >{% if not school_schedule.weekday in school_schedules_purchased %}Получить доступ{% else %}Смотреть урок{% endif %}</a>