diff --git a/app/mailers/mailbot.rb b/app/mailers/mailbot.rb index 15c5846f..93eb450d 100644 --- a/app/mailers/mailbot.rb +++ b/app/mailers/mailbot.rb @@ -1,17 +1,19 @@ # frozen_string_literal: true SNAPCON_BCC_ADDRESS = 'messages@snap.berkeley.edu' +EMAIL_TEMPLATE = 'email_template' YTLF_TICKET_ID = 50 class Mailbot < ActionMailer::Base def registration_mail(conference, user) - mail(to: user.email, - bcc: SNAPCON_BCC_ADDRESS, - from: conference.contact.email, - subject: conference.email_settings.registration_subject, - body: conference.email_settings.generate_email_on_conf_updates(conference, - user, - conference.email_settings.registration_body)) + @email_body = conference.email_settings.generate_email_on_conf_updates(conference, user, conference.email_settings.registration_body) + @logo = conference.picture.thumb.url + + mail(to: user.email, + bcc: SNAPCON_BCC_ADDRESS, + from: conference.contact.email, + subject: conference.email_settings.registration_subject, + template_name: EMAIL_TEMPLATE) end def ticket_confirmation_mail(ticket_purchase) @@ -39,108 +41,128 @@ class Mailbot < ActionMailer::Base def acceptance_mail(event) conference = event.program.conference - mail(to: event.submitter.email, - bcc: SNAPCON_BCC_ADDRESS, - from: conference.contact.email, - subject: conference.email_settings.accepted_subject, - body: conference.email_settings.generate_event_mail(event, conference.email_settings.accepted_body)) + @logo = conference.picture.thumb.url + @email_body = conference.email_settings.generate_event_mail(event, conference.email_settings.accepted_body) + + mail(to: event.submitter.email, + bcc: SNAPCON_BCC_ADDRESS, + from: conference.contact.email, + subject: conference.email_settings.accepted_subject, + template_name: EMAIL_TEMPLATE) end def submitted_proposal_mail(event) conference = event.program.conference - mail(to: event.submitter.email, - bcc: SNAPCON_BCC_ADDRESS, - from: conference.contact.email, - subject: conference.email_settings.submitted_proposal_subject, - body: conference.email_settings.generate_event_mail(event, conference.email_settings.submitted_proposal_body)) + @logo = conference.picture.thumb.url + @email_body = conference.email_settings.generate_event_mail(event, conference.email_settings.submitted_proposal_body) + + mail(to: event.submitter.email, + bcc: SNAPCON_BCC_ADDRESS, + from: conference.contact.email, + subject: conference.email_settings.submitted_proposal_subject, + template_name: EMAIL_TEMPLATE) end def rejection_mail(event) conference = event.program.conference - mail(to: event.submitter.email, - bcc: SNAPCON_BCC_ADDRESS, - from: conference.contact.email, - subject: conference.email_settings.rejected_subject, - body: conference.email_settings.generate_event_mail(event, conference.email_settings.rejected_body)) + @logo = conference.picture.thumb.url + @email_body = conference.email_settings.generate_event_mail(event, conference.email_settings.rejected_body) + + mail(to: event.submitter.email, + bcc: SNAPCON_BCC_ADDRESS, + from: conference.contact.email, + subject: conference.email_settings.rejected_subject, + template_name: EMAIL_TEMPLATE) end def confirm_reminder_mail(event) conference = event.program.conference - mail(to: event.submitter.email, - bcc: SNAPCON_BCC_ADDRESS, - from: conference.contact.email, - subject: conference.email_settings.confirmed_without_registration_subject, - body: conference.email_settings.generate_event_mail(event, - conference.email_settings.confirmed_without_registration_body)) + @logo = conference.picture.thumb.url + @email_body = conference.email_settings.generate_event_mail(event, conference.email_settings.confirmed_without_registration_body) + + mail(to: event.submitter.email, + bcc: SNAPCON_BCC_ADDRESS, + from: conference.contact.email, + subject: conference.email_settings.confirmed_without_registration_subject, + template_name: EMAIL_TEMPLATE) end def conference_date_update_mail(conference, user) - mail(to: user.email, - bcc: SNAPCON_BCC_ADDRESS, - from: conference.contact.email, - subject: conference.email_settings.conference_dates_updated_subject, - body: conference.email_settings.generate_email_on_conf_updates(conference, - user, - conference.email_settings.conference_dates_updated_body)) + @logo = conference.picture.thumb.url + @email_body = conference.email_settings.generate_email_on_conf_updates(conference, user, conference.email_settings.conference_dates_updated_body) + + mail(to: user.email, + bcc: SNAPCON_BCC_ADDRESS, + from: conference.contact.email, + subject: conference.email_settings.conference_dates_updated_subject, + template_name: EMAIL_TEMPLATE) end def conference_registration_date_update_mail(conference, user) - mail(to: user.email, - bcc: SNAPCON_BCC_ADDRESS, - from: conference.contact.email, - subject: conference.email_settings.conference_registration_dates_updated_subject, - body: conference.email_settings.generate_email_on_conf_updates(conference, - user, - conference.email_settings.conference_registration_dates_updated_body)) + @logo = conference.picture.thumb.url + @email_body = conference.email_settings.generate_email_on_conf_updates(conference, user, conference.email_settings.conference_registration_dates_updated_body) + + mail(to: user.email, + bcc: SNAPCON_BCC_ADDRESS, + from: conference.contact.email, + subject: conference.email_settings.conference_registration_dates_updated_subject, + template_name: EMAIL_TEMPLATE) end def conference_venue_update_mail(conference, user) - mail(to: user.email, - bcc: SNAPCON_BCC_ADDRESS, - from: conference.contact.email, - subject: conference.email_settings.venue_updated_subject, - body: conference.email_settings.generate_email_on_conf_updates(conference, - user, - conference.email_settings.venue_updated_body)) + @logo = conference.picture.thumb.url + @email_body = conference.email_settings.generate_email_on_conf_updates(conference, user, conference.email_settings.venue_updated_body) + + mail(to: user.email, + bcc: SNAPCON_BCC_ADDRESS, + from: conference.contact.email, + subject: conference.email_settings.venue_updated_subject, + template_name: EMAIL_TEMPLATE) end def conference_schedule_update_mail(conference, user) - mail(to: user.email, - from: conference.contact.email, - subject: conference.email_settings.program_schedule_public_subject, - body: conference.email_settings.generate_email_on_conf_updates(conference, - user, - conference.email_settings.program_schedule_public_body)) + @logo = conference.picture.thumb.url + @email_body = conference.email_settings.generate_email_on_conf_updates(conference, user, conference.email_settings.program_schedule_public_body) + + mail(to: user.email, + from: conference.contact.email, + subject: conference.email_settings.program_schedule_public_subject, + template_name: EMAIL_TEMPLATE) end def conference_cfp_update_mail(conference, user) - mail(to: user.email, - from: conference.contact.email, - subject: conference.email_settings.cfp_dates_updated_subject, - body: conference.email_settings.generate_email_on_conf_updates(conference, - user, - conference.email_settings.cfp_dates_updated_body)) + @logo = conference.picture.thumb.url + @email_body = conference.email_settings.generate_email_on_conf_updates(conference, user, conference.email_settings.cfp_dates_updated_body) + + mail(to: user.email, + from: conference.contact.email, + subject: conference.email_settings.cfp_dates_updated_subject, + template_name: EMAIL_TEMPLATE) end def conference_booths_acceptance_mail(booth) conference = booth.conference + @logo = conference.picture.thumb.url + @email_body = conference.email_settings.generate_booth_mail(booth, conference.email_settings.booths_acceptance_body) - mail(to: booth.submitter.email, - from: conference.contact.email, - subject: conference.email_settings.booths_acceptance_subject, - body: conference.email_settings.generate_booth_mail(booth, conference.email_settings.booths_acceptance_body)) + mail(to: booth.submitter.email, + from: conference.contact.email, + subject: conference.email_settings.booths_acceptance_subject, + template_name: EMAIL_TEMPLATE) end def conference_booths_rejection_mail(booth) conference = booth.conference + @logo = conference.picture.thumb.url + @email_body = conference.email_settings.generate_booth_mail(booth, conference.email_settings.booths_rejection_body) - mail(to: booth.submitter.email, - from: conference.contact.email, - subject: conference.email_settings.booths_rejection_subject, - body: conference.email_settings.generate_booth_mail(booth, conference.email_settings.booths_rejection_body)) + mail(to: booth.submitter.email, + from: conference.contact.email, + subject: conference.email_settings.booths_rejection_subject, + template_name: EMAIL_TEMPLATE) end def event_comment_mail(comment, user) diff --git a/app/views/mailbot/email_template.erb b/app/views/mailbot/email_template.erb new file mode 100644 index 00000000..5c64cf11 --- /dev/null +++ b/app/views/mailbot/email_template.erb @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + Email + + +
+
+ +
<%= image_tag(@logo, style: "display:block") %>
+

+
+
+
+ + <%= @email_body %> + +
+
+

+
+ + diff --git a/config/environments/development.rb b/config/environments/development.rb index c3dcac54..6f2a1042 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,7 +1,7 @@ Osem::Application.configure do # Settings specified here will take precedence over those in config/application.rb - config.action_mailer.delivery_method = :letter_opener + config.action_mailer.delivery_method = :letter_opener_web # In the development environment your application's code is reloaded on # every request. This slows down response time but is perfect for development