Write new email messages for member applicants

locale/en/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-20 23:09+0300\n"
+"POT-Creation-Date: 2018-10-29 14:57+0200\n"
 "PO-Revision-Date: 2017-11-02 23:09+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -450,12 +450,12 @@ msgid ""
 "%%20rekisteri.pdf\" target=\"_blank\">tietosuojaselosteen</a> ja tietojeni "
 "tallentamisen.\n"
 "                "
-msgstr
+msgstr ""
 "\n"
 "                I accept the <a href=\"https://sik.ayy.fi/files/official/"
 "Tietosuojaseloste%%20%%E2%%80%%93%%20Toimihenkil%%C3%%B6ksi%%20hakemisen"
-"%%20rekisteri.pdf\" target=\"_blank\">privacy statement</a> and the saving of personal data."
+"%%20rekisteri.pdf\" target=\"_blank\">privacy statement</a> and the saving "
-"\n"
+"of personal data.\n"
 "                "
 
 #: kaehmy/templates/kaehmy.html:82 members/templates/settings.html:23
@@ -630,8 +630,11 @@ msgid "Download Excel"
 msgstr "Download Excel"
 
 #: members/templates/application_success.html:8
-msgid "Hienoa! Jäsenhakemuksesi on nyt lähetetty."
+msgid ""
-msgstr "Amazing! Your membership application has been sent."
+"Hienoa! Jäsenhakemuksesi on nyt lähetetty. Varmistathan että sait "
+"sähköpostiin vahvistusviestin. Ongelma tilanteissa ota yhteyttä sik-"
+"vtmk@list.ayy.fi"
+msgstr ""
 
 #: members/templates/application_success.html:9
 msgid "Takaisin Sähköinsinöörikillan web-sivuille"
@@ -812,32 +815,82 @@ msgstr "Finnish"
 msgid "English"
 msgstr "English"
 
-#: members/views/applications.py:51 members/views/applications.py:112
+#: members/views.py:40
-#: members/views/applications.py:137
+msgid "Aalto-yliopiston Sähköinsinöörikillan jäsenhakemuksesi on hyväksytty"
+msgstr "Your member application to Aalto-yliopiston Sähköinsinöörikilta ry has been accepted"
+
+#: members/views.py:41
+msgid "Moikka ja onnittelut"
+msgstr "Hello and congratulations"
+
+#: members/views.py:42
+msgid "olet nyt virallisesti Aalto-yliopiston Sähköinsinöörikillan jäsen!"
+msgstr "you are now officially a member of Aalto-yliopiston Sähköinsinöörikilta!"
+
+#: members/views/applications.py:53 members/views/applications.py:114
+#: members/views/applications.py:139
 msgid "No application id specified"
 msgstr "No application id specified"
 
-#: members/views/applications.py:71
+#: members/views/applications.py:73
 msgid "Application missing 'id' field."
 msgstr "Application missing 'id' field."
 
-#: members/views/applications.py:80
+#: members/views/applications.py:82
 msgid "Email {} is already in use by a member. Application cannot be accepted."
 msgstr ""
 "Email {} is already in use by a member. Application cannot be accepted."
 
-#: members/views/applications.py:91
+#: members/views/applications.py:93
 msgid "Successfully accepted application"
 msgstr "Successfully accepted application"
 
-#: members/views/applications.py:116
+#: members/views/applications.py:118
 msgid "Successfully deleted application"
 msgstr "Successfully deleted application"
 
-#: members/views/applications.py:126
+#: members/views/applications.py:128
 msgid "Could not delete application object"
 msgstr "Could not delete application object"
 
+#: members/views/applications.py:164
+msgid "Jäsenhakemuksesi on vastaanotettu"
+msgstr "Your membership application has been sent"
+
+#: members/views/applications.py:165
+msgid "Hei"
+msgstr "Hello"
+
+#: members/views/applications.py:166
+msgid ""
+"Olet onnistuneesti lähettänyt jäsenhakemuksen Aalto-yliopiston "
+"Sähköinsinöörikiltaan."
+msgstr ""
+"You have successfully sent member application to the Aalto University Guild of Electrical Engineering"
+"(Aalto-yliopiston Sähköinsinöörikilta)."
+
+#: members/views/applications.py:167
+msgid ""
+"Muistathan maksaa jäsenmaksun, jos mielit jäseneksi. Maksuohjeet löydät alta."
+msgstr ""
+"Remember to pay the membership fee. See the instructions below."
+
+#: members/views/applications.py:168
+msgid "Summa: 8 €"
+msgstr "Sum: 8 €"
+
+#: members/views/applications.py:169
+msgid "Tilinumero: FI97 1309 3000 1118 23"
+msgstr "Account number"
+
+#: members/views/applications.py:170
+msgid "BIC: NDEAFIHH"
+msgstr ""
+
+#: members/views/applications.py:171
+msgid "Viite: 1313"
+msgstr "Reference: 1313"
+
 #: members/views/members.py:86 members/views/members.py:188
 #: members/views/members.py:212
 msgid "No member id specified"
