e9_crm 0.1.20 → 0.1.21

data/app/controllers/e9_crm/campaigns_controller.rb

@@ -13,7 +13,7 @@ class E9Crm::CampaignsController < E9Crm::ResourcesController
   end
 
   has_scope :of_type, :as => :type, :only => :index do |_, scope, value|
-    scope.of_type("#{type}_campaign".classify)
+    scope.of_type("#{value}_campaign".classify)
   end
 
   protected

data/app/controllers/e9_crm/contact_merges_controller.rb

@@ -3,6 +3,7 @@ class E9Crm::ContactMergesController < E9Crm::BaseController
 
   def create
     @contact_a.attributes = params[:contact]
+    @contact_a.avatar = @contact_b.avatar if params[:contact_avatar] == 'b'
 
     if @contact_a.merge_and_destroy!(@contact_b)
       redirect_to @contact_a

data/app/controllers/e9_crm/deals_controller.rb

@@ -14,6 +14,8 @@ class E9Crm::DealsController < E9Crm::ResourcesController
 
   before_filter :prepop_deal_owner_contact, :only => [:new, :edit]
 
+  before_filter :redirect_for_default_from_time, :only => [:leads, :reports]
+
   ##
   # All Scopes
   #
@@ -21,10 +23,13 @@ class E9Crm::DealsController < E9Crm::ResourcesController
   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])
+      scope.for_time_range(value, controller.params[:until], :right_join => is_reports)
     else
-      scope.from_time(value)
+      scope.from_time(value, :right_join => is_reports)
     end
   end
 
@@ -85,6 +90,7 @@ class E9Crm::DealsController < E9Crm::ResourcesController
     add_breadcrumb!(@edit_title)
   end
 
