e9_crm 0.1.26 → 0.1.27

data/app/controllers/e9_crm/base_controller.rb

@@ -1,3 +1,3 @@
 class E9Crm::BaseController < AdminController
-  include E9Rails::Helpers::ResourceLinks
+  self.route_scope = nil
 end

data/app/controllers/e9_crm/campaigns_controller.rb

@@ -32,7 +32,7 @@ class E9Crm::CampaignsController < E9Crm::ResourcesController
 
   has_scope :of_group, :as => :group, :only => :reports
 
-  has_scope :type, :only => :reports do |_, scope, value|
+  has_scope :type, :only => [:reports, :index] do |_, scope, value|
     scope.of_type("#{value}_campaign".classify)
   end
 

data/app/controllers/e9_crm/leads_controller.rb

@@ -3,7 +3,6 @@ class E9Crm::LeadsController < ApplicationController
   #      rather it handles only public side lead creation
 
   # TODO these should all be included in e9_base
-  include E9Rails::Helpers::ResourceLinks
   include E9Rails::Helpers::Title
   include E9Rails::Helpers::Translation
   include E9Rails::Helpers::ResourceErrorMessages

data/app/controllers/e9_crm/page_views_controller.rb

@@ -1,7 +1,8 @@
 class E9Crm::PageViewsController < E9Crm::ResourcesController
   defaults :resource_class => PageView
-  belongs_to :campaign, :contact, :polymorphic => true
-  include E9Rails::Controllers::Orderable
+  include E9::Controllers::Orderable
+
+  actions :index
 
   # NOTE association chain is prepended to ensure parent is loaded so other
   #      before filters can use collection_path, etc.  Is there a better solution
@@ -9,13 +10,61 @@ class E9Crm::PageViewsController < E9Crm::ResourcesController
   #
   prepend_before_filter :association_chain
 
-  has_scope :until_time, :as => :until, :unless => 'params[:from].present?'
+  before_filter :find_contact
+
+  has_scope :campaign, :only => :index do |_, scope, value|
+    scope.where(:campaign_id => value)
+  end
+
+  has_scope :contact, :only => :index do |_, scope, value|
+    scope.joins(:user => :contact).merge(Contact.where(:id => value))
+  end
+
+  has_scope :new_visits, :only => :index, do |_, scope, value|
+    scope.new_visits(E9.true_value?(value))
+  end
+
+  has_scope :month, :only => :index do |controller, scope, value|
+    scope.for_time_range(value, :in => :month)
+  end
+
+  protected
 
-  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)
+  def collection_scope
+    scope = end_of_association_chain
+
+    unless params[:contact]
+      join_sql = <<-SQL
+        LEFT OUTER JOIN tracking_cookies
+          ON tracking_cookies.id = page_views.tracking_cookie_id
+        LEFT OUTER JOIN users
+          ON users.id = tracking_cookies.user_id
+        LEFT OUTER JOIN contacts
+          ON contacts.id = users.contact_id
+      SQL
+
+      scope = scope.joins(join_sql)
+    end
+
+    sel_sql = <<-SQL
+      page_views.*,
+      IF(contacts.id,CONCAT_WS(' ', contacts.first_name, contacts.last_name),'(Unknown)') contact_name,
+      contacts.id as contact_id
+    SQL
+
+    scope.select(sel_sql)
+  end
+
+  def collection
+    get_collection_ivar || begin
+      total_entries = collection_scope.except(:order).count
+      objects       = collection_scope.includes(:campaign).paginate(pagination_parameters.merge(:total_entries => total_entries))
+
+      set_collection_ivar objects
     end
   end
+
+  def find_contact
+    @contact ||= params[:contact] && Contact.find_by_id(params[:contact])
+  end
 end

data/app/controllers/e9_crm/resources_controller.rb

@@ -2,6 +2,7 @@ class E9Crm::ResourcesController < E9Crm::BaseController
   inherit_resources
 
   include E9Rails::Helpers::ResourceErrorMessages
