e9_crm 0.1.21 → 0.1.22

data/app/controllers/e9_crm/campaigns_controller.rb

@@ -2,43 +2,86 @@ class E9Crm::CampaignsController < E9Crm::ResourcesController
   defaults :resource_class => Campaign
   include E9Rails::Controllers::Orderable
 
+  helper :"e9_crm/deals"
+
   before_filter :redirect_new_to_subclass, :only => :new
 
-  self.should_paginate_index = false
+  before_filter :redirect_for_default_from_time, :only => :reports
 
-  has_scope :of_group, :as => :group, :only => :index
+  prepend_before_filter :set_reports_index_title, :only => :reports
+
+  filter_access_to :reports, :require => :read, :context => :admin
+
+  self.should_paginate_index = false
 
   has_scope :active, :only => :index, :default => 'true' do |_, scope, value|
     scope.active(E9.true_value?(value))
   end
 
-  has_scope :of_type, :as => :type, :only => :index do |_, scope, value|
+  ##
+  # Reports
+  #
+
+  has_scope :reports, :only => :reports, :default => 'true' do |controller, scope, _|
+    if (args = controller.params.values_at(:from, :until)).any?
+      scope.reports(*args)
+    else
+      scope.reports
+    end
+  end
+
+  has_scope :of_group, :as => :group, :only => :reports
+
+  has_scope :type, :only => :reports do |_, scope, value|
     scope.of_type("#{value}_campaign".classify)
   end
 
+  def reports
+    index!
+  end
+
   protected
 
-    def redirect_new_to_subclass
-      types = %w(advertising affiliate email sales)
-      type = types.member?(params[:type]) ? params[:type] : types.first
-      redirect_to send("new_#{type}_campaign_path")
-    end
+  def redirect_new_to_subclass
+    types = %w(advertising affiliate email sales)
+    type = types.member?(params[:type]) ? params[:type] : types.first
+    redirect_to send("new_#{type}_campaign_path")
+  end
 
-    def collection_scope
-      #end_of_association_chain.typed.includes(:campaign_group)
+  def collection_scope
+    if reports?
+      end_of_association_chain
 
-      # NOTE this is a pretty ugly join just to be able to sort on campaign group name
+    else
       end_of_association_chain.typed
         .joins("left outer join campaign_groups on campaign_groups.id = campaigns.campaign_group_id")
         .select("campaigns.*, campaign_groups.name campaign_group_name")
     end
+  end
 
-    def default_ordered_on
-      'type,campaign_group_name,name'
-    end
+  def default_ordered_on
+    'type,campaign_group_name,name'
+  end
 
-    def default_ordered_dir
-      'ASC'
-    end
+  def default_ordered_dir
+    'ASC'
+  end
 
+  def reports?
+    params[:action] == 'reports'
+  end
+
+  def set_reports_index_title
+    @index_title = I18n.t(:index_title, :scope => 'e9.e9_crm.reports')
+  end
+
+  def redirect_for_default_from_time
+    format = request.format.blank? || request.format == Mime::ALL ? Mime::HTML : request.format
+
+    if format.html? && params[:from].blank?
+      url = params.slice(:controller, :action)
+      url.merge!(:from => Date.today.strftime('%Y/%m'))
+      redirect_to url and return false
+    end
+  end
 end

data/app/controllers/e9_crm/contacts_controller.rb

@@ -22,6 +22,7 @@ class E9Crm::ContactsController < E9Crm::ResourcesController
   
   skip_before_filter :authenticate_user!, :filter_access_filter, :only => :templates
   before_filter :build_resource, :only => :templates
+  before_filter :set_edit_title, :only => :edit
 
   def templates
     render RecordAttribute::TEMPLATES
@@ -71,6 +72,10 @@ class E9Crm::ContactsController < E9Crm::ResourcesController
     end
   end
 
+  def set_edit_title
+    @edit_title ||= e9_t(:edit_title_with_name, :contact => resource.name)
+  end
+
   # we don't need @index_title in the breadcrumb here (too long)
   def add_index_breadcrumb
     add_breadcrumb! e9_t(:index_title), collection_path

data/app/controllers/e9_crm/deals_controller.rb

@@ -5,34 +5,33 @@ class E9Crm::DealsController < E9Crm::ResourcesController
   # 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
 
   skip_after_filter :flash_to_headers, :except => :destroy
 
   prepend_before_filter :set_leads_index_title, :only => :leads
-  prepend_before_filter :set_reports_index_title, :only => :reports
 
   before_filter :prepop_deal_owner_contact, :only => [:new, :edit]
 
-  before_filter :redirect_for_default_from_time, :only => [:leads, :reports]
+  before_filter :redirect_for_default_from_time, :only => :leads
 
   ##
   # All Scopes
   #
 
   has_scope :until_time, :as => :until, :unless => 'params[:from].present?'
-
   has_scope :from_time, :as => :from do |controller, scope, value|