@@ -867,28 +920,28 @@ msgstr "Successfully deleted member"
 msgid "Could not delete member object"
 msgstr "Could not delete member object"
 
-#: members/views/payments.py:71
+#: members/views/payments.py:72
 msgid "Successfully added payment for member"
 msgstr "Successfully added payment for member"
 
-#: members/views/payments.py:88 members/views/payments.py:105
+#: members/views/payments.py:89 members/views/payments.py:106
-#: members/views/payments.py:123
+#: members/views/payments.py:124
 msgid "No payment id specified"
 msgstr "No payment id specified"
 
-#: members/views/payments.py:128
+#: members/views/payments.py:129
 msgid "Successfully deleted payment"
 msgstr "Successfully deleted payment"
 
-#: members/views/payments.py:136
+#: members/views/payments.py:137
 msgid "Could not delete payment object"
 msgstr "Could not delete payment object"
 
-#: members/views/payments.py:156
+#: members/views/payments.py:157
 msgid "Successfully updated payment"
 msgstr "Successfully updated payment"
 
-#: members/views/payments.py:161
+#: members/views/payments.py:162
 msgid "Could not update payment object"
 msgstr "Could not update payment object"
 
@@ -1138,6 +1191,9 @@ msgstr "Sössö"
 msgid "Corporate"
 msgstr "Corporate"
 
+#~ msgid "Hienoa! Jäsenhakemuksesi on nyt lähetetty."
+#~ msgstr "Amazing! Your membership application has been sent."
+
 #~ msgid "Username"
 #~ msgstr "Username"
 

locale/fi/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-20 23:09+0300\n"
+"POT-Creation-Date: 2018-10-29 14:57+0200\n"
 "PO-Revision-Date: 2017-11-02 23:04+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -628,8 +628,11 @@ msgid "Download Excel"
 msgstr "Lataa Excel"
 
 #: members/templates/application_success.html:8
-msgid "Hienoa! Jäsenhakemuksesi on nyt lähetetty."
+msgid ""
-msgstr "Hienoa! Jäsenhakemuksesi on nyt lähetetty."
+"Hienoa! Jäsenhakemuksesi on nyt lähetetty. Varmistathan että sait "
+"sähköpostiin vahvistusviestin. Ongelma tilanteissa ota yhteyttä sik-"
+"vtmk@list.ayy.fi"
+msgstr ""
 
 #: members/templates/application_success.html:9
 msgid "Takaisin Sähköinsinöörikillan web-sivuille"
@@ -808,31 +811,78 @@ msgstr "suomi"
 msgid "English"
 msgstr "englanti"
 
-#: members/views/applications.py:51 members/views/applications.py:112
+#: members/views.py:40
-#: members/views/applications.py:137
+msgid "Aalto-yliopiston Sähköinsinöörikillan jäsenhakemuksesi on hyväksytty"
+msgstr ""
+
+#: members/views.py:41
+msgid "Moikka ja onnittelut"
+msgstr ""
+
+#: members/views.py:42
+msgid "olet nyt virallisesti Aalto-yliopiston Sähköinsinöörikillan jäsen!"
+msgstr ""
+
+#: members/views/applications.py:53 members/views/applications.py:114
+#: members/views/applications.py:139
 msgid "No application id specified"
-msgstr "Hakemuksen ID ei määritelty"
+msgstr "Hakemuksen ID ei ole määritelty"
 
-#: members/views/applications.py:71
+#: members/views/applications.py:73
 msgid "Application missing 'id' field."
-msgstr "Hakemuksen ID ei määritelty."
+msgstr "Hakemuksen ID ei ole määritelty."
 
-#: members/views/applications.py:80
+#: members/views/applications.py:82
 msgid "Email {} is already in use by a member. Application cannot be accepted."
 msgstr "Sähköpostiosoite {} on jo käytössä. Hakemusta ei hyväksytty."
 
-#: members/views/applications.py:91
+#: members/views/applications.py:93
 msgid "Successfully accepted application"
-msgstr "Onnistuneesti hyväksyttiin hakemus"
+msgstr "Hakemus hyväksyttiin onnistuneesti"
 
