e9_crm 0.1.13 → 0.1.14

data/app/controllers/e9_crm/campaign_subclass_controller.rb

@@ -9,12 +9,13 @@ class E9Crm::CampaignSubclassController < E9Crm::ResourcesController
   end
 
   protected
+
     def parent_redirect_path
       campaigns_path(:type => type_param)
     end
 
     def type_param
-      resource_class.name[/(.*)Campaign/, 1].underscore
+      resource_class.name[/(.*)Campaign/, 1].underscore rescue nil
     end
 
     def add_index_breadcrumb

data/app/controllers/e9_crm/contact_emails_controller.rb

@@ -20,7 +20,7 @@ class E9Crm::ContactEmailsController < E9Crm::ResourcesController
         ContactEmail.new_from_template(template, :contact_ids => params[:uids])
       end
 
-      object.from_email ||= current_user.email
+      object.from_email = object.from_email.presence || current_user.email
 
       object.valid?
 

data/app/controllers/e9_crm/dated_costs_controller.rb

@@ -1,15 +1,21 @@
-class E9Crm::DatedCostsController < E9Crm::CampaignSubclassController
+class E9Crm::DatedCostsController < E9Crm::ResourcesController
   belongs_to :advertising_campaign, :optional => true
   defaults :resource_class => DatedCost
   include E9Rails::Controllers::Orderable
 
+  self.should_paginate_index = true
+
   filter_access_to :bulk_create, :require => :create, :context => :admin
 
+  prepend_before_filter :association_chain
   before_filter :add_breadcrumbs
   before_filter :generate_temp_id, :only => :new
 
+  respond_to :json, :only => :new
+
   def index
     if params[:advertising_campaign_id]
+      @index_title = "Advertising Costs for #{parent.name}" if parent
       index!
     else
       @advertising_campaigns = AdvertisingCampaign.all
@@ -17,6 +23,13 @@ class E9Crm::DatedCostsController < E9Crm::CampaignSubclassController
     end
   end
 