-    #is_reports = controller.params[:action] == 'reports'
-    is_reports = false
-
     if controller.params[:until]
-      scope.for_time_range(value, controller.params[:until], :right_join => is_reports)
+      scope.for_time_range(value, controller.params[:until])
     else
-      scope.from_time(value, :right_join => is_reports)
+      scope.from_time(value)
     end
   end
 
+  has_scope :closed_in_month, :as => :closed, :only => :index do |controller, scope, value|
+    scope.for_time_range(value, :column => :closed_at, :in => :month)
+  end
+
   ##
   # Leads Scopes
   #
@@ -57,20 +56,6 @@ class E9Crm::DealsController < E9Crm::ResourcesController
   has_scope :status, :only => :index
   has_scope :owner, :only => :index
 
-  ##
-  # 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
-
   ##
   # Actions
   #
@@ -79,10 +64,6 @@ class E9Crm::DealsController < E9Crm::ResourcesController
     index!
   end
 
-  def reports
-    index!
-  end
-
   protected
 
   def add_edit_breadcrumb(opts = {})
@@ -94,18 +75,15 @@ class E9Crm::DealsController < E9Crm::ResourcesController
   def collection
     get_collection_ivar || begin
       set_collection_ivar(
-        if params[:action] == 'reports'
-          end_of_association_chain.all
+        if params[:action] == 'leads'
+          end_of_association_chain.includes(:contacts).paginate(pagination_parameters)
 
-        elsif params[:action] == 'deals'
+        else
           # NOTE this is a pretty ugly join just to be able to sort on owner
           end_of_association_chain
             .joins("left outer join contacts on contacts.id = deals.contact_id")
             .select("deals.*, contacts.first_name owner_name")
             .all
-
-        else
-          end_of_association_chain.includes(:contacts).paginate(pagination_parameters)
         end
       )
     end
@@ -123,12 +101,12 @@ class E9Crm::DealsController < E9Crm::ResourcesController
     @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')
+  def should_paginate_index
+    params[:action] == 'leads'
   end
 
   def ordered_if 
-    %w(index leads reports).member? params[:action]
+    %w(index leads).member? params[:action]
   end
 
   def default_ordered_on 

data/app/controllers/e9_crm/offers_controller.rb

@@ -38,11 +38,11 @@ class E9Crm::OffersController < E9Crm::ResourcesController
   end
 
   def default_ordered_on
-    :name
+    'name'
   end
 
   def default_ordered_dir
-    :ASC
+    'ASC'
   end
 
   def ensure_mailing_list_ids

data/app/controllers/e9_crm/resources_controller.rb

@@ -32,6 +32,10 @@ class E9Crm::ResourcesController < E9Crm::BaseController
 
   protected
 
+  def should_paginate_index
+    self.class.should_paginate_index
+  end
+
   def filter_target
     resource
   end

data/app/helpers/e9_crm/campaigns_helper.rb

@@ -17,9 +17,20 @@ module E9Crm::CampaignsHelper
     val && "?#{E9Crm.query_param}=#{val}" || 'n/a'
   end
 
-  def display_campaign_type(val = '')
-    retv = val[/(.*)Campaign/, 1]
-    retv == 'No' ? 'No Campaign' : retv
+  def display_campaign_type(val)
+    @_campaign_types ||= {}
+    @_campaign_types[val] ||= begin
+      retv = val[/(.*)Campaign/, 1]
+      retv == 'No' ? 'No Campaign' : retv
+    end
+  end
+
+  def display_campaign_group_by_id(val)
+    @_campaign_groups ||= CampaignGroup.all
+    @_campaign_group_by_id ||= {}
+    @_campaign_group_by_id[val] ||= begin
+      @_campaign_groups.find {|c| c.id == val }.try(:name) || 'No Group'
+    end
   end
 
   def campaign_type_select_options(with_all_option = true)

data/app/helpers/e9_crm/deals_helper.rb

@@ -46,40 +46,34 @@ module E9Crm::DealsHelper
     end
   end
 
-  def deal_date_select_options(ending_month = false)
+  def deal_date_select_options(options = {})
     @_first_deal_date ||= Deal.order(:created_at).first.try(:created_at) || Date.today
 
     date, cdate = @_first_deal_date, Date.today
 
-    options = []
+    sel_options = []
 
-    if ending_month
-      prefix = 'Until'
+    if options[:type] == :until
+      prefix = 'Up to '
       label = prefix + ' Now'
+    elsif options[:type] == :in_month
+      prefix = 'Closed in '
+      label = 'Since Inception'
     else
-      prefix = 'From'
+      prefix = 'Since '
       label = prefix + ' Inception'
     end
 
     begin
-      options << [date.strftime("#{prefix} %B %Y"), date.strftime('%Y/%m')]
+      sel_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])
+    sel_options.reverse!
 
-    options_for_select(options)
-  end
+    sel_options.unshift([label, nil])
 