+  # TODO the leads table references offer each row, and it is not joined here
   def collection
     get_collection_ivar || begin
       set_collection_ivar(
@@ -132,4 +138,14 @@ class E9Crm::DealsController < E9Crm::ResourcesController
   def default_ordered_dir 
     'ASC' 
   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/leads_controller.rb

@@ -1,4 +1,7 @@
 class E9Crm::LeadsController < ApplicationController
+  # NOTE this controller, contrary to sanity, doesn't handle admin/crm/leads,
+  #      rather it handles only public side lead creation
+
   # TODO these should all be included in e9_base
   include E9Rails::Helpers::ResourceLinks
   include E9Rails::Helpers::Title

data/app/models/contact.rb

@@ -9,6 +9,7 @@ class Contact < ActiveRecord::Base
 
   before_validation :ensure_user_references
   before_destroy :ensure_no_associated_deals
+  after_destroy :destroy_or_nullify_users
 
   ##
   # Associations
@@ -17,7 +18,7 @@ class Contact < ActiveRecord::Base
   has_many :owned_deals, :class_name => 'Deal', :dependent => :restrict
   has_and_belongs_to_many :associated_deals, :class_name => 'Deal'
 
-  has_many :users, :inverse_of => :contact, :dependent => :nullify do
+  has_many :users, :inverse_of => :contact do
 
     ##
     # Resets the primary user on a contact
@@ -264,33 +265,33 @@ class Contact < ActiveRecord::Base
       unless errors.delete(:"users.email").blank?
         users.dup.each_with_index do |user, i|
           user.errors[:email].each do |error|
-            #if error.taken? && users.select {|u| u.email == user.email }.length == 1
-              #existing_user = User.find_by_email(user.email)
-
-              #if contact = existing_user.contact
-                #args = if new_record?
-                  #[contact, 'new', {:contact => self.attributes}]
-                #else
-                  #[contact, self]
-                #end
-
-                #errors.add(:users, :merge_required, {
-                  #:email => user.email, 
-                  #:merge_path => new_contact_merge_path(*args)
-                #})
-
-                #return false
-              #else
-                #self.users.delete(user)
-                #self.users << existing_user
-              #end
-            #else
+            if error.taken? && users.select {|u| u.email == user.email }.length == 1
+              existing_user = User.find_by_email(user.email)
+
+              if contact = existing_user.contact
+                args = if new_record?
+                  [contact, 'new', {:contact => self.attributes}]
+                else
+                  [contact, self]
+                end
+
+                errors.add(:users, :merge_required, {
+                  :email => user.email, 
+                  :merge_path => new_contact_merge_path(*args)
+                })
+
+                return false
+              else
+                self.users.delete(user)
+                self.users << existing_user
+              end
+            else
               if error.label
                 errors.add(:users, error.label.to_sym, :email => user.email)
               else
                 errors.add(:users, nil, :message => error, :email => user.email)
               end
-            #end
+            end
           end
         end
 
@@ -341,6 +342,14 @@ class Contact < ActiveRecord::Base
       end
     end
 
+    def destroy_or_nullify_users
+      without_access_control do
+        users.prospects.destroy_all
+      end
+
+      users.update_all("contact_id = NULL")
+    end
+
   class Drop < ::E9::Liquid::Drops::Base
     source_methods :first_name, :last_name, :name, :email, :title, :company_name
   end

data/app/models/deal.rb

@@ -3,9 +3,10 @@
 #
 class Deal < ActiveRecord::Base
   include E9Rails::ActiveRecord::Initialization
-  include E9Rails::ActiveRecord::Scopes::Times
   include E9Rails::ActiveRecord::InheritableOptions
 
+  include E9::ActiveRecord::TimeScopes
+
   self.options_column = false
 
   belongs_to :campaign, :inverse_of => :deals
@@ -164,7 +165,10 @@ class Deal < ActiveRecord::Base
 
     # this is for leads
     def transform_options_column
-      self.info ||= options.to_hash.map {|k, v| "%s:\n%s\n\n" % [k.to_s.titleize, v] }.join
+      self.info ||= options.to_hash.map {|k, v| 
+        v = v.join(', ') if v.is_a?(Array)
+        "**%s:**\n%s\n\n" % [k.to_s.titleize, v] 
+      }.join
     end
 
     def ensure_denormalized_columns

data/app/models/offer.rb

@@ -6,8 +6,8 @@ class Offer < Renderable
   include E9Rails::ActiveRecord::Initialization
   include E9Rails::ActiveRecord::InheritableOptions
 
-  has_many :deals, :inverse_of => :offer
-  has_many :leads, :class_name => 'Deal', :conditions => ["deals.status = ?", Deal::Status::Lead]
+  has_many :deals, :inverse_of => :offer, :dependent => :restrict
+  has_many :leads, :class_name => 'Deal', :conditions => ["deals.status = ?", Deal::Status::Lead], :dependent => :restrict
 
   validates :conversion_alert_email, :email => { :allow_blank => true }
 

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

@@ -2,6 +2,19 @@
   = hidden_field_tag :contact_a_id, @contact_a.id
   = hidden_field_tag :contact_b_id, @contact_b.id
 
+  .field
+    = f.label :avatar
+
+    .contact-a-value
+      %label{:for => "contact_avatar_a"}
+        <img src="#{@contact_a.avatar_url}" alt="Photo for #{@contact_a.name}" />
+      = radio_button_tag 'contact_avatar', 'a', :checked => true
+
+    .contact-b-value
+      %label{:for => "contact_avatar_b"}
+        <img src="#{@contact_b.avatar_url}" alt="Photo for #{@contact_b.name}" />
+      = radio_button_tag 'contact_avatar', 'b'
+
   = render 'field', :column => :first_name, :f => f
   = render 'field', :column => :last_name, :f => f
   = render 'field', :column => :company_name, :f => f

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

@@ -42,6 +42,9 @@
 
 - content_for :bottom_javascripts do
   = javascript_include_tag templates_contacts_path
+
   #merge-dialog{:title => t(:email_taken_title), 'data-id' => resource.try(:id) }
-    %p= I18n.t(resource.persisted? ? :edit_conflict : :merge_conflict).html_safe
+    = t(resource.persisted? ? :edit_conflict : :merge_conflict).html_safe
+  #duplicate-dialog{:title => t(:duplicate_email_title), 'data-id' => resource.try(:id) }
+    = t(:duplicate_email_warning).html_safe
 

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

@@ -1,36 +1,6 @@
-.actions
-  = link_to_new_resource(Contact)
-  = link_to_collection(Company)
-
-- if (etag = contact_email_template_select_tag).present?
-  %fieldset
-    %legend= e9_t(:email_actions_legend)
-    = 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
-  %legend= e9_t(:search_options_legend)
-  = form_tag(resource_class, :method => :get, :id => 'contact_search_form') do
-    = 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
-    = label_tag 'contact_company_select', Company.model_name.human
-    %select{:name => 'company', :id => 'contact_company_select'}
-      = company_select_options
-
-  .field#contact_tag_list
-    %label{:for => 'contact_tag_autocomplete'} Tags
-    %input#contact_tag_autocomplete.list{:type => 'text', 'data-iname' => 'contact', 'data-field' => '[tagged]', :placeholder => 'Enter a tag...'}
-    %ul#contact_tag_select.select
-      - Array.wrap(params[:tagged]).each do |tag|
-        %li.ui-state-default
-          %span.content= tag
-          %a{:class => :remove, :title => "Remove", :alt => "Remove"} Remove
-
-  .actions
-    = submit_tag t(:clear_all_filters), :name => nil, :id => 'contact_search_clear'
+#sidebar-actions
+  = render 'sidebar_actions'
+#sidebar-email-form
+  = render 'sidebar_email_form'
+#sidebar-search-form
+  = render 'sidebar_search_form'

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

@@ -0,0 +1,3 @@
+.actions
+  = link_to_new_resource(Contact)
+  = link_to_collection(Company)

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

@@ -0,0 +1,7 @@
+- if (etag = contact_email_template_select_tag).present?
+  %fieldset
+    %legend= e9_t(:email_actions_legend)
+    = 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

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

@@ -0,0 +1,22 @@
+%fieldset
+  %legend= e9_t(:search_options_legend)
+  .actions
+    = submit_tag t(:clear_all_filters), :name => nil, :id => 'contact_search_clear'
+
+  = form_tag(resource_class, :method => :get, :id => 'contact_search_form') do
+    = label_tag 'contact_search_field', t(:search)
+    = text_field_tag 'search', params[:search], :id => 'contact_search_field'
+
+  = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
+    = label_tag 'contact_company_select', Company.model_name.human
+    %select{:name => 'company', :id => 'contact_company_select'}
+      = company_select_options
+
+  .field#contact_tag_list
+    %label{:for => 'contact_tag_autocomplete'} Tags
+    %input#contact_tag_autocomplete.list{:type => 'text', 'data-iname' => 'contact', 'data-field' => '[tagged]', :placeholder => 'Enter a tag...'}
+    %ul#contact_tag_select.select
+      - Array.wrap(params[:tagged]).each do |tag|
+        %li.ui-state-default
+          %span.content= tag
+          %a{:class => :remove, :title => "Remove", :alt => "Remove"} Remove

data/app/views/e9_crm/contacts/index.js.erb

@@ -1,5 +1,6 @@
 <% new_title = @index_title || e9_t(:index_title) %>
-$('#index-sidebar').html("<%= escape_javascript(render('index_sidebar')) %>");
+//$('#index-sidebar').html("<%= escape_javascript(render('index_sidebar')) %>");
+$('#sidebar-email-form').html("<%= escape_javascript(render('sidebar_email_form')) %>");
 $('#records_table').html("<%= escape_javascript(render('table', :resources => collection)) %>");
 document.title = "<%= escape_javascript(meta_title(new_title)) %>";
 $("h1.title, ul.breadcrumbs li.last").html("<%= escape_javascript(new_title) %>");

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

@@ -36,33 +36,48 @@
       %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, deal
-            .contact-deal-value
-              = deal.value
+    %table
+      %thead
+        %tr
+          %th= Deal.human_attribute_name(:status)
+          %th= Deal.human_attribute_name(:name)
+          %th= Deal.human_attribute_name(:value)
+
+      %tbody
+        - if (deals = resource.associated_deals.leads(false)).blank?
+          %tr
+            %td{:colspan => 3}= resource_humanize(:no_deals)
+        - else
+          - deals.each do |deal|
+            %tr
+              %td.contact-deal-name
+                = link_to deal.name, deal
+              %td.contact-deal-status
+                = deal.status
+              %td.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)
+    %table
+      %thead
+        %tr
+          %th= Deal.human_attribute_name(:created_at)
+          %th= Deal.human_attribute_name(:offer_name)
+        
+      %tbody
+        - if (leads = resource.associated_deals.leads).blank?
+          %tr
+            %td{:colspan => 2}= resource_humanize(:no_leads)
+        - 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)
 
 .contact-sidebar
   = render 'sidebar'

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

