e9_crm 0.1.12 → 0.1.13

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

@@ -3,6 +3,29 @@ class E9Crm::EmailTemplatesController < E9Crm::ResourcesController
   include E9Rails::Controllers::Orderable
   self.should_paginate_index = false
 
+  filter_access_to :select, :require => :read, :context => :admin
+
+  before_filter :handle_unacceptable_mimetype, :only => :show
+
+  respond_to :json, :only => :show
+  respond_to :html, :except => :show
+
+  def select
+    index!
+  end
+
+  def show
+    unless params[:contact_id] =~ /\d+/ && @contact = Contact.find_by_id(params[:contact_id])
+      head :status => 404
+    else
+      object           = resource
+      object.contact   = @contact
+      object.recipient = params[:user_id] =~ /\d+/ && @contact.users.find_by_id(params[:user_id]) || @contact.primary_user
+
+      render :json => object
+    end
+  end
+
   protected
 
   def default_ordered_on
@@ -12,4 +35,8 @@ class E9Crm::EmailTemplatesController < E9Crm::ResourcesController
   def default_ordered_dir
     'ASC'
   end
+
+  def determine_template
+    request.xhr? ? false : super
+  end
 end

data/app/models/campaign.rb

@@ -13,7 +13,6 @@ class Campaign < ActiveRecord::Base
   has_many   :lost_deals, :class_name => 'Deal', :conditions => ['deals.status = ?', Deal::Status::Lost]
   has_many   :pending_deals, :class_name => 'Deal', :conditions => ['deals.status = ?', Deal::Status::Pending]
   has_many   :leads, :class_name => 'Deal', :conditions => ['deals.status = ?', Deal::Status::Lead]
-
   has_many   :page_views, :inverse_of => :campaign, :dependent => :nullify
 
   # only advertising campaigns use this association
@@ -41,6 +40,7 @@ class Campaign < ActiveRecord::Base
   scope :inactive, lambda { active(false) }
   scope :of_group, lambda {|val| 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) }
 
   def new_visit_session_count
     page_views.new_visits.group(:session).count.keys.length
@@ -67,6 +67,6 @@ class Campaign < ActiveRecord::Base
   end
 
   def to_s
-    name
+    name.tap {|n| n << " (#{code})" if code.present? }
   end
 end

data/app/models/contact.rb

@@ -84,7 +84,11 @@ class Contact < ActiveRecord::Base
   end
   accepts_nested_attributes_for :users, :allow_destroy => true
 
-  delegate :email, :to => 'users.primary.first', :allow_nil => true
+  def primary_user
+    users.primary.first
+  end
+
+  delegate :email, :to => :primary_user, :allow_nil => true
 
   def page_views
     PageView.by_user(users)
@@ -301,7 +305,14 @@ class Contact < ActiveRecord::Base
     end
 
     def ensure_user_references
-      users.each {|u| u.contact = self }
+      users.each {|u| 
+        # We set contact as self on all our users so they have a reference to the contact.
+        # This doesn't happen with nested associations by default.
+        u.contact = self 
+
+        # make sure our users have our first name if it's blank
+        u.first_name = self.first_name if u.first_name.blank?
+      }
     end
 
     # override has_destroy_flag? to force destroy on persisted associations as well

data/app/models/deal.rb

@@ -18,6 +18,7 @@ class Deal < ActiveRecord::Base
   money_columns :value
 
   validates :value,      :numericality => true
+  validates :campaign,   :presence     => true
 
   # non-lead validations (deals in the admin)
   # require a deal name
@@ -29,11 +30,14 @@ class Deal < ActiveRecord::Base
   validates :lead_email, :presence => { :if => lambda {|r| r.lead? } },
                          :email    => { :if => lambda {|r| r.lead? }, :allow_blank => true }
 
+  # NOTE should offer be validated?
+  #validates :offer,      :presence => { :if => lambda {|r| r.lead? } }
+
   # If a lead with a user, get the lead_name and lead_email from the user before validation
-  before_validation :get_name_and_email_from_user, :only => :create
-  before_validation :update_to_pending_status, :only => :update
+  before_validation :get_name_and_email_from_user, :on => :create
+  before_validation :update_to_pending_status,     :on => :update
 
-  # copy temp options over into custom_info column
+  # copy temp options over into info column
   before_create :transform_options_column
 
   # denormalize campaign code and offer name columns
@@ -42,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
+  after_create :find_or_create_user, :assign_user_mailing_lists, :add_user_contact
 
   # money column definitions for pseudo attributes (added on the reports scope)
   %w(total_value average_value total_cost average_cost).each do |money_column|
