diff --git a/app/mailers/mailbot.rb b/app/mailers/mailbot.rb index 15c5846f..c055ec84 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/comment_template.text.erb b/app/views/mailbot/comment_template.text.erb index 0e7a8c35..d162d710 100644 --- a/app/views/mailbot/comment_template.text.erb +++ b/app/views/mailbot/comment_template.text.erb @@ -1,10 +1,83 @@ -Dear <%= @user.name %>, + + + + + + + + + + + + + + Email + + +
+
+ +
+
+

+
+
+
+ + Dear <%= @user.name %>, + + User <%= @comment.user.name %> posted a new comment for event <%= @event.title %> of <%= @conference.short_title %> . + + "<%= @comment.body %>" + + To reply to this comment, please go to <%= h(admin_conference_program_event_url(@conference.short_title, @event, only_path: false)) %> + + Best wishes, + <%= @conference.title %> Team + +
+
+

+
+ + diff --git a/app/views/mailbot/email_template.erb b/app/views/mailbot/email_template.erb new file mode 100644 index 00000000..429553be --- /dev/null +++ b/app/views/mailbot/email_template.erb @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + Email + + +
+
+ +
+ <% if !@logo.nil? %> + <%= image_tag(@logo, style: "display:block") %> + <% end %> +
+

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

+
+ + diff --git a/app/views/mailbot/ticket_confirmation_template.text.erb b/app/views/mailbot/ticket_confirmation_template.text.erb index 08f5175a..0e4e54f8 100644 --- a/app/views/mailbot/ticket_confirmation_template.text.erb +++ b/app/views/mailbot/ticket_confirmation_template.text.erb @@ -1,8 +1,81 @@ -Dear <%= @user.name %>, + + + + + + + + + + + + + + Email + + +
+
+ +
+
+

+
+
+
+ + Dear <%= @user.name %>, + + Thanks! You have successfully booked <%= @ticket_purchase.quantity %> <%= @ticket_purchase.ticket.title %> ticket(s) for the event <%= @conference.title %>. Your transaction id is <%= @ticket_purchase.id %>. + + Please, find the ticket(s) pdf attached. + + Best wishes, + <%= @conference.title %> Team + +
+
+

+
+ + diff --git a/app/views/mailbot/young_thinkers_ticket_confirmation_template.text.erb b/app/views/mailbot/young_thinkers_ticket_confirmation_template.text.erb index e3e52c1f..6a4c7fb5 100644 --- a/app/views/mailbot/young_thinkers_ticket_confirmation_template.text.erb +++ b/app/views/mailbot/young_thinkers_ticket_confirmation_template.text.erb @@ -1,10 +1,83 @@ -Dear <%= @user.name %>, + + + + + + + + + + + + + + Email + + +
+
+ +
+
+

+
+
+
+ + Dear <%= @user.name %>, + + Thanks! You have successfully booked <%= @ticket_purchase.quantity %> <%= @ticket_purchase.ticket.title %> ticket(s) for the event <%= @conference.title %>. Your transaction id is <%= @ticket_purchase.id %>. + + Please, find the ticket(s) pdf attached. + + The SAP Young Thinkers team will reach out to you with information on how to participate in the event soon. In the meantime, you can check the event page (https://events.sap.com/yt-learning-festival-at-snapcon-2020/en/home) or send an email with your questions to youngthinkers@sap.com. + + Best wishes, + <%= @conference.title %> Team + +
+
+

+
+ + diff --git a/spec/mailers/mailbot_spec.rb b/spec/mailers/mailbot_spec.rb index 1cbdd8e7..1f739997 100644 --- a/spec/mailers/mailbot_spec.rb +++ b/spec/mailers/mailbot_spec.rb @@ -23,7 +23,7 @@ describe Mailbot do end it 'assigns the email body' do - expect(mail.body).to eq 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit' + expect(mail.body).to include 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit' end it 'delivers the email' do