+  include E9::Controllers::InheritableViews
 
   # NOTE depending on e9_base pagination (which should eventually use this module)
   #include E9Rails::Helpers::Pagination

data/app/controllers/e9_crm/visits_controller.rb

@@ -0,0 +1,60 @@
+class E9Crm::VisitsController < E9Crm::ResourcesController
+  defaults :resource_class => PageView, :collection_name => :page_views
+  belongs_to :campaign
+  include E9::Controllers::Orderable
+
+  actions :index
+
+  # NOTE association chain is prepended to ensure parent is loaded so other
+  #      before filters can use collection_path, etc.  Is there a better solution
+  #      for this?
+  #
+  prepend_before_filter :association_chain
+
+  before_filter :determine_title, :only => :index
+
+  has_scope :visits, :default => 'true' do |_, scope, _|
+    sel_sql  = <<-SQL
+      page_views.*,
+      IF(contacts.id,CONCAT_WS(' ', contacts.first_name, contacts.last_name),'(Unknown)') contact_name,
+      contacts.id as contact_id,
+      count(distinct(if(page_views.new_visit=1,IFNULL(page_views.session,1),null))) as new_visits,
+      count(distinct(if(page_views.new_visit=1,null,IFNULL(page_views.session,1)))) as repeat_visits
+    SQL
+
+    join_sql = <<-SQL
+      LEFT OUTER JOIN tracking_cookies
+        ON tracking_cookies.id = page_views.tracking_cookie_id
+      LEFT OUTER JOIN users
+        ON users.id = tracking_cookies.user_id
+      LEFT OUTER JOIN contacts
+        ON contacts.id = users.contact_id
+    SQL
+      
+    scope.select(sel_sql).joins(join_sql).group('contact_id')
+  end
+
+  protected
+
+  def collection
+    get_collection_ivar || begin
+      set_collection_ivar end_of_association_chain.paginate(pagination_parameters)
+    end
+  end
+
+  def default_ordered_dir
+    'ASC'
+  end
+
+  def default_ordered_on
+    'contact_name'
+  end
+
+  def add_index_breadcrumb
+    add_breadcrumb! e9_t(:breadcrumb_title)
+  end
+
+  def determine_title
+    @index_title = e9_t(:index_title, :parent => parent.name)
+  end
+end

data/app/helpers/e9_crm/contacts_helper.rb

@@ -62,16 +62,9 @@ module E9Crm::ContactsHelper
     tags.map {|tag| link_to_contact_search(:tagged, [tag], tag) }.join(', ').html_safe
   end
 
-  def contact_newsletter_select_tag
-    options = UserEmail.pending.order('name').map {|e| [e.name, e.id] }
-    #select_tag 'eid', options_for_select( options.presence || [['n/a', nil]] )
-    select_tag 'eid', options_for_select(options) if options.present?
-  end
-
   def contact_email_template_select_tag
-    options = EmailTemplate.order('name').map {|e| [e.name, e.id] }
-    #select_tag 'etid', options_for_select( options.presence || [['n/a', nil]] )
-    select_tag 'etid', options_for_select(options) if options.present?
+    options = UserEmail.bulk_sendable.order('name').map {|e| [e.name, e.id] }
+    select_tag 'email_id', options_for_select(options) if options.present?
   end
 
   def contact_user_subscribed_to_newsletter?(user)

data/app/helpers/e9_crm/page_views_helper.rb

@@ -1,2 +1,47 @@
 module E9Crm::PageViewsHelper
