LIL-720

apps/school/views.py

@@ -137,7 +137,7 @@ class SchoolView(TemplateView):
         school_schedules_purchased = []
         school_purchased_future = False
         prev_school_payments = None
-        prev_range = [date_now - timedelta(days=8), date_now]
+        prev_range = [date_now - timedelta(days=8), date_now - timedelta(days=1)]
         if self.request.user.is_authenticated:
             school_payment = SchoolPayment.objects.filter(
                 user=self.request.user,
@@ -165,7 +165,7 @@ class SchoolView(TemplateView):
             ).values_list('joined_weekdays', flat=True).distinct()
 
             prev_school_payments = SchoolPayment.objects.filter(
-                date_start__lt=prev_range[1],
+                date_start__lte=prev_range[1],
                 date_end__gte=prev_range[0],
                 user=self.request.user,
                 status__in=[
@@ -179,7 +179,7 @@ class SchoolView(TemplateView):
             # берем все подписки, которые были в периоде
             for sp in prev_school_payments:
                 # берем все уроки в оплаченном промежутке
-                date_range = [max(sp.date_start, prev_range[0]), min(sp.date_end, prev_range[1] - timedelta(days=1))]
+                date_range = [max(sp.date_start, prev_range[0]), min(sp.date_end, prev_range[1])]
                 prev_live_lessons += list(LiveLesson.objects.filter(
                     date__range=date_range,
                     deactivated_at__isnull=True,