e9_crm 0.1.5 → 0.1.6

data/app/helpers/e9_crm/contacts_helper.rb

@@ -1,21 +1,75 @@
 module E9Crm::ContactsHelper
 
+  def contact_tags
+    @_contact_tags ||= begin 
+      relation = Tagging.joins(:tag).select('distinct tags.name')
+                        .where(:context => E9Tags.escape_context('users*'))
+
+      Tagging.connection.send(:select_values, relation.to_sql, 'Contact Tags Select')
+    end
+  end
+
+  def link_to_google(query, opts = {})
+    return unless query.present?
+
+    opts.symbolize_keys!
+    opts.reverse_merge!({
+      :base_url => 'http://google.com/search?q=%s', 
+      :exact => true,
+      :text => :search
+    })
+
+    opts[:text] = I18n.t(opts[:text]) if opts[:text].is_a?(Symbol)
+
+    query = query.to_s
+    query = "\"#{query}\"" if query =~ /\s/ && opts[:exact]
+    query = CGI.escape(query)
+    link_to opts[:text], opts[:base_url] % query, :rel => 'nofollow external'
+  end
+
+  def google_search_link(query, opts = {})
+    link_to_google query, opts
+  end
+
+  def google_news_link(query, opts = {})
+    link_to_google query, opts.merge(:text => :news, :base_url => "http://news.google.com/news/search?q=%s")
+  end
+
+  def google_maps_link(query, opts = {})
+    link_to_google query, opts.merge(:text => :map, :exact => false, :base_url => "http://maps.google.com/maps?q=%s")
+  end
+
+  def contact_simple_format(text)
+    auto_link(
+      simple_format(text), 
+      :html => { :rel => 'external nofollow' }, 
+      :link => :urls
+    )
+  end
+
   def link_to_contact_search(attribute, query, text = nil)
     link_to(text || query, contacts_path(attribute => query), :class => "contact-search contact-#{attribute.to_s.dasherize}-search")
   end
 
-  def contact_email_template_select_options
-    options_for_select( EmailTemplate.order('name').map {|e| [e.name, e.id] })
+  def contact_tag_list(tags)
+    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_newsletter_select_options
-    options_for_select( UserEmail.pending.order('name').map {|e| [e.name, e.id] })
+  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?
   end
 
   def contact_user_subscribed_to_newsletter?(user)
     @_newsletter ||= MailingList.newsletter
-
-    user.subscription_ids.include? @_newsletter.id
+    @_newsletter && user.subscription_ids.include?(@_newsletter.id)
   end
 
   def records_table_field_map_for_contact

data/app/models/address_attribute.rb

@@ -1,4 +1,7 @@
 # Attribute for address info
 #
 class AddressAttribute < RecordAttribute
+  def to_html
+    to_s.gsub(/\n/, '<br />').html_safe
+  end
 end

data/app/models/company.rb

@@ -1,4 +1,5 @@
 # A company record, mainly an organizational tool for Contacts
 #
 class Company < ActiveRecord::Base
+  include E9Rails::ActiveRecord::AttributeSearchable
 end

data/app/models/contact.rb

@@ -129,11 +129,14 @@ class Contact < ActiveRecord::Base
         AND record_attributes.record_type = 'Contact'
       LEFT OUTER JOIN users AS contacts_users
         ON contacts_users.contact_id = contacts.id
+      LEFT OUTER JOIN companies
+        ON companies.id = contacts.company_id
     }
 
     where_sql = any_attrs_like_scope_conditions(:first_name, :last_name, :title, query)
                   .or(RecordAttribute.attr_like_scope_condition(:value, query))
-                  .to_sql
+                  .or(Company.attr_like_scope_condition(:name, query))
+                  .to_sql.gsub(/\s+/, ' ')
 
     ucond = sanitize_sql_array(['contacts_users.email like ?', "%#{query}%"])
     where_sql << " OR (#{ucond})"
@@ -186,7 +189,7 @@ class Contact < ActiveRecord::Base
   # Helper to concatenate a Contact's full name
   #
   def name
-    [first_name, last_name].join(' ')
+    [first_name, last_name].join(' ').to_s.strip
   end
 
   def merge_and_destroy!(other_contact)

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

