e9_crm 0.1.10 → 0.1.11

data/app/controllers/e9_crm/contacts_controller.rb

@@ -11,17 +11,23 @@ class E9Crm::ContactsController < E9Crm::ResourcesController
   before_filter :determine_title, :only => :index
   before_filter :load_contact_ids, :only => :index
   before_filter :build_nested_associations, :only => [:new, :edit]
+  before_filter :set_tag_instructions_scope
 
   has_scope :search, :by_title, :by_company, :only => :index
   has_scope :tagged, :only => :index, :type => :array
+  has_scope :by_company, :as => :company, :only => :index
 
   # record attributes templates js
   skip_before_filter :authenticate_user!, :filter_access_filter, :only => :templates
   before_filter :build_resource, :only => :templates
-  caches_action :templates
+  #caches_action :templates
 
+  # NOTE for some reason create! { redirect } is trying to redirect on failure
   def create
-    create! { resource_path }
+    create! do |success, failure|
+      success.html { redirect_to resource_path }
+      failure.html { render :new }
+    end
   end
 
   def update
@@ -36,7 +42,7 @@ class E9Crm::ContactsController < E9Crm::ResourcesController
   #
   def load_contact_ids
     @contact_ids ||= begin
-      contact_id_sql = end_of_association_chain.scoped.select('contacts.id').to_sql
+      contact_id_sql = end_of_association_chain.scoped.ok_to_email.select('contacts.id').to_sql
       Contact.connection.send(:select_values, contact_id_sql, 'Contact ID Load')
     end
   end
@@ -46,22 +52,35 @@ class E9Crm::ContactsController < E9Crm::ResourcesController
   #
   def determine_title
     params.delete(:search) if params[:search].blank?
-
-    @index_title ||= if params[:tagged] && params[:search]
-      e9_t(:index_title_with_search_and_tags, :tagged => params[:tagged].join(' or '), :search => params[:search])
-    elsif params[:tagged]
-      e9_t(:index_title_with_tags, :tagged => params[:tagged].join(' or '))
-    elsif params[:search]
-      e9_t(:index_title_with_search, :search => params[:search])
+    
+    @index_title = 'Contacts'.tap do |t|
+      if params[:search]
+        t << " matching \"#{params[:search]}\""
+      end
+      if params[:tagged]
+        t << " tagged #{params[:tagged].map {|t| "\"#{t}\"" }.join(' or ')}"
+      end
+      if params[:company] =~ /\d+/ && company = Company.find_by_id(params[:company])
+        t << " in company \"#{company.name}\""
+      end
     end
   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
+  end
+
   def collection_scope
     #TODO fix eager loading, which totally breaks because of the left outer joins in search
     #super.includes(:users => :subscriptions)
     scope = super
   end
 
+  def set_tag_instructions_scope
+    @tag_instructions_scope = 'activerecord.attributes.contact'
+  end
+
   def build_nested_associations
     object = params[:id] ? resource : build_resource
     object.build_all_record_attributes

data/app/controllers/e9_crm/deals_controller.rb

@@ -64,7 +64,6 @@ class E9Crm::DealsController < E9Crm::ResourcesController
     scope & Campaign.of_type("#{value}_campaign".classify)
   end
 
-
   ##
   # Actions
   #

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

@@ -2,4 +2,14 @@ class E9Crm::EmailTemplatesController < E9Crm::ResourcesController
   defaults
   include E9Rails::Controllers::Orderable
   self.should_paginate_index = false
+
+  protected
+
+  def default_ordered_on
+    'name'
+  end
+
+  def default_ordered_dir
+    'ASC'
+  end
 end

data/app/helpers/e9_crm/base_helper.rb

@@ -101,6 +101,8 @@ module E9Crm::BaseHelper
     )
   end
 
+  # tries to build an associated resource, looking to the assocatiaon's model for a method
+  # named "%{association_name}_build_parameters}" first for any default params
   def build_associated_resource(association_name)
     params_method = "#{association_name}_build_parameters"
     build_params = resource_class.send(params_method) if resource_class.respond_to?(params_method)

