From a60f1c434ebbfa1ce49ba4a5f1060a29ec451ed5 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Thu, 31 May 2018 23:58:10 +0200 Subject: [PATCH] Improve the mailers readability --- app/mailers/administrateur_mailer.rb | 1 + app/mailers/administration_mailer.rb | 2 ++ app/mailers/avis_mailer.rb | 1 + app/mailers/dossier_mailer.rb | 2 ++ app/mailers/gestionnaire_mailer.rb | 2 ++ app/mailers/user_mailer.rb | 1 + 6 files changed, 9 insertions(+) diff --git a/app/mailers/administrateur_mailer.rb b/app/mailers/administrateur_mailer.rb index a46e46658..7f2c647da 100644 --- a/app/mailers/administrateur_mailer.rb +++ b/app/mailers/administrateur_mailer.rb @@ -5,6 +5,7 @@ class AdministrateurMailer < ApplicationMailer @administrateur = administrateur @reset_password_token = reset_password_token @expiration_date = @administrateur.reset_password_sent_at + Devise.reset_password_within + mail(to: administrateur.email, subject: "demarches-simplifiees.fr - N'oubliez pas d'activer votre compte administrateur", reply_to: "contact@demarches-simplifiees.fr") diff --git a/app/mailers/administration_mailer.rb b/app/mailers/administration_mailer.rb index b13081cb7..c9a584de5 100644 --- a/app/mailers/administration_mailer.rb +++ b/app/mailers/administration_mailer.rb @@ -12,6 +12,7 @@ class AdministrationMailer < ApplicationMailer def invite_admin(admin, reset_password_token) @reset_password_token = reset_password_token @admin = admin + mail(to: admin.email, subject: "demarches-simplifiees.fr - Activez votre compte administrateur", reply_to: "contact@demarches-simplifiees.fr") @@ -25,6 +26,7 @@ class AdministrationMailer < ApplicationMailer def dubious_procedures(procedures_and_type_de_champs) @procedures_and_type_de_champs = procedures_and_type_de_champs + mail(to: 'equipe@demarches-simplifiees.fr', subject: "[RGS] De nouvelles procédures comportent des champs interdits") end diff --git a/app/mailers/avis_mailer.rb b/app/mailers/avis_mailer.rb index 52c826b02..2fd8401f4 100644 --- a/app/mailers/avis_mailer.rb +++ b/app/mailers/avis_mailer.rb @@ -2,6 +2,7 @@ class AvisMailer < ApplicationMailer def avis_invitation(avis) @avis = avis email = @avis.gestionnaire&.email || @avis.email + mail(to: email, subject: "Donnez votre avis sur le dossier nº #{@avis.dossier.id} (#{@avis.dossier.procedure.libelle})") end end diff --git a/app/mailers/dossier_mailer.rb b/app/mailers/dossier_mailer.rb index 1d8643314..10fd85a14 100644 --- a/app/mailers/dossier_mailer.rb +++ b/app/mailers/dossier_mailer.rb @@ -3,11 +3,13 @@ class DossierMailer < ApplicationMailer def notify_deletion_to_user(deleted_dossier, to_email) @deleted_dossier = deleted_dossier + mail(to: to_email, subject: "Votre dossier n° #{@deleted_dossier.dossier_id} a bien été supprimé") end def notify_deletion_to_administration(deleted_dossier, to_email) @deleted_dossier = deleted_dossier + mail(to: to_email, subject: "Le dossier n° #{@deleted_dossier.dossier_id} a été supprimé à la demande de l'usager") end end diff --git a/app/mailers/gestionnaire_mailer.rb b/app/mailers/gestionnaire_mailer.rb index fbb090012..bc9782ee6 100644 --- a/app/mailers/gestionnaire_mailer.rb +++ b/app/mailers/gestionnaire_mailer.rb @@ -4,6 +4,7 @@ class GestionnaireMailer < ApplicationMailer def invite_gestionnaire(gestionnaire, reset_password_token) @reset_password_token = reset_password_token @gestionnaire = gestionnaire + mail(to: gestionnaire.email, subject: "demarches-simplifiees.fr - Activez votre compte accompagnateur", reply_to: "contact@demarches-simplifiees.fr") @@ -16,6 +17,7 @@ class GestionnaireMailer < ApplicationMailer def last_week_overview(gestionnaire) headers['X-mailjet-campaign'] = 'last_week_overview' overview = gestionnaire.last_week_overview + send_mail gestionnaire.email, overview, 'Vos activités sur demarches-simplifiees.fr' end diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 2bef4f3ba..fde3369a9 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -3,6 +3,7 @@ class UserMailer < ApplicationMailer def new_account_warning(user) @user = user + mail(to: user.email, subject: "Création de compte") end end