Model-based mail queuing

src/pretix/presale/checkoutflow.py

@@ -1654,11 +1654,6 @@ class ConfirmStep(CartMixin, AsyncAction, TemplateFlowStep):
         order = Order.objects.get(id=value)
         return self.get_order_url(order)
 
-    def get_error_message(self, exception):
-        if exception.__class__.__name__ == 'SendMailException':
-            return _('There was an error sending the confirmation mail. Please try again later.')
-        return super().get_error_message(exception)
-
     def get_error_url(self):
         return self.get_step_url(self.request)
 

src/pretix/presale/views/customer.py

@@ -325,6 +325,7 @@ class ResetPasswordView(FormView):
             locale=customer.locale,
             customer=customer,
             organizer=self.request.organizer,
+            sensitive=True,
         )
         messages.success(
             self.request,

src/pretix/presale/views/order.py

@@ -77,7 +77,6 @@ from pretix.base.services.invoices import (
     generate_cancellation, generate_invoice, invoice_pdf, invoice_pdf_task,
     invoice_qualified,
 )
-from pretix.base.services.mail import SendMailException
 from pretix.base.services.orders import (
     OrderChangeManager, OrderError, _try_auto_refund, cancel_order,
     change_payment_provider, error_messages,
@@ -656,10 +655,7 @@ class OrderPayChangeMethod(EventViewMixin, OrderDetailMixin, TemplateView):
                 amount=Decimal('0.00'),
                 fee=None
             )
-            try:
-                p.confirm()
-            except SendMailException:
-                pass
+            p.confirm()
         else:
             p._mark_order_paid(
                 payment_refund_sum=self.order.payment_refund_sum

src/pretix/presale/views/user.py

@@ -32,8 +32,6 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.
 
-import logging
-
 from django.conf import settings
 from django.contrib import messages
 from django.utils.functional import cached_property
@@ -42,7 +40,7 @@ from django.views import View
 from django.views.generic import TemplateView
 
 from pretix.base.email import get_email_context
-from pretix.base.services.mail import INVALID_ADDRESS, SendMailException, mail
+from pretix.base.services.mail import INVALID_ADDRESS, mail
 from pretix.helpers.http import redirect_to_url
 from pretix.multidomain.urlreverse import eventreverse
 from pretix.presale.forms.user import ResendLinkForm
@@ -83,13 +81,7 @@ class ResendLinkView(EventViewMixin, TemplateView):
         subject = self.request.event.settings.mail_subject_resend_all_links
         template = self.request.event.settings.mail_text_resend_all_links
         context = get_email_context(event=self.request.event, orders=orders)
-        try:
-            mail(user, subject, template, context, event=self.request.event, locale=self.request.LANGUAGE_CODE)
-        except SendMailException:
-            logger = logging.getLogger('pretix.presale.user')
-            logger.exception('A mail resending order links to {} could not be sent.'.format(user))
-            messages.error(self.request, _('We have trouble sending emails right now, please check back later.'))
-            return self.get(request, *args, **kwargs)
+        mail(user, subject, template, context, event=self.request.event, locale=self.request.LANGUAGE_CODE)
 
         messages.success(self.request, _('If there were any orders by this user, they will receive an email with their order codes.'))
         return redirect_to_url(eventreverse(self.request.event, 'presale:event.index'))