+  def new
+    new! do |format|
+      format.html
+      format.json { render :json => { :html => render_html_for_action } }
+    end
+  end
+
   def bulk_create
     params[:id].zip(params[:cost]) do |id, cost|
       DatedCost.create(
@@ -33,8 +46,16 @@ class E9Crm::DatedCostsController < E9Crm::CampaignSubclassController
 
   protected
 
-    def collection
-      get_collection_ivar || set_collection_ivar(end_of_association_chain.all)
+    def render_html_for_action(action = nil)
+      action ||= params[:action]
+
+      html = nil
+
+      lookup_context.update_details(:formats => [Mime::HTML.to_sym]) do
+        html = render_to_string(action, :layout => false)
+      end
+
+      html
     end
 
     def default_ordered_on
@@ -45,11 +66,17 @@ class E9Crm::DatedCostsController < E9Crm::CampaignSubclassController
       'ASC'
     end
 
-    def add_breadcrumbs
-      if parent?
+    def add_index_breadcrumb
+      #association_chain
+
+      add_breadcrumb! Campaign.model_name.collection.titleize, campaigns_path
+
+      if parent
         add_breadcrumb! parent.name, edit_advertising_campaign_path(parent)
       end
+    end
 
+    def add_breadcrumbs
       add_breadcrumb! e9_t(:index_title)
     end
 

data/app/controllers/e9_crm/leads_controller.rb

@@ -39,10 +39,11 @@ class E9Crm::LeadsController < ApplicationController
 
   def build_resource
     get_resource_ivar || set_resource_ivar(
+      # NOTE mailing list ids come from the form (to allow opt-outs)
       Deal.leads.new((params[resource_instance_name] || {}).reverse_merge(
-        :user            => current_user,
-        :offer           => @offer,
-        :campaign        => tracking_campaign
+        :user             => current_user,
+        :offer            => @offer,
+        :campaign         => tracking_campaign
       ))
     )
   end

data/app/controllers/e9_crm/users_controller.rb

@@ -0,0 +1,22 @@
+class E9Crm::UsersController < ApplicationController
+  inherit_resources
+
+  respond_to :html, :except => :new
+  respond_to :json, :only => :new
+
+  def new
+    new! do |format|
+      format.json { render :json => resource }
+    end
+  end
+
+  protected
+
+  def build_resource
+    get_resource_ivar || begin
+      user = User.new(params[resource_instance_name] || {})
+      user.valid?
+      set_resource_ivar(user)
+    end
+  end
+end

data/app/helpers/e9_crm/base_helper.rb

@@ -6,9 +6,9 @@ module E9Crm::BaseHelper
 
   alias :k :kramdown
 
-  def help_tooltip(string)
+  def help_tooltip(string, data_title = nil)
     return <<-HTML.strip.html_safe
-      <span class="help" rel="tooltip" title="#{CGI.escape_html(string)}">#{t(:inline_help_link)}</span>
+      <span class="help" rel="tooltip" #{data_title ? %Q[data-title="#{data_title}"] : nil } title="#{CGI.escape_html(string)}">#{t(:inline_help_link)}</span>
     HTML
   end
 
@@ -20,7 +20,7 @@ module E9Crm::BaseHelper
     str = ''.html_safe
     str.safe_concat resource_humanize(key)
     str.safe_concat ' '
-    str.safe_concat help_tooltip(help_title)
+    str.safe_concat help_tooltip(help_title, options.delete(:header))
 
     if form_or_id.respond_to?(:label)
       form_or_id.label(key, str, options)

data/app/models/dated_cost.rb

@@ -12,6 +12,10 @@ class DatedCost < ActiveRecord::Base
 
   attr_accessor :temp_id
 
+  def self.default_scope
+    order('dated_costs.created_at ASC')
+  end
+
   def as_json(options={})
     {}.tap do |hash|
       hash[:id]            = self.id

data/app/models/deal.rb

@@ -46,7 +46,7 @@ class Deal < ActiveRecord::Base
 
   # 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
-  after_create :find_or_create_user, :assign_user_mailing_lists, :add_user_contact
+  after_create :handle_user_if_lead
 
   # money column definitions for pseudo attributes (added on the reports scope)
   %w(total_value average_value total_cost average_cost).each do |money_column|
@@ -55,6 +55,8 @@ class Deal < ActiveRecord::Base
 
   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
 
   # 
@@ -230,21 +232,21 @@ class Deal < ActiveRecord::Base
       end
     end
 
-    def find_or_create_user
-      if lead? && user.blank? && lead_email
-        u = User.find_by_email(lead_email) || create_prospect
-        update_attribute(:user_id, u.id)
-      end
-    end
-
-    def add_user_contact
-      user.create_contact_if_missing!
-      self.contacts << user.contact
-    end
-
-    def assign_user_mailing_lists
-      if @mailing_list_ids
-        user.mailing_list_ids |= @mailing_list_ids
+    def handle_user_if_lead
+      if lead? 
+        if user.blank? && lead_email
+          user = User.find_by_email(lead_email) || create_prospect
+          update_attribute(:user_id, u.id)
+        end
+
+        if user.present?
+          user.create_contact_if_missing!
+          self.contacts << user.contact
+
+          if @mailing_list_ids
+            user.mailing_list_ids |= @mailing_list_ids
+          end
+        end
       end
     end
 

data/app/models/email_template.rb

@@ -5,9 +5,7 @@ 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 }
+  validates :from_email, :email => { :allow_blank => true }
 
   def as_json(options = {})
     {}.tap do |hash|

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

@@ -3,7 +3,7 @@
 %fieldset
   %legend= e9_t(:affiliate_information_legend, :scope => 'e9_crm.campaigns')
   .field
-    = f.label :affilate, nil, :class => :req, :for => 'campaign_affiliate_id'
+    = 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'
   .field
     = help_label f, :affiliate_fee

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

@@ -1,6 +1,6 @@
 .field
   = f.label :name, nil, :class => :req
   = f.text_field :name
-.field.tinymce
-  = f.label :info
+.field
+  = help_label(f, :info, :key => :markdown_help, :header => 'Markdown Help')
   = f.text_area :info

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

@@ -30,14 +30,14 @@
 
 %fieldset.contact-contact-fields
   %legend= e9_t(:form_legend_contact)