@@ -167,14 +171,6 @@ class Deal < ActiveRecord::Base
   scope :owner,    lambda {|owner|    where(:contact_id => owner.to_param) }
   scope :status,   lambda {|status|   where(:status => status) }
 
-  def custom_info
-    read_attribute(:options)
-  end
-
-  def custom_info=(v)
-    write_attribute(:options, v)
-  end
-
   protected
 
     def write_options(obj={})
@@ -215,13 +211,7 @@ class Deal < ActiveRecord::Base
     end
 
     def transform_options_column
-      # NOTE this column can't be passed, it is only generated from
-      # the custom options pseudo column
-      self.custom_info = begin
-        options.to_hash.map do |k, v|
-          "%s:\n%s\n\n" % [k.to_s.titleize, v]
-        end.join
-      end
+      self.info = options.to_hash.map {|k, v| "%s:\n%s\n\n" % [k.to_s.titleize, v] }.join
     end
 
     def ensure_denormalized_columns
@@ -244,12 +234,14 @@ class Deal < ActiveRecord::Base
       if lead? && user.blank? && lead_email
         u = User.find_by_email(lead_email) || create_prospect
         update_attribute(:user_id, u.id)
-
-        u.create_contact_if_missing!
-        self.contacts << u.contact
       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

data/app/models/email_template.rb

@@ -8,4 +8,15 @@ class EmailTemplate < Email
   validates :text_body,  :presence => true
   validates :subject,    :presence => true
   validates :from_email, :presence => true, :email => { :allow_blank => true }
+
+  def as_json(options = {})
+    {}.tap do |hash|
+      hash[:to]        = recipient.email
+      hash[:reply_to]  = reply_email
+      hash[:from]      = from_email
+      hash[:subject]   = render(:subject)
+      hash[:html_body] = render(:html_body)
+      hash[:text_body] = render(:text_body)
+    end
+  end
 end

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

@@ -13,6 +13,6 @@
     - record.users.each do |user|
       .contact-email
         -#= '* ' if contact_user_subscribed_to_newsletter?(user)
-        = link_to(user.email, "mailto:#{user.email}")
+        = link_to(user.email, "mailto:#{user.email}", 'data-contact-id' => record.id, 'data-user-id' => user.id, :class => 'contact-mailto')
         = "(#{user.options.type})" if user.options.type
         = "(primary)"              if user.primary?

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

@@ -3,8 +3,8 @@
     %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}")
+        -#= '* ' if contact_user_subscribed_to_newsletter?(user)
+        = link_to(user.email, "mailto:#{user.email}", 'data-contact-id' => resource.id, 'data-user-id' => user.id, :class => 'contact-mailto')
         = "(#{user.options.type})" if user.options.type
         = "(primary)"              if user.primary?
 
@@ -35,4 +35,3 @@
         .address= address_attribute.to_html
         .actions
           = google_maps_link(address_attribute)
-

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

@@ -14,15 +14,50 @@
   .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)
-
+      %h2
+        %span.contact-subheader= company.name
+        %span.contact-actions
+          = google_search_link(company.name)
+          = google_news_link(company.name)
       - if company.info.present?
         = k(company.info)
+
+  .contact-deals
+    %h2
+      %span.contact-subheader Deals
+      %span.contact-actions
+        = link_to_new_resource(Deal, :deal => { :contact_ids => [resource.id] })
+
+    %ul
+      - if (deals = resource.associated_deals.leads(false).limit(5)).blank?
+        %li= resource_humanize(:no_deals)
+      - else
+        - deals.each do |deal|
+          %li
+            .contact-deal-status
+              = deal.status
+            .contact-deal-name
+              = link_to deal.name, edit_deal_path(deal)
+            .contact-deal-value
+              = deal.value
+
+  .contact.leads
+    %h2
+      %span.contact-subheader Leads 
+
+    %ul
+      - if (leads = resource.associated_deals.leads.limit(5)).blank?
+        %li= resource_humanize(:no_leads)
+      - else
+        - leads.each do |lead|
+          %li
+            .contact-lead-created-at
+              = l(lead.created_at)
+            .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

@@ -11,12 +11,12 @@
 .field.select
   = f.label :category
   = f.select :category, MenuOption.options_for('Deal Category'), :include_blank => 'No Category'
+.field
+  = f.label :campaign, :for => 'deal_campaign_select'
+  = f.collection_select :campaign_id, Campaign.ordered.all, :id, :to_s, {:prompt => true}, :id => 'deal_campaign_select'
 .field
   = f.label :info
   = f.text_area :info
-.field
-  = f.label :custom_info
-  = f.text_area :custom_info
 .field
   = f.label :value, nil, :class => :req
   = f.text_field :value

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

