lil-583

apps/payment/views.py

@@ -98,16 +98,17 @@ class SchoolBuyView(TemplateView):
         host = urlsplit(self.request.META.get('HTTP_REFERER'))
         host = str(host[0]) + '://' + str(host[1])
         weekdays = set(request.GET.getlist('weekdays', []))
+        use_bonuses = request.GET.get('use_bonuses')
         add_days = 'add_days' in request.GET
         roistat_visit = request.COOKIES.get('roistat_visit', None)
         if not weekdays:
             messages.error(request, 'Выберите несколько дней недели.')
-            return redirect('school:summer-school')
+            return redirect('school:school')
         try:
             weekdays = [int(weekday) for weekday in weekdays]
         except ValueError:
             messages.error(request, 'Ошибка выбора дней недели.')
-            return redirect('school:summer-school')
+            return redirect('school:school')
         if add_days:
             _school_payment = SchoolPayment.objects.filter(
                 user=request.user,
@@ -128,7 +129,7 @@ class SchoolBuyView(TemplateView):
             )
             if school_payment.amount <= 0:
                 messages.error(request, 'Выбранные дни отсутствуют в оставшемся периоде подписки')
-                return redirect(reverse_lazy('school:summer-school'))
+                return redirect(reverse_lazy('school:school'))
         else:
             school_payment = SchoolPayment.objects.create(
                 user=request.user,

apps/user/templates/blocks/profile-menu.html

@@ -1,9 +1,14 @@
 <div class="section section_gray section_menu">
   <div class="section__center center center_xs">
     <div class="menu">
-      <a class="menu__link" href="{% url 'user-edit-profile' %}">Профиль</a>
+      <a class="menu__link {% if active == 'profile' %}active{% endif %}"
-      <a class="menu__link" href="{% url 'user-edit-notifications' user.id %}">Уведомления</a>
+         href="{% url 'user-edit-profile' %}">Профиль</a>
-      <a class="menu__link active" href="{% url 'user-edit-payments' user.id %}">Платежи</a>
+      <a class="menu__link {% if active == 'notifications' %}active{% endif %}"
+         href="{% url 'user-edit-notifications' %}">Уведомления</a>
+      <a class="menu__link {% if active == 'payments' %}active{% endif %}"
+         href="{% url 'user-edit-payments' %}">Платежи</a>
+      <a class="menu__link {% if active == 'bonuses' %}active{% endif %}"
+         href="{% url 'user-bonuses' %}">Бонусы</a>
     </div>
   </div>
 </div>

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

@@ -3,7 +3,7 @@
 {% load rupluralize from plural %}
 
 {% block content %}
-{% include "../blocks/profile-menu.html" %}
+{% include "../blocks/profile-menu.html" with active="bonuses" %}
 
 <div class="section section_gray" style="padding-bottom: 0;">
   <div class="section__center center center_xs">
@@ -37,11 +37,7 @@
             Школа. {% if payment.date_start and payment.date_end %}{{ payment.date_start }} - {{ payment.date_end }}{% endif %}
           </div>
           {% endif %}
-          {% if payment.balance %}
+          <div class="transactions__cell">{{payment.amount }}</div>
-          <div class="transactions__cell">{{payment.balance.amount}}</div>
-          {% else %}
-          <div class="transactions__cell">{{payment.amount|floatformat }}</div>
-          {% endif %}
           {% if bonus.referral %}
           <div class="transactions__cell"><a href="{% url 'user' pk=bonus.referral.referral.id %}">{{ bonus.referral.referral.get_full_name }}</a></div>
           {% endif %}

apps/user/templates/user/notification-settings.html

@@ -1,5 +1,5 @@
 {% extends "templates/lilcity/index.html" %} {% load static %} {% block content %}
-{% include "../blocks/profile-menu.html" %}
+{% include "../blocks/profile-menu.html" with active="notifications" %}
 {% if not user.is_email_proved %}
 <div class="section section_confirm">
   <div class="section__center center center_xs">

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

@@ -1,5 +1,5 @@
 {% extends "templates/lilcity/index.html" %} {% load static %} {% block content %}
-{% include "../blocks/profile-menu.html" %}
+{% include "../blocks/profile-menu.html" with active="payments" %}
 {% if not user.is_email_proved %}
 <div class="section section_confirm">
   <div class="section__center center center_xs">

apps/user/templates/user/profile-settings.html

@@ -1,5 +1,5 @@
 {% extends "templates/lilcity/index.html" %} {% load static %} {% load thumbnail %} {% block content %}
-{% include "../blocks/profile-menu.html" %}
+{% include "../blocks/profile-menu.html" with active="profile" %}
 {% if not user.is_email_proved %}
 <div class="section section_confirm">
   <div class="section__center center center_xs">

apps/user/views.py

@@ -158,7 +158,7 @@ class NotificationEditView(TemplateView):
         request.user.email_subscription.categories.set(
             SubscriptionCategory.objects.filter(id__in=categories)
         )
-        return redirect('user-edit-notifications', request.user.id)
+        return redirect('user-edit-notifications')
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -195,7 +195,7 @@ class PaymentHistoryView(FormView):
             return self.form_invalid(form)
 
     def get_success_url(self):
-        success_url = reverse_lazy('user-edit-payments', args=[self.request.user.id])
+        success_url = reverse_lazy('user-edit-payments')
         return success_url
 
 

project/templates/blocks/popup_buy.html

@@ -88,11 +88,19 @@
                 </div>
                 <div class="order__info">
                   <div class="order__label">ШКОЛА</div>
-                  <div class="order__days">Вторник, Четверг, Воскресенье</div>
+                  <div class="order__days"></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>
+                    </span>
+                  </label>
+                  {% endif %}
                 </div>
                 <div class="order__foot">
                   <div class="order__subtitle">Итого, за месяц:</div>
-                  <div class="order__total order_price_text">1800р.</div>
+                  <div class="order__total order_price_text"></div>
                 </div>
               </div>
             </div>

project/templates/blocks/user_menu.html

@@ -12,7 +12,7 @@
   <div class="header__drop">
     {# FIXME #}
     {% if request.user.role >= request.user.AUTHOR_ROLE %}
-      <a class="header__link header__link_border" href="{% url 'user-edit-payments' request.user.id %}">
+      <a class="header__link header__link_border" href="{% url 'user-edit-payments' %}">
         {{ request.user.balance }} руб.
       </a>
     {% endif %}

project/urls.py

@@ -70,8 +70,8 @@ urlpatterns = [
     path('user/profile/', ProfileView.as_view(), name='user-profile'),
     path('user/profile/edit', ProfileEditView.as_view(), name='user-edit-profile'),
     path('user/<int:pk>/', UserView.as_view(), name='user'),
-    path('user/<int:pk>/notifications', NotificationEditView.as_view(), name='user-edit-notifications'),
+    path('user/notifications', NotificationEditView.as_view(), name='user-edit-notifications'),
-    path('user/<int:pk>/payments', PaymentHistoryView.as_view(), name='user-edit-payments'),
+    path('user/payments', PaymentHistoryView.as_view(), name='user-edit-payments'),
     path('user/bonuses', BonusHistoryView.as_view(), name='user-bonuses'),
     path('user/resend-email-verify', resend_email_verify, name='resend-email-verify'),
     path('subscribe', SubscribeView.as_view(), name='subscribe'),

web/src/js/modules/popup.js

@@ -145,10 +145,18 @@ $(document).ready(function () {
         updateCart();
     });
 
+    $(document).on('change', '[data-bonuses]', function(){
+        updateCart();
+    });
+
     function updateCart(){
         var $orderPrice = $('.order_price_text');
         var days = ['', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота', 'Воскресенье'];
         var weekdays = [], daysText = [];
+        var $bonuses = $('.buy__bonuses');
+        var $bonusesCheckbox = $('[data-bonuses]');
+        var useBonuses = $bonusesCheckbox.prop('checked');
+        var bonuses = +$bonusesCheckbox.data('bonuses');
         $('[data-day]').each(function() {
             var weekday = $(this).data('day');
             if($(this).is(':checked')) {
@@ -161,10 +169,17 @@ $(document).ready(function () {
             api.getPaymentAmount({ user: window.LIL_STORE.user.id, weekdays: weekdays })
             .then((response) => {
                 var text = '';
-                if(response.data.price != response.data.amount) {
+                var amount = +response.data.amount;
-                    text = '<del>'+response.data.price+'</del> '+response.data.amount+'р.';
+                if(bonuses && bonuses >= amount){
+                  $bonuses.show();
+                }
+                if(useBonuses){
+                    amount = 0;
+                }
+                if(response.data.price != amount) {
+                    text = '<del>' + response.data.price+'</del> ' + amount + 'р.';
                 } else {
-                    text = response.data.amount+'p.';
+                    text = amount + 'p.';
                 }
                 $orderPrice.html(text);
             });
@@ -177,7 +192,7 @@ $(document).ready(function () {
 
         var link = $('.but_btn_popup').data('link');
 
-        link = link+'?'+decodeURIComponent($.param({weekdays: weekdays}, true));
+        link = link+'?'+decodeURIComponent($.param({weekdays: weekdays, use_bonuses: useBonuses || ''}, true));
         $('.but_btn_popup').attr('href', link);
     }