-  = render_record_attribute_form(:phone_number_attributes             , f)
-  = render_record_attribute_form(:instant_messaging_handle_attributes , f)
-  = render_record_attribute_form(:website_attributes                  , f)
-  = render_record_attribute_form(:address_attributes                  , f)
+  = render_record_attribute_form(:phone_number_attributes, f)
+  = render_record_attribute_form(:instant_messaging_handle_attributes, f)
+  = render_record_attribute_form(:website_attributes, f)
+  = render_record_attribute_form(:address_attributes, f)
 
 %fieldset.contact-background-info
-  %legend= f.label(:info)
-  .field.tinymce
+  %legend= help_label(f, :info, :key => :markdown_help, :header => 'Markdown Help')
+  .field
     = f.text_area :info
 
 - content_for :bottom_javascripts do

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

@@ -2,22 +2,13 @@
   = link_to_new_resource(Contact)
   = link_to_collection(Company)
 
--# Email actions (template, newsletter)
--#- etag, ntag = contact_email_template_select_tag, contact_newsletter_select_tag
--#- if [etag, ntag].any?(&:present?)
-- if (etag = contact_newsletter_select_tag).present?
+- if (etag = contact_email_template_select_tag).present?
   %fieldset
     %legend= e9_t(:email_actions_legend)
-    - if etag
-      = 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
-        = 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
+    = 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
+      = etag
+      = hidden_field_tag 'uids', @contact_ids.join(','), :id => 'contact_email_uids'
+      = submit_tag e9_t(:send_email_template), :name => nil
 
 -# Search filter options
 %fieldset

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

@@ -25,6 +25,7 @@
     %label= Contact.human_attribute_name(:website_attributes)
     - resource.website_attributes.each do |website_attribute|
       .contact-website
+        - url = website_attribute.value =~/^\w+:\/\// ? website_attribute.value : "http://#{website_attribute.value}"
         = link_to(website_attribute.to_s, website_attribute.to_s, :rel => "external nofollow")
 
 - if resource.address_attributes.any?

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

@@ -6,7 +6,7 @@
   - unless request.xhr?
     = f.label :date, nil, :class => :req, :for => id
   = f.text_field :date, :class => 'date-picker', :value => l(f.object.date), :id => id
-.field
+.field.cost
   - fid = "dated_cost_cost_#{id}"
   - unless request.xhr?
     = f.label :cost, nil, :class => :req, :for => id

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

@@ -5,11 +5,11 @@
     .dated-cost-labels
       .field
         = resource_class.human_attribute_name(:date)
-      .field
+      .field.cost
         = resource_class.human_attribute_name(:cost)
 
     = render collection
 
     .actions
-      = link_to_new_resource(resource_class, :remote => true)
+      = link_to_new_resource(resource_class, :class => 'new-resource')
 

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

@@ -22,14 +22,13 @@
   = f.text_field :value
 .field.select
   = f.label :owner
-  = f.collection_select :contact_id, Contact.all, :id, :name, :prompt => true
+  = f.collection_select :contact_id, Contact.sales_persons.all, :id, :name, :prompt => true
 .field.select
   = f.label :contacts
-  %select.list{'data-iname' => resource_instance_name, 'data-field' => '[contact_ids]'}
-    = deal_contact_select_options
+  %input#contact_autocomplete.list{:type => 'text', 'data-values' => f.object.contact_ids.join(','), 'data-iname' => resource_instance_name, 'data-field' => '[contact_ids]'}
   %ul.select
     - f.object.contacts.each do |contact|
-      %li
-        %span= contact.name
+      %li.ui-state-default
+        %span.content= contact.name
         %input{:type => :hidden, :name => "contact[contact_ids][]", :value => contact.id}
         %a{:class => :remove, :title => "Remove", :alt => "Remove"} Remove

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

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

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

@@ -7,8 +7,8 @@
     .field
       = f.object.email
   - else
-    .field
-      = f.email_field :email
+    .field.contact-email
+      = f.text_field :email
 
   = f.fields_for f.object.options do |ff|
     - if (types = User.email_types).present?

data/config/locales/en.yml

@@ -17,6 +17,11 @@ en:
     add_record_attribute: Add
     destroy_record_attribute: Remove
 
