Mailjet

members/views.py

@@ -11,7 +11,7 @@ import logging
 from smtplib import SMTPAuthenticationError
 
 from members.models import Member, Request
-from members.views.utils import send_mail_wrapper
+from webapp.utils import send_email
 
 
 @receiver(post_save, sender=Request)
@@ -24,7 +24,7 @@ def email_on_request(sender, instance, created, **kwargs):
         if created:
             subject = 'Test1'
             message = 'Please validate your email address\r\n'
-            send_mail_wrapper(subject, message, instance.email)
+            send_email(instance.email, subject, message)
     except SMTPAuthenticationError:
         logging.error('Failed to send email to accepted request!')
 
@@ -39,6 +39,6 @@ def email_on_accept(sender, instance, created, **kwargs):
         if created:
             subject = 'Test2'
             message = 'Jäsenhakemuksesi on hyväksytty!!!\r\n'
-            send_mail_wrapper(subject, message, instance.email)
+            send_email(instance.email, subject, message)
     except SMTPAuthenticationError:
         logging.error('Failed to send email to accepted member!')

members/views/applications.py

@@ -3,7 +3,6 @@ from django.contrib.auth.decorators import permission_required, login_required
 from django.views.decorators.http import require_http_methods
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.http import HttpResponse, HttpResponseRedirect
-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

members/views/members.py

@@ -4,7 +4,6 @@ from django.utils.decorators import method_decorator
 from django.views.decorators.http import require_http_methods
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.http import HttpResponse, HttpResponseRedirect, JsonResponse, HttpResponseForbidden
-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

members/views/payments.py

@@ -3,7 +3,6 @@ from django.contrib.auth.decorators import permission_required, login_required
 from django.views.decorators.http import require_http_methods
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.http import HttpResponse, HttpResponseRedirect
-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

members/views/utils.py

@@ -3,7 +3,7 @@ from django.contrib.auth.decorators import permission_required, login_required
 from django.views.decorators.http import require_http_methods
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.http import HttpResponse, HttpResponseRedirect, HttpResponseBadRequest
-from django.core.mail import send_mail
+from webapp.utils import send_email
 from django.conf import settings
 from django.utils.translation import ugettext as _
 from django.forms.models import model_to_dict
@@ -145,15 +145,6 @@ def import_csv(request, *args, **kwargs):
     return render(request, 'member_add_many_confirm.html', context)
 
 
-def send_mail_wrapper(subject, message, email_to):
-    """Send mail to default email."""
-    send_mail(subject,
-              message,
-              settings.DEFAULT_EMAIL_FROM,
-              [email_to],
-              fail_silently=False)
-
-
 def make_excel_response(Resource):
     res = Resource()
     dataset = res.export()