Merge branch 'hotfix/LIL-691' into 'master'

LIL-691

See merge request lilcity/backend!192
remotes/origin/hotfix/LIL-691
cfwme 7 years ago
commit 739580d985
  1. 2
      apps/user/templates/user/bonus-history.html
  2. 6
      apps/user/views.py
  3. 4
      project/templates/blocks/share.html

@ -30,7 +30,7 @@
<button id="copy-referrer-url-btn" class="referrer-url__btn go__btn btn" data-clipboard-target="#referrer-url">Копировать ссылку</button>
</div>
</div>
{% include 'templates/blocks/share.html' with share_object_name="ссылкой" share_url=referrer_url %}
{% include 'templates/blocks/share.html' with share_object_name="ссылкой" share_url=referrer_url share_tw_title=share_text share_tg_text=share_text %}
</div>
</div>

@ -20,6 +20,7 @@ from django.utils.decorators import method_decorator
from django.utils.timezone import now
from apps.auth.tokens import verification_email_token
from apps.config.models import Config
from apps.course.models import Course
from apps.notification.utils import send_email
from apps.school.models import SchoolSchedule
@ -298,6 +299,7 @@ class BonusHistoryView(TemplateView):
template_name = 'user/bonus-history.html'
def get(self, request, *args, **kwargs):
config = Config.load()
context = self.get_context_data(**kwargs)
context['bonuses'] = request.user.bonuses.filter(
payment__isnull=False,
@ -306,4 +308,8 @@ class BonusHistoryView(TemplateView):
context['referrer_url'] = '%s%s?referrer=%s' % (
settings.MAIN_HOST, reverse('index'), short_url.encode_url(request.user.id)
)
context['share_text'] = '%s приглашает вас и ваших детей в первую онлайн школу креативного мышления Lil School. ' \
'Занимайтесь с ребёнком творчеством, не выходя из дома. ' \
'Перейдите по ссылке и получите скидку %d%% на первую покупку' \
% (request.user.get_full_name(), config.REFERRAL_BONUS)
return self.render_to_response(context)

@ -6,11 +6,11 @@
<div class="share__list likely likely-big"
{% if share_title %}data-title="{{ share_title }}"{% endif %}
data-url="{% if share_url %}{{ share_url }}{% else %}http://{{request.META.HTTP_HOST}}{{object.get_absolute_url}}{% endif %}">
<div class="twitter"></div>
<div class="twitter" {% if share_tw_title %}data-title="{{ share_tw_title }}"{% endif %}></div>
<div class="facebook"></div>
<div class="gplus"></div>
<div class="vkontakte"></div>
<div class="telegram"></div>
<div class="telegram" {% if share_tg_text %}data-text="{{ share_tg_text }}"{% endif %}></div>
<div class="pinterest"></div>
</div>
</div>

Loading…
Cancel
Save