+  # activemodel translation looks to %{i18n_scope}.attributes.%{model_name}.%{attribute} 
+  # then simply attributes.%{attribute}, dropping i18n_scope, e.g "activerecord"
+  attributes:
+    markdown_help: "You can style the text in this field using the Markdown syntax as follows:\n\nA line break is created by putting 2 spaces\n\nat the end of the line above and then a return.\n\nA paragraph is created by putting a blank line between the first paragraph and the second paragraph.\n\nThis is the start of the next paragraph.\n\n*italics*\n\n**bold**\n\n***bold and italic text***\n\n* Item in a bulleted list\n\t* A sub-item, indented with 4 spaces\n* Another item in a bulleted list\n\n1. Item in numbered list\n2. Another Item in numbered list\n3. Another Item in numbered list\n\n# First-level heading\n\n## Second-level heading\n\n### Third-level heading\n\n#### Fourth-level heading\n\n> This is a blockquote.\n> Blockquote with hard wrap\n>\n> This is the second paragraph in the blockquote.\n>\n> ## This is an H2 in a blockquote\n\n[This is a link](http://www.google.com \"Google\")\n\n![Image Alt Text](image url \"Image Title\")\n\n--- Horizontal rules are created by 3 hyphens\n\nIf you need to actually render the following characters AND they are NOT rendering, place a backslash before the character like \*italics\* will actually render with the asterisks instead of italicizing the word.\n\n\\\tbackslash\n*\tasterisk\n_\tunderscore\n{}\tcurly braces\n[]\tsquare brackets\n()\tparentheses\n#\thash mark\n+\tplus sign\n-\tminus sign (hyphen)\n.\tdot\n!\texclamation mark"
+
   activerecord:
     titles:
       show: 'Show %{model}'
@@ -24,10 +29,12 @@ en:
         show: '%{model}'
 
     links:
-      edit: "Edit %{model}"
-      destroy: "Delete %{model}"
-      show: "View %{model}"
       index: "Manage %{models}"
+      new: "New %{model}"
+      edit: "Edit"
+      destroy: "Delete"
+      show: "View"
+      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.
@@ -108,8 +115,8 @@ en:
         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."
-        no_deals: There are no deals associated with this contact.
-        no_leads: There are no leads associated with this contact.
+        no_deals: 'There are no deals associated with this contact.'
+        no_leads: 'There are no leads associated with this contact.'
       company:
         info: Background Information
       deal:
@@ -119,6 +126,7 @@ en:
         campaign_code: Code
         offer_name: Offer
         created_at: Date
+        owner: Responsible
       offer:
         template: Teaser Text
         alert_email_instructions: (Enter an email if you want to be notified of conversions)

data/config/routes.rb

@@ -1,6 +1,9 @@
 Rails.application.routes.draw do
   crm_path = 'admin/crm'
 
+  get '/autocomplete/contacts' => E9Crm::Rack::ContactAutoCompleter
+  get '/autocomplete/companies' => E9Crm::Rack::CompanyAutoCompleter
+
   scope :module => :e9_crm do
     resources :offers, :as => :public_offer, :only => :show do
       resources :leads, :as => :deals, :only => [:new, :create], :path => ''
@@ -8,6 +11,10 @@ Rails.application.routes.draw do
   end
 
   scope :path => crm_path, :module => :e9_crm do
+    # NOTE this should be handled by base, and is here because base doesn't have a sensible
+    # user api, which crm needs to check for email uniqueness errors
+    resources :users, :only => :new
+
     resources :companies, :except => :show
     resources :contacts do
       # page_views currently not routed, but near working

data/lib/e9_crm/rack/company_auto_completer.rb

