Merge branch 'master' of https://gitlab.com/lilcity/backend into feature/LIL-503

apps/course/templates/course/course.html

@@ -29,16 +29,15 @@
       <a class="go__btn btn" href="{% url 'course_edit' course.id %}">Редактировать</a>
       {% endif %}
       {% if course.author != request.user and not paid and course.price %}
-      <a
+      <a href="#"
         class="go__btn btn{% if pending %} btn_gray{% endif %} btn_md"
         {% if user.is_authenticated %}
         {% if not pending %}
         data-course-buy
-        href="{% url 'course-checkout' course.id %}"
+        data-popup=".js-popup-course-buy"
         {% endif %}
         {% else %}
         data-popup=".js-popup-auth"
-        href="#"
         {% endif %}
         >{% if pending %}ОЖИДАЕТСЯ ПОДТВЕРЖДЕНИЕ ОПЛАТЫ{% else %}КУПИТЬ КУРС{% endif %}</a>
       {% endif %}
@@ -159,12 +158,14 @@
             >УРОКИ
           </a>
           {% else %}
-          <a
+          <a href="#"
             class="course__action btn btn_lg{% if only_lessons %} btn_stroke{% else %} btn_gray{% endif %}"
             {% if paid or not course.price %}
             href="{% url 'course-only-lessons' course.id %}"
             {% else %}
-            data-popup=".js-popup-course-lock"
+            data-course-buy
+            data-popup=".js-popup-course-buy"
+            data-course-lock="1"
             {% endif %}
             >УРОКИ
             {% if not paid and course.price %}
@@ -323,16 +324,15 @@
         {% endif %}
       </div>
       {% if course.author != request.user and not paid and course.price %}
-        <a
+        <a href="#"
           class="go__btn btn{% if pending %} btn_gray{% endif %} btn_md"
           {% if user.is_authenticated %}
           {% if not pending %}
           data-course-buy
-          href="{% url 'course-checkout' course.id %}"
+          data-popup=".js-popup-course-buy"
           {% endif %}
           {% else %}
           data-popup=".js-popup-auth"
-          href="#"
           {% endif %}
           >{% if pending %}ОЖИДАЕТСЯ ПОДТВЕРЖДЕНИЕ ОПЛАТЫ{% else %}КУПИТЬ КУРС{% endif %}</a>
       {% endif %}

apps/payment/models.py

@@ -84,6 +84,11 @@ class PaymentManger(PolymorphicManager):
 
 
 class Payment(PolymorphicModel):
+    PW_PAID_STATUSES = [
+        Pingback.PINGBACK_TYPE_REGULAR,
+        Pingback.PINGBACK_TYPE_GOODWILL,
+        Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
+    ]
     PW_STATUS_CHOICES = (
         (Pingback.PINGBACK_TYPE_REGULAR, 'regular',),
         (Pingback.PINGBACK_TYPE_GOODWILL, 'goodwill',),
@@ -125,6 +130,10 @@ class Payment(PolymorphicModel):
     def calc_amount(cls, payment=None, user=None, course=None, date_start=None, weekdays=None):
         date_start = date_start or now().date()
         date_end = Payment.add_months(date_start, 1)
+        price = 0
+        discount = 0
+        referral_bonus = 0
+        referrer_bonus = 0
         if isinstance(payment, CoursePayment):
             course = payment.course
             user = payment.user
@@ -132,14 +141,12 @@ class Payment(PolymorphicModel):
             user = payment.user
             weekdays = payment.weekdays
             date_start = payment.date_start
-        price = 0
-        referral_bonus = 0
-        referrer_bonus = 0
         if hasattr(user, 'referral') and not user.referral.payment:
             referral_bonus = user.referral.bonus
             referrer_bonus = user.referral.referrer_bonus
-        discount = 0
+        if payment and payment.is_paid():
-        if course:
+            price = payment.amount
+        elif course:
             price = course.price
         else:
             if user:
@@ -191,9 +198,15 @@ class Payment(PolymorphicModel):
             'weekdays': weekdays,
         }
 
+    # TODO? change to property?
     def calc_commission(self):
         return self.amount * config.SERVICE_COMMISSION / 100
 
+    # TODO change to property
+    def is_paid(self):
+        return self.status in self.PW_PAID_STATUSES
+
+    # TODO? delete ? change to property
     def is_deliverable(self):
         return self.status in [
             Pingback.PINGBACK_TYPE_REGULAR,
@@ -201,9 +214,11 @@ class Payment(PolymorphicModel):
             Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
         ]
 
+    # TODO change to property
     def is_under_review(self):
         return self.status == Pingback.PINGBACK_TYPE_RISK_UNDER_REVIEW
 