+  def page_view_campaign_select_options
+    @_page_view_campaign_select_options ||= begin
+      opts = Campaign.all.map {|campaign| [campaign.name, campaign.id] }
+      opts.unshift ['Any', nil]
+      options_for_select(opts)
+    end
+  end
+
+  def page_view_new_visit_select_options
+    options_for_select([
+      ['Any', nil],
+      ['New Visits', true],
+      ['Repeat Visits', false]
+    ])
+  end
+
+  def page_view_date_select_options(options = {})
+    @_first_date ||= PageView.order(:created_at).first.try(:created_at) || Date.today
+
+    date, cdate = @_first_date, Date.today
+
+    sel_options = []
+
+    if options[:type] == :until
+      prefix = 'Up to '
+      label = prefix + ' Now'
+    elsif options[:type] == :in_month
+      prefix = 'Closed in '
+      label = 'Since Inception'
+    else
+      prefix = 'Since '
+      label = prefix + ' Inception'
+    end
+
+    begin
+      sel_options << [date.strftime("#{prefix}%B %Y"), date.strftime('%Y/%m')]
+      date += 1.month
+    end while date.year <= cdate.year && date.month <= cdate.month
+
+    sel_options.reverse!
+
+    sel_options.unshift([label, nil])
+
+    options_for_select(sel_options)
+  end
 end

data/app/models/campaign.rb

@@ -5,6 +5,7 @@
 #
 class Campaign < ActiveRecord::Base
   include E9Rails::ActiveRecord::STI
+  include E9::ActiveRecord::AttributeSearchable
 
   belongs_to :campaign_group
 
@@ -14,7 +15,10 @@ class Campaign < ActiveRecord::Base
   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 :non_leads, :class_name => 'Deal', :conditions => ['deals.status != ?', Deal::Status::Lead]
+
   has_many :page_views, :inverse_of => :campaign, :dependent => :nullify
+  has_many :new_page_views, :class_name => 'PageView', :conditions => ['page_views.new_visit = ?', true]
+  has_many :repeat_page_views, :class_name => 'PageView', :conditions => ['page_views.new_visit = ?', false]
 
   # only advertising campaigns use this association
   has_many :dated_costs, :as => :costable
@@ -58,8 +62,8 @@ class Campaign < ActiveRecord::Base
       SUM(costs.total) / 
         SUM(IF(deals.status='won',1,0))               average_cost,
 
-      rv.count                                       repeat_visits,
-      nv.count                                          new_visits,
+      IFNULL(rv.count, 0)                            repeat_visits,
+      IFNULL(nv.count, 0)                               new_visits,
 
       SUM(DATEDIFF(
         deals.closed_at,
@@ -70,36 +74,36 @@ class Campaign < ActiveRecord::Base
         deals.created_at))                         average_elapsed
     SQL
 
-    select(selects)
-      .joins(
+    select(selects).
+      joins(
         'LEFT OUTER JOIN deals ' +
         'ON deals.campaign_id = campaigns.id ' +
-        "#{ 'AND ' + Deal.for_time_range_conditions(*args, options).to_sql if args.present?}")
-      .joins(
+        "#{ 'AND ' + Deal.for_time_range_conditions(*args, options).to_sql if args.present?}").
+      joins(
         'LEFT OUTER JOIN ( ' +
          'SELECT SUM(cost) total, costable_id dc_cid ' +
          'FROM dated_costs ' +
          'WHERE costable_type="Campaign" ' +
          "#{ 'AND ' + DatedCost.for_time_range_conditions(*args, options).to_sql if args.present?}" +
          ' GROUP BY dc_cid) costs ' +
-         'ON costs.dc_cid = campaigns.id')
-      .joins(
+         'ON costs.dc_cid = campaigns.id').
+      joins(
         'LEFT OUTER JOIN ( ' +
         'SELECT COUNT(DISTINCT session) count, campaign_id nv_cid ' +
         'FROM page_views ' +
         'WHERE page_views.new_visit = 1 ' +
         "#{ 'AND ' + PageView.for_time_range_conditions(*args, options).to_sql if args.present?}" +
         ' GROUP BY nv_cid ) nv ' + 
-        'ON nv.nv_cid = campaigns.id')
-      .joins(
+        'ON nv.nv_cid = campaigns.id').
+      joins(
         'LEFT OUTER JOIN ( ' +
         'SELECT COUNT(DISTINCT session) count, campaign_id rv_cid ' +
         'FROM page_views ' +
         'WHERE page_views.new_visit = 0 ' +
         "#{ 'AND ' + PageView.for_time_range_conditions(*args, options).to_sql if args.present?}" +
         ' GROUP BY rv_cid ) rv ' +
-        'ON rv.rv_cid = campaigns.id')
-      .group('campaigns.id')
+        'ON rv.rv_cid = campaigns.id').
+      group('campaigns.id')
   }
 
   def self.default
