remotes/origin/hotfix/LIL-661
gzbender 8 years ago
parent 4db3dff9bb
commit 9920ef5713
  1. 37
      apps/payment/models.py

@ -123,26 +123,29 @@ class Payment(PolymorphicModel):
if course: if course:
price = course.price price = course.price
else: else:
school_payments = SchoolPayment.objects.filter( if user:
user=user, school_payments = SchoolPayment.objects.filter(
date_start__lte=now().date(), user=user,
date_end__gte=now().date(), date_start__lte=now().date(),
add_days=False, date_end__gte=now().date(),
status__in=[ add_days=False,
Pingback.PINGBACK_TYPE_REGULAR, status__in=[
Pingback.PINGBACK_TYPE_GOODWILL, Pingback.PINGBACK_TYPE_REGULAR,
Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED, Pingback.PINGBACK_TYPE_GOODWILL,
], Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
) ],
school_schedules_purchased = school_payments.annotate( )
joined_weekdays=Func(F('weekdays'), function='unnest', ) school_schedules_purchased = school_payments.annotate(
).values_list('joined_weekdays', flat=True).distinct() joined_weekdays=Func(F('weekdays'), function='unnest', )
weekdays = set(map(int, weekdays)) - set(school_schedules_purchased) ).values_list('joined_weekdays', flat=True).distinct()
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)

Loading…
Cancel
Save