@@ -1 +1,18 @@
-= resource.name
+-#.contact-deals
+  -#%h2
+    -#= Deal.model_name.human.pluralize
+    -#= link_to_new_resource(Deal, :deal => {:contact_id => resource.id })
+  -#- resource.deals.each do |deal|
+    -#.contact-deal
+      -#.contact-deal-status
+        -#= deal.status
+      -#.contact-deal-type
+        -#= deal.type.titleize
+      -#.contact-deal-value
+        -#= deal.value
+-#.contact-leads
+  -#%h2
+    -#= Lead.model_name.human.pluralize
+  -#- resource.leads.each do |lead|
+      -#.contact-lead
+        -#.contact-lead-type

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

@@ -1,26 +1,15 @@
 = render 'who', :record => record
 
-- if record.users.any?
+- if record.phone_number_attributes.any?
   .contact-phone-numbers
+    - record.phone_number_attributes.each do |phone_number_attribute|
+      .contact-phone-number= phone_number_attribute
+
+- if record.users.any?
+  .contact-emails
     - record.users.each do |user|
       .contact-email
         = '* ' 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?
-
-- if record.phone_number_attributes.any?
-  .contact-phone-numbers
-    - record.phone_number_attributes.each do |phone_number_attribute|
-      .contact-phone-number= phone_number_attribute
-
-- if record.instant_messaging_handle_attributes.any?
-  .contact-im-handles
-    - record.instant_messaging_handle_attributes.each do |instant_messaging_handle_attribute|
-      .contact-im-handle= instant_messaging_handle_attribute
-
-- if record.website_attributes.any?
-  .contact-websites
-    - record.website_attributes.each do |website_attribute|
-      .contact-website
-        = auto_link(website_attribute.to_s, :rel => "external nofollow")

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

@@ -7,14 +7,16 @@
       = submit_tag t(:go), :name => nil
     = submit_tag t(:clear), :name => nil, :id => 'contact_search_clear'
   .toolbar-middle
-    = 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
-      = select_tag 'etid', contact_email_template_select_options
-      = hidden_field_tag 'uids', @contact_ids.join(','), :id => 'contact_email_uids'
-      = submit_tag e9_t(:send_email_template), :name => nil
-    = 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
-      = select_tag 'eid', contact_newsletter_select_options
-      = hidden_field_tag 'uids', @contact_ids.join(','), :id => 'contact_newsletter_uids'
-      = submit_tag e9_t(:send_email_newsletter), :name => nil
+    - if (tag = contact_email_template_select_tag).present?
+      = 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
+        = tag
+        = hidden_field_tag 'uids', @contact_ids.join(','), :id => 'contact_email_uids'
+        = submit_tag e9_t(:send_email_template), :name => nil
+    - if (tag = contact_email_template_select_tag).present?
+      = 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
+        = tag
+        = hidden_field_tag 'uids', @contact_ids.join(','), :id => 'contact_newsletter_uids'
+        = submit_tag e9_t(:send_email_newsletter), :name => nil
   .toolbar-right
     = link_to_new_resource(Contact)
     = link_to_new_resource(Company)

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

@@ -0,0 +1,38 @@
+- 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)
+    - resource.users.each do |user|
+      .contact-email
+        = '* ' 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?
+
+- if resource.instant_messaging_handle_attributes.any?
+  .contact-im-handles
+    %label= Contact.human_attribute_name(:instant_messaging_handle_attributes)
+    - resource.instant_messaging_handle_attributes.each do |instant_messaging_handle_attribute|
+      .contact-im-handle= instant_messaging_handle_attribute
+
+- if resource.website_attributes.any?
+  .contact-websites
+    %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")
+
+- if resource.address_attributes.any?
+  .contact-addresses
+    %label= Contact.human_attribute_name(:address_attributes)
+    - resource.address_attributes.each do |address_attribute|
+      .contact-address
+        .address= address_attribute.to_html
+        .actions
+          = google_maps_link(address_attribute)
+

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

@@ -4,12 +4,12 @@
     %th{:colspan => 2}
       = t(:tags_name, :scope => :e9_tags)
   %tbody
-    - Tagging.where(:context => E9Tags.escape_context('users*')).joins(:tag).all.group_by {|t| t.name[0].upcase }.sort.each do |letter, tags|
+    - contact_tags.sort.group_by {|tag| tag[0].upcase }.each do |letter, tags|
       %tr
         %td.tag-starts-with= letter
         %td.tags
           %ul.tags