data/app/helpers/e9_crm/campaigns_helper.rb

@@ -3,12 +3,17 @@ module E9Crm::CampaignsHelper
     Money === val && val || 'n/a'
   end
 
+  def no_money
+    @_no_money ||= Money.new(0)
+  end
+
   def display_campaign_code(val)
     val && "?#{E9Crm.query_param}=#{val}" || 'n/a'
   end
 
-  def display_campaign_type(val)
-    val[/(.*)Campaign/, 1]
+  def display_campaign_type(val = '')
+    retv = val[/(.*)Campaign/, 1]
+    retv == 'No' ? 'No Campaign' : retv
   end
 
   def campaign_type_select_options(with_all_option = true)

data/app/helpers/e9_crm/contacts_helper.rb

@@ -9,6 +9,12 @@ module E9Crm::ContactsHelper
     end
   end
 
+  def company_select_options
+    options = Company.select('name', 'id').ordered.all.map {|c| [c.name, c.id] }
+    options.unshift(['Any Company', nil])
+    options_for_select(options, params[:company])
+  end
+
   def link_to_google(query, opts = {})
     return unless query.present?
 
@@ -75,7 +81,7 @@ module E9Crm::ContactsHelper
   def records_table_field_map_for_contact
     {
       :fields => { 
-        :avatar => proc {|r| "<img src=\"#{r.avatar_url}\" alt=\"Avatar for #{r.name}\" />".html_safe  },
+        :avatar => proc {|r| link_to("<img src=\"#{r.avatar_url}\" alt=\"Avatar for #{r.name}\" />".html_safe, contact_path(r)) },
         :details => proc {|r| render('details', :record => r) }
       },
 

data/app/models/company.rb

@@ -7,4 +7,5 @@ class Company < ActiveRecord::Base
 
   validates :name, :presence   => true, :uniqueness => { :allow_blank => true, :case_sensitive => false }
 
+  scope :ordered, lambda { order(arel_table[:name].asc) }
 end

data/app/models/contact.rb

@@ -154,6 +154,7 @@ class Contact < ActiveRecord::Base
   scope :contacts, lambda { where(:status => Status::Contact) }
   scope :ordered, lambda { order(arel_table[:first_name].asc) }
 
+  scope :ok_to_email, lambda { where(:ok_to_email => true) }
   scope :by_title, lambda {|val| where(:title => val) }
   scope :by_company, lambda {|val| where(:company_id => val) }
   scope :tagged, lambda {|tags| 
@@ -164,6 +165,7 @@ class Contact < ActiveRecord::Base
     end
   }
 
+  # NOTE for future restriction?
   scope :deal_owners, lambda { scoped }
 
   def self.available_to_deal(deal) 
@@ -317,7 +319,8 @@ class Contact < ActiveRecord::Base
 
     def ensure_no_associated_deals
       unless self.associated_deals.empty?
-        object.errors.add(:associated_deals, :delete_restricted)
+        errors.add(:associated_deals, :delete_restricted)
+        false
       end
     end
 

data/app/models/deal.rb

@@ -38,6 +38,7 @@ class Deal < ActiveRecord::Base
 
   # denormalize campaign code and offer name columns
   before_save :ensure_denormalized_columns
+  before_save :ensure_associated_campaign
 
   # If a lead with no user, find the user by email or create it, then if mailing_lists
   # were passed, assign the user those mailing lists
@@ -52,21 +53,30 @@ class Deal < ActiveRecord::Base
 
   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 {
-    select_sql = <<-SELECT.gsub(/\s+/, ' ')
-      campaigns.id                            campaign_id,
-      campaigns.type                          campaign_type,
-      campaigns.name                          campaign_name,
-      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,
-      campaigns.new_visits                    new_visits, 
-      campaigns.repeat_visits                 repeat_visits, 
-
-      SUM(IF(deals.status='won',value,0))     total_value, 
-      AVG(IF(deals.status='won',value,NULL))  average_value, 
-
+    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(CASE campaigns.type
         WHEN "AdvertisingCampaign" 
           THEN dated_costs.cost 
@@ -77,8 +87,7 @@ class Deal < ActiveRecord::Base
                  campaigns.affiliate_fee
         ELSE 
           0 
-        END)                                   total_cost,
-
+        END)                                         total_cost,
       SUM(CASE campaigns.type
         WHEN "AdvertisingCampaign" 
           THEN dated_costs.cost 
@@ -89,31 +98,28 @@ class Deal < ActiveRecord::Base
                  campaigns.affiliate_fee
         ELSE 
           0 
-        END) / SUM(IF(deals.status='won',1,0)) average_cost,
-
+        END) / SUM(IF(deals.status='won',1,0))      average_cost,
       FLOOR(AVG(
         DATEDIFF(
           deals.closed_at,
-          deals.created_at)))                  average_elapsed
+          deals.created_at)))                       average_elapsed
+    SQL
 
