Merge branch 'current_branch' into 'dev'

migrate update

See merge request !33

courses/api.py

@@ -29,17 +29,18 @@ class CourseProgressApi:
     @staticmethod
     def get_next(course_token: str, lesson_list: list):
         """
-
         :param course_token:
         :param lesson_list:
         :return: следующий урок для прохождения и требует ли он валидации
         """
+
         course = Course.objects.get(token=course_token)
         acc = []
         include_lesson = True
         for lesson in course.get_lesson_list():
             if not lesson.token in lesson_list and include_lesson:
                 acc.append((lesson.token, lesson.is_hm))
+                break
             else:
                 include_lesson = True
 

finance/models.py

@@ -18,7 +18,7 @@ class Bill(models.Model):
         return '%s: %s' % (self.id, self.user)
 
     def get_full_price(self):
-        return sum([i.price for i in self.invoice_set.all()])
+        return sum([i.price for i in self.invoice_set.all() if not i.price is None])
 
     class Meta:
         verbose_name = 'Счет'