diff --git a/apps/course/tests/__init__.py b/apps/course/tests/__init__.py
index e69de29b..7230f40d 100644
--- a/apps/course/tests/__init__.py
+++ b/apps/course/tests/__init__.py
@@ -0,0 +1,8 @@
+# TODO: test_course_access_duration
+'''
+сделать поле "продолжительность доступа" у курсов: автор указывает продолжительность,
+после покупки по истечению указанного кол-ва дней у пользователя нет доступа к курсу,
+но он может его купить с 50% скидкой, при покупке курса появляется надпись "осталось Х дней доступа",
+так же за неделю до окончания можно купить курс еще раз с 50% скидкой, при этом доступ продлевается
+на указанное кол-во дней в продолжительности
+'''
diff --git a/apps/course/views.py b/apps/course/views.py
index 7ac3297d..1f0a101f 100644
--- a/apps/course/views.py
+++ b/apps/course/views.py
@@ -1,5 +1,6 @@
-from paymentwall import Pingback
+from datetime import timedelta
+from paymentwall import Pingback
from django.contrib.auth import get_user_model
from django.contrib.auth.decorators import login_required
from django.db.models import Q
@@ -12,8 +13,9 @@ from django.utils.decorators import method_decorator
from django.views.decorators.csrf import csrf_exempt
from django.views.decorators.http import require_http_methods
from django.utils.translation import gettext as _
+from django.utils.timezone import now
-from apps.payment.models import AuthorBalance
+from apps.payment.models import AuthorBalance, CoursePayment
from .models import Course, Like, Lesson, CourseComment, LessonComment
from .filters import CourseFilter
@@ -231,14 +233,20 @@ class CourseView(DetailView):
context = super().get_context_data(**kwargs)
if self.request.user.is_authenticated:
context['next'] = self.request.GET.get('next', None)
- context['paid'] = self.object.payments.filter(
+ # берем последнюю оплату курса
+ payments = self.object.payments.filter(
user=self.request.user,
status__in=[
Pingback.PINGBACK_TYPE_REGULAR,
Pingback.PINGBACK_TYPE_GOODWILL,
Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
- ],
- ).exists()
+ ])
+ payment = payments.filter(access_expire__gte=now().date()).order_by('-access_expire').first()
+ context['payment'] = payment
+ context['access_duration'] = ((payment.access_expire - now().date()).days + 1) if payment else self.object.access_duration
+ context['paid'] = bool(payment)
+ context['can_buy_again'] = bool(self.object.price) and (context['access_duration'] <= 7 if payment else
+ payments.filter(access_expire__lt=now().date()).exists())
context['pending'] = self.object.payments.filter(
user=self.request.user,
status=Pingback.PINGBACK_TYPE_RISK_UNDER_REVIEW,
@@ -249,6 +257,8 @@ class CourseView(DetailView):
context['is_owner'] = self.object.author == self.request.user
context['is_admin'] = self.request.user.role == User.ADMIN_ROLE
context['has_full_access'] = context['is_owner'] or context['is_admin']
+
+ context['course_price'] = self.object.price / 2 if context.get('can_buy_again') else self.object.price
return context
def get_queryset(self):
@@ -317,6 +327,13 @@ class CoursesView(ListView):
context['age_name'] = dict(Course.AGE_CHOICES).get(age, '')
else:
context['age_name'] = ''
+ if self.request.user.is_authenticated:
+ can_buy_again_courses = list(CoursePayment.objects.filter(user=self.request.user,
+ status__in=CoursePayment.PW_PAID_STATUSES,
+ access_expire__lte=now().date() + timedelta(7)).values_list('course_id', flat=True))
+ for course in context['course_items']:
+ if course.id in can_buy_again_courses:
+ course.buy_again_price = course.price / 2
return context
def get_template_names(self):
@@ -340,6 +357,7 @@ class LessonView(DetailView):
Pingback.PINGBACK_TYPE_GOODWILL,
Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
],
+ access_expire__gte=now().date(),
).exists()
# если это не автор или админ
if not (request.user.is_authenticated and
diff --git a/apps/payment/management/commands/fill_access_expired.py b/apps/payment/management/commands/fill_access_expired.py
new file mode 100644
index 00000000..b9fd134a
--- /dev/null
+++ b/apps/payment/management/commands/fill_access_expired.py
@@ -0,0 +1,18 @@
+from datetime import timedelta
+
+from django.core.management.base import BaseCommand
+from django.db.models import F
+
+from apps.payment.models import CoursePayment
+
+
+class Command(BaseCommand):
+ help = 'Fill payment.access_expire where it is not filled'
+
+ def handle(self, *args, **options):
+
+ for payment in CoursePayment.objects.filter(access_expire__isnull=True):
+ payment.access_expire = payment.created_at.date() + timedelta(days=payment.course.access_duration)
+ payment.save()
+
+
diff --git a/apps/payment/migrations/0031_coursepayment_access_expired.py b/apps/payment/migrations/0031_coursepayment_access_expired.py
new file mode 100644
index 00000000..bf472d32
--- /dev/null
+++ b/apps/payment/migrations/0031_coursepayment_access_expired.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.7 on 2019-02-06 17:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('payment', '0030_auto_20190114_1649'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='coursepayment',
+ name='access_expired',
+ field=models.DateField(null=True, verbose_name='Доступ к курсу до даты'),
+ ),
+ ]
diff --git a/apps/payment/migrations/0032_auto_20190207_1233.py b/apps/payment/migrations/0032_auto_20190207_1233.py
new file mode 100644
index 00000000..764c08a2
--- /dev/null
+++ b/apps/payment/migrations/0032_auto_20190207_1233.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.7 on 2019-02-07 12:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('payment', '0031_coursepayment_access_expired'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='coursepayment',
+ old_name='access_expired',
+ new_name='access_expire',
+ ),
+ ]
diff --git a/apps/payment/models.py b/apps/payment/models.py
index 5b4e7615..4e157d4a 100644
--- a/apps/payment/models.py
+++ b/apps/payment/models.py
@@ -63,7 +63,7 @@ class AuthorBalance(models.Model):
verbose_name_plural = 'Балансы'
def save(self, *args, **kwargs):
- if self.status != self.ACCEPTED:
+ if self.type == self.IN and not self.id:
self.commission = self.calc_commission()
if self.type == self.OUT:
if self.status == self.DECLINED and not self.declined_send_at:
@@ -152,18 +152,15 @@ class Payment(PolymorphicModel):
elif isinstance(payment, GiftCertificatePayment):
price = payment.gift_certificate.price
elif course:
- price = course.price
+ paid_before = CoursePayment.objects.filter(user=user, course=course, status__in=Payment.PW_PAID_STATUSES).exists()
+ price = course.price / 2 if paid_before else course.price
else:
if user:
school_payments = SchoolPayment.objects.filter(
user=user,
date_start__lte=date_start,
date_end__gte=date_start,
- status__in=[
- Pingback.PINGBACK_TYPE_REGULAR,
- Pingback.PINGBACK_TYPE_GOODWILL,
- Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
- ],
+ status__in=Payment.PW_PAID_STATUSES,
)
school_schedules_purchased = school_payments.annotate(
joined_weekdays=Func(F('weekdays'), function='unnest', )
@@ -232,39 +229,38 @@ class Payment(PolymorphicModel):
def save(self, *args, **kwargs):
amount_data = Payment.calc_amount(payment=self)
- if self.status is None and not self.bonus:
- self.amount = amount_data.get('amount')
- if isinstance(self, SchoolPayment):
- self.weekdays = amount_data.get('weekdays')
+ if not self.is_paid():
+ if not self.bonus:
+ self.amount = amount_data.get('amount')
+ if isinstance(self, SchoolPayment):
+ self.weekdays = amount_data.get('weekdays')
super().save(*args, **kwargs)
- if isinstance(self, CoursePayment) and self.is_paid():
- author_balance = getattr(self, 'authorbalance', None)
- if not author_balance:
- AuthorBalance.objects.create(
- author=self.course.author,
- amount=self.amount,
- payment=self,
- )
- else:
- author_balance.amount = self.amount
- author_balance.save()
- if isinstance(self, GiftCertificatePayment) and self.is_paid():
- ugs, created = UserGiftCertificate.objects.get_or_create(user=self.user, gift_certificate=self.gift_certificate,
- payment=self)
- if created:
- from apps.notification.tasks import send_gift_certificate
- send_gift_certificate(ugs.id)
- # Если юзер реферал и нет платежа, где применялась скидка
- if hasattr(self.user, 'referral') and not self.user.referral.payment and self.is_paid():
- # Платеж - как сигнал, что скидка применилась
- self.user.referral.payment = self
- self.user.referral.save()
- # Отправляем кэшбэк
- self.user.referral.send_bonuses(amount_data.get('referral_bonus'), amount_data.get('referrer_bonus'))
+ if self.is_paid():
+ if isinstance(self, CoursePayment):
+ if not getattr(self, 'authorbalance', None):
+ AuthorBalance.objects.create(
+ author=self.course.author,
+ amount=self.amount,
+ payment=self,
+ )
+ if isinstance(self, GiftCertificatePayment):
+ ugs, created = UserGiftCertificate.objects.get_or_create(user=self.user, gift_certificate=self.gift_certificate,
+ payment=self)
+ if created:
+ from apps.notification.tasks import send_gift_certificate
+ send_gift_certificate(ugs.id)
+ # Если юзер реферал и нет платежа, где применялась скидка
+ if hasattr(self.user, 'referral') and not self.user.referral.payment:
+ # Платеж - как сигнал, что скидка применилась
+ self.user.referral.payment = self
+ self.user.referral.save()
+ # Отправляем кэшбэк
+ self.user.referral.send_bonuses(amount_data.get('referral_bonus'), amount_data.get('referrer_bonus'))
class CoursePayment(Payment):
course = models.ForeignKey(Course, on_delete=models.CASCADE, verbose_name='Курс', related_name='payments')
+ access_expire = models.DateField('Доступ к курсу до даты', null=True)
class Meta:
verbose_name = 'Платеж за курс'
diff --git a/apps/payment/views.py b/apps/payment/views.py
index b9491321..f1399ff2 100644
--- a/apps/payment/views.py
+++ b/apps/payment/views.py
@@ -67,9 +67,15 @@ class CourseBuyView(TemplateView):
if request.user == course.author:
messages.error(request, 'Вы не можете приобрести свой курс.')
return redirect(reverse_lazy('course', args=[course.id]))
+ prev_payment = CoursePayment.objects.filter(user=request.user, course=course,
+ status__in=Payment.PW_PAID_STATUSES).order_by('-access_expire').first()
+ access_duration = course.access_duration or 90
+ access_expire = prev_payment.access_expire + timedelta(days=access_duration) if prev_payment \
+ else now().date() + timedelta(days=access_duration - 1)
course_payment = CoursePayment.objects.create(
user=request.user,
course=course,
+ access_expire=access_expire,
roistat_visit=roistat_visit,
)
if use_bonuses:
diff --git a/apps/school/views.py b/apps/school/views.py
index 7387c129..3dc0f01a 100644
--- a/apps/school/views.py
+++ b/apps/school/views.py
@@ -187,7 +187,7 @@ class SchoolView(TemplateView):
date__range=date_range,
deactivated_at__isnull=True,
date__week_day__in=list(map(lambda x: 1 if x == 7 else x+1, sp.weekdays)),
- ).values_list('id', flat=True))
+ ).exclude(title='').values_list('id', flat=True))
prev_live_lessons = LiveLesson.objects.filter(id__in=set(prev_live_lessons)).order_by('-date')
prev_live_lessons_exists = prev_live_lessons.exists()
if prev_live_lessons_exists:
@@ -195,7 +195,6 @@ class SchoolView(TemplateView):
school_schedules_dict[0] = school_schedules_dict.get(7)
for ll in prev_live_lessons:
ll.school_schedule = school_schedules_dict.get(ll.date.isoweekday())
-
context.update({
'online': online,
'prev_live_lessons': prev_live_lessons,
diff --git a/apps/user/models.py b/apps/user/models.py
index 5a7337bd..5713e6db 100644
--- a/apps/user/models.py
+++ b/apps/user/models.py
@@ -108,9 +108,9 @@ class User(AbstractUser):
@cached_property
def balance(self):
- from apps.payment.models import Payment
+ from apps.payment.models import Payment, AuthorBalance
income = self.balances.filter(
- type=0,
+ type=AuthorBalance.IN,
payment__isnull=False,
payment__status__in=Payment.PW_PAID_STATUSES,
).aggregate(
@@ -120,7 +120,7 @@ class User(AbstractUser):
income_amount = income.get('amount__sum') or 0
income_commission = income.get('commission__sum') or 0
- payout = self.balances.filter(type=1, status=1).aggregate(models.Sum('amount'))
+ payout = self.balances.filter(type=AuthorBalance.OUT, status=AuthorBalance.ACCEPTED).aggregate(models.Sum('amount'))
payout_amount = payout.get('amount__sum') or 0
return income_amount - income_commission - payout_amount
diff --git a/project/templates/blocks/popup_course_buy.html b/project/templates/blocks/popup_course_buy.html
index 0498564d..6158a551 100644
--- a/project/templates/blocks/popup_course_buy.html
+++ b/project/templates/blocks/popup_course_buy.html
@@ -37,7 +37,7 @@
Итого:
-
{{ course.price }}р.
+
{{ course_price }}р.