-  def deal_cost(deal)
-    campaign = deal.campaign
-     
-    if campaign.blank?
-      0
-    else
-      c = campaign.non_leads.count
-      c > 0 ? campaign.cost.to_f / c : campaign.cost
-    end.to_money
+    options_for_select(sel_options)
   end
 
   def deal_contacts
@@ -92,4 +86,9 @@ module E9Crm::DealsHelper
   def deal_contacts_array
     deal_contacts.map {|c| [c.name, c.id] }
   end
+
+  def title_and_or_company(contact)
+    [contact.title, contact.company_name].
+      map(&:presence).compact.join(' at ').html_safe
+  end
 end

data/app/models/campaign.rb

@@ -22,10 +22,6 @@ class Campaign < ActiveRecord::Base
   # NOTE tracking cookie code changes with new visits
   has_many :tracking_cookies, :foreign_key => :code, :primary_key => :code, :class_name => 'TrackingCookie'
 
-  def self.default
-    NoCampaign.first || NoCampaign.create
-  end
-
   validates :name,          :presence     => true,
                             :uniqueness   => { :allow_blank => true, :case_sensitive => false }
 
@@ -39,9 +35,81 @@ class Campaign < ActiveRecord::Base
 
   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 :of_group, lambda {|val| joins(:campaign_group).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) }
+  
+  scope :reports, lambda {|*args|
+    options = args.extract_options!
+
+    selects = <<-SQL.gsub(/\s+/, ' ')
+      campaigns.*,
+
+      SUM(IF(deals.status != 'lead',1,0))               deal_count, 
+
+      COUNT(deals.id)                                   lead_count,
+
+      SUM(IF(deals.status='won',1,0))               won_deal_count,
+      SUM(IF(deals.status='won',deals.value,0))        total_value, 
+      AVG(IF(deals.status='won',deals.value,NULL))   average_value, 
+      
+      SUM(costs.total)                                  total_cost,
+      SUM(costs.total) / 
+        SUM(IF(deals.status='won',1,0))               average_cost,
+
+      rv.count                                       repeat_visits,
+      nv.count                                          new_visits,
+
+      FLOOR(AVG(
+        DATEDIFF(
+          deals.closed_at,
+          deals.created_at)))                       average_elapsed
+    SQL
+
+    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(
+        '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(
+        '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(
+        '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')
+  }
+
+  def self.default
+    NoCampaign.first || NoCampaign.create
+  end
+
+  # money column definitions for pseudo attributes (added on the reports scope)
+  %w(total_value average_value total_cost average_cost).each do |money_column|
+    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
@@ -55,7 +123,7 @@ class Campaign < ActiveRecord::Base
     page_views.repeat_visits.group(:session).count.keys.length
   end
 
-  def repeat_visit_session_count
+  def repeat_visit_page_view_count
     page_views.repeat_visits.group(:session).count.values.sum
   end
 

data/app/models/contact.rb

@@ -1,6 +1,6 @@
 class Contact < ActiveRecord::Base
   include E9Tags::Model
-  include E9Rails::ActiveRecord::AttributeSearchable
+  include E9::ActiveRecord::AttributeSearchable
   include E9Rails::ActiveRecord::Initialization
 
   # necessary so contact knows its merge path
@@ -215,6 +215,8 @@ class Contact < ActiveRecord::Base
   def merge_and_destroy!(other)
     merge_tags(other)
 
+    self.info = "#{self.info}\n\n#{other.info}"
+
     if success = save
       merge_destructive_and_destroy!(other)
     end
@@ -236,6 +238,8 @@ class Contact < ActiveRecord::Base
     self.address_attributes                  |= other.address_attributes
     self.phone_number_attributes             |= other.phone_number_attributes
     self.instant_messaging_handle_attributes |= other.instant_messaging_handle_attributes
+
+    other.associated_deals.clear
     other.destroy
   end
 
@@ -327,6 +331,17 @@ class Contact < ActiveRecord::Base
       reject_record_attribute?(hash) || super 
     end
 
+    def assign_to_or_mark_for_destruction(record, attributes, allow_destroy)
+      record.attributes = attributes.except(*UNASSIGNABLE_KEYS)
+      if has_destroy_flag?(attributes) && allow_destroy
+        if record.prospect?
+          record.mark_for_destruction
+        else
+          self.users.delete(record)
+        end
+      end
+    end
+
     #
     # #TODO figure out exactly how to handle rejection of Users
     #

data/app/models/dated_cost.rb

@@ -4,6 +4,7 @@
 #
 class DatedCost < ActiveRecord::Base
   include E9Rails::ActiveRecord::Initialization
+  include E9::ActiveRecord::TimeScopes
 
   money_columns :cost
   belongs_to :costable, :polymorphic => true

data/app/models/deal.rb

@@ -4,7 +4,6 @@
 class Deal < ActiveRecord::Base
   include E9Rails::ActiveRecord::Initialization
   include E9Rails::ActiveRecord::InheritableOptions
-
   include E9::ActiveRecord::TimeScopes
 
   self.options_column = false