@@ -0,0 +1,6 @@
+= title e9_t(:select_title)
+= form_tag email_templates_path, :id => "email_templates_select", :method => :get do
+  = hidden_field_tag "contact_id", params[:contact_id]
+  = hidden_field_tag "user_id", params[:user_id]
+  = select_tag "id", options_for_select(collection.map {|e| [e.name, e.id] })
+  = submit_tag e9_t(:select_submit), :name => nil

data/config/locales/e9.en.yml

@@ -27,6 +27,9 @@ en:
         send_email: Send Email
       deals:
         new_title: Create Deal
+      email_templates:
+        select_title: Choose a Template
+        select_submit: Go
       leads:
         index_title: Leads 
       reports:

data/config/locales/en.yml

@@ -108,11 +108,12 @@ 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.
       company:
         info: Background Information
       deal:
         info: Details
-        custom_info: Lead Information
         lead_email: Email
         lead_name: First Name
         campaign_code: Code

data/config/routes.rb

@@ -24,7 +24,9 @@ Rails.application.routes.draw do
 
     # contact_emails are generated by email templates, and end up in the sent emails list
     resources :contact_emails,  :except => [:index, :show]
-    resources :email_templates, :except => :show
+    resources :email_templates do
+      collection { get :select }
+    end
 
     resources :menu_options, :except => [:show] do
       collection { post :update_order }

data/lib/e9_crm/email.rb

@@ -3,9 +3,11 @@ module E9Crm
     extend ActiveSupport::Concern
 
     included do
+      attr_accessor :contact
+
       def locals_with_contact
         default_locals.merge({
-          :contact => recipient.try(:contact)
+          :contact => @contact || recipient.try(:contact)
         })
       end
 

data/lib/e9_crm/version.rb

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

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

@@ -219,4 +219,83 @@
     $.submit_with_query();
   });
 
+
+   
+  /*
+   * contact mailto links have template functionality, passing the contact and user (login) 
+   * for the email to the email templates form, which offers the available templates and
+   * on submit, will return the template in its rendered form for population of a mailto.
+   *
+   * See below handling of the form.
+   */
+  $('a.contact-mailto')
+    .click(function(e) {
+      e.preventDefault();
+    })
+    .each(function(i, el) {
+      var $el = $(el);
+      $el.qtip({
+        content: {
+          text: '<img src="/images/spinner.gif" />',
+          ajax: {
+            url: '/admin/crm/email_templates/select',
+            dataType: 'script',
+            data: {
+              contact_id: $el.attr('data-contact-id'),
+              user_id: $el.attr('data-user-id')
+            }
+          }
+        }, 
+        position: {
+           at: 'bottom center', // Position the tooltip above the link
+           my: 'top center'
+        },
+        show: {
+           event: 'click',
+           solo: true // Only show one tooltip at a time
+        },
+        hide: 'unfocus',
+        style: {
+           classes: 'ui-tooltip-wiki ui-tooltip-light ui-tooltip-shadow'
+        }
+      })
+    })
+  ;
+
+  /*
+   * Behavior for the email template select form.
+   *
+   * It should intercept the submit and redirect itself to email_templates#show.json
+   * passing along the user_id and contact_id sent with the request.
+   *
+   * On success, it should take the json returned (the rendered email template data) and 
+   * build a mailto href which is then opened in a new window.
+   */
+  $('form#email_templates_select').live('submit', function(e) {
+    e.preventDefault();
+
+    var $t = $(this), 
+        $s = $t.find('select'),
+        $c = $t.find('> input[type=hidden]');
+
+    $.ajax({
+      url: $t.attr('action') + '/' + $s.val(),
+      type: 'GET',
+      dataType: 'json',
+      data: $.param($c),
+      success: function(data, status, xhr) {
+        var   to = data.to,
+            subj = escape(data.subject),
+            body = escape(data.text_body);
+
+        var href = 'mailto:' + to + '?subject=' + subj + '&body=' + body;
+
+        // attempt to close our tooltip
+        try { $t.closest('.ui-tooltip').qtip('api').hide(); } catch(e) {}
+
+        // open mailto in new window
+        window.open(href, '_blank');
+      }
+    });
+  });
 });

metadata

@@ -2,7 +2,7 @@
 name: e9_crm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors: 
 - Travis Cox
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 -04:00
+date: 2011-05-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -270,6 +270,7 @@ files:
 - app/views/e9_crm/email_campaigns/_form_inner.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/email_templates/select.html.haml
 - app/views/e9_crm/file_download_offers/_form.html.haml
 - app/views/e9_crm/file_download_offers/_form_inner.html.haml
 - app/views/e9_crm/leads/_form.html.haml