From e9b4ac369be7b72ccad4d34dd7982407052d9d48 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 21 Feb 2018 13:40:02 +0300 Subject: [PATCH] migrate update --- access/migrations/0002_init_group.py | 1 + courses/api.py | 9 +++++++++ finance/views.py | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/access/migrations/0002_init_group.py b/access/migrations/0002_init_group.py index fd03861..20da1ac 100644 --- a/access/migrations/0002_init_group.py +++ b/access/migrations/0002_init_group.py @@ -10,6 +10,7 @@ def init_group(*_args, **_kwargs): Group.objects.get_or_create(name='students') Group.objects.get_or_create(name='teachers') Group.objects.get_or_create(name='managers') + Group.objects.get_or_create(name='finance_managers') Group.objects.get_or_create(name='lead_managers') Group.objects.get_or_create(name='curators') Group.objects.get_or_create(name='partners') diff --git a/courses/api.py b/courses/api.py index 838049c..0917650 100644 --- a/courses/api.py +++ b/courses/api.py @@ -48,3 +48,12 @@ class CourseProgressApi: include_lesson = True return acc + + +class CourseParamsApi: + + def __init__(self, token): + self.course = Course.objects.get(token=token) + + def get_slug_and_title(self): + return {"title": self.course.title, "slug": self.course.slug} diff --git a/finance/views.py b/finance/views.py index b1f6b21..ebd2c37 100644 --- a/finance/views.py +++ b/finance/views.py @@ -12,6 +12,7 @@ from rest_framework.views import APIView from yandex_money.models import Payment from django.conf import settings +from courses.api import CourseParamsApi from finance.models import Bill, Invoice from finance.serializers import BillSerializer, InvoiceSerializer from lms.global_decorators import transaction_decorator @@ -178,11 +179,12 @@ def get_invoices(request): writer.writerow(['date', 'student_email', 'full_name', 'course', 'price', 'real_price', 'key']) for i in invoices.order_by('-date'): + course_api = CourseParamsApi(i.bill.course_token) writer.writerow([ i.date, i.bill.user.email, i.bill.user.get_full_name(), - i.bill.course.title, + course_api.get_slug_and_title()['title'], i.price, i.real_price, i.key,