-    SELECT
+    joins = <<-SQL.gsub(/\s+/, ' ')
+      RIGHT JOIN campaigns
+        ON deals.campaign_id = campaigns.id
 
-    join_sql = <<-JOINS.gsub(/\s+/, ' ')
-      LEFT OUTER JOIN dated_costs 
-        ON deals.campaign_id          = dated_costs.costable_id 
+      LEFT JOIN dated_costs 
+        ON campaigns.id = dated_costs.costable_id 
         AND dated_costs.costable_type = "Campaign" 
 
-      LEFT OUTER JOIN campaigns 
-        ON campaigns.id = deals.campaign_id 
-
-      LEFT OUTER JOIN campaign_groups
+      LEFT JOIN campaign_groups
         ON campaign_groups.id = campaigns.campaign_group_id
-    JOINS
+    SQL
 
-    select(select_sql).joins(join_sql).group(:campaign_id)
+    select(selects).joins(joins).group('campaigns.id')
   }
 
-
   validate do |record|
     return unless record.status_changed?
 
@@ -223,6 +229,10 @@ class Deal < ActiveRecord::Base
       self.offer_name    ||= offer.name    if offer.present?
     end
 
+    def ensure_associated_campaign
+      self.campaign ||= Campaign.default
+    end
+
     def get_name_and_email_from_user
       if lead? && user.present?
         self.lead_email = user.email

data/app/models/email_template.rb

@@ -4,4 +4,8 @@
 class EmailTemplate < Email
   # TODO the email class hierarchy needs a major refactoring, it's backwards and convoluted
   before_save :generate_html_body_from_text_body
+
+  validates :text_body,  :presence => true
+  validates :subject,    :presence => true
+  validates :from_email, :presence => true, :email => { :allow_blank => true }
 end

data/app/models/sales_campaign.rb

@@ -6,7 +6,7 @@ class SalesCampaign < Campaign
   money_columns :sales_fee
 
   belongs_to :sales_person, :class_name => 'Contact'
-  validates :sales_person, :presence => true
+  validates :sales_person, :presence => { :if => lambda {|x| x.type == 'SalesCampaign' } }
 
   ##
   # The sum cost of this campaign

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

@@ -31,3 +31,6 @@
             - if record.is_a?(AdvertisingCampaign)
               = 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
+  = will_paginate collection

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

@@ -9,5 +9,3 @@
 - else
   %div#records_table
     = render 'table', :resources => collection
-
-= render 'footer'

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

@@ -7,9 +7,12 @@
 
 - if record.users.any?
   .contact-emails
+    - unless record.ok_to_email?
+      .contact-email-warning
+        = resource_humanize(:not_ok_to_email)
     - record.users.each do |user|
       .contact-email
-        = '* ' if contact_user_subscribed_to_newsletter?(user)
+        -#= '* ' if contact_user_subscribed_to_newsletter?(user)
         = link_to(user.email, "mailto:#{user.email}")
         = "(#{user.options.type})" if user.options.type
         = "(primary)"              if user.primary?

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