@@ -32,18 +32,27 @@
 .field.select
   = f.label :owner
   = f.select :contact_id, deal_contacts_array, { :prompt => true }, :id => :deal_owner 
-.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)
+
+.debug-fields
+  .field.date-picker
+    = f.label :created_at
+    = f.text_field :created_at, :class => 'date-picker', :value => l(resource.created_at.try(:to_date))
+  .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/_leads_table.html.haml

@@ -18,7 +18,7 @@
           %td.record-created-at
             = I18n.l(record.created_at)
           %td.record-offer-name
-            = record.offer_name
+            = record.offer.try(:name) || t(:no_offer_value)
           %td.record-campaign-code
             = record.campaign_code
           %td.record-lead-name
@@ -26,7 +26,7 @@
           %td.record-lead-email
             = record.lead_email
           %td.record-info
-            = record.info
+            = k record.info
           %td.actions
             - if record.contacts.present?
               = link_to 'View Contact', record.contacts.first

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

@@ -0,0 +1,13 @@
+= title e9_t(:show_title)
+
+.deal-header
+  .deal-category
+    = resource.category
+  .deal-value
+    = resource.value.format
+  .deal-status
+    = resource.status
+
+.deal-body
+  .deal-info
+    = k(resource.info)

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

@@ -4,7 +4,8 @@
   - if f.object.persisted?
     = f.hidden_field :id
     = f.hidden_field :_destroy, :value => 0
