diff --git a/project/customer/context_processors.py b/project/customer/context_processors.py index cbc9a05..7b6c751 100644 --- a/project/customer/context_processors.py +++ b/project/customer/context_processors.py @@ -5,10 +5,22 @@ from .models import License def license_check_soon_ends(request): - print 12434674658457 try: license_cookie = request.COOKIES.get('close_message_license') license_15days = cache.get('license_15_%s' % (request.user.username,), None) + days_left = cache.get('days_left_%s' % (request.user.username,), None) + cur_license = cache.get('cur_license_%s' % (request.user.username,), None) + print cur_license + if not days_left or not cur_license: + now = datetime.today() + cur_license = License.objects.filter(company=request.user.profile, date_from__lte=now, date_to__gte=now, status__in=[-1, 1, 2], deleted=False) + if cur_license: + cur_license = cur_license[0] + print cur_license + days_left = (cur_license.date_to - now.date()).days + cache.set('days_left_%s' % (request.user.username,), days_left, 3600) + cache.set('cur_license_%s' % (request.user.username,), cur_license, 3600) + if not license_cookie: now = datetime.today() if license_15days is None: @@ -21,13 +33,11 @@ def license_check_soon_ends(request): else: license_15days = '' - print '@1!!!!!', license_15days - return { - 'license_15days': license_15days, - 'license_days': license_15days - } - print '!!!!!', license_15days - return {'license_days': license_15days} - except: - print 123123213 + return { + 'license_15days': license_15days, + 'license_days': days_left, + 'cur_license': cur_license, + } + except Exception as e: + print e return { } diff --git a/project/static/css/style.css b/project/static/css/style.css index 8ab9fbc..579e6bb 100644 --- a/project/static/css/style.css +++ b/project/static/css/style.css @@ -621,3 +621,4 @@ a.popup-history {background:url(../img/popup-clock.png) no-repeat 3px center;} a.popup-password {background:url(../img/popup-settings.png) no-repeat 3px center;} a.popup-email {background:url(../img/popup-link.png) no-repeat 3px center;} a.popup-unreg {background:url(../img/popup-trash.png) no-repeat 3px center;} +.italic {font-style: italic;} diff --git a/project/templates/base.html b/project/templates/base.html index de684c5..724ec46 100644 --- a/project/templates/base.html +++ b/project/templates/base.html @@ -1,5 +1,5 @@ {# spaceless #} -{% load cms_tags sekizai_tags menu_tags %} +{% load cms_tags sekizai_tags menu_tags pytils_numeral %} {% url 'myauth_login' as myauth_login %} {% url 'myauth_register' as myauth_register %} @@ -73,10 +73,10 @@ {% block content %}{% endblock %}

Платежные данные

-
Тариф:{{ license.tariff }}
+
Тариф:{% if cur_license.term > 0 %}{{ cur_license.term|get_plural:"месяц,месяца, месяцев" }}{% else %}пробный{% endif %}
Осталось
- 26{{ license_days }} + {{ license_days }}
Купить лицензию Мои счета