+    # TODO change to property
     def is_cancelable(self):
         return self.status in [
             Pingback.PINGBACK_TYPE_NEGATIVE,
@@ -211,19 +226,15 @@ class Payment(PolymorphicModel):
         ]
 
     def save(self, *args, **kwargs):
-        paid = self.status in [Pingback.PINGBACK_TYPE_REGULAR, Pingback.PINGBACK_TYPE_GOODWILL,
-                            Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,]
         amount_data = Payment.calc_amount(payment=self)
-        print('amount_data', amount_data)
         if self.status is None and not self.bonus:
-            print(123)
             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 paid:
+        if isinstance(self, CoursePayment) and self.is_paid():
             author_balance = getattr(self, 'authorbalance', None)
-            if not author_balance :
+            if not author_balance:
                 AuthorBalance.objects.create(
                     author=self.course.author,
                     amount=self.amount,
@@ -233,7 +244,7 @@ class Payment(PolymorphicModel):
                 author_balance.amount = self.amount
                 author_balance.save()
         # Если юзер реферал и нет платежа, где применялась скидка
-        if hasattr(self.user, 'referral') and not self.user.referral.payment and paid:
+        if hasattr(self.user, 'referral') and not self.user.referral.payment and self.is_paid():
             # Платеж - как сигнал, что скидка применилась
             self.user.referral.payment = self
             self.user.referral.save()

apps/payment/views.py

@@ -58,6 +58,7 @@ class CourseBuyView(TemplateView):
     template_name = 'payment/paymentwall_widget.html'
 
     def get(self, request, pk=None, *args, **kwargs):
+        use_bonuses = request.GET.get('use_bonuses')
         host = urlsplit(self.request.META.get('HTTP_REFERER'))
         host = str(host[0]) + '://' + str(host[1])
         course = Course.objects.get(id=pk)
@@ -70,9 +71,22 @@ class CourseBuyView(TemplateView):
             course=course,
             roistat_visit=roistat_visit,
         )
+        if use_bonuses:
+            if request.user.bonus >= course_payment.amount:
+                bonus = UserBonus.objects.create(amount= -course_payment.amount, user=request.user, payment=course_payment)
+                course_payment.amount = 0
+                course_payment.status = Pingback.PINGBACK_TYPE_REGULAR
+            else:
+                bonus = UserBonus.objects.create(amount= -request.user.bonus, user=request.user,
+                                                 payment=course_payment)
+                course_payment.amount -= request.user.bonus
+            course_payment.bonus = bonus
+            course_payment.save()
+            if course_payment.is_paid():
+                return redirect(reverse_lazy('course_payment_success', args=[course.id]))
         product = Product(
             f'course_{course_payment.id}',
-            course.price,
+            course_payment.amount,
             'RUB',
             f'Курс "{course.title}"',
         )
@@ -156,7 +170,7 @@ class SchoolBuyView(TemplateView):
                 school_payment.amount -= request.user.bonus
             school_payment.bonus = bonus
             school_payment.save()