@@ -0,0 +1,30 @@
+module E9Crm::Rack
+  #
+  # Returns contacts and joins their primary user for their email if it exists,
+  # and will return a string like "firstname lastname (email)".  If for whatever
+  # reason the contact has no primary user, it will drop the email.
+  #
+  class CompanyAutoCompleter
+    DEFAULT_LIMIT = 10
+
+    def self.call(env)
+      if env["PATH_INFO"] =~ /^\/autocomplete\/companies/
+        params = Rack::Request.new(env).params
+        
+        if term = params['term']
+          relation = Company.limit(params['limit'] || DEFAULT_LIMIT).select('name').attr_like('name', term, :matcher => '%s%%')
+
+          companies = ::ActiveRecord::Base.connection.send(:select, relation.to_sql, 'Company Autocomplete').map do |row|
+            { :label => row['name'], :value => row['name'] }
+          end
+        else
+          companies = []
+        end
+
+        [200, {"Content-Type" => "application/json", "Cache-Control" => "max-age=3600, must-revalidate"}, [companies.to_json]]
+      else
+        [404, {"Content-Type" => "text/html", "X-Cascade" => "pass"}, ["Not Found"]]
+      end
+    end
+  end
+end

data/lib/e9_crm/rack/contact_auto_completer.rb

@@ -0,0 +1,42 @@
+module E9Crm::Rack
+  #
+  # Returns contacts and joins their primary user for their email if it exists,
+  # and will return a string like "firstname lastname (email)".  If for whatever
+  # reason the contact has no primary user, it will drop the email.
+  #
+  class ContactAutoCompleter
+    DEFAULT_LIMIT = 10
+
+    def self.call(env)
+      if env["PATH_INFO"] =~ /^\/autocomplete\/contacts/
+        params = Rack::Request.new(env).params
+        
+        if query = params['query']
+          relation = 
+            Contact.any_attrs_like('first_name', 'last_name', query).
+              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}).
+              select('contacts.id id, contacts.first_name first_name, contacts.last_name last_name, users.email email').
+              order('contacts.first_name ASC')
+
+          if params['except'] && (except = params['except'].scan(/(\d+),?/)) && !except.empty?
+            relation = relation.where( Contact.arel_table[:id].not_in(except.flatten) )
+          end
+
+          contacts = ::ActiveRecord::Base.connection.send(:select, relation.to_sql, 'Contact Autocomplete').map do |row|
+            name = row.values_at('first_name', 'last_name').join(' ').strip
+            name << " (#{row['email']})" if row['email']
+            { :label => name, :value => name, :id => row['id'] }
+          end
+        else
+          contacts = []
+        end
+
+        [200, {"Content-Type" => "application/json", "Cache-Control" => "max-age=3600, must-revalidate"}, [contacts.to_json]]
+      else
+        [404, {"Content-Type" => "text/html", "X-Cascade" => "pass"}, ["Not Found"]]
+      end
+    end
+  end
+end

data/lib/e9_crm/version.rb

@@ -1,3 +1,3 @@
 module E9Crm
-  VERSION = '0.1.13'
+  VERSION = '0.1.14'
 end

data/lib/e9_crm.rb

@@ -11,11 +11,16 @@ require 'e9_base'
 require 'e9_crm/rails_extensions'
 
 module E9Crm
-  autoload :VERSION,            'e9_crm/version'
-  autoload :Controller,         'e9_crm/controller'
-  autoload :Model,              'e9_crm/model'
-  autoload :Email,              'e9_crm/email'
-  autoload :TrackingController, 'e9_crm/tracking_controller'
+  autoload :VERSION,                'e9_crm/version'
+  autoload :Controller,             'e9_crm/controller'
+  autoload :Model,                  'e9_crm/model'
+  autoload :Email,                  'e9_crm/email'
+  autoload :TrackingController,     'e9_crm/tracking_controller'
+
+  module Rack
+    autoload :ContactAutoCompleter, 'e9_crm/rack/contact_auto_completer'
+    autoload :CompanyAutoCompleter, 'e9_crm/rack/company_auto_completer'
+  end
 
   mattr_accessor :cookie_name
   @@cookie_name = '_e9_tc'

data/lib/generators/e9_crm/templates/javascript.js

@@ -19,8 +19,19 @@
   /* 
    *
    */