@@ -24,7 +23,7 @@ class Deal < ActiveRecord::Base
   validates :campaign,   :presence     => true
   validate do |record|
     if !Status::OPTIONS.include?(record.status)
-      record.errors.add(:status, :inclusion, :options => Status::OPTIONS)
+      record.errors.add(:status, :inclusion, :options => Status::HUMAN_OPTIONS.join(', '))
     elsif record.status_changed? && record.won? || record.lost? and record.status_was == Status::Lead
       record.errors.add(:status, :illegal_conversion)
     end
@@ -54,63 +53,12 @@ class Deal < ActiveRecord::Base
   before_save :handle_status_conversion, :if => lambda {|r| r.status_changed? }
   before_save :handle_dated_cost, :if => lambda {|r| r.status_changed? || r.campaign_id_changed? }
 
-  # money column definitions for pseudo attributes (added on the reports scope)
-  %w(total_value average_value total_cost average_cost).each do |money_column|
-    class_eval("def #{money_column}; (r = read_attribute(:#{money_column})) && Money.new(r) end")
-  end
-
   delegate :name, :to => :owner, :prefix => true, :allow_nil => true
 
   # mailing_list_ids may be set on Deals when they are being created as leads, this is
   # done via opt-in checkboxes on the form
   attr_accessor :mailing_list_ids
 
-  # 
-  # reports is technically a deal scope, but actually returns campaigns
-  # and a selection of relevant pseudo columns.
-  #
-  # NOTE reports probably should be a campaign scope?  It doesn't really seem
-  # to matter.  The resultset is neither Deals nor Campaigns, anyway, but
-  # a selection of calculated columns aggregated from data from both tables.
-  # 
-  scope :reports, lambda {
-    selects = <<-SQL.gsub(/\s+/, ' ')
-      campaigns.type                                 campaign_type,
-      campaigns.name                                 campaign_name,
-      campaigns.new_visits                           new_visits,
-      campaigns.repeat_visits                        repeat_visits,
-      deals.closed_at                                closed_at,
-      deals.created_at                               created_at,
-      campaign_groups.name                           campaign_group,
-      SUM(IF(deals.status != 'lead',1,0))            deal_count, 
-      COUNT(deals.id)                                lead_count,
-      SUM(IF(deals.status='won',1,0))                won_deal_count,
-      SUM(IF(deals.status='won',deals.value,0))      total_value, 
-      AVG(IF(deals.status='won',deals.value,NULL))   average_value, 
-      SUM(dated_costs.cost)                          total_cost,
-      SUM(dated_costs.cost) / 
-        SUM(IF(deals.status='won',1,0))              average_cost,
-      FLOOR(AVG(
-        DATEDIFF(
-          deals.closed_at,
-          deals.created_at)))                       average_elapsed
-    SQL
-
-    joins = <<-SQL.gsub(/\s+/, ' ')
-      RIGHT JOIN campaigns
-        ON deals.campaign_id = campaigns.id
-
-      LEFT JOIN dated_costs 
-        ON campaigns.id = dated_costs.costable_id 
-        AND dated_costs.costable_type = "Campaign" 
-
-      LEFT JOIN campaign_groups
-        ON campaign_groups.id = campaigns.campaign_group_id
-    SQL
-
-    select(selects).joins(joins).group('campaigns.id')
-  }
-
   scope :column_op, lambda {|op, column, value, reverse=false|
     conditions = arel_table[column].send(op, value)
     conditions = conditions.not if reverse
@@ -262,10 +210,12 @@ class Deal < ActiveRecord::Base
   end
 
   module Status
-    OPTIONS  = %w(lead pending won lost)
-    Lead    = OPTIONS[0]
-    Pending = OPTIONS[1]
-    Won     = OPTIONS[2]
-    Lost    = OPTIONS[3]
+    OPTIONS     = %w(lead pending won lost)
+    Lead        = OPTIONS[0]
+    Pending     = OPTIONS[1]
+    Won         = OPTIONS[2]
+    Lost        = OPTIONS[3]
+
+    HUMAN_OPTIONS = [Pending, Won, Lost].map(&:titleize)
   end
 end

data/app/models/no_campaign.rb

@@ -8,6 +8,6 @@ class NoCampaign < Campaign
   end
 
   def code
-    'No Code'
+    'NoCode'
   end
 end

data/app/models/page_view.rb

@@ -14,15 +14,16 @@
 #
 class PageView < ActiveRecord::Base
   include E9Rails::ActiveRecord::Scopes::Times
+  include E9::ActiveRecord::TimeScopes
 
   belongs_to :tracking_cookie
 
   belongs_to :campaign, :inverse_of => :page_views
   has_one :user, :through => :tracking_cookie
 
-  attr_accessor :should_cache 
+  #attr_accessor :should_cache 
 
-  after_create :increment_campaign_visit_cache, :if => '!!should_cache'
+  #after_create :increment_campaign_visit_cache, :if => '!!should_cache'
 
   scope :by_user, lambda {|*users| 
     users.flatten!
@@ -43,7 +44,7 @@ class PageView < ActiveRecord::Base
 
   protected
 
-  def increment_campaign_visit_cache
-    Campaign.increment_counter(new_visit ? :new_visits : :repeat_visits, campaign_id)
-  end
+  #def increment_campaign_visit_cache
+    #Campaign.increment_counter(new_visit ? :new_visits : :repeat_visits, campaign_id)
+  #end
 end

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

@@ -4,7 +4,13 @@
   %legend= e9_t(:affiliate_information_legend, :scope => 'e9_crm.campaigns')
   .field
     = f.label :affiliate, :class => :req, :for => 'campaign_affiliate_id'
-    = f.collection_select :affiliate_id, Contact.affiliates.ordered.all, :id, :name, {:prompt => true}, :id => 'campaign_affiliate_id'
+    %input.contact-autocomplete{:type => 'text'}
+    - contact = f.object.affiliate
+    .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)}
+      %a{:class => :remove, :title => "Remove", :alt => "Remove"} Remove
+
   .field
     = help_label f, :affiliate_fee
     = f.text_field :affiliate_fee, :value => f.object.affiliate_fee.to_s

