+
+
+
+
\ No newline at end of file
diff --git a/app/views/mailbot/comment_template.html.erb b/app/views/mailbot/comment_template.html.erb
new file mode 100644
index 00000000..b9e9cce0
--- /dev/null
+++ b/app/views/mailbot/comment_template.html.erb
@@ -0,0 +1,16 @@
+<%= render partial: "layouts/mailbot_header" %>
+
+
+ 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
+
+
+<%= render partial: "layouts/mailbot_footer" %>
\ No newline at end of file
diff --git a/app/views/mailbot/comment_template.text.erb b/app/views/mailbot/comment_template.text.erb
deleted file mode 100644
index d162d710..00000000
--- a/app/views/mailbot/comment_template.text.erb
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 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
-
-
+<%= render partial: "layouts/mailbot_footer" %>
\ No newline at end of file
diff --git a/app/views/mailbot/ticket_confirmation_template.html.erb b/app/views/mailbot/ticket_confirmation_template.html.erb
new file mode 100644
index 00000000..f92284d7
--- /dev/null
+++ b/app/views/mailbot/ticket_confirmation_template.html.erb
@@ -0,0 +1,14 @@
+<%= render partial: "layouts/mailbot_header" %>
+
+
+ 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
+
+
+<%= render partial: "layouts/mailbot_footer" %>
\ No newline at end of file
diff --git a/app/views/mailbot/ticket_confirmation_template.text.erb b/app/views/mailbot/ticket_confirmation_template.text.erb
deleted file mode 100644
index 0e4e54f8..00000000
--- a/app/views/mailbot/ticket_confirmation_template.text.erb
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 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
-
-
+
+ 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
+
+
+<%= render partial: "layouts/mailbot_footer" %>
\ No newline at end of file
diff --git a/app/views/mailbot/young_thinkers_ticket_confirmation_template.text.erb b/app/views/mailbot/young_thinkers_ticket_confirmation_template.text.erb
deleted file mode 100644
index 6a4c7fb5..00000000
--- a/app/views/mailbot/young_thinkers_ticket_confirmation_template.text.erb
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 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/config/environments/development.rb b/config/environments/development.rb
index d99d92f0..5b6263e3 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -113,5 +113,7 @@ Osem::Application.configure do
devise_config.ichain_test_mode = true
end
end
+
+ config.assets.precompile += ['mailbot.css']
config.active_record.verbose_query_logs = true
end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 225ae26f..1a9d4d7b 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -52,4 +52,5 @@ Osem::Application.configure do
ActiveSupport::Deprecation.silenced = true
end
+ config.assets.precompile += ['mailbot.css']
end
diff --git a/spec/factories/conferences.rb b/spec/factories/conferences.rb
index d1ac5032..1968e54e 100644
--- a/spec/factories/conferences.rb
+++ b/spec/factories/conferences.rb
@@ -49,6 +49,7 @@ FactoryBot.define do
ticket_layout { 'portrait' }
description { Faker::Hipster.paragraph }
organization
+ color { '#FFFFFF' }
after(:create) do |conference|
Role.where(name: 'organizer', resource: conference).first_or_create(description: 'For the organizers of the conference (who shall have full access)')
Role.where(name: 'cfp', resource: conference).first_or_create(description: 'For the members of the CfP team')
diff --git a/spec/helpers/conference_helper_spec.rb b/spec/helpers/conference_helper_spec.rb
index 101d083a..4ea48496 100644
--- a/spec/helpers/conference_helper_spec.rb
+++ b/spec/helpers/conference_helper_spec.rb
@@ -67,4 +67,36 @@ describe ConferenceHelper, type: :helper do
expect(sponsorship_mailto(conference)).to match conference.short_title
end
end
+
+ describe '#conference_logo_url' do
+ let(:organization) { create(:organization) }
+ let(:conference2) { create(:conference, organization: organization) }
+
+ it 'gives the correct logo url' do
+ expect(conference_logo_url(conference2)).to eq('snapcon_logo.png')
+
+ File.open('spec/support/logos/1.png') do |file|
+ organization.picture = file
+ end
+
+ expect(conference_logo_url(conference2)).to include('1.png')
+
+ File.open('spec/support/logos/2.png') do |file|
+ conference2.picture = file
+ end
+
+ expect(conference_logo_url(conference2)).to include('2.png')
+ end
+ end
+
+ describe '#conference_color' do
+ let(:conference2) { create(:conference, color: '#000000') }
+
+ it 'gives the correct conference color' do
+ expect(conference_color(conference2)).to eq('#000000')
+
+ conference2.color = ''
+ expect(conference_color(conference2)).to eq('#0B3559')
+ end
+ end
end
diff --git a/spec/mailers/mailbot_spec.rb b/spec/mailers/mailbot_spec.rb
index 1f739997..4c4bd699 100644
--- a/spec/mailers/mailbot_spec.rb
+++ b/spec/mailers/mailbot_spec.rb
@@ -26,6 +26,14 @@ describe Mailbot do
expect(mail.body).to include 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit'
end
+ it 'assigns the email body with the correct color' do
+ expect(mail.body).to include('background-color: ' + conference.color)
+ end
+
+ it 'assigns the email body with the correct logo' do
+ expect(mail.body).to include 'snapcon_logo'
+ end
+
it 'delivers the email' do
expect(ActionMailer::Base.deliveries).to include(mail)
end