-            if school_payment.status == Pingback.PINGBACK_TYPE_REGULAR:
+            if school_payment.is_paid():
                 return redirect(reverse_lazy('payment-success'))
         product = Product(
             f'school_{school_payment.id}',

apps/school/templates/blocks/schedule.html

@@ -5,7 +5,7 @@
     <div class="title title_center">Расписание</div>
     <div class="timing js-timing">
       <div class="timing__week">
-        {% for school_schedule in school_schedules %}
+        {% for school_schedule in school_schedules_sorted %}
           {% include 'blocks/schedule_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_live_lesson purchased=True %}
         {% endfor %}
       </div>

apps/school/templates/blocks/schedule_purchased.html

@@ -6,9 +6,11 @@
       <div class="casing__col">
         <div class="casing__subscribe">
           {% if is_purchased %}
-          <div class="casing__msg">Подписка истекает
+            {% if not school_purchased_future %}
-            <span class="bold">{{ subscription_ends }}</span>
+            <div class="casing__msg">Подписка истекает
-          </div>
+              <span class="bold">{{ subscription_ends }}</span>
+            </div>
+            {% endif %}
           {% else %}
           <div class="casing__msg">Подписка
             <span class="bold">истекла</span>

apps/school/templates/summer/schedule_purchased.html

@@ -42,7 +42,7 @@
                   {% endif %}
                 {% endfor %}
               {% else %}
-                {% for school_schedule in school_schedules %}
+                {% for school_schedule in school_schedules_sorted %}
                 {% include 'blocks/schedule_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_live_lesson purchased=True %}
                 {% endfor %}
               {% endif %}

apps/school/views.py

@@ -128,32 +128,43 @@ class SchoolView(TemplateView):
 
         school_schedules = SchoolSchedule.objects.all()
         try:
-            school_schedules = sorted(school_schedules, key=lambda ss: ss.current_live_lesson and ss.current_live_lesson.date)
+            school_schedules_sorted = sorted(school_schedules, key=lambda ss: ss.current_live_lesson and ss.current_live_lesson.date)
         except Exception:
             pass
         school_schedules_dict = {ss.weekday: ss for ss in school_schedules}
         school_schedules_dict[0] = school_schedules_dict.get(7)
         live_lessons = None
         live_lessons_exists = False
+        subscription_ends = None
         if self.request.user.is_authenticated:
             school_payment = SchoolPayment.objects.filter(
                 user=self.request.user,
-                status__in=[
+                status__in=SchoolPayment.PW_PAID_STATUSES,
-                    Pingback.PINGBACK_TYPE_REGULAR,
-                    Pingback.PINGBACK_TYPE_GOODWILL,
-                    Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
-                ],
                 date_start__lte=date_now,
                 date_end__gte=date_now
             )
             school_payment_exists = school_payment.exists()
 
+            school_purchased_future = SchoolPayment.objects.filter(
+                user=self.request.user,
+                status__in=SchoolPayment.PW_PAID_STATUSES,
+                date_start__gt=date_now,
+                date_end__gt=date_now
+            )
+
+            if school_purchased_future.exists():
+                subscription_ends = school_purchased_future.filter(add_days=False).latest(
+                    'date_end').date_end
+            elif school_payment_exists:
+                subscription_ends = school_payment.filter(add_days=False).latest('date_end').date_end
+
             school_schedules_purchased = school_payment.annotate(
                 joined_weekdays=Func(F('weekdays'), function='unnest',)
             ).values_list('joined_weekdays', flat=True).distinct()
         else:
             school_payment_exists = False
             school_schedules_purchased = []
+            school_purchased_future = False
         if is_previous:
             prev_range = [yesterday - timedelta(days=7), yesterday]
             live_lessons = []
@@ -180,7 +191,7 @@ class SchoolView(TemplateView):
                 ll.school_schedule = school_schedules_dict.get(ll.date.isoweekday())
             live_lessons_exists = live_lessons.exists()
             live_lessons = live_lessons or None
-        subscription_ends = school_payment.filter(add_days=False).last().date_end if school_payment_exists else None
+
         context.update({
             'online': online,
             'live_lessons': live_lessons,
@@ -190,12 +201,14 @@ class SchoolView(TemplateView):
             'is_purchased': school_payment_exists,
             'is_purchased_future': False,
             'min_school_price': SchoolSchedule.objects.aggregate(Min('month_price'))['month_price__min'],
+            'school_schedules_sorted': school_schedules_sorted,
             'school_schedules': school_schedules,
             'school_schedules_purchased': school_schedules_purchased,
-            'school_purchased_future': False,
+            'school_purchased_future': school_purchased_future,
             'subscription_ends': subscription_ends,
             'prolong_date_start': subscription_ends + timedelta(days=1) if subscription_ends else None,
-            'allow_prolong': subscription_ends - date_now <= timedelta(days=14) if subscription_ends else False,
+            'allow_prolong': subscription_ends - date_now <= timedelta(days=7)
+                if not school_purchased_future and subscription_ends else False,
         })
         return context
 

apps/user/models.py

@@ -102,10 +102,11 @@ class User(AbstractUser):
 
     @cached_property
     def balance(self):
+        from apps.payment.models import Payment
         income = self.balances.filter(
                 type=0,
                 payment__isnull=False,
-                payment__status__isnull=False
+                payment__status__in=Payment.PW_PAID_STATUSES,
             ).aggregate(
             models.Sum('amount'),
             models.Sum('commission'),
@@ -120,7 +121,11 @@ class User(AbstractUser):
 
     @cached_property
     def bonus(self):
-        return int(self.bonuses.aggregate(models.Sum('amount')).get('amount__sum') or 0)
+        from apps.payment.models import Payment
+        return int(self.bonuses.filter(
+            payment__isnull=False,
+            payment__status__in=Payment.PW_PAID_STATUSES,
+        ).aggregate(models.Sum('amount')).get('amount__sum') or 0)
 
 
 @receiver(post_save, sender=User)

apps/user/templates/user/bonus-history.html

@@ -17,7 +17,7 @@
       вы получите {{ config.REFERRER_BONUS }}%, а они {{ config.REFERRAL_BONUS }}%
       {% endif %}
       от суммы их первой покупки на бонусный счет. Приглашайте друзей, накапливайте бонусные баллы, тратьте бонусы
-      на приобретения доступа к школе и курсам. Оплата услуг возможна только, если вы накопили баллов на стоимость услуги.
+      на приобретения доступа к школе и курсам.
       <br>
       Просто отправьте им эту ссылку, по которой они смогут зарегистрироваться:
     </div>

apps/user/views.py

@@ -23,7 +23,7 @@ from apps.auth.tokens import verification_email_token
 from apps.course.models import Course
 from apps.notification.utils import send_email
 from apps.school.models import SchoolSchedule
-from apps.payment.models import AuthorBalance, CoursePayment, SchoolPayment
+from apps.payment.models import AuthorBalance, CoursePayment, SchoolPayment, Payment
 from apps.user.models import AuthorRequest, EmailSubscription, SubscriptionCategory
 
 from .forms import AuthorRequesForm, UserEditForm, WithdrawalForm
@@ -70,7 +70,6 @@ class ProfileView(TemplateView):
         ).distinct()
         school_payment = SchoolPayment.objects.filter(
             user=self.object,
-            date_start__lte=now(),
             date_end__gte=now(),
             status__in=[
                 Pingback.PINGBACK_TYPE_REGULAR,
@@ -300,7 +299,10 @@ class BonusHistoryView(TemplateView):
 
     def get(self, request, *args, **kwargs):
         context = self.get_context_data(**kwargs)
-        context['bonuses'] = request.user.bonuses.all()
+        context['bonuses'] = request.user.bonuses.filter(
+            payment__isnull=False,
+            payment__status__in=Payment.PW_PAID_STATUSES,
+        )
         context['referrer_url'] = '%s%s?referrer=%s' % (
             settings.MAIN_HOST, reverse('index'), short_url.encode_url(request.user.id)
         )

project/templates/blocks/popup_course_buy.html

@@ -0,0 +1,54 @@
+{% load static %}
+<div class="popup js-popup-course-buy">
+  <div class="popup__wrap js-popup-wrap">
+    <button class="popup__close js-popup-close">
+      <svg class="icon icon-close">
+        <use xlink:href="{% static 'img/sprite.svg' %}#icon-close"></use>
+      </svg>
+    </button>
+    <div class="popup__body">
+      <div class="buy">
+        <div class="buy__row">
+          <div class="buy__subtitle">ЧТОБЫ ПРОДОЛЖИТЬ ПРОСМОТР</div>
+          <div class="buy__col" style="flex: 1;">
+            <div class="order">
+              <div class="order__wrap">
+                <div class="order__title">Ваш заказ:</div>
+                <div class="order__preview">
+                  {% if course.cover %}
+                  <img class="order__pic" src="{{ course.cover.image.url }}">
+                  {% else %}
+                  <img class="order__pic" src="{% static 'img/order.jpg' %}">
+                  {% endif %}
+                </div>
+                <div class="order__info">
+                  <div class="order__label">КУРС</div>
+                  <div>{{ course.title }}</div>
+                  {% if request.user.bonuses %}
+                  <label class="buy__bonuses switch" style="display: none;">
+                    <input class="switch__input" type="checkbox" data-bonuses="{{ request.user.bonus }}">
+                    <span class="switch__content">
+                      <span class="switch__cell">Использовать <span class="buy__bonuses-count"></span></span>
+                    </span>
+                  </label>
+                  {% endif %}
+                </div>
+                <div class="order__foot">
+                  <div class="order__subtitle">Итого:</div>
+                  <div class="order__total">
+                    <div class="loading-loader"></div>
+                    <span class="order_price_text">{{ course.price }}р.</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="buy__foot">
+          <a class="buy__btn btn btn_md but_btn_popup" data-link="{% url 'course-checkout' course.id %}" data-price="{{ course.price }}">КУПИТЬ КУРС</a>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+

project/templates/blocks/popup_school_buy.html

@@ -11,7 +11,7 @@
         <div class="buy__row">
           <div class="buy__col">
             <div class="buy__head buy__head_main">
-              <div class="buy__title">Выбор курса/дня</div>
+              <div class="buy__title">Выбор дня</div>
             </div>
           </div>
           <div class="buy__col">

project/templates/lilcity/index.html

@@ -146,7 +146,10 @@
       </div>
       {% include "templates/blocks/footer.html" %}
       {% include "templates/blocks/popup_auth.html" %}
-      {% include "templates/blocks/popup_buy.html" %}
+      {% include "templates/blocks/popup_school_buy.html" %}
+      {% if course %}
+      {% include "templates/blocks/popup_course_buy.html" %}
+      {% endif %}
       {% include "templates/blocks/popup_course_lock.html" %}
       {% include "templates/blocks/popup_subscribe.html" %}
     </div>

project/urls.py

@@ -39,6 +39,7 @@ from apps.payment.views import (
 
 from .views import AboutView, IndexView, SchoolSchedulesView
 
+# TODO trim slash in the end
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('auth/', include(('apps.auth.urls', 'lilcity'))),

web/src/js/modules/popup.js

@@ -87,10 +87,50 @@ $(document).ready(function () {
                     });
                 }
             }
+            popup.on('change', '[data-day]', function(){
+                updateCart();
+            });
+
+            popup.on('change', '[data-bonuses]', function(){
+                updateCart();
+            });
 
             updateCart();
         }
 
+        if(data === '.js-popup-course-buy'){
+            const updateCourseCart = () => {
+                const $orderPrice = popup.find('.order_price_text');
+                const useBonuses = $bonusesCheckbox.prop('checked');
+                const amount = useBonuses ? coursePrice - bonusesCount : coursePrice;
+
+                $orderPrice.html(amount !== coursePrice ? `<del>${coursePrice}</del> ${amount}р.` : `${amount}р.`);
+                $buyBtn.attr('href', link + '?' + decodeURIComponent($.param({
+                    use_bonuses: useBonuses || ''
+                })));
+            }
+            const $buyBtn = popup.find('.but_btn_popup');
+            const link = $buyBtn.data('link');
+            const coursePrice = +$buyBtn.data('price').replace(',', '.');
+            const $bonuses = popup.find('.buy__bonuses');
+            const $bonusesCount = popup.find('.buy__bonuses-count');
+            const $bonusesCheckbox = popup.find('[data-bonuses]');
+            const bonuses = +$bonusesCheckbox.data('bonuses');
+            const bonusesCount = bonuses > coursePrice ? coursePrice : bonuses;
+            const isCourseLock = $this.data('course-lock');
+
+            popup.find('.buy__subtitle').css('display', isCourseLock ? '' : 'none');
+
+            $bonuses.hide();
+            if(bonuses){
+                $bonusesCount.text(rupluralize(bonusesCount, ['бонус', 'бонуса', 'бонусов']));
+                $bonuses.show();
+            }
+
+            popup.on('change', '[data-bonuses]', updateCourseCart);
+            updateCourseCart();
+        }
+
         if( data === '.js-popup-auth') {
             let nextUrl = $this.data('auth-next-url');
             if(nextUrl === 'href') {
@@ -146,26 +186,18 @@ $(document).ready(function () {
         });
     }
 
-    $(document).on('change', '[data-day]', function(){
-        updateCart();
-    });
-
-    $(document).on('change', '[data-bonuses]', function(){
-        updateCart();
-    });
-
     function updateCart(){
-        var link = $('.but_btn_popup').data('link');
+        var link = popup.find('.but_btn_popup').data('link');
-        var $order = $('.order');
+        var $order = popup.find('.order');
-        var $orderPrice = $('.order_price_text');
+        var $orderPrice = popup.find('.order_price_text');
-        var $orderDates = $('.order__dates');
+        var $orderDates = popup.find('.order__dates');
         var dateStart = popup.data('date-start');
         var days = ['', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота', 'Воскресенье'];
         var weekdays = [];
         var daysText = [];
-        var $bonuses = $('.buy__bonuses');
+        var $bonuses = popup.find('.buy__bonuses');
-        var $bonusesCheckbox = $('[data-bonuses]');
+        var $bonusesCheckbox = popup.find('[data-bonuses]');
-        var $bonusesCount = $('.buy__bonuses-count');
+        var $bonusesCount = popup.find('.buy__bonuses-count');
         var useBonuses = $bonusesCheckbox.prop('checked');
         var bonuses = +$bonusesCheckbox.data('bonuses');
         $('[data-day]').each(function() {

web/src/sass/_common.sass

@@ -3039,6 +3039,13 @@ a.grey-link
     font-size: 30px
     +t
       font-size: 24px
+  &__subtitle
+    margin-bottom: 10px
+    font-family: 'ProximaNova-Bold', serif
+    font-size: 12px
+    letter-spacing: 2px
+    text-align: center
+    width: 100%
   &__content
     font-size: 12px
     color: $gray
@@ -3055,6 +3062,8 @@ a.grey-link
       right: 0;
       padding: 0;
       top: 9px;
+  &__bonuses
+    margin-top: 10px
 
 .order
   padding: 2px