data/app/views/e9_crm/{deals → campaigns}/_reports_table.html.haml

@@ -3,7 +3,7 @@
     %tr
       %th= orderable_column_link(:campaign_type)
       %th= orderable_column_link(:campaign_group)
-      %th= orderable_column_link(:campaign_name)
+      %th= orderable_column_link(:name)
       %th= orderable_column_link(:new_visits)
       %th= orderable_column_link(:repeat_visits)
       %th= orderable_column_link(:lead_count)
@@ -14,6 +14,7 @@
       %th= orderable_column_link(:total_cost)
       %th= orderable_column_link(:average_cost)
       %th= orderable_column_link(:average_elapsed)
+
   %tbody
     -# prepare a hash to store the accumulated row data for calculations
     - dat = Hash.new {|k,v| k[v] = [] }
@@ -25,11 +26,11 @@
       - collection.each do |record|
         %tr{:id => "ids_#{record.id}", :class => cycle('odd', 'even')}
           %td.record-campaign-type
-            = display_campaign_type(record.campaign_type)
+            = display_campaign_type(record.type)
           %td.record-campaign-group
-            = record.campaign_group || 'n/a'
-          %td.record-campaign-name
-            = record.campaign_name || 'n/a'
+            = display_campaign_group_by_id(record.campaign_group)
+          %td.record-name
+            = record.name || 'n/a'
           %td.record-new-visits.num
             - dat[:new_visits] << record.new_visits
             = record.new_visits
@@ -60,6 +61,7 @@
           %td.record-average-elapsed.num
             - dat[:average_elapsed] << record.average_elapsed
             = record.average_elapsed && "%s days" % record.average_elapsed || 'n/a'
+
     %tfooter
       %tr{:class => 'record-totals'}
         %td.record-totals-label{:colspan => 3}

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

@@ -32,5 +32,5 @@
               = link_to t(:edit_dated_costs), advertising_campaign_dated_costs_path(record), :class => 'dated-costs'
             = link_to_edit_campaign(record)
 
-- if @controller.should_paginate_index
+- if controller.send(:should_paginate_index)
   = will_paginate collection

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

@@ -1,11 +1,19 @@
-= title (@index_title || e9_t(:reports_title))
+= title (@index_title || e9_t(:index_title, :scope => 'e9_crm.reports'))
 
-= render 'header'
+.toolbar
+  .toolbar-left
+    = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
+      %select{:name => 'type'}
+        = campaign_type_select_options
+      %select{:name => 'group'}
+        = campaign_group_select_options
+      %select{:name => 'from'}
+        = deal_date_select_options
+      %select{:name => 'until'}
+        = deal_date_select_options(:type => :until)
 
-- if sortable_controller?
-  = form_tag polymorphic_path([:update_order, resource_class]) do
-    %div#records_table
-      = render 'table', :resources => collection
-- else
-  %div#records_table
-    = render 'table', :resources => collection
+  .toolbar-right
+    = link_to_collection(Campaign)
+
+%div#records_table
+  = render 'reports_table'

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

@@ -20,9 +20,6 @@
   .field
     = f.label :title
     = f.text_field :title
-  .field
-    = f.label :status
-    = f.select :status, Contact::Status::VALUES.map {|v| [v.titleize, v] }
 
   = upload_mount_field(resource.avatar, :reset_path => true)
 

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

@@ -15,5 +15,5 @@
             - field_map[:links][record].each do |link|
               = link
 
-- if @controller.should_paginate_index
+- if controller.send(:should_paginate_index)
   = will_paginate collection

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

@@ -0,0 +1,6 @@
+= title @edit_title || e9_t(:edit_title)
+
+.actions
+  = link_to 'View Contact', resource
+
+= render 'form'

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

