Skip to content

GitLab

Commit 578a4140 authored by Thom Wiggers's avatar Thom Wiggers 📐
Browse files

Merge branch 'fix/renewal-page-no-membership' into 'master' 

Fix membership renewal page when user has no previous memberships

Closes #622

See merge request !785
parents ee80ef0d cf6c26c1
Hide whitespace changes
Inline Side-by-side
website/registrations/locale/nl/LC_MESSAGES/django.po
View file @ 578a4140
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-02-12 14:07+0100\n"
"PO-Revision-Date: 2018-04-13 16:21+0200\n"
"POT-Creation-Date: 2018-04-13 16:43+0200\n"
"PO-Revision-Date: 2018-04-13 16:44+0200\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
......@@ -711,7 +711,7 @@ msgstr ""
"\">privacybeleid</a>"
#: templates/registrations/register_member.html:66
#: templates/registrations/renewal.html:70
#: templates/registrations/renewal.html:78
msgid "send"
msgstr "verstuur"
......@@ -740,50 +740,38 @@ msgstr ""
#: templates/registrations/renewal.html:10
#, python-format
msgid ""
"\n"
" A membership costs € %(year_fees)s per year, or € %(study_fees)s for "
"your entire study duration.<br/>\n"
" Note: Only Computing Science and Information Sciences students at "
"the Radboud University can become a member.<br/><br/>\n"
" It is still possible to be associated with Thalia, even if you do "
"not study Computing Science or Information Sciences (anymore): You can "
"become a supporter. For at least € %(year_fees)s per year, you too can enjoy "
"everything Thalia has to offer.\n"
" "
"A membership costs € %(year_fees)s per year, or € %(study_fees)s for your "
"entire study duration.<br/> Note: Only Computing Science and Information "
"Sciences students at the Radboud University can become a member.<br/><br/> "
"It is still possible to be associated with Thalia, even if you do not study "
"Computing Science or Information Sciences (anymore): You can become a "
"supporter. For at least € %(year_fees)s per year, you too can enjoy "
"everything Thalia has to offer."
msgstr ""
"\n"
" Een lidmaatschap kost € %(year_fees)s per jaar, of € %(study_fees)s "
"voor je hele studieperiode.<br/>\n"
" Let wel op: Je kunt alleen lid worden wanneer je informatica of "
"informatiekunde studeert aan de Radboud Universiteit.<br/><br/>\n"
" Mocht je nu geen Informatica of Informatiekunde (meer) studeren, "
"maar toch verbonden willen zijn, dan kan dat ook. Hiervoor kun je "
"begunstiger van Thalia worden. Voor minimaal € %(year_fees)s per jaar kun je "
"ook genieten van alles wat Thalia je te bieden heeft.\n"
" "
"Een lidmaatschap kost € %(year_fees)s per jaar, of € %(study_fees)s voor je "
"hele studieperiode.<br/>Let wel op: Je kunt alleen lid worden wanneer je "
"informatica of informatiekunde studeert aan de Radboud Universiteit.<br/><br/"
">Mocht je nu geen Informatica of Informatiekunde (meer) studeren, maar toch "
"verbonden willen zijn, dan kan dat ook. Hiervoor kun je begunstiger van "
"Thalia worden. Voor minimaal € %(year_fees)s per jaar kun je ook genieten "
"van alles wat Thalia je te bieden heeft."
#: templates/registrations/renewal.html:18
msgid ""
"\n"
" Are you currently paying per year for your membership? During the "
"lecture year you're allowed to change your membership to one for your entire "
"study duration without paying a double fee.\n"
" Choose 'until graduation' option in the form below and click send. "
"Just make you currently have an active membership.<br/><br/>\n"
" If your membership is almost expiring or has expired you can renew "
"it starting one month before expiration.\n"
" "
"Are you currently paying per year for your membership? During the lecture "
"year you're allowed to change your membership to one for your entire study "
"duration without paying a double fee. Choose 'until graduation' option in "
"the form below and click send. Just make you currently have an active "
"membership.<br/><br/> If your membership is almost expiring or has expired "
"you can renew it starting one month before expiration."
msgstr ""
"\n"
" Betaal je op dit moment per jaar voor je lidmaatschap? Dan kun je "
"tijdens het studiejaar je lidmaatschap aanpassen naar een die geldig is tot "
"je afstuderen zonder dat je dubbel betaalt.\n"
" Kies voor ‘tot afstuderen’ in het onderstaande formulier en klik op "
"‘versturen’. Zorg er alleen voor dat je op dit moment een geldig "
"lidmaatschap hebt.<br/><br/>\n"
" Als je lidmaatschap bijna afloopt of net is afgelopen kun je het "
"vanaf één maand voor aflopen verlengen.\n"
" "
"Betaal je op dit moment per jaar voor je lidmaatschap? Dan kun je tijdens "
"het studiejaar je lidmaatschap aanpassen naar een die geldig is tot je "
"afstuderen zonder dat je dubbel betaalt. Kies voor ‘tot afstuderen’ in het "
"onderstaande formulier en klik op ‘versturen’. Zorg er alleen voor dat je op "
"dit moment een geldig lidmaatschap hebt.<br/><br/>Als je lidmaatschap bijna "
"afloopt of net is afgelopen kun je het vanaf één maand voor aflopen "
"verlengen."
#: templates/registrations/renewal.html:27
msgid "Membership information"
......@@ -803,45 +791,36 @@ msgstr "actief"
#: templates/registrations/renewal.html:40
msgid ""
"\n"
" You're a honorary member. That means that you never have to renew "
"your membership.\n"
" "
"We do not have any previous memberships in our system. Contact the board to "
"renew your membership."
msgstr ""
"\n"
" Je bent een erelid. Dat betekent dat je je lidmaatschap nooit hoeft "
"te verlengen.\n"
" "
"Je bent een begunstiger. Neem contact op met het bestuur om je lidmaatschap "
"te verlengen."
#: templates/registrations/renewal.html:45
#: templates/registrations/renewal.html:46
msgid ""
"\n"
" You're a supporter. Contact the board to renew your membership.\n"
" "
"You're a honorary member. That means that you never have to renew your "
"membership."
msgstr ""
"\n"
" Je bent een begunstiger. Neem contact op met het bestuur om je "
"lidmaatschap te verlengen.\n"
" "
"Je bent een erelid. Dat betekent dat je je lidmaatschap nooit hoeft te "
"verlengen."
#: templates/registrations/renewal.html:52
msgid "You're a supporter. Contact the board to renew your membership."
msgstr ""
"Je bent een begunstiger. Neem contact op met het bestuur om je lidmaatschap "
"te verlengen."
#: templates/registrations/renewal.html:50
#: templates/registrations/renewal.html:58
msgid ""
"\n"
" You currently have an active membership for your entire study "
"duration.<br/>\n"
" Did you graduate or stop with your studies for some other reason?<br/"
">\n"
" Please let us know by sending an email to info@thalia.nu.\n"
" "
"You currently have an active membership for your entire study duration.<br/> "
"Did you graduate or stop with your studies for some other reason?<br/> "
"Please let us know by sending an email to info@thalia.nu."
msgstr ""
"\n"
" Je hebt op dit moment een actief lidmaatschap dat geldig is totdat "
"je afstudeert.<br/>\n"
" Ben je klaar met studeren of ben je om een andere reden gestopt?<br/"
">\n"
" Laat ons dat alsjeblieft weten door een mail te sturen naar "
"info@thalia.nu.\n"
" "
"Je hebt op dit moment een actief lidmaatschap dat geldig is totdat je "
"afstudeert.<br/>Ben je klaar met studeren of ben je om een andere reden "
"gestopt?<br/>Laat ons dat alsjeblieft weten door een mail te sturen naar "
"info@thalia.nu."
#: templates/registrations/renewal_success.html:4
msgid "success"
......
website/registrations/templates/registrations/renewal.html
View file @ 578a4140
......@@ -7,7 +7,7 @@
<h1>{% trans "renewal" %}</h1>
<p class="tcenter">
{% blocktrans %}
{% blocktrans trimmed %}
A membership costs € {{ year_fees }} per year, or € {{ study_fees }} for your entire study duration.<br/>
Note: Only Computing Science and Information Sciences students at the Radboud University can become a member.<br/><br/>
It is still possible to be associated with Thalia, even if you do not study Computing Science or Information Sciences (anymore): You can become a supporter. For at least € {{ year_fees }} per year, you too can enjoy everything Thalia has to offer.
......@@ -15,7 +15,7 @@
</p>
<p class="tcenter">
{% blocktrans %}
{% blocktrans trimmed %}
Are you currently paying per year for your membership? During the lecture year you're allowed to change your membership to one for your entire study duration without paying a double fee.
Choose 'until graduation' option in the form below and click send. Just make you currently have an active membership.<br/><br/>
If your membership is almost expiring or has expired you can renew it starting one month before expiration.
......@@ -35,19 +35,27 @@
<hr/>
{% if membership.type == 'honorary' %}
{% if membership is None %}
<p class="tcenter">
{% blocktrans %}
{% blocktrans trimmed %}
We do not have any previous memberships in our system. Contact the board to renew your membership.
{% endblocktrans %}
</p>
{% elif membership.type == 'honorary' %}
<p class="tcenter">
{% blocktrans trimmed %}
You're a honorary member. That means that you never have to renew your membership.
{% endblocktrans %}
</p>
{% elif membership.type == 'supporter' %}
{% blocktrans %}
<p class="tcenter">
{% blocktrans trimmed %}
You're a supporter. Contact the board to renew your membership.
{% endblocktrans %}
</p>
{% elif membership.until is None %}
<p class="tcenter">
{% blocktrans %}
{% blocktrans trimmed %}
You currently have an active membership for your entire study duration.<br/>
Did you graduate or stop with your studies for some other reason?<br/>
Please let us know by sending an email to info@thalia.nu.
......
website/registrations/views.py
View file @ 578a4140
......@@ -139,16 +139,15 @@ class RenewalFormView(FormView):
context['study_fees'] = floatformat(settings.MEMBERSHIP_PRICES[
Entry.MEMBERSHIP_STUDY], 2)
context['membership'] = self.request.member.latest_membership
context['membership_type'] = [
c[1] for c in Membership.MEMBERSHIP_TYPES
if c[0] == context['membership'].type
][0]
if context['membership'] is not None:
context['membership_type'] = (context['membership']
.get_type_display())
return context
def get_form(self, form_class=None):
form = super().get_form(form_class)
member = self.request.member
if member is not None:
if member is not None and member.latest_membership is not None:
latest_membership = member.latest_membership
# If latest membership has not ended or does not ends
# within 1 month: do not show 'year' length
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment