e9_crm 0.1.1 → 0.1.4

data/app/controllers/e9_crm/advertising_campaigns_controller.rb

@@ -1,3 +1,4 @@
 class E9Crm::AdvertisingCampaignsController < E9Crm::ResourcesController
   defaults :resource_class => AdvertisingCampaign
+  include E9Rails::Controllers::Orderable
 end

data/app/controllers/e9_crm/affiliate_campaigns_controller.rb

@@ -1,3 +1,4 @@
 class E9Crm::AffiliateCampaignsController < E9Crm::ResourcesController
   defaults :resource_class => AffiliateCampaign
+  include E9Rails::Controllers::Orderable
 end

data/app/controllers/e9_crm/campaign_groups_controller.rb

@@ -1,3 +1,11 @@
 class E9Crm::CampaignGroupsController < E9Crm::ResourcesController
   defaults :resource_class => CampaignGroup
+  include E9Rails::Controllers::Orderable
+
+  protected
+  
+  # no pagination
+  def collection
+    get_collection_ivar || set_collection_ivar(end_of_association_chain.all)
+  end
 end

data/app/controllers/e9_crm/campaigns_controller.rb

@@ -1,4 +1,41 @@
 class E9Crm::CampaignsController < E9Crm::ResourcesController
   defaults :resource_class => Campaign
-  has_scope :of_type, :as => :t, :only => :index
+  include E9Rails::Controllers::Orderable
+
+  filter_access_to :reports, :require => :read, :context => :admin
+
+  has_scope :of_group, :as => :group, :only => :index
+
+  has_scope :active, :only => :index do |_, scope, value|
+    scope.active(E9.true_value?(value))
+  end
+
+  has_scope :of_type, :as => :type, :only => :index do |_, scope, value|
+    scope.of_type("#{value}_campaign".classify)
+  end
+
+  def reports
+    index!
+  end
+
+  protected
+
+  def set_reports_index_title
+    @index_title = I18n.t(:reports_title, :scope => 'e9.e9_crm.campaigns')
+  end
+
+  def collection_scope
+    scope = end_of_association_chain
+    if params[:action] == 'reports'
+      scope = scope.select(
+        'campaigns.*, count(deals.id) won_deals_count, count(deals_campaigns.id) deals_count'
+      ).joins([:deals, :won_deals])
+    end
+    scope
+  end
+  
+  # no pagination
+  def collection
+    get_collection_ivar || set_collection_ivar(collection_scope.all)
+  end
 end

data/app/controllers/e9_crm/companies_controller.rb

@@ -1,3 +1,4 @@
 class E9Crm::CompaniesController < E9Crm::ResourcesController
   defaults :resource_class => Company
+  include E9Rails::Controllers::Orderable
 end

data/app/controllers/e9_crm/contact_emails_controller.rb

@@ -17,21 +17,17 @@ class E9Crm::ContactEmailsController < E9Crm::ResourcesController
       object = if params[resource_instance_name]
         ContactEmail.new(params[resource_instance_name] || {})
       else
-        ContactEmail.new_from_template(template, :from_email => current_user.email, :user_ids => params[:uids])
+        ContactEmail.new_from_template(template, :from_email => current_user.email, :contact_ids => params[:uids])
       end
 
-      # we set the user_ids.blank? error right away signifiying a problem, 
-      # as the record won't be valid if the user_ids weren't passed in params
-      if object.user_ids.blank?
-        object.errors.add(:user_ids, :blank)
-      end
+      object.valid?
 
       set_resource_ivar(object)
     end
   end
 
   # throw record_not_found if there's no template.  #new requires email_template_id
-  # be passed in params (and also user_ids)
+  # be passed in params (and also contact_ids)
   def template
     @_template ||= EmailTemplate.find(params[:etid])
   end

data/app/controllers/e9_crm/contacts_controller.rb

@@ -1,12 +1,13 @@
 class E9Crm::ContactsController < E9Crm::ResourcesController
   defaults :resource_class => Contact
 
+  include E9Rails::Controllers::Orderable
   include E9Tags::Controller
 
   respond_to :js, :html
 
   before_filter :determine_title, :only => :index
-  before_filter :load_user_ids, :only => :index
+  before_filter :load_contact_ids, :only => :index
 
   has_scope :search, :by_title, :by_company, :only => :index
   has_scope :tagged, :only => :index, :type => :array
@@ -18,9 +19,10 @@ class E9Crm::ContactsController < E9Crm::ResourcesController
 
   protected
 
-  def load_user_ids
-    @user_ids ||= begin
-      (User.primary.joins(:contact) & end_of_association_chain.scoped).all.map(&:id)
+  def load_contact_ids
+    @contact_ids ||= begin
+      contact_id_sql = end_of_association_chain.scoped.select('contacts.id').to_sql
+      Contact.connection.send(:select_values, contact_id_sql, 'Contact ID Load')
     end
   end
 

data/app/controllers/e9_crm/dated_costs_controller.rb

