From 74a8988abc07fd7c28b905d3d7f76b44abf6d916 Mon Sep 17 00:00:00 2001 From: Gopesh Tulsyan Date: Fri, 11 Jul 2014 18:21:23 +0530 Subject: [PATCH 1/3] Adds migration to Email Settings for Venue Updates --- app/models/email_settings.rb | 2 ++ app/views/admin/emails/index.html.haml | 3 +++ .../20140711113037_add_venue_update_to_email_settings.rb | 7 +++++++ db/schema.rb | 3 +++ 4 files changed, 15 insertions(+) create mode 100644 db/migrate/20140711113037_add_venue_update_to_email_settings.rb diff --git a/app/models/email_settings.rb b/app/models/email_settings.rb index 633c6834..f2d1c203 100644 --- a/app/models/email_settings.rb +++ b/app/models/email_settings.rb @@ -7,6 +7,8 @@ class EmailSettings < ActiveRecord::Base :send_on_updated_conference_dates, :updated_conference_dates_subject, :updated_conference_dates_template, :send_on_updated_conference_registration_dates, :updated_conference_registration_dates_subject, :updated_conference_registration_dates_template + :send_on_venue_update, + :venue_update_subject, :venue_update_template def get_values(conference, user, event = nil) h = { diff --git a/app/views/admin/emails/index.html.haml b/app/views/admin/emails/index.html.haml index 0cf146ff..ddf5bc1a 100644 --- a/app/views/admin/emails/index.html.haml +++ b/app/views/admin/emails/index.html.haml @@ -41,6 +41,9 @@ = f.input :send_on_updated_conference_registration_dates, hint: "This is to notify all participants that the conference registration dates has been changed." = f.input :updated_conference_registration_dates_subject = f.input :updated_conference_registration_dates_template, :input_html => { :rows => 10, :cols => 20 } + = f.input :send_on_venue_update, hint: 'Send an email on updating the Venue.' + = f.input :venue_update_subject + = f.input :venue_update_template, :input_html => { :rows => 10, :cols => 20 } = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"} :javascript diff --git a/db/migrate/20140711113037_add_venue_update_to_email_settings.rb b/db/migrate/20140711113037_add_venue_update_to_email_settings.rb new file mode 100644 index 00000000..9280181b --- /dev/null +++ b/db/migrate/20140711113037_add_venue_update_to_email_settings.rb @@ -0,0 +1,7 @@ +class AddVenueUpdateToEmailSettings < ActiveRecord::Migration + def change + add_column :email_settings, :send_on_venue_update, :boolean, default: true + add_column :email_settings, :venue_update_subject, :string + add_column :email_settings, :venue_update_template, :text + end +end diff --git a/db/schema.rb b/db/schema.rb index e45fb684..ff6cc884 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -170,6 +170,9 @@ ActiveRecord::Schema.define(version: 20140714141156) do t.boolean "send_on_updated_conference_registration_dates", default: true t.string "updated_conference_registration_dates_subject" t.text "updated_conference_registration_dates_template" + t.boolean "send_on_venue_update", default: true + t.string "venue_update_subject" + t.text "venue_update_template" end create_table "event_attachments", force: true do |t| From 5baeee9ee87ac50af9178c0e2d424af7f54ce339 Mon Sep 17 00:00:00 2001 From: Gopesh Tulsyan Date: Tue, 15 Jul 2014 19:07:22 +0530 Subject: [PATCH 2/3] Venue update notifications done --- app/controllers/admin/venue_controller.rb | 10 +++++++++- app/mailers/mailbot.rb | 9 +++++++++ app/models/email_settings.rb | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/venue_controller.rb b/app/controllers/admin/venue_controller.rb index 4c8696d6..9c7d8359 100644 --- a/app/controllers/admin/venue_controller.rb +++ b/app/controllers/admin/venue_controller.rb @@ -6,7 +6,15 @@ class Admin::VenueController < ApplicationController def update @venue = @conference.venue - if @venue.update_attributes!(params[:venue]) + @venue.assign_attributes(params[:venue]) + unless @venue.name.blank? || @venue.address.blank? || @conference.registrations.blank? + if @venue.name_changed? || @venue.address_changed? && @conference.email_settings.send_on_venue_update + venue_notify = Mailbot.send_email_on_venue_update(@conference) + end + end + + if @venue.update_attributes(params[:venue]) + venue_notify.deliver unless venue_notify.blank? redirect_to(admin_conference_venue_info_path(conference_id: @conference.short_title), notice: 'Venue was successfully updated.') else diff --git a/app/mailers/mailbot.rb b/app/mailers/mailbot.rb index a7bd0807..51918d34 100644 --- a/app/mailers/mailbot.rb +++ b/app/mailers/mailbot.rb @@ -56,6 +56,15 @@ class Mailbot < ActionMailer::Base end end + def send_email_on_venue_update(conference) + subject = conference.email_settings.venue_update_subject.blank? ? "#{conference.title} location has been changed" : conference.email_settings.venue_update_subject + partial = "#{conference.title} new location is: #{conference.venue.name}.\n Address: #{conference.venue.address}\n. For more information please visit #{Rails.application.routes.url_helpers.conference_path(conference.short_title, host: CONFIG['url_for_emails'])}" + body = conference.email_settings.venue_update_template.blank? ? partial : "#{conference.email_settings.venue_update_template}\n #{partial}" + conference.registrations.each do |u| + build_email(conference, u.email, subject, body) + end + end + def build_email(conference, to, subject, body) mail(:to => to, :from => conference.contact_email, diff --git a/app/models/email_settings.rb b/app/models/email_settings.rb index f2d1c203..f22c2102 100644 --- a/app/models/email_settings.rb +++ b/app/models/email_settings.rb @@ -6,7 +6,7 @@ class EmailSettings < ActiveRecord::Base :confirmed_without_registration_subject, :send_on_updated_conference_dates, :updated_conference_dates_subject, :updated_conference_dates_template, :send_on_updated_conference_registration_dates, - :updated_conference_registration_dates_subject, :updated_conference_registration_dates_template + :updated_conference_registration_dates_subject, :updated_conference_registration_dates_template, :send_on_venue_update, :venue_update_subject, :venue_update_template From b504db337281ed1eb4971461f2d444f12e339e7d Mon Sep 17 00:00:00 2001 From: Gopesh Tulsyan Date: Tue, 15 Jul 2014 19:20:24 +0530 Subject: [PATCH 3/3] Added tests for emails views specs for addition of settings --- app/models/email_settings.rb | 3 +-- spec/factories/email_settings.rb | 3 +++ spec/views/admin/emails/index.html.haml_spec.rb | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/models/email_settings.rb b/app/models/email_settings.rb index f22c2102..3c624e1d 100644 --- a/app/models/email_settings.rb +++ b/app/models/email_settings.rb @@ -7,8 +7,7 @@ class EmailSettings < ActiveRecord::Base :send_on_updated_conference_dates, :updated_conference_dates_subject, :updated_conference_dates_template, :send_on_updated_conference_registration_dates, :updated_conference_registration_dates_subject, :updated_conference_registration_dates_template, - :send_on_venue_update, - :venue_update_subject, :venue_update_template + :send_on_venue_update, :venue_update_subject, :venue_update_template def get_values(conference, user, event = nil) h = { diff --git a/spec/factories/email_settings.rb b/spec/factories/email_settings.rb index ec4887ed..d840a94c 100644 --- a/spec/factories/email_settings.rb +++ b/spec/factories/email_settings.rb @@ -12,6 +12,9 @@ FactoryGirl.define do updated_conference_dates_subject 'Conference dates have been updated' updated_conference_registration_dates_subject 'Conference registration dates have been updated' updated_conference_registration_dates_template 'Sample Conference\n New Dates: January 17 - 21 2014' + send_on_venue_update true + venue_update_subject "Venue has been updated" + venue_update_template "Venue has been Updated to Sample Location" registration_subject 'Lorem Ipsum Dolsum' registration_email_template 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit' end diff --git a/spec/views/admin/emails/index.html.haml_spec.rb b/spec/views/admin/emails/index.html.haml_spec.rb index c6acb8d1..e859ff2e 100644 --- a/spec/views/admin/emails/index.html.haml_spec.rb +++ b/spec/views/admin/emails/index.html.haml_spec.rb @@ -8,9 +8,9 @@ describe 'admin/emails/index' do assign :settings, @settings render expect(rendered). - to have_selector("input[type='checkbox'][value='1']", count: 6) + to have_selector("input[type='checkbox'][value='1']", count: 7) expect(rendered). - to have_selector("input[checked='checked'][type='checkbox'][value='1']", count: 3) + to have_selector("input[checked='checked'][type='checkbox'][value='1']", count: 4) expect(rendered).to include('Lorem Ipsum Dolsum') expect(rendered). to include('Lorem ipsum dolor sit amet, consectetuer adipiscing elit') @@ -18,5 +18,7 @@ describe 'admin/emails/index' do to include('Conference dates have been updated') expect(rendered). to include('Conference registration dates have been updated') + expect(rendered).to include("Venue has been updated") + expect(rendered).to include("Venue has been Updated to Sample Location") end end