Merge branch 'hotfix/school-payment-w-bonus' into 'master'

Не продляется подписка при оплате лиликами

See merge request lilschool/site!410
remotes/origin/hotfix/prolong-btn
Danil 6 years ago
commit cd2ebab784
  1. 5
      apps/payment/views.py

@ -135,6 +135,11 @@ class SchoolBuyView(TemplateView):
payment_id = request.GET.get('payment_id') payment_id = request.GET.get('payment_id')
package = get_object_or_404(Package, duration=duration) package = get_object_or_404(Package, duration=duration)
date_start = date_start and datetime.datetime.strptime(date_start, '%Y-%m-%d').date() or now().date() date_start = date_start and datetime.datetime.strptime(date_start, '%Y-%m-%d').date() or now().date()
prev_payment = SchoolPayment.objects.paid().filter(
user=self.request.user,
date_end__gte=now().date(),).last()
if prev_payment and prev_payment.date_end > date_start:
date_start = prev_payment.date_end + timedelta(1)
if payment_id: if payment_id:
school_payment = get_object_or_404(SchoolPayment, id=payment_id) school_payment = get_object_or_404(SchoolPayment, id=payment_id)
else: else:

Loading…
Cancel
Save