diff --git a/apps/user/views.py b/apps/user/views.py
index a235629d..6f54861d 100644
--- a/apps/user/views.py
+++ b/apps/user/views.py
@@ -4,18 +4,16 @@ from uuid import uuid4
from os.path import splitext
from datetime import timedelta
from paymentwall import Pingback
+import short_url
from django.conf import settings
from django.contrib.auth import login
-from django.core.exceptions import ValidationError
-from django.shortcuts import render, reverse, redirect
+from django.shortcuts import reverse, redirect
from django.views import View
from django.views.generic import DetailView, UpdateView, TemplateView, FormView
from django.contrib import messages
from django.contrib.auth import get_user_model
-from django.contrib.auth.decorators import login_required, permission_required
-from django.contrib.auth.hashers import check_password, make_password
-from django.http import Http404
+from django.contrib.auth.decorators import login_required
from django.db.models import F, Func, Sum, Min, Max
from django.urls import reverse_lazy
from django.utils.decorators import method_decorator
@@ -147,7 +145,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)
@@ -184,7 +182,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
@@ -293,3 +291,17 @@ class AuthorRequestView(FormView):
'facebook': self.request.user.facebook,
}
return super().get_context_data(**kwargs)
+
+
+@method_decorator(login_required, name='dispatch')
+class BonusHistoryView(TemplateView):
+ model = User
+ template_name = 'user/bonus-history.html'
+
+ def get(self, request, *args, **kwargs):
+ context = self.get_context_data(**kwargs)
+ context['bonuses'] = request.user.bonuses.all()
+ context['referrer_url'] = '%s%s?referrer=%s' % (
+ settings.MAIN_HOST, reverse('index'), short_url.encode_url(request.user.id)
+ )
+ return self.render_to_response(context)
diff --git a/project/context_processors.py b/project/context_processors.py
index ebb36f25..6e954da7 100644
--- a/project/context_processors.py
+++ b/project/context_processors.py
@@ -1,11 +1,14 @@
from django.db.models import Func, F
from django.utils.timezone import now
from paymentwall.pingback import Pingback
-
+from django.contrib.auth import get_user_model
+from django.conf import settings
from apps.config.models import Config
from apps.content.models import Baner
from apps.payment.models import SchoolPayment
+User = get_user_model()
+
def config(request):
return {"config": Config.load()}
@@ -39,3 +42,17 @@ def school_purchased(request):
'is_school_purchased': False,
'school_schedules_purchased': [],
}
+
+
+def referrer(request):
+ referrer = request.session.get('referrer')
+ if referrer:
+ try:
+ referrer = User.objects.get(pk=referrer)
+ except:
+ referrer = None
+ return {'referrer': referrer}
+
+
+def settings(request):
+ return {'settings': settings}
diff --git a/project/settings.py b/project/settings.py
index 5ba46b7d..8cdb2ed2 100644
--- a/project/settings.py
+++ b/project/settings.py
@@ -96,6 +96,8 @@ TEMPLATES = [
'project.context_processors.config',
'project.context_processors.baner',
'project.context_processors.school_purchased',
+ 'project.context_processors.referrer',
+ 'project.context_processors.settings',
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
diff --git a/project/templates/blocks/lil_store_js.html b/project/templates/blocks/lil_store_js.html
index ff2a45fe..0d19b124 100644
--- a/project/templates/blocks/lil_store_js.html
+++ b/project/templates/blocks/lil_store_js.html
@@ -23,5 +23,10 @@
courses: "{% url 'courses' %}",
userProfileEdit: "{% url 'user-edit-profile' %}",
}
+ flags: {
+ referrer: '{{ referrer.id|default:'' }}',
+ referrerName: '{% if referrer %}{{ referrer.get_full_name }}{% endif %}',
+ isReferralUrl: {{ is_referral_url|yesno:"true,false" }},
+ }
};
diff --git a/project/templates/blocks/popup_auth.html b/project/templates/blocks/popup_auth.html
index 092cee9b..5fbca404 100644
--- a/project/templates/blocks/popup_auth.html
+++ b/project/templates/blocks/popup_auth.html
@@ -10,13 +10,13 @@