|
|
|
@ -123,6 +123,7 @@ class Payment(PolymorphicModel): |
|
|
|
if course: |
|
|
|
if course: |
|
|
|
price = course.price |
|
|
|
price = course.price |
|
|
|
else: |
|
|
|
else: |
|
|
|
|
|
|
|
if user: |
|
|
|
school_payments = SchoolPayment.objects.filter( |
|
|
|
school_payments = SchoolPayment.objects.filter( |
|
|
|
user=user, |
|
|
|
user=user, |
|
|
|
date_start__lte=now().date(), |
|
|
|
date_start__lte=now().date(), |
|
|
|
@ -138,11 +139,13 @@ class Payment(PolymorphicModel): |
|
|
|
joined_weekdays=Func(F('weekdays'), function='unnest', ) |
|
|
|
joined_weekdays=Func(F('weekdays'), function='unnest', ) |
|
|
|
).values_list('joined_weekdays', flat=True).distinct() |
|
|
|
).values_list('joined_weekdays', flat=True).distinct() |
|
|
|
weekdays = set(map(int, weekdays)) - set(school_schedules_purchased) |
|
|
|
weekdays = set(map(int, weekdays)) - set(school_schedules_purchased) |
|
|
|
|
|
|
|
prev_school_payment = school_payments.last() |
|
|
|
|
|
|
|
add_days = bool(prev_school_payment) |
|
|
|
|
|
|
|
else: |
|
|
|
|
|
|
|
add_days = False |
|
|
|
school_schedules = SchoolSchedule.objects.filter( |
|
|
|
school_schedules = SchoolSchedule.objects.filter( |
|
|
|
weekday__in=weekdays, |
|
|
|
weekday__in=weekdays, |
|
|
|
) |
|
|
|
) |
|
|
|
prev_school_payment = school_payments.last() |
|
|
|
|
|
|
|
add_days = bool(prev_school_payment) |
|
|
|
|
|
|
|
if add_days: |
|
|
|
if add_days: |
|
|
|
weekdays_count = weekdays_in_date_range(now().date(), prev_school_payment.date_end) |
|
|
|
weekdays_count = weekdays_in_date_range(now().date(), prev_school_payment.date_end) |
|
|
|
all_weekdays_count = weekdays_in_date_range(prev_school_payment.date_start, prev_school_payment.date_end) |
|
|
|
all_weekdays_count = weekdays_in_date_range(prev_school_payment.date_start, prev_school_payment.date_end) |
|
|
|
|