@@ -1,9 +1,15 @@
-= render_record_attribute_form(:users, f)
+%fieldset.nested-associations
+  %legend= f.label(:users)
+  = render_record_attribute_association(:users, f)
+  = link_to_add_record_attribute(:users)
+  .field.checkbox
+    = f.label :ok_to_email
+    = f.check_box :ok_to_email
 
 %fieldset.contact-standard-fields
   %legend= e9_t(:form_legend_standard)
   .field
-    = f.label :first_name
+    = f.label :first_name, nil, :class => :req
     = f.text_field :first_name
   .field
     = f.label :last_name

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

@@ -3,8 +3,9 @@
   = link_to_collection(Company)
 
 -# Email actions (template, newsletter)
-- etag, ntag = contact_email_template_select_tag, contact_newsletter_select_tag
-- if [etag, ntag].any?(&:present?)
+-#- etag, ntag = contact_email_template_select_tag, contact_newsletter_select_tag
+-#- if [etag, ntag].any?(&:present?)
+- if (etag = contact_newsletter_select_tag).present?
   %fieldset
     %legend= e9_t(:email_actions_legend)
     - if etag
@@ -12,11 +13,11 @@
         = etag
         = hidden_field_tag 'uids', @contact_ids.join(','), :id => 'contact_email_uids'
         = submit_tag e9_t(:send_email_template), :name => nil
-    - if ntag
-      = form_tag send_email_admin_user_email_path('__ID__'), :method => :put, :id => 'contact_newsletter_form', 'data-confirm' => e9_t(:contact_newsletter_confirmation, :count => collection.length), 'data-empty' => e9_t(:no_contacts_notification), 'data-count' => @contact_ids.length  do
-        = ntag
-        = hidden_field_tag 'uids', @contact_ids.join(','), :id => 'contact_newsletter_uids'
-        = submit_tag e9_t(:send_email_newsletter), :name => nil
+    -#- if ntag
+      -#= form_tag send_email_admin_user_email_path('__ID__'), :method => :put, :id => 'contact_newsletter_form', 'data-confirm' => e9_t(:contact_newsletter_confirmation, :count => collection.length), 'data-empty' => e9_t(:no_contacts_notification), 'data-count' => @contact_ids.length  do
+        -#= ntag
+        -#= hidden_field_tag 'uids', @contact_ids.join(','), :id => 'contact_newsletter_uids'
+        -#= submit_tag e9_t(:send_email_newsletter), :name => nil
 
 -# Search filter options
 %fieldset
@@ -25,6 +26,11 @@
     = label_tag 'contact_search_field', t(:search)
     = text_field_tag 'search', params[:search], :id => 'contact_search_field'
     = submit_tag t(:go), :name => nil
+
+  = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
+    %select{:name => 'company'}
+      = company_select_options
+
   = render 'tag_table'
   .actions
     = submit_tag t(:clear), :name => nil, :id => 'contact_search_clear'

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

@@ -1,9 +1,3 @@
-- if resource.phone_number_attributes.any?
-  .contact-phone-numbers
-    %label= Contact.human_attribute_name(:phone_number_attributes)
-    - resource.phone_number_attributes.each do |phone_number_attribute|
-      .contact-phone-number= phone_number_attribute
-
 - if resource.users.any?
   .contact-emails
     %label= Contact.human_attribute_name(:users)
@@ -14,6 +8,12 @@
         = "(#{user.options.type})" if user.options.type
         = "(primary)"              if user.primary?
 
+- if resource.phone_number_attributes.any?
+  .contact-phone-numbers
+    %label= Contact.human_attribute_name(:phone_number_attributes)
+    - resource.phone_number_attributes.each do |phone_number_attribute|
+      .contact-phone-number= phone_number_attribute
+
 - if resource.instant_messaging_handle_attributes.any?
   .contact-im-handles
     %label= Contact.human_attribute_name(:instant_messaging_handle_attributes)
@@ -25,7 +25,7 @@
     %label= Contact.human_attribute_name(:website_attributes)
     - resource.website_attributes.each do |website_attribute|
       .contact-website