@@ -55,7 +55,7 @@
               %td.contact-deal-status
                 = deal.status
               %td.contact-deal-value
-                = deal.value
+                = deal.value.format
 
   .contact.leads
     %h2
@@ -74,10 +74,10 @@
         - else
           - leads.each do |lead|
             %tr
-              %td.contact-lead-name
-                = link_to lead.offer_name, edit_deal_path(lead)
               %td.contact-lead-created-at
                 = l(lead.created_at)
+              %td.contact-lead-name
+                = link_to lead.offer_name, edit_deal_path(lead)
 
 .contact-sidebar
   = render 'sidebar'

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

@@ -19,7 +19,7 @@
   = f.collection_select :campaign_id, Campaign.ordered.all, :id, :to_s, {:prompt => true}, :id => 'deal_campaign_select'
 .field.select
   = f.label :status
-  = f.select :status, Deal::Status::OPTIONS[1..-1]
+  = f.select :status, Deal::Status::HUMAN_OPTIONS.map {|d| [d, d.downcase] }
 .field.select
   = f.label :contacts
   %input#contact_autocomplete.list{:type => 'text', 'data-values' => resource.contact_ids.join(','), 'data-iname' => resource_instance_name, 'data-field' => '[contact_ids]'}
@@ -40,19 +40,3 @@
   .field.date-picker
     = f.label :closed_at
     = f.text_field :closed_at, :class => 'date-picker', :value => l(resource.closed_at.try(:to_date))
-
-  .field
-    Created At:
-    = l(resource.created_at)
-  .field
-    Closed At:
-    = resource.closed_at ? l(resource.closed_at) : 'n/a'
-  .field
-    Campaign Cost:
-    = resource.campaign.try(:cost) || 0
-  .field
-    Campaign Deal Count:
-    = resource.campaign ? resource.campaign.non_leads.count : 0
-  .field
-    Cost:
-    = deal_cost(resource)

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

@@ -7,6 +7,8 @@
         = deal_category_select_options 
       %select{:name => 'owner'}
         = deal_owner_select_options 
+      %select{:name => 'closed'}
+        = deal_date_select_options(:type => :in_month)
 
   .toolbar-right
     = link_to I18n.t('activerecord.links.index', :models => 'Leads'), leads_path

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

@@ -6,7 +6,7 @@
       %select{:name => 'from'}
         = deal_date_select_options
       %select{:name => 'until'}
-        = deal_date_select_options(true)
+        = deal_date_select_options(:type => :until)
 
   .toolbar-right
     = link_to_collection(Deal)

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

@@ -27,7 +27,7 @@
             = record.lead_email
           %td.record-info
             = k record.info
-          %td.actions
+          %td.links
             - if record.contacts.present?
               = link_to 'View Contact', record.contacts.first
             = link_to 'Create Deal', edit_deal_path(record)

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

@@ -20,7 +20,7 @@
           %td.record-name
             = record.name
           %td.record-status
-            = record.status
+            = record.status.titleize
           %td.record-category
             = record.category
           %td.record-owner

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

@@ -1,4 +1,7 @@
-= title e9_t(:show_title)
+= title resource.name
+
+.actions
+  = link_to_edit_resource(resource)
 
 .deal-header
   .deal-category
@@ -8,6 +11,22 @@
   .deal-status
     = resource.status
 
-.deal-body
-  .deal-info
-    = k(resource.info)
+.deal-info
+  = k(resource.info)
+
+%fieldset.deal-owner
+  %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)
+    - else
+      = 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)

data/app/views/e9_crm/leads/_form.html.haml

@@ -1,14 +1,14 @@
-= form_for resource, :url => public_offer_deals_path(@offer), :remote => request.xhr? do |f|
+= form_for resource, :url => public_offer_deals_path(@offer) do |f|
   .errors= resource_error_messages!
   .notice
 
   - if f.object.user.blank?
     .field
-      = f.label :lead_email
-      = f.text_field :lead_email
+      = f.label :lead_email, nil, :class => :req
+      = f.text_field :lead_email, :class => 'email required'
     .field
-      = f.label :lead_name
-      = f.text_field :lead_name
+      = f.label :lead_name, nil, :class => :req
+      = f.text_field :lead_name, :class => 'required'
 
   = @offer.custom_form_html.html_safe
 

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

@@ -1,5 +1,4 @@
 - content_for :bottom_javascripts do
-  -#= render 'shared/admin/tiny_mce') if use_tiny_mce?
   = render 'shared/admin/tiny_mce'
 
 .field

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

@@ -24,5 +24,5 @@
           %td.record-remote-ip
             = record.remote_ip
 
-- if @controller.should_paginate_index
+- if controller.send(:should_paginate_index)
   = will_paginate collection

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

@@ -23,5 +23,5 @@
             - field_map[:links][record].each do |link|
               = link
 
-- if @controller.should_paginate_index
+- if controller.send(:should_paginate_index)
   = will_paginate collection

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