-    .field
+    .field.contact-email
+      <input type="hidden" value="#{f.object.email}"/>
       = f.object.email
   - else
     .field.contact-email

data/config/locales/en.yml

@@ -1,7 +1,10 @@
 en:
   email_taken_title: Oops!
+  duplicate_email_title: Oops!
   edit_conflict: "<p>This email is already attached to another contact and cannot be used.</p><p>Do you want to merge these contacts now?</p><p>Be careful!  If you have made extensive edits you may want to save first and come back to merge.</p>"
   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
 
   actions: Actions
   clear: Clear
@@ -58,6 +61,10 @@ en:
             users:
               taken: "Two or more of the login accounts entered share a duplicate email."
               invalid: "One or more of the emails you entered is invalid."
+        offer:
+          attributes:
+            deals:
+              delete_restricted: "You cannot delete this offer because it has leads and/or deals."
         contact_email:
           attributes:
             contact_ids:

data/lib/e9_crm/tracking_controller.rb

@@ -3,7 +3,7 @@ module E9Crm
     extend ActiveSupport::Concern
 
     included do
-      before_filter :check_for_new_session 
+      prepend_before_filter :check_for_new_session 
       after_filter  :track_page_view
 
       prepend_before_filter do
@@ -22,10 +22,13 @@ module E9Crm
     # only happen once per session.
     #
     def check_for_new_session
-      if request.session_options[:id].blank?
+      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
 
     #
@@ -48,16 +51,18 @@ module E9Crm
     #                 has been assigned.
     #
     def track_page_view
-      @_page_view ||= tracking_cookie.page_views.create({
-        :request_path => request.fullpath,
-        :user_agent   => request.user_agent,
-        :referer      => request.referer,
-        :remote_ip    => request.remote_ip,
-        :session      => request.session_options[:id],
-        :campaign     => tracking_campaign,
-        :new_visit    => session[:new_visit].present?,
-        :should_cache => !!@_should_cache
-      })
+      if request.get?
+        @_page_view ||= tracking_cookie.page_views.create({
+          :request_path => request.fullpath,
+          :user_agent   => request.user_agent,
+          :referer      => request.referer,
+          :remote_ip    => request.remote_ip,
+          :session      => request.session_options[:id],
+          :campaign     => tracking_campaign,
+          :new_visit    => session[:new_visit].present?,
+          :should_cache => !!@_should_cache
+        })
+      end
     end
   end
 end

data/lib/e9_crm/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: e9_crm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors: 
 - Travis Cox
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-15 00:00:00 Z
+date: 2011-09-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -239,6 +239,9 @@ files:
 - app/views/e9_crm/contacts/_header.html.haml
 - app/views/e9_crm/contacts/_index_sidebar.html.haml
 - app/views/e9_crm/contacts/_sidebar.html.haml
+- app/views/e9_crm/contacts/_sidebar_actions.html.haml
+- app/views/e9_crm/contacts/_sidebar_email_form.html.haml
+- app/views/e9_crm/contacts/_sidebar_search_form.html.haml
 - 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
@@ -269,6 +272,7 @@ files:
 - 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
 - app/views/e9_crm/email_templates/_header.html.haml