Merge 24c0af7d3f into d9d72eae07

app/models/event.rb

@@ -125,7 +125,9 @@ class Event < ActiveRecord::Base
   end
 
   def process_confirmation
-    if conference.email_settings.send_on_confirmed_without_registration?
+    if conference.email_settings.send_on_confirmed_without_registration? &&
+        conference.email_settings.confirmed_email_template &&
+        conference.email_settings.confirmed_without_registration_subject
       if conference.registrations.where(user_id: submitter.id).first.nil?
         Mailbot.confirm_reminder_mail(self).deliver
       end
@@ -134,7 +136,9 @@ class Event < ActiveRecord::Base
 
   def process_acceptance(options)
     if conference.email_settings.send_on_accepted &&
-        options[:send_mail].blank?
+        conference.email_settings.accepted_email_template &&
+        conference.email_settings.accepted_subject &&
+        !options[:send_mail].blank?
       Rails.logger.debug 'Sending event acceptance mail'
       Mailbot.acceptance_mail(self).deliver
     end
@@ -142,7 +146,9 @@ class Event < ActiveRecord::Base
 
   def process_rejection(options)
     if conference.email_settings.send_on_rejected &&
-        options[:send_mail].blank?
+        conference.email_settings.rejected_email_template &&
+        conference.email_settings.rejected_subject &&
+        !options[:send_mail].blank?
       Rails.logger.debug 'Sending rejected mail'
       Mailbot.rejection_mail(self).deliver
     end
@@ -180,6 +186,25 @@ class Event < ActiveRecord::Base
     result
   end
 
+  def update_state(transition, mail = false, subject = false, send_mail = false, send_mail_param)
+    alert = ''
+    if mail && send_mail_param && subject && send_mail
+      alert = 'Update Email Subject before Sending Mails'
+    end
+      begin
+        if mail
+          self.send(transition,
+                      send_mail: send_mail_param)
+        else
+          self.send(transition)
+        end
+        self.save
+      rescue Transitions::InvalidTransition => e
+        alert = "Update state failed. #{e.message}"
+      end
+    alert
+  end
+
   private
 
   def abstract_limit