@@ -10,5 +10,5 @@
   %div#records_table
     = render 'table', :resources => collection
 
-- if controller.should_paginate_index
+- if controller.send(:should_paginate_index)
   = will_paginate collection

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

@@ -3,8 +3,14 @@
 %fieldset
   %legend= e9_t(:salesperson_information_legend, :scope => 'e9_crm.campaigns')
   .field
-    = f.label :sales_person_id, nil, :class => (f.object.type == 'SalesCampaign' ? :req : nil)
-    = f.collection_select :sales_person_id, Contact.sales_persons.ordered.all, :id, :name, :prompt => true
+    = f.label :sales_person, :class => :req, :for => 'campaign_sales_person_id'
+    %input.contact-autocomplete{:type => 'text'}
+    - contact = f.object.sales_person
+    .contact-select{:style => contact.blank? && 'display:none' || ''}
+      %span.content= contact.try(:name)
+      %input{:type => :hidden, :name => "#{resource_instance_name}[sales_person_id]", :value => contact.try(:id)}
+      %a{:class => :remove, :title => "Remove", :alt => "Remove"} Remove
+
   .field
     = help_label f, :sales_fee
     = f.text_field :sales_fee, :value => f.object.sales_fee.to_s

data/app/views/record_attributes/_user.html.haml

@@ -20,5 +20,5 @@
       = ff.label :primary_true, ff.object.class.human_attribute_name(:primary)
       = ff.radio_button :primary, true
 
-  - if f.object.prospect?
-    = link_to_destroy_record_attribute
+  -#- if f.object.prospect?
+  = link_to_destroy_record_attribute

data/config/locales/e9.en.yml

@@ -19,6 +19,7 @@ en:
         no_contacts_notification: "Either you have selected no contacts, or all of those selected are opted out of bulk email.  Please correct this and try again."
         email_actions_legend: Email Actions
         search_options_legend: Search Filters
+        edit_title_with_name: "Edit %{contact}"
       contact_merges:
         new_title: Merge Contacts
         no_value: (No Value)
@@ -31,6 +32,7 @@ en:
         select_submit: Send Email Now
       leads:
         index_title: Leads 
+        no_records_text: No leads exist.
       reports:
         index_title: Marketing Report
         no_records_text: No data exists for those query parameters.

data/config/locales/en.yml

@@ -5,6 +5,9 @@ en:
   merge_conflict: "<p>This email is already attached to another contact and cannot be used.</p><p>Do you want to edit that contact instead?</p>"
   duplicate_email_warning: "<p>You cannot enter the same email twice.</p>"
   no_offer_value: No Offer
+  deal_owner_legend: Responsible
+  no_deal_owner: No one is responsible
+  deal_contact_legend: Associated Contacts
 
   actions: Actions
   clear: Clear
@@ -45,6 +48,8 @@ en:
       confirm_destroy: Are you sure?  This cannot be undone.
       campaign_group: 
         confirm_destroy: Are you sure?  This cannot be undone.  Any campaigns which are associated with this group will become groupless.
+      with_model:
+        show: "View %{name}"
 
     errors:
       messages:

data/config/routes.rb

@@ -66,7 +66,7 @@ Rails.application.routes.draw do
 
     # leads are simply a scoped view of deals (only index)
     get :leads,            :as => :leads,          :to => 'deals#leads'
-    get :marketing_report,                         :to => 'deals#reports'
+    get :marketing_report,                         :to => 'campaigns#reports'
 
     get  '/merge_contacts/:contact_a_id/and/:contact_b_id', :as => :new_contact_merge, :to => 'contact_merges#new'
     post '/merge_contacts', :as => :contact_merges, :to => 'contact_merges#create'

data/lib/e9_crm/controller.rb

@@ -66,8 +66,8 @@ module E9Crm
           else
             attrs = {}
 
-            if current_user && !@_tracking_cookie.user_id?
-              E9Crm.log("Cookie user (#{@_tracking_cookie.user_id}) not current_user (#{current_user.id}), changing...")
+            if current_user && @_tracking_cookie.user_id.nil?
+              E9Crm.log("Cookie has no user, setting as current_user (#{current_user.id})")
               attrs[:user] = current_user
             end
 

data/lib/e9_crm/rack/contact_auto_completer.rb

@@ -11,9 +11,9 @@ module E9Crm::Rack
       if env["PATH_INFO"] =~ /^\/autocomplete\/contacts/
         params = Rack::Request.new(env).params
         
-        if query = params['query']
+        if query = params['query'] || params['term']
           relation = 