-#: members/views/applications.py:116
+#: members/views/applications.py:118
 msgid "Successfully deleted application"
-msgstr "Onnistuneesti poistettiin hakemus"
+msgstr "Hakemus poistettiin onnistuneesti"
 
-#: members/views/applications.py:126
+#: members/views/applications.py:128
 msgid "Could not delete application object"
 msgstr "Hakemusobjektia ei voitu poistaa"
 
+#: members/views/applications.py:164
+msgid "Jäsenhakemuksesi on vastaanotettu"
+msgstr ""
+
+#: members/views/applications.py:165
+msgid "Hei"
+msgstr ""
+
+#: members/views/applications.py:166
+msgid ""
+"Olet onnistuneesti lähettänyt jäsenhakemuksen Aalto-yliopiston "
+"Sähköinsinöörikiltaan."
+msgstr ""
+
+#: members/views/applications.py:167
+msgid ""
+"Muistathan maksaa jäsenmaksun, jos mielit jäseneksi. Maksuohjeet löydät alta."
+msgstr ""
+
+#: members/views/applications.py:168
+msgid "Summa: 8 €"
+msgstr ""
+
+#: members/views/applications.py:169
+msgid "Tilinumero: FI97 1309 3000 1118 23"
+msgstr ""
+
+#: members/views/applications.py:170
+msgid "BIC: NDEAFIHH"
+msgstr ""
+
+#: members/views/applications.py:171
+msgid "Viite: 1313"
+msgstr ""
+
 #: members/views/members.py:86 members/views/members.py:188
 #: members/views/members.py:212
 msgid "No member id specified"
@@ -862,28 +912,28 @@ msgstr "Onnistuneesti poistettiin jäsen"
 msgid "Could not delete member object"
 msgstr "Jäsenobjektia ei voitu poistaa"
 
-#: members/views/payments.py:71
+#: members/views/payments.py:72
 msgid "Successfully added payment for member"
 msgstr "Onnistuneesti lisättiin maksutapahtuma jäsenelle"
 
-#: members/views/payments.py:88 members/views/payments.py:105
+#: members/views/payments.py:89 members/views/payments.py:106
-#: members/views/payments.py:123
+#: members/views/payments.py:124
 msgid "No payment id specified"
 msgstr "Maksutapahtuman ID ei määritelty"
 
-#: members/views/payments.py:128
+#: members/views/payments.py:129
 msgid "Successfully deleted payment"
 msgstr "Onnistuneesti poistettiin maksutapahtuma"
 
-#: members/views/payments.py:136
+#: members/views/payments.py:137
 msgid "Could not delete payment object"
 msgstr "Maksutapahtumaobjektia ei voitu poistaa"
 
-#: members/views/payments.py:156
+#: members/views/payments.py:157
 msgid "Successfully updated payment"
 msgstr "Onnistuneesti päivitettiin maksutapahtuma"
 
-#: members/views/payments.py:161
+#: members/views/payments.py:162
 msgid "Could not update payment object"
 msgstr "Maksutapahtumaobjektia ei voitu päivittää"
 
@@ -1132,6 +1182,9 @@ msgstr "Sössö"
 msgid "Corporate"
 msgstr "Yritys"
 
+#~ msgid "Hienoa! Jäsenhakemuksesi on nyt lähetetty."
+#~ msgstr "Hienoa! Jäsenhakemuksesi on nyt lähetetty."
+
 #~ msgid "Culture"
 #~ msgstr "Kulttuuri"
 

members/templates/application_form_base.html

@@ -22,8 +22,8 @@
         <script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
 
         <!-- reCaptcha -->
-        <script src="{% static "js/lib/angular-recaptcha.js" %}"></script>
+        <!--<script src="{% static "js/lib/angular-recaptcha.js" %}"></script>
-        <script src="https://www.google.com/recaptcha/api.js?onload=vcRecaptchaApiLoaded&render=explicit" async defer></script>
+        <script src="https://www.google.com/recaptcha/api.js?onload=vcRecaptchaApiLoaded&render=explicit" async defer></script>-->
 
         <script src="{% static "js/lib/jquery.noty.packaged.js" %}"></script>
         <script src="{% static "js/lib/moment.js" %}"></script>

members/templates/application_success.html

@@ -4,7 +4,7 @@
 {% load i18n %}
 
 {% block content %}
