Permalink
Browse files

email sent to users whose subscription expired, is shorter than the o…

…ne they received as a warning; the link to subscription renewal is available in the main menu
  • Loading branch information...
guglielmo committed Mar 10, 2012
1 parent 2d07a0f commit 850363c619b3f0f4ea159bc79b079c7873834082
Showing with 8 additions and 4 deletions.
  1. +2 −4 notifications.py
  2. +6 −0 templates/nav.html
View
@@ -48,10 +48,8 @@ def send_expired_email(membership):
d = Context({ 'current_site': Site.objects.get(id=settings.SITE_ID),
'associate': membership.associate,
'renewal_url': reverse('subscribe-renewal', args=[membership.associate.hash_key]) })
- #plaintext = get_template('email/expired_email.txt')
- #htmly = get_template('email/expired_email.html')
- plaintext = get_template('email/expiring_warning_email.txt')
- htmly = get_template('email/expiring_warning_email.html')
+ plaintext = get_template('email/expired_email.txt')
+ htmly = get_template('email/expired_email.html')
send_mail(
'[openpolis] Tua iscrizione scaduta!',
View
@@ -49,6 +49,12 @@
{% else %}
<li><a href="{% url subscribe %}">Diventa socio</a></li>
{% endif %}
+
+ {% if current_route_name == 'subscribe-renewal-request'%}
+ <li class="active"><a>Rinnova la tua iscrizione</a></li>
+ {% else %}
+ <li><a href="{% url subscribe-renewal-request %}">Rinnova la tua iscrizione</a></li>
+ {% endif %}
{% if page_slug == 'dona' %}
<li class="active"><a>Fai una donazione</a></li>

0 comments on commit 850363c

Please sign in to comment.