app/models/campaign.rb in e9_crm-0.1.12 vs app/models/campaign.rb in e9_crm-0.1.13
- old
+ new
@@ -11,11 +11,10 @@
has_many :deals, :inverse_of => :campaign, :dependent => :nullify
has_many :won_deals, :class_name => 'Deal', :conditions => ['deals.status = ?', Deal::Status::Won]
has_many :lost_deals, :class_name => 'Deal', :conditions => ['deals.status = ?', Deal::Status::Lost]
has_many :pending_deals, :class_name => 'Deal', :conditions => ['deals.status = ?', Deal::Status::Pending]
has_many :leads, :class_name => 'Deal', :conditions => ['deals.status = ?', Deal::Status::Lead]
-
has_many :page_views, :inverse_of => :campaign, :dependent => :nullify
# only advertising campaigns use this association
has_many :dated_costs, :as => :costable
@@ -39,10 +38,11 @@
scope :active, lambda {|val=true| where(:active => val) }
scope :inactive, lambda { active(false) }
scope :of_group, lambda {|val| where(:campaign_group_id => val.to_param) }
scope :typed, lambda { where(arel_table[:type].not_eq('NoCampaign')) }
+ scope :ordered, lambda { order(arel_table[:name].asc) }
def new_visit_session_count
page_views.new_visits.group(:session).count.keys.length
end
@@ -65,8 +65,8 @@
def cost
raise NotImplementedError
end
def to_s
- name
+ name.tap {|n| n << " (#{code})" if code.present? }
end
end