@@ -1,4 +1,5 @@
 class E9Crm::DatedCostsController < E9Crm::ResourcesController
   belongs_to :advertising_campaign
   defaults :resource_class => DatedCost
+  include E9Rails::Controllers::Orderable
 end

data/app/controllers/e9_crm/deals_controller.rb

@@ -1,19 +1,83 @@
 class E9Crm::DealsController < E9Crm::ResourcesController
   defaults :resource_class => Deal
+  include E9Rails::Controllers::Orderable
+
+  # for campaign select options
+  helper :"e9_crm/campaigns"
+
+  filter_access_to :leads, :reports, :require => :read, :context => :admin
 
-  filter_access_to :leads, :require => :read, :context => :admin
   prepend_before_filter :set_leads_index_title, :only => :leads
+  prepend_before_filter :set_reports_index_title, :only => :reports
+
+  ##
+  # Index/Reports Scopes
+  #
 
   has_scope :leads, :only => :leads, :default => true
-  has_scope :leads, :except => :leads, :default => false
+  has_scope :leads, :except => [:leads, :reports], :default => false
+
+
+  ##
+  # Reports scopes
+  #
+
+  has_scope :reports, :only => :reports, :type => :boolean, :default => true
+
+  has_scope :group, :only => :reports do |c, scope, value|
+    scope & Campaign.of_group(value)
+  end
+
+  has_scope :type, :only => :reports do |_, scope, value|
+    scope & Campaign.of_type("#{value}_campaign".classify)
+  end
+
+  has_scope :until_time, :as => :until, :unless => 'params[:from].present?'
+
+  has_scope :from_time, :as => :from do |controller, scope, value|
+    if controller.params[:until]
+      scope.for_time_range(value, controller.params[:until])
+    else
+      scope.from_time(value)
+    end
+  end
+
+
+  ##
+  # Actions
+  #
 
   def leads
     index!
   end
 
+  def reports
+    index!
+  end
+
   protected
 
+  def collection
+    get_collection_ivar || begin
+      set_collection_ivar(
+        if params[:action] == 'reports'
+          end_of_association_chain.all
+        else
+          end_of_association_chain.paginate(pagination_parameters)
+        end
+      )
+    end
+  end
+
   def set_leads_index_title
     @index_title = I18n.t(:index_title, :scope => 'e9.e9_crm.leads')
   end
+
+  def set_reports_index_title
+    @index_title = I18n.t(:index_title, :scope => 'e9.e9_crm.reports')
+  end
+
+  def ordered_if 
+    %w(index reports).member? params[:action]
+  end
 end

data/app/controllers/e9_crm/email_campaigns_controller.rb

@@ -1,3 +1,4 @@
 class E9Crm::EmailCampaignsController < E9Crm::ResourcesController
   defaults :resource_class => EmailCampaign
+  include E9Rails::Controllers::Orderable
 end

data/app/controllers/e9_crm/email_templates.controller.rb

@@ -1,3 +1,4 @@
 class E9Crm::EmailTemplatesController < E9Crm::ResourcesController
   defaults
+  include E9Rails::Controllers::Orderable
 end

data/app/controllers/e9_crm/offers_controller.rb

@@ -1,3 +1,4 @@
 class E9Crm::OffersController < E9Crm::ResourcesController
   defaults :resource_class => Offer
+  include E9Rails::Controllers::Orderable
 end

data/app/controllers/e9_crm/page_views_controller.rb

@@ -1,6 +1,7 @@
 class E9Crm::PageViewsController < E9Crm::ResourcesController
   defaults :resource_class => PageView
   belongs_to :campaign, :contact, :polymorphic => true
+  include E9Rails::Controllers::Orderable
 
   # NOTE association chain is prepended to ensure parent is loaded so other
   #      before filters can use collection_path, etc.  Is there a better solution

data/app/controllers/e9_crm/resources_controller.rb

@@ -1,10 +1,11 @@
 class E9Crm::ResourcesController < E9Crm::BaseController
-  include E9Rails::Controllers::Orderable
   include E9Rails::Helpers::ResourceErrorMessages
   include E9Rails::Helpers::Pagination
 
   inherit_resources
 
+  respond_to :js
+
   add_resource_breadcrumbs
 
   def self.defaults(hash = {})

data/app/controllers/e9_crm/sales_campaigns_controller.rb

@@ -1,3 +1,4 @@
 class E9Crm::SalesCampaignsController < E9Crm::ResourcesController
   defaults :resource_class => SalesCampaign
+  include E9Rails::Controllers::Orderable
 end

data/app/helpers/e9_crm/campaign_groups_helper.rb

@@ -0,0 +1,8 @@
+module E9Crm::CampaignGroupsHelper
+  def records_table_field_map_for_campaign_group
+    {
+      :fields => { :name => nil },
+      :links => proc {|r| [link_to_edit_resource(r), link_to_destroy_resource(r)] }
+    }
+  end
+end

data/app/helpers/e9_crm/campaigns_helper.rb

@@ -1,14 +1,45 @@
 module E9Crm::CampaignsHelper