@@ -111,24 +115,20 @@ class Campaign < ActiveRecord::Base
     class_eval("def #{money_column}; (r = read_attribute(:#{money_column})) && Money.new(r) end")
   end
 
-  %w(new_visits repeat_visits).each do |count_column|
-    class_eval("def #{count_column}; (r = read_attribute(:#{count_column})) || 0 end")
-  end
-
-  def new_visit_session_count
-    page_views.new_visits.group(:session).count.keys.length
+  def new_visit_count
+    new_visits.group(:session).count.keys.length
   end
 
   def new_visit_page_view_count
-    page_views.new_visits.group(:session).count.values.sum
+    new_visits.group(:session).count.values.sum
   end
 
-  def repeat_visit_session_count
-    page_views.repeat_visits.group(:session).count.keys.length
+  def repeat_visit_count
+    repeat_visits.group(:session).count.keys.length
   end
 
   def repeat_visit_page_view_count
-    page_views.repeat_visits.group(:session).count.values.sum
+    repeat_visits.group(:session).count.values.sum
   end
 
   ##
@@ -140,7 +140,7 @@ class Campaign < ActiveRecord::Base
   end
 
   def to_s
-    name.tap {|n| n << " (#{code})" if code.present? }
+    name.dup.tap {|n| n << " (#{code})" if code.present? }
   end
 
   def to_liquid

data/app/models/contact.rb

@@ -18,6 +18,13 @@ class Contact < ActiveRecord::Base
   has_many :owned_deals, :class_name => 'Deal', :dependent => :restrict
   has_and_belongs_to_many :associated_deals, :class_name => 'Deal'
 
+  has_many :campaigns_as_salesperson, :class_name => "SalesCampaign",     :inverse_of => :sales_person, :foreign_key => 'sales_person_id'
+  has_many :campaigns_as_affiliate,   :class_name => "AffiliateCampaign", :inverse_of => :affiliate,    :foreign_key => 'affiliate_id'
+
+  def page_views
+    PageView.by_users(user_ids)
+  end
+
   has_many :users, :inverse_of => :contact do
 
     ##
@@ -91,10 +98,6 @@ class Contact < ActiveRecord::Base
 
   delegate :email, :to => :primary_user, :allow_nil => true
 
-  def page_views
-    PageView.by_user(users)
-  end
-
   has_record_attributes :users, 
                         :phone_number_attributes, 
                         :instant_messaging_handle_attributes, 
@@ -204,6 +207,12 @@ class Contact < ActiveRecord::Base
   end
   delegate :name, :to => :company, :prefix => true, :allow_nil => true
 
+  def name_with_email
+    retv = name.dup
+    retv << " (#{email})" if email.present?
+    retv
+  end
+
   ##
   # Helper to concatenate a Contact's full name
   #
@@ -232,7 +241,10 @@ class Contact < ActiveRecord::Base
 
   def merge_destructive_and_destroy!(other)
     other.users.clear_primary!
+    self.owned_deals                         |= other.owned_deals
     self.associated_deals                    |= other.associated_deals
+    self.campaigns_as_salesperson            |= other.campaigns_as_salesperson
+    self.campaigns_as_affiliate              |= other.campaigns_as_affiliate
     self.users                               |= other.users
     self.website_attributes                  |= other.website_attributes
     self.address_attributes                  |= other.address_attributes
