Subscription on Registration, Independent Subscription without registration

app/models/conference.rb

@@ -50,6 +50,7 @@ class Conference < ActiveRecord::Base
   has_many :campaigns, dependent: :destroy
   has_many :commercials, as: :commercialable, dependent: :destroy
   has_many :subscriptions, dependent: :destroy
+  belongs_to :venue
 
   accepts_nested_attributes_for :rooms, reject_if: proc { |r| r['name'].blank? }, allow_destroy: true
   accepts_nested_attributes_for :tracks, reject_if: proc { |r| r['name'].blank? }, allow_destroy: true

app/models/email_settings.rb

@@ -41,28 +41,14 @@ class EmailSettings < ActiveRecord::Base
     h
   end
 
-  def generate_accepted_email(event)
+  def generate_event_mail(event, event_template)
     values = get_values(event.conference, event.submitter, event)
-    template = accepted_email_template
-    parse_template(template, values)
-  end
-
-  def generate_rejected_email(event)
-    values = get_values(event.conference, event.submitter, event)
-    template = rejected_email_template
-    parse_template(template, values)
-  end
-
-  def confirmed_but_not_registered_email(event)
-    values = get_values(event.conference, event.submitter, event)
-    template = confirmed_email_template
-    parse_template(template, values)
+    parse_template(event_template, values)
   end
 
   def generate_email_on_conf_updates(conference, user, conf_update_template)
     values = get_values(conference, user)
-    template = conf_update_template
-    parse_template(template, values)
+    parse_template(conf_update_template, values)
   end
 
   def parse_template(text, values)

app/models/subscription.rb

@@ -1,5 +1,6 @@
 class Subscription < ActiveRecord::Base
   attr_accessible :user_id, :conference_id
+  validates_uniqueness_of :user_id, scope: [:conference_id]
   belongs_to :conference
   belongs_to :user
 end