-            - tags.sort_by(&:name).each do |tag|; tag_id = "tagged-#{tag.name.dasherize}"
+            - tags.each do |tag|; tag_id = "tagged-#{tag.downcase.dasherize}"
               %li.tag
-                = label_tag(tag_id, tag.name)
-                = check_box_tag('tagged[]', tag.name, tagged_params.member?(tag.name), :id => tag_id)
+                = label_tag(tag_id, tag)
+                = check_box_tag('tagged[]', tag, tagged_params.member?(tag), :id => tag_id)

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

@@ -1,14 +1,15 @@
 .contact-who
-  %span.contact-who-name= record.name
+  - unless local_assigns[:hide_name]
+    %span.contact-who-name= record.name
 
-  = " - " if record.company_id? || record.title?
+    = " - " if record.company_id? || record.title?
 
   - if record.title?
     %span.contact-who-title
-      = link_to_contact_search(:by_title, record.title)
+      = link_to_contact_search(:search, record.title)
 
   = " at " if record.company_id? && record.title?
 
   - if record.company_id?
     %span.contact-who-company
-      = link_to_contact_search(:by_company, record.company_id, record.company_name)
+      = link_to_contact_search(:search, record.company_name)

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

@@ -0,0 +1,24 @@
+.contact-body
+  = title resource.name
+  = render 'who', :record => resource
+  .contact-links.actions
+    = link_to_edit_resource(resource)
+    = google_search_link(resource.name)
+    = google_news_link(resource.name)
+  - if (tags = resource.tags(:show_all => true)).present?
+    .contact-tags
+      %label #{Tag.model_name.human.pluralize}:
+      = contact_tag_list(tags)
+  .contact-info
+    %label #{Contact.human_attribute_name(:info)}:
+    = contact_simple_format(resource.info.presence || t(:none))
+  - if company = resource.company
+    .contact-company
+      %label= company.name
+      .contact-company-links.actions
+        = google_search_link(company.name)
+        = google_news_link(company.name)
+      - if company.info.present?
+        = contact_simple_format(text)
+.contact-sidebar
+  = render 'sidebar'

data/config/locales/en.yml

@@ -7,6 +7,8 @@ en:
   totals: Totals
   inline_help_link: '[?]'
   edit_dated_costs: Edit Costs
+  news: News
+  map: Map
 
   e9_crm:
     add_record_attribute: Add
@@ -64,7 +66,10 @@ en:
       deal: Deal
       page_view: Page View
       tracking_cookie: Tracking Cookie
-    
+      address_attribute: Address
+      instant_messaging_handle_attribute: IM Handle
+      phone_number_attrubute: Phone
+      website_attribute: Website
     attributes:
       campaign:
         name: Name
@@ -73,7 +78,7 @@ en:
         avatar: Photo
         users: Email Addresses
         address_attributes: Addresses
-        instant_messaging_handle_attributes: Instant Messaging Handles
+        instant_messaging_handle_attributes: IM Handles
         phone_number_attrubutes: Phone Numbers
         website_attributes: Websites
         info: Background Information

data/lib/e9_crm/model.rb

@@ -31,7 +31,7 @@ module E9Crm
     # Is this the Contact's primary model?
     #
     def primary?
-      !!options.primary
+      ["true", true].member? options.primary
     end
 
     protected

data/lib/e9_crm/version.rb

@@ -1,3 +1,3 @@
 module E9Crm
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -2,7 +2,7 @@
 name: e9_crm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Travis Cox
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 -04:00
+date: 2011-05-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -214,11 +214,12 @@ files:
 - app/views/e9_crm/contacts/_details.html.haml
 - app/views/e9_crm/contacts/_form_inner.html.haml
 - app/views/e9_crm/contacts/_header.html.haml
+- app/views/e9_crm/contacts/_sidebar.html.haml
 - app/views/e9_crm/contacts/_tag_table.html.haml
 - app/views/e9_crm/contacts/_who.html.haml
 - app/views/e9_crm/contacts/index.html.haml
 - app/views/e9_crm/contacts/index.js.erb
-- app/views/e9_crm/contacts/merge.html.haml
+- app/views/e9_crm/contacts/show.html.haml
 - app/views/e9_crm/contacts/templates.js.erb
 - app/views/e9_crm/dated_costs/_dated_cost.html.haml
 - app/views/e9_crm/dated_costs/_form.html.haml

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

@@ -1 +0,0 @@
-