Merge branch 'dev' into 'master'

Dev

See merge request !406

access/management/commands/set_tokens.py

@@ -27,7 +27,7 @@ class Command(BaseCommand):
         with open(from_path) as f:
             with open(to_path, 'w') as out_f:
                 fw = csv.writer(out_f)
-                fr = csv.reader(f)
+                fr = csv.reader(f, delimiter=';')
                 for row in fr:
                     email = row[0]
                     course_token = row[1]

access/urls.py

@@ -5,7 +5,6 @@ from access import views
 
 urlpatterns = [
     url(r'progress_detail/(?P<token>[0-9A-Fa-f-]+)/$', progress.views.CourseProgressUserView.as_view()),
-    url(r'progress_dynamic/(?P<token>[0-9A-Fa-f-]+)/$', progress.views.CourseProgressDynamicView.as_view()),
     url(r'teachers/$', views.TeacherListView.as_view()),
     url(r'detail/(?P<out_key>[0-9A-Fa-f-]+)/$', views.DetailUserView.as_view()),
     url(r'detail/$', views.DetailUserView.as_view()),

finance/views.py

@@ -214,8 +214,11 @@ class InvoiceDetailView(APIView):
                     user=bill.user,
                     cps_email=bill.user.email,
                 )
-                invoice.yandex_pay = yandex_pay
+                if pay_count > 1:
+                    yandex_pay.shop_id = settings.YANDEX_MONEY_REBILLING_SHOP_ID
+                    yandex_pay.scid = settings.YANDEX_MONEY_REBILLING_SCID
 
+                invoice.yandex_pay = yandex_pay
                 invoice.send_link()
 
                 context = {

lms/settings.py

@@ -46,6 +46,11 @@ YANDEX_MONEY_DEBUG = False
 YANDEX_MONEY_SCID = '149639'
 YANDEX_MONEY_TEST_SCID = '558146'
 YANDEX_MONEY_SHOP_ID = '157133'
+
+#Todo костыль на рассрочку
+YANDEX_MONEY_REBILLING_SCID = '723030'
+YANDEX_MONEY_REBILLING_SHOP_ID = '199287'
+
 YANDEX_MONEY_SHOP_PASSWORD = 'nu5Xefise'
 YANDEX_MONEY_FAIL_URL = '%s/api/v1/finance/yandex/fail/' % DOMAIN
 YANDEX_MONEY_SUCCESS_URL = '%s/' % DOMAIN

progress/urls.py

@@ -3,6 +3,7 @@ from django.conf.urls import url
 from progress import views
 
 urlpatterns = [
+    url(r'progress_dynamic/$', views.CourseProgressDynamicView.as_view()),
     url(r'students/(?P<teacher_token>[0-9A-Fa-f-]+)/$', views.StudentWorkView.as_view()),
     url(r'student/$', views.StudentUpdateProgress.as_view()),
     url(r'find/$', views.FindProgressView.as_view()),

progress/views.py

@@ -15,7 +15,7 @@ from rest_framework.permissions import IsAuthenticated
 from rest_framework.renderers import JSONRenderer
 from rest_framework.response import Response
 from rest_framework.views import APIView
-from django.db.models import Q
+from django.db.models import Q, Count
 import jwt
 from django.conf import settings
 
@@ -64,19 +64,31 @@ class CourseProgressDynamicView(APIView):
     renderer_classes = (JSONRenderer,)
 
     @staticmethod
-    def get(request, token):
+    def get(request):
+        course_token = request.GET.get('course_token', None)
+        from_date = int(request.GET.get('from', '7'))
+        to_date = int(request.GET.get('to', '0'))
+
         if request.user.is_authenticated() and request.user.is_staff:
+            progresses = ProgressLesson.objects.filter(status='done')
+            if not course_token is None:
                 try:
-                progresses = Progress.objects.filter(course_token=token)
+                    progresses = progresses.filter(progress__course_token=course_token)
+                except ProgressLesson.DoesNotExist:
+                    return Response('incorrect course token', status=404)
+
+            progresses = progresses.filter(finish_date__gt=timezone.now() - relativedelta(days=from_date))
+            progresses = progresses.filter(finish_date__lt=timezone.now() - relativedelta(days=to_date))
+            progresses = progresses.order_by('finish_date')
+
             res = {}
-                for i in progresses:
-                    key = i.progresslesson_set.filter(status="done").count() + 1
-                    res[key] = 1 if not key in res.keys() else res[key] + 1
-                return Response(res, status=200)
-            except ValidationError:
-                return Response("Bad request", status=400)
+            progresses = progresses.extra({'finish_date_day': "date(finish_date)"})\
+                                   .values('progress__course_token', 'finish_date_day')\
+                                   .annotate(total=Count('progress'))
+            #TODO Доделать
 
-        return Response(status=403)
+            return Response(res, status=200)
+        return Response('Доступно только персоналу', status=403)
 
 
 class CourseProgressUserView(APIView):