-<link rel="stylesheet" href="{% static "css/application.css" %}">
+<link rel="stylesheet" href="{% static "members/css/application.css" %}">
-<h3>{% trans "Hienoa! Jäsenhakemuksesi on nyt lähetetty." %}</h3>
+<h3>{% trans "Hienoa! Jäsenhakemuksesi on nyt lähetetty. Varmistathan että sait sähköpostiin vahvistusviestin. Ongelma tilanteissa ota yhteyttä sik-vtmk@list.ayy.fi" %}</h3>
 <a href="/"><h4>{% trans "Takaisin Sähköinsinöörikillan web-sivuille" %}</h4></a>
 {% endblock content %}

members/views.py

@@ -29,21 +29,6 @@ from members.forms import MemberForm, PaymentForm, ApplicationForm, CSVValidatio
 from members.views.utils import send_mail_wrapper
 
 
-@receiver(post_save, sender=Request)
-def email_on_request(sender, instance, created, **kwargs):
-    """Send email validation."""
-    if not settings.ENABLE_AUTOMATIC_EMAILS:
-        return
-
-    try:
-        if created:
-            subject = 'Test1'
-            message = 'Please validate your email address\r\n'
-            send_mail_wrapper(subject, message, instance.email)
-    except SMTPAuthenticationError:
-        logging.error('Failed to send email to accepted request!')
-
-
 @receiver(post_save, sender=Member)
 def email_on_accept(sender, instance, created, **kwargs):
     """Send email to accepted member."""
@@ -52,8 +37,9 @@ def email_on_accept(sender, instance, created, **kwargs):
 
     try:
         if created:
-            subject = 'Test2'
+            subject = _('Aalto-yliopiston Sähköinsinöörikillan jäsenhakemuksesi on hyväksytty')
-            message = 'Jäsenhakemuksesi on hyväksytty!!!\r\n'
+            message = (_('Moikka ja onnittelut') + ',\r\n\r\n' +
+                       _('olet nyt virallisesti Aalto-yliopiston Sähköinsinöörikillan jäsen!') + '\r\n')
             send_mail_wrapper(subject, message, instance.email)
     except SMTPAuthenticationError:
         logging.error('Failed to send email to accepted member!')

members/views/applications.py

@@ -7,6 +7,8 @@ from django.core.mail import send_mail
 from django.conf import settings
 from django.utils.translation import ugettext as _
 from django.forms.models import model_to_dict
+from django.db import DatabaseError
+from smtplib import SMTPAuthenticationError
 
 import logging
 import html
@@ -122,7 +124,7 @@ def application_delete(request, *args, **kwargs):
         return HttpResponseRedirect(
             '/members/applications?notification={}'
             .format(html.escape(notification)))
-    except:
+    except DatabaseError:
         return error_view(request, _('Could not delete application object'))
 
 
@@ -152,13 +154,24 @@ def application_form(request, *args, **kwargs):
 
 @ensure_csrf_cookie
 @require_http_methods(["POST"])
-@login_required(login_url='/admin/login')
-@permission_required('members.delete_request', raise_exception=True)
 def application_submit(request, *args, **kwargs):
     """Submit member application"""
     form = ApplicationForm(request.POST)
     if form.is_valid():
         form.save()
+        if settings.ENABLE_AUTOMATIC_EMAILS:
+            try:
+                subject = _('Jäsenhakemuksesi on vastaanotettu')
+                message = (_('Hei',) + '\r\n\r\n' +
+                           _('Olet onnistuneesti lähettänyt jäsenhakemuksen Aalto-yliopiston Sähköinsinöörikiltaan.') + '\r\n' +
+                           _('Muistathan maksaa jäsenmaksun, jos mielit jäseneksi. Maksuohjeet löydät alta.') + '\r\n\r\n' +
+                           _('Summa: 8 €') + '\r\n' +
+                           _('Tilinumero: FI97 1309 3000 1118 23') + '\r\n' +
+                           _('BIC: NDEAFIHH') + '\r\n' +
+                           _('Viite: 1313') + '\r\n')
+                send_mail_wrapper(subject, message, form.cleaned_data['email'])
+            except SMTPAuthenticationError:
+                logging.error('Failed to send email to accepted request!')
         return render(request, 'application_success.html', {})
     else:
         return error_view(request, form.errors)

members/views/payments.py

@@ -7,6 +7,7 @@ from django.core.mail import send_mail
 from django.conf import settings
 from django.utils.translation import ugettext as _
 from django.forms.models import model_to_dict
+from django.db import DatabaseError
 
 import logging
 import html
@@ -132,7 +133,7 @@ def payment_delete(request, *args, **kwargs):
         return HttpResponseRedirect(
             '/members/payments?notification={}'
             .format(html.escape(notification)))
-    except:
+    except DatabaseError:
         return error_view(request, _('Could not delete payment object'))