-            Contact.any_attrs_like('first_name', 'last_name', query).
+            Contact.any_attrs_like('first_name', 'last_name', query, :matcher => '%s%%').
               limit(params['limit'] || DEFAULT_LIMIT).
               joins("LEFT JOIN users on users.contact_id = contacts.id").
               where(%{users.options REGEXP "primary: [\\"']?true" OR users.options IS NULL}).

data/lib/e9_crm/tracking_controller.rb

@@ -3,8 +3,7 @@ module E9Crm
     extend ActiveSupport::Concern
 
     included do
-      prepend_before_filter :check_for_new_session 
-      after_filter  :track_page_view
+      before_filter  :track_page_view
 
       prepend_before_filter do
         E9Crm.log("E9Crm tracking controller request")
@@ -13,24 +12,6 @@ module E9Crm
 
     protected 
 
-    #
-    # Checks to see if our session is new (a first request).  During such a call 
-    # the session id has not been set yet.
-    #
-    # This is useful when determining whether or not the page view (created afterwards)
-    # should increment the counter cache for its associated Campaign, as this should
-    # only happen once per session.
-    #
-    def check_for_new_session
-      if request.session_options[:id].blank? && request.get?
-        E9Crm.log("No session found, page view will increment campaign counter cache")
-        @_should_cache = true
-      end
-
-      E9Crm.log("session id: #{request.session_options[:id]}")
-      E9Crm.log("session get?: #{request.get?}")
-    end
-
     #
     # Track a page view and associate it with the loaded cookie.
     #
@@ -43,13 +24,6 @@ module E9Crm
     # [:campaign]     The campaign associated with the tracking cookie or the default
     #                 campaign (typically the NoCampaign record)
     #
-    # [:should_cache] Whether or not this page view should increment the page view
-    #                 count for it's associated page.  This should only happen once
-    #                 per session and for this reason, is only true on sessionless
-    #                 (new) requests.  This is determined by looking for a session id
-    #                 during the before filter, as in the after filter the session id
-    #                 has been assigned.
-    #
     def track_page_view
       if request.get?
         @_page_view ||= tracking_cookie.page_views.create({
@@ -59,8 +33,7 @@ module E9Crm
           :remote_ip    => request.remote_ip,
           :session      => request.session_options[:id],
           :campaign     => tracking_campaign,
-          :new_visit    => session[:new_visit].present?,
-          :should_cache => !!@_should_cache
+          :new_visit    => session[:new_visit].present?
         })
       end
     end

data/lib/e9_crm/version.rb

@@ -1,3 +1,3 @@
 module E9Crm
-  VERSION = '0.1.21'
+  VERSION = '0.1.22'
 end

metadata

@@ -2,7 +2,7 @@
 name: e9_crm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors: 
 - Travis Cox
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-16 00:00:00 Z
+date: 2011-09-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -223,8 +223,10 @@ files:
 - app/views/e9_crm/campaign_groups/_header.html.haml
 - app/views/e9_crm/campaigns/_form_inner.html.haml
 - app/views/e9_crm/campaigns/_header.html.haml
+- app/views/e9_crm/campaigns/_reports_table.html.haml
 - app/views/e9_crm/campaigns/_table.html.haml
 - app/views/e9_crm/campaigns/reports.html.haml
+- app/views/e9_crm/campaigns/reports.js.erb
 - app/views/e9_crm/companies/_form_inner.html.haml
 - app/views/e9_crm/companies/_header.html.haml
 - app/views/e9_crm/contact_emails/_form.html.haml
@@ -245,6 +247,7 @@ files:
 - app/views/e9_crm/contacts/_table.html.haml
 - app/views/e9_crm/contacts/_tag_table.html.haml
 - app/views/e9_crm/contacts/_who.html.haml
+- app/views/e9_crm/contacts/edit.html.haml
 - app/views/e9_crm/contacts/index.html.haml
 - app/views/e9_crm/contacts/index.js.erb
 - app/views/e9_crm/contacts/show.html.haml
@@ -265,13 +268,10 @@ files:
 - app/views/e9_crm/deals/_header.html.haml
 - app/views/e9_crm/deals/_leads_header.html.haml
 - app/views/e9_crm/deals/_leads_table.html.haml
-- app/views/e9_crm/deals/_reports_table.html.haml
 - app/views/e9_crm/deals/_table.html.haml
 - app/views/e9_crm/deals/leads.html.haml
 - app/views/e9_crm/deals/leads.js.erb
 - app/views/e9_crm/deals/offer_form.html.haml
-- app/views/e9_crm/deals/reports.html.haml
-- app/views/e9_crm/deals/reports.js.erb
 - app/views/e9_crm/deals/show.html.haml
 - app/views/e9_crm/email_campaigns/_form_inner.html.haml
 - app/views/e9_crm/email_templates/_form_inner.html.haml

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

@@ -1,19 +0,0 @@
-= title (@index_title || e9_t(:index_title, :scope => 'e9_crm.reports'))
-
-.toolbar
-  .toolbar-left
-    = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
-      %select{:name => 'type'}
-        = campaign_type_select_options
-      %select{:name => 'group'}
-        = campaign_group_select_options
-      %select{:name => 'from'}
-        = deal_date_select_options
-      %select{:name => 'until'}
-        = deal_date_select_options(true)
-
-  .toolbar-right
-    = link_to_collection(Campaign)
-
-%div#records_table
-  = render 'reports_table'