-        = auto_link(website_attribute.to_s, :rel => "external nofollow")
+        = link_to(website_attribute.to_s, website_attribute.to_s, :rel => "external nofollow")
 
 - if resource.address_attributes.any?
   .contact-addresses

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

@@ -14,3 +14,6 @@
           %td.links
             - field_map[:links][record].each do |link|
               = link
+
+- if @controller.should_paginate_index
+  = will_paginate collection

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

@@ -12,4 +12,4 @@
 
   - if record.company_id?
     %span.contact-who-company
-      = link_to_contact_search(:search, record.company_name)
+      = link_to_contact_search(:company, record.company_id, record.company_name)

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

@@ -3,7 +3,6 @@
 #index-body
   #records_table
     = render 'table', :resources => collection
-  = render 'footer'
 
 #index-sidebar
   = render 'index_sidebar'

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

@@ -1,6 +1,8 @@
 .contact-body
   = title resource.name
-  = render 'who', :record => resource
+  .contact-photo
+    %img{:src => resource.avatar_url, :alt => "Avatar for #{resource.name}"}
+  = render 'who', :record => resource, :hide_name => true
   .contact-links.actions
     = link_to_edit_resource(resource)
     = google_search_link(resource.name)

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

@@ -32,3 +32,6 @@
               = link_to_show_resource(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.should_paginate_index
+  = will_paginate collection

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

@@ -25,11 +25,11 @@
       - collection.each do |record|
         %tr{:id => "ids_#{record.id}", :class => cycle('odd', 'even')}
           %td.record-campaign-type
-            = record.campaign_type[/(.*)Campaign/, 1]
+            = display_campaign_type(record.campaign_type)
           %td.record-campaign-name
-            = record.campaign_name
+            = record.campaign_name || 'n/a'
           %td.record-campaign-group
-            = record.campaign_group
+            = record.campaign_group || 'n/a'
           %td.record-new-visits
             - dat[:new_visits] << record.new_visits
             = record.new_visits
@@ -47,16 +47,16 @@
             = record.won_deal_count.to_i
           %td.record-total-value
             - dat[:total_value] << record.total_value
-            = record.total_value
+            = record.total_value || no_money
           %td.record-averate-value
             - dat[:average_value] << record.average_value
-            = record.average_value
+            = record.average_value || no_money
           %td.record-total-cost
             - dat[:total_cost] << record.total_cost
-            = record.total_cost
+            = record.total_cost || no_money
           %td.record-average-cost
             - dat[:average_cost] << record.average_cost
-            = record.average_cost
+            = record.average_cost || no_money
           %td.record-average-elapsed
             - dat[:average_elapsed] << record.average_elapsed
             = record.average_elapsed && "%s days" % record.average_elapsed || 'n/a'
@@ -75,12 +75,12 @@
         %td.record-won-deal-count
           = dat[:won_deal_count].sum.to_i
         %td.record-total-value
-          = dat[:total_value].average
-        %td.record-averate-value
-          = dat[:average_value].average
+          = dat[:total_value].compact.sum.to_money
+        %td.record-average-value
+          = dat[:average_value].compact.average.to_money
         %td.record-total-cost
-          = dat[:total_cost].compact.sum
+          = dat[:total_cost].compact.sum.to_money
         %td.record-average-cost
-          = dat[:average_cost].compact.average
+          = dat[:average_cost].compact.average.to_money
         %td.record-average-elapsed
           = "%s days" % dat[:average_elapsed].compact.average

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

@@ -39,3 +39,6 @@
         %td.record-totals
           = dat[:value].sum
         %td
+
+- if @controller.should_paginate_index
+  = will_paginate collection

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

@@ -2,7 +2,7 @@
   = f.label :name, nil, :class => :req
   = f.text_field :name
 .field
-  = f.label :from_email
+  = f.label :from_email, nil, :class => :req
   = f.text_field :from_email
 .field
   = f.label :subject, nil, :class => :req

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

@@ -23,3 +23,6 @@
             = record.referer
           %td.record-remote-ip
             = record.remote_ip
+
+- if @controller.should_paginate_index
+  = will_paginate collection

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

@@ -22,3 +22,6 @@
           %td.links
             - field_map[:links][record].each do |link|
               = link
+
+- if @controller.should_paginate_index
+  = will_paginate collection

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

@@ -9,5 +9,3 @@
 - else
   %div#records_table
     = render 'table', :resources => collection
-
-= render 'footer'

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

@@ -3,9 +3,8 @@
 %fieldset
   %legend= e9_t(:salesperson_information_legend, :scope => 'e9_crm.campaigns')
   .field
-    = f.label :sales_person_id
+    = 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
   .field
     = help_label f, :sales_fee
     = f.text_field :sales_fee
-

data/config/locales/e9.en.yml

@@ -16,7 +16,7 @@ en:
         send_email_template: Send Email
         send_email_newsletter: Send Newsletter
         contact_newsletter_confirmation: "The system will send the newsletter to all of the selected contacts (%{count}) if they are subscribed to receieve email.  Are you sure you want to proceed?"
-        no_contacts_notification: "You cannot send an email with no recipients!"
+        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
       contact_merges:

data/config/locales/en.yml

@@ -42,6 +42,7 @@ en:
             code:
               invalid: "%{attribute} must be comprised of letters and numbers only."
         contact:
+          delete_restricted: "This contact is related to leads and/or deals and can not be deleted."
           attributes:
             users:
               taken: "Two or more of the login accounts entered share a duplicate email."
@@ -49,7 +50,7 @@ en:
         contact_email:
           attributes:
             contact_ids:
-              blank: "You cannot send an email with no recipients!"
+              blank: "Either you have selected no contacts, or all of those selected are opted out of bulk email.  Please correct this and try again."
             user_ids:
               blank: "None of the contacts selected are configured with primary emails.  Please correct this and try again."
         deal:
@@ -78,7 +79,7 @@ en:
       menu_options: Menu Option
       new_content_subscription_offer: New Content Subscription Offer
       newsletter_subscription_offer: Newsletter Subscription Offer
-      no_campaign: '(No Campaign)'
+      no_campaign: No Campaign
       offer: Offer
       page_view: Page View
       phone_number_attrubute: Phone
@@ -101,9 +102,11 @@ en:
         users: Email Addresses
         address_attributes: Addresses
         instant_messaging_handle_attributes: IM Handles
-        phone_number_attrubutes: Phone Numbers
+        phone_number_attributes: Phone Numbers
         website_attributes: Websites
         info: Background Information
+        not_ok_to_email: "This contact will not receive bulk email."
+        tag_instructions: "Tags are words or phrases that describe or categorize this contact.\n\nWhen searching a particular tag, the system will show all contacts with that tag."
       company:
         info: Background Information
       deal:

data/e9_crm.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |s|
   s.add_dependency("inherited_resources", "~> 1.1.2")
   s.add_dependency("has_scope")
   s.add_dependency("money")
-  s.add_dependency("e9_rails", "~> 0.0.15")
-  s.add_dependency("e9_tags", "~> 0.0.11")
+  s.add_dependency("e9_rails", "~> 0.0.16")
+  s.add_dependency("e9_tags", "~> 0.0.12")
   s.add_dependency("will_paginate")
   s.add_dependency("kramdown", "~> 0.13")
 end

data/lib/e9_crm/version.rb

@@ -1,3 +1,3 @@
 module E9Crm
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 end

data/lib/generators/e9_crm/templates/migration.rb

@@ -26,6 +26,7 @@ class CreateE9CrmStructure < ActiveRecord::Migration
       t.string :title
       t.string :avatar
       t.string :status
+      t.boolean :ok_to_email, :default => true
       t.text :info
       t.references :company
       t.timestamps

metadata

@@ -2,7 +2,7 @@
 name: e9_crm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors: 
 - Travis Cox
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 -04:00
+date: 2011-05-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,7 +65,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.0.15
+        version: 0.0.16
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -76,7 +76,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.0.11
+        version: 0.0.12
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -216,13 +216,10 @@ files:
 - app/views/e9_crm/advertising_campaigns/_form_inner.html.haml
 - app/views/e9_crm/advertising_campaigns/costs.html.haml
 - app/views/e9_crm/affiliate_campaigns/_form_inner.html.haml
-- app/views/e9_crm/campaign_groups/_footer.html.haml
 - app/views/e9_crm/campaign_groups/_form_inner.html.haml
 - app/views/e9_crm/campaign_groups/_header.html.haml
-- app/views/e9_crm/campaigns/_footer.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/companies/_form_inner.html.haml
@@ -259,7 +256,6 @@ files:
 - app/views/e9_crm/dated_costs/new.html.haml
 - app/views/e9_crm/dated_costs/show.html.haml
 - app/views/e9_crm/dated_costs/update.js.erb
-- app/views/e9_crm/deals/_footer.html.haml
 - app/views/e9_crm/deals/_form_inner.html.haml
 - app/views/e9_crm/deals/_header.html.haml
 - app/views/e9_crm/deals/_leads_header.html.haml
@@ -272,7 +268,6 @@ files:
 - app/views/e9_crm/deals/reports.html.haml
 - app/views/e9_crm/deals/reports.js.erb
 - app/views/e9_crm/email_campaigns/_form_inner.html.haml
-- app/views/e9_crm/email_templates/_footer.html.haml
 - app/views/e9_crm/email_templates/_form_inner.html.haml
 - app/views/e9_crm/email_templates/_header.html.haml
 - app/views/e9_crm/file_download_offers/_form.html.haml
@@ -280,12 +275,10 @@ files:
 - app/views/e9_crm/leads/_form.html.haml
 - app/views/e9_crm/leads/create.js.erb
 - app/views/e9_crm/leads/new.html.haml
-- app/views/e9_crm/menu_options/_footer.html.haml
 - app/views/e9_crm/menu_options/_form_inner.html.haml
 - app/views/e9_crm/menu_options/_header.html.haml
 - app/views/e9_crm/new_content_subscription_offers/_form_inner.html.haml
 - app/views/e9_crm/newsletter_subscription_offers/_form_inner.html.haml
-- app/views/e9_crm/offers/_footer.html.haml
 - app/views/e9_crm/offers/_form_inner.html.haml
 - app/views/e9_crm/offers/_header.html.haml
 - app/views/e9_crm/offers/_offer.html.haml
@@ -300,7 +293,6 @@ files:
 - app/views/e9_crm/record_attributes/_templates.js.erb
 - app/views/e9_crm/record_attributes/_user.html.haml
 - app/views/e9_crm/record_attributes/_website_attribute.html.haml
-- app/views/e9_crm/resources/_footer.html.haml
 - app/views/e9_crm/resources/_form.html.haml
 - app/views/e9_crm/resources/_form_inner.html.haml
 - app/views/e9_crm/resources/_header.html.haml

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

@@ -1,31 +0,0 @@
-%table.records
-  %thead
-    %tr
-      %th= orderable_column_link(:type)
-      %th= orderable_column_link(:name)
-      %th= orderable_column_link('campaign_group.name', :campaign_group)
-      %th= orderable_column_link(:new_visits)
-      %th= orderable_column_link(:repeat_visits)
-      %th= orderable_column_link(:deals_count)
-      %th= orderable_column_link(:won_deals_count)
-  %tbody
-    - if collection.empty?
-      %tr
-        %td{:colspan => 5}= e9_t(:no_records_text)
-    - else
-      - collection.each do |record|
-        %tr{:id => "ids_#{record.id}", :class => cycle('odd', 'even')}
-          %td.record-type
-            = record.type[/(.*)Campaign/, 1]
-          %td.record-name
-            = record.name
-          %td.record-campaign-group
-            = record.campaign_group || e9_t(:no_group, :scope => 'e9_crm.campaigns')
-          %td.record-new-visits
-            = record.new_visits
-          %td.record-repeat-visits
-            = record.repeat_visits
-          %td.record-deals-count
-            = record.deals_count
-          %td.record-won-deals-count
-            = record.won_deals_count

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

@@ -1 +0,0 @@
-= will_paginate collection