@@ -240,6 +252,7 @@ class Contact < ActiveRecord::Base
     self.instant_messaging_handle_attributes |= other.instant_messaging_handle_attributes
 
     other.associated_deals.clear
+    other.reload
     other.destroy
   end
 

data/app/models/page_view.rb

@@ -21,30 +21,13 @@ class PageView < ActiveRecord::Base
   belongs_to :campaign, :inverse_of => :page_views
   has_one :user, :through => :tracking_cookie
 
-  #attr_accessor :should_cache 
-
-  #after_create :increment_campaign_visit_cache, :if => '!!should_cache'
-
-  scope :by_user, lambda {|*users| 
-    users.flatten!
-    users.map! &:to_param
-    joins(:tracking_cookie).where(TrackingCookie.arel_table[:user_id].send *(users.length == 1 ? [:eq, users.pop] : [:in, users]))
-  }
-
-  scope :by_campaign, lambda {|*campaigns| 
-    campaigns.flatten!
-    campaigns.map! &:to_param
-    where(arel_table[:campaign_id].send *(campaigns.length == 1 ? [:eq, campaigns.pop] : [:in, campaigns]))
+  scope :by_users, lambda {|*users| 
+    joins(:tracking_cookie) & TrackingCookie.for_users(users)
   }
 
   scope :new_visits,    lambda {|v=true| where(:new_visit => v) }
   scope :repeat_visits, lambda { new_visits(false) }
 
   delegate :name, :code, :to => :campaign, :prefix => true, :allow_nil => true
-
-  protected
-
-  #def increment_campaign_visit_cache
-    #Campaign.increment_counter(new_visit ? :new_visits : :repeat_visits, campaign_id)
-  #end
+  delegate :contact, :to => :user, :allow_nil => true
 end

data/app/models/tracking_cookie.rb

@@ -45,6 +45,22 @@ class TrackingCookie < ActiveRecord::Base
   has_many :page_views
   after_save :generate_hid, :on => :create
 
+  scope :for_users, lambda {|*users| 
+    users.flatten!
+    users.map!(&:to_param)
+    users.compact!
+
+    if users.length == 1
+      where arel_table[:user_id].eq(users.first)
+    else
+      where arel_table[:user_id].in(users)
+    end
+  }
+
+  scope :for_user, lambda {|user|
+    where arel_table[:user_id].in(users.flatten.map(&:to_param))
+  }
+
   protected
 
   def generate_hid

data/app/views/e9_crm/affiliate_campaigns/_form_inner.html.haml

@@ -4,8 +4,9 @@
   %legend= e9_t(:affiliate_information_legend, :scope => 'e9_crm.campaigns')
   .field
     = f.label :affiliate, :class => :req, :for => 'campaign_affiliate_id'
-    %input.contact-autocomplete{:type => 'text'}
+
     - contact = f.object.affiliate
+    %input.contact-autocomplete{:type => 'text', :style => contact.blank? && '' || 'display:none'}
     .contact-select{:style => contact.blank? && 'display:none' || ''}
       %span.content= contact.try(:name)
       %input{:type => :hidden, :name => "#{resource_instance_name}[affiliate_id]", :value => contact.try(:id)}

data/app/views/e9_crm/campaigns/_reports_table.html.haml

@@ -83,13 +83,13 @@
           - total_value = dat[:total_value].compact.sum
           = m(total_value)
         %td.record-average-value.num
-          = m(total_value.to_f / won_deal_count)
+          = won_deal_count.zero? ? 'n/a' : m(total_value.to_f / won_deal_count)
         %td.record-total-cost.num
           - total_cost = dat[:total_cost].compact.sum
           = m(total_cost)
         %td.record-average-cost.num
-          = m(total_cost.to_f / won_deal_count)
+          = won_deal_count.zero? ? 'n/a' : m(total_cost.to_f / won_deal_count)
         %td.record-average-elapsed.num
           - total_elapsed     = dat[:total_elapsed].compact.sum.to_f
           - closed_deal_count = dat[:closed_deal_count].sum.to_i
-          = "%i days" % (total_elapsed / closed_deal_count)
+          = closed_deal_count.zero? ? 'n/a' : "%i days" % (total_elapsed / closed_deal_count)

data/app/views/e9_crm/campaigns/_table.html.haml

@@ -20,7 +20,7 @@
           %td.record-campaign-group
             = record.campaign_group_name || e9_t(:no_group, :scope => 'e9_crm.campaigns')
           %td.record-name
-            = record.name
+            = link_to record.name, campaign_visits_path(record), :title => 'View Campaign Activity'
           %td.record-code
             = display_campaign_code(record.code)
           %td.record-affiliate-fee.num

data/app/views/e9_crm/campaigns/reports.js.erb

@@ -1 +1 @@
-$("table.records").replaceWith("<%= escape_javascript(render('reports_table', :collection => collection)) %>");  
+$("#records_table").html("<%= escape_javascript(render('reports_table', :collection => collection)) %>");  

data/app/views/e9_crm/contacts/_sidebar_email_form.html.haml

@@ -1,7 +1,9 @@
-- if (etag = contact_email_template_select_tag).present?
-  %fieldset
-    %legend= e9_t(:email_actions_legend)
-    = form_tag new_contact_email_path, :method => :get, :id => 'contact_email_form', 'data-empty' => e9_t(:no_contacts_notification), 'data-count' => @contact_ids.length do
+%fieldset
+  %legend= e9_t(:email_actions_legend)
+  - if (etag = contact_email_template_select_tag).present?
+    = form_for EmailDelivery.new(:contact_ids => @contact_ids), :url => new_admin_email_delivery_path, :html => { :method => :get, :id => 'contact_email_form', 'data-empty' => e9_t(:no_contacts_notification), 'data-count' => @contact_ids.length } do |f|
       = etag
-      = hidden_field_tag 'uids', @contact_ids.join(','), :id => 'contact_email_uids'
+      = f.hidden_field :contact_ids, :id => 'contact_email_uids'
       = submit_tag e9_t(:send_email_template), :name => nil
+  - else
+    = I18n.t(:no_email_templates).html_safe

data/app/views/e9_crm/contacts/index.html.haml

@@ -12,7 +12,7 @@
   .toolbar-right
     #sidebar-actions
       %fieldset
-        %legend= "Manage"#e9_t(:search_options_legend)
+        %legend= "Manage"
         .manage-contacts
           = link_to_new_resource(Contact)
         .manage-company

data/app/views/e9_crm/contacts/show.html.haml

@@ -8,6 +8,7 @@
 
   .contact-links.actions
     = link_to_edit_resource(resource)
+    = link_to "View Activity", page_views_url(:contact => resource.id)
     = google_search_link(resource.name)
     = google_news_link(resource.name)
 

data/app/views/e9_crm/dated_costs/index.html.haml

@@ -1,7 +1,6 @@
 = title @index_title || e9_t(:index_title)
+
 .toolbar
-  .toolbar-left
-  .toolbar-middle
   .toolbar-right
     = link_to_new_resource(resource_class, :class => 'new-resource')
 
@@ -19,4 +18,3 @@
         %td{:colspan => 7}= e9_t(:no_records_text)
     - else
       = render collection
-

data/app/views/e9_crm/deals/_leads_table.html.haml

@@ -32,3 +32,6 @@
               = link_to 'View Contact', record.contacts.first
             = link_to 'Create Deal', edit_deal_path(record)
             = link_to 'Delete Lead', record, :method => :delete, :remote => true, :confirm => I18n.t("#{resource_class.i18n_scope}.links.confirm_destroy")
+
+- if controller.send(:should_paginate_index)
+  = will_paginate collection

data/app/views/e9_crm/deals/_table.html.haml

@@ -40,3 +40,6 @@
         %td.record-totals.num
           = dat[:value].sum.to_money.format
         %td
+
+- if controller.send(:should_paginate_index)
+  = will_paginate collection

data/app/views/e9_crm/deals/leads.js.erb

@@ -1 +1 @@
-$("table.records").replaceWith("<%= escape_javascript(render('leads_table', :collection => collection)) %>");  
+$("#records_table").html("<%= escape_javascript(render('leads_table', :collection => collection)) %>");  

data/app/views/e9_crm/deals/show.html.haml

@@ -18,15 +18,24 @@
   %legend= t(:deal_owner_legend)
   .deal-contact
     - if resource.owner
-      .contact-link= link_to(resource.owner.name, resource.owner)
-      .contact-title= title_and_or_company(resource.owner)
+      = link_to resource.owner do
+        .contact-photo 
+          %img{:src => resource.owner.avatar_url, :alt => "Photo for #{resource.owner.name}"} 
+        .contact-name= resource.owner.name
+        .contact-title= title_and_or_company(resource.owner)
     - else
-      = t(:no_deal_owner)
+      .contact-photo 
+        %img{:src => User.new.avatar_url, :alt => "Default Contact Photo"} 
+      .contact-name
+        = t(:no_deal_owner)
 
 - if resource.contacts.any?
   %fieldset.deal-contacts
     %legend= t(:deal_contact_legend)
     - resource.contacts.each do |contact|
       .deal-contact
-        .contact-link= link_to(contact.name, contact)
-        .contact-title= title_and_or_company(contact)
+        = link_to contact do
+          .contact-photo 
+            %img{:src => contact.avatar_url, :alt => "Photo for #{contact.name}"} 
+          .contact-name= contact.name
+          .contact-title= title_and_or_company(contact)

data/app/views/e9_crm/page_views/_header.html.haml

@@ -0,0 +1,15 @@
+.toolbar
+  .toolbar-left
+    = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
+      %select{:name => 'campaign'}
+        = page_view_campaign_select_options
+      %select{:name => 'new_visits'}
+        = page_view_new_visit_select_options
+      %select{:name => 'month'}
+        = page_view_date_select_options(:type => :in_month)
+
+      %input.contact-autocomplete{:type => :text, :style => @contact.blank? && '' || 'display:none', :placeholder => 'Enter Contact...'}
+      .contact-select{:style => @contact.blank? && 'display:none' || ''}
+        %span.content= @contact.try(:name_with_email)
+        %input{:type => :hidden, :name => "contact", :value => @contact.try(:id)}
+        %a{:class => :remove, :title => "Remove", :alt => "Remove"} Remove

data/app/views/e9_crm/page_views/_table.html.haml

@@ -3,9 +3,9 @@
     %tr
       %th= orderable_column_link(:created_at)
       %th= orderable_column_link('campaign.name', :campaign)
+      %th= orderable_column_link(:new_visit)
       %th= orderable_column_link(:request_path)
-      %th= orderable_column_link(:referer)
-      %th= orderable_column_link(:remote_ip)
+      %th= orderable_column_link('contact_name', :contact)
   %tbody
     - if collection.empty?
       %tr
@@ -17,12 +17,12 @@
             = I18n.l(record.created_at)
           %td.record-campaign-name
             = record.campaign_name || e9_t(:no_campaign)
+          %td.record-request-new-visit
+            = record.new_visit ? 'New Visit' : 'Repeat Visit'
           %td.record-request-path
             = record.request_path
-          %td.record-referer
-            = record.referer
-          %td.record-remote-ip
-            = record.remote_ip
+          %td.record-contact-name
+            = record.contact_name
 
 - if controller.send(:should_paginate_index)
   = will_paginate collection