-  def records_table_map_for_campaign
-    { 
-      :fields => {
-        :type => nil, 
-        :name => nil, 
-        :code => nil, 
-        :affiliate_fee => proc {|r| v = r.affiliate_fee; Money === v ? v : 'n/a' },  
-        :sales_fee => nil, 
-        :status => proc {|r| resource_class.human_attribute_name(Campaign::Status::VALUES[r.status]) } 
-      }
-    }
+  def display_campaign_fee(val)
+    Money === val && val || 'n/a'
+  end
+
+  def display_campaign_code(val)
+    val || 'n/a'
+  end
+
+  def display_campaign_type(val)
+    val[/(.*)Campaign/, 1]
+  end
+
+  def campaign_type_select_options(with_all_option = true)
+    options = %w( advertising affiliate email sales ).map {|t| [t.titleize, t] }
+    options.unshift(['All Types', nil]) if with_all_option
+    options_for_select(options)
+  end
+
+  def campaign_group_select_options
+    options = CampaignGroup.select('name, id').all.map {|c| [c.name, c.id] }
+    options.unshift(['All Groups', nil])
+    options_for_select(options)
+  end
+
+  def campaign_date_select_options
+    ''
+  end
+
+  def campaign_active_select_options
+    options = [
+      ['All Statuses', nil],
+      ['Active',      true],
+      ['Inactive',   false]
+    ]
+    options_for_select(options)
+  end
+
+  ##
+  # Accommodate for "NoCampaign" campaign in link
+  #
+  def link_to_edit_campaign(record)
+    link_to_edit_resource(record) unless record.is_a?(NoCampaign)
   end
 end

data/app/helpers/e9_crm/contacts_helper.rb

@@ -15,7 +15,7 @@ module E9Crm::ContactsHelper
   def records_table_field_map_for_contact
     {
       :fields => { 
-        :avatar => proc {|r| },
+        :avatar => proc {|r| "<img src=\"#{r.avatar_url}\" alt=\"Avatar for #{r.name}\" />".html_safe  },
         :details => proc {|r| render('details', :record => r) }
       },
 

data/app/helpers/e9_crm/deals_helper.rb

@@ -12,4 +12,29 @@ module E9Crm::DealsHelper
       }
     }
   end
+
+  def deal_date_select_options(ending_month = false)
+    @_first_deal_date ||= Deal.order(:created_at).first.try(:created_at) || Date.today
+
+    date, cdate = @_first_deal_date, Date.today
+
+    options = []
+
+    if ending_month
+      prefix = 'Until'
+      label = prefix + ' Now'
+    else
+      prefix = 'From'
+      label = prefix + ' Inception'
+    end
+
+    begin
+      options << [date.strftime("#{prefix} %B %Y"), date.strftime('%Y/%m')]
+      date += 1.month
+    end while date.year <= cdate.year && date.month <= cdate.month
+
+    options.unshift([label, nil])
+
+    options_for_select(options)
+  end
 end

data/app/models/advertising_campaign.rb

@@ -4,7 +4,6 @@
 # DatedCost records.
 #
 class AdvertisingCampaign < Campaign
-  has_many :dated_costs, :as => :costable
 
   ##
   # The sum cost of this campaign

data/app/models/campaign.rb

@@ -7,18 +7,50 @@ class Campaign < ActiveRecord::Base
   include E9Rails::ActiveRecord::STI
 
   belongs_to :campaign_group
-  has_many   :deals, :inverse_of => :campaign
-  has_many   :page_views, :inverse_of => :campaign
+
+  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
 
   # NOTE tracking cookie code changes with new visits
-  has_many   :tracking_cookies, :foreign_key => :code, :primary_key => :code, :class_name => 'TrackingCookie'
+  has_many :tracking_cookies, :foreign_key => :code, :primary_key => :code, :class_name => 'TrackingCookie'
 
-  validates  :code, :presence   => true,
-                    :length     => { :maximum => 32 }, 
-                    :uniqueness => { :ignore_case => true }
+  def self.default
+    NoCampaign.first || NoCampaign.create
+  end
 
-  scope :active,   lambda { where(:active => true) }
-  scope :inactive, lambda { where(:active => false) }
+  validates :code,          :presence     => { :unless => lambda {|r| r.is_a?(NoCampaign) } },
+                            :length       => { :maximum => 32 }, 
+                            :uniqueness   => { :ignore_case => true, :allow_blank => true }
+  validates :affiliate_fee, :numericality => true
+  validates :sales_fee,     :numericality => true
+
+  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) }
+
+  def new_visit_session_count
+    page_views.new_visits.group(:session).count.keys.length
+  end
+
+  def new_visit_page_view_count
+    page_views.new_visits.group(:session).count.values.sum
+  end
+
+  def repeat_visit_session_count
+    page_views.repeat_visits.group(:session).count.keys.length
+  end
+
+  def repeat_visit_session_count
+    page_views.repeat_visits.group(:session).count.values.sum
+  end
 
   ##
   # The sum cost of this campaign