-  $('.dated-costs > .actions a').bind('ajax:success', function(e, data, status, xhr) {
-    $(data).insertBefore($(this).closest('.actions'));
+  $('.dated-costs a.new-resource').click(function(e) {
+    e.preventDefault();
+
+    var $this = $(this);
+
+    $.ajax({
+      url: $this.attr('href'),
+      dataType: 'json',
+      success: function(data) {
+        $(data.html).insertBefore($this.closest('.actions'));
+      }
+    });
+    
   });
 
   $("#campaign_code_field input").keyup(function() {
@@ -130,6 +141,8 @@
 
 
   $('#contact_email_form', $selector).live('submit', function(e) {
+    e.preventDefault();
+
     var $f = $(this);
 
     if ($f.attr('data-count') == '0') {
@@ -137,6 +150,15 @@
       $f.undisable();
       return false;
     }
+
+    $.ajax({
+      url: $f.attr('action'),
+      data: $f.serializeArray(),
+      type: 'get',
+      success: function(data) {
+        $.colorbox({ html: data });
+      }
+    });
   });
 
   //$('#contact_newsletter_form', $selector).live('submit', function(e) {
@@ -298,4 +320,95 @@
       }
     });
   });
+
+
+  function doNothing(e) {
+    var keyCode = event.keyCode ? event.keyCode : event.which ? event.which : event.charCode;
+
+    alert(keyCode);
+
+    if( keyCode == 13 ) {
+      if(!e) var e = window.event;
+
+      e.cancelBubble = true;
+      e.returnValue = false;
+
+      if (e.stopPropagation) {
+        e.stopPropagation();
+        e.preventDefault();
+      }
+    }
+  }
+
+  /*
+   * Contact autocomplete
+   */
+  var $contact_autocomplete = $('#contact_autocomplete');
+  //var search_cache = {};
+
+  $contact_autocomplete
+    // stop enter from submitting our form
+    .bind('keypress', function(e) {
+      if (e.keyCode == 13) e.preventDefault();
+    })
+    .autocomplete({
+      delay: 400,
+
+      // on select, add the template (code is in widgets.js) and
+      // clear the input field
+      select: function(e, ui) {
+        $contact_autocomplete
+          .add_select_template(ui.item.value, ui.item.id)
+          .val('');
+
+       // return false to prevent autocomplete from filling the field
+       return false;
+      },
+      source: function(request, response) {
+
+        var data = 'query=' + request.term, 
+            excl = $contact_autocomplete.attr('data-values');
+
+        // add 'except' ids if they exist in values.
+        if (excl.length) data += '&except=' + excl;
+
+        $.ajax({
+          url: "/autocomplete/contacts",
+          dataType: "json",
+          data: data,
+          success: function(data) {
+            // caching code, not impl
+            //search_cache.term = request.term;
+            //search_cache.content = data;
+            response(data);
+          }
+        });
+      }
+    })
+  ; 
+
+  var $company_autocomplete = $('#contact_company_name');
+
+  $company_autocomplete
+    .autocomplete({
+      delay: 400,
+      focus: function(e, ui) {
+        $company_autocomplete.val(ui.item.value);
+        return false;
+      },
+      source: function(request, response) {
+        $.ajax({
+          url: "/autocomplete/companies",
+          dataType: "json",
+          data: request,
+          success: function(data) {
+            // caching code, not impl
+            //search_cache.term = request.term;
+            //search_cache.content = data;
+            response(data);
+          }
+        });
+      }
+    })
+  ; 
 });

metadata

@@ -2,7 +2,7 @@
 name: e9_crm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors: 
 - Travis Cox
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 -04:00
+date: 2011-06-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -170,6 +170,7 @@ files:
 - app/controllers/e9_crm/page_views_controller.rb
 - app/controllers/e9_crm/resources_controller.rb
 - app/controllers/e9_crm/sales_campaigns_controller.rb
+- app/controllers/e9_crm/users_controller.rb
 - app/controllers/e9_crm/video_offers_controller.rb
 - app/helpers/e9_crm/base_helper.rb
 - app/helpers/e9_crm/campaign_groups_helper.rb
@@ -319,6 +320,8 @@ files:
 - lib/e9_crm/e9_extensions.rb
 - lib/e9_crm/email.rb
 - lib/e9_crm/model.rb
+- lib/e9_crm/rack/company_auto_completer.rb
+- lib/e9_crm/rack/contact_auto_completer.rb
 - lib/e9_crm/rails_extensions.rb
 - lib/e9_crm/tracking_controller.rb
 - lib/e9_crm/version.rb