e9_crm 0.1.26 → 0.1.27

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

@@ -9,6 +9,3 @@
 - else
   %div#records_table
     = render 'table', :resources => collection
-
-- if controller.send(:should_paginate_index)
-  = will_paginate collection

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

@@ -1 +1 @@
-$("table.records").replaceWith("<%= escape_javascript(render('table', :collection => collection)) %>");  
+$("#records_table").html("<%= escape_javascript(render('table', :collection => collection)) %>");  

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

@@ -4,8 +4,9 @@
   %legend= e9_t(:salesperson_information_legend, :scope => 'e9_crm.campaigns')
   .field
     = f.label :sales_person, :class => :req, :for => 'campaign_sales_person_id'
-    %input.contact-autocomplete{:type => 'text'}
+
     - contact = f.object.sales_person
+    %input.contact-autocomplete{:type => 'text', :style => contact.blank? && '' || 'display:none'}
     .contact-select{:style => contact.blank? && 'display:none' || ''}
       %span.content= contact.try(:name)
       %input{:type => :hidden, :name => "#{resource_instance_name}[sales_person_id]", :value => contact.try(:id)}

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

@@ -0,0 +1,3 @@
+.toolbar
+  .toolbar-right
+    = link_to 'View All Activity', page_views_url(:campaign => parent.id)

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

@@ -0,0 +1,27 @@
+%table.records
+  %thead
+    %tr
+      %th= orderable_column_link(:contact_name, :contact)
+      %th= orderable_column_link(:new_visits)
+      %th= orderable_column_link(:repeat_visits)
+      %th= t(:actions)
+  %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-contact-name
+            = record.contact_name
+          %td.record-new-visits.num
+            = record.new_visits.to_i
+          %td.record-repeat-visits.num
+            = record.repeat_visits.to_i
+          %td.links
+            - if record.contact_id
+              = link_to "View Contact", contact_url(record.contact_id)
+              = link_to "View Contact's Activity", page_views_url(:contact => record.contact_id, :campaign => parent.id)
+
+- if controller.send(:should_paginate_index)
+  = will_paginate collection

data/config/locales/e9.en.yml

@@ -7,6 +7,18 @@ en:
       new_title: "New %{model}"
       actions: Actions
 
+      campaigns:
+        no_campaign: No Campaign
+        no_group: No Group
+        campaign_information_legend: Campaign Information
+        salesperson_information_legend: Salesperson Information
+        affiliate_information_legend: Affiliate Information
+      contact_emails:
+        prepare_title: Edit Your Template
+        send_email: Send Email
+      contact_merges:
+        new_title: Merge Contacts
+        no_value: (No Value)
       contacts:
         index_title_with_search: "%{models} matching \"%{search}\""
         index_title_with_tags: "%{models} tagged \"%{tagged}\""
@@ -22,12 +34,6 @@ en:
         email_actions_legend: Email Actions
         search_options_legend: Search Filters
         edit_title_with_name: "Edit %{contact}"
-      contact_merges:
-        new_title: Merge Contacts
-        no_value: (No Value)
-      contact_emails:
-        prepare_title: Edit Your Template
-        send_email: Send Email
       deals:
         new_title: Create Deal
       email_templates:
@@ -35,12 +41,13 @@ en:
       leads:
         index_title: Leads 
         no_records_text: No leads exist.
+      page_views:
+        no_records_text: No activity exists.
+      visits:
+        no_records_text: No activity exists.
       reports:
         index_title: Marketing Report
         no_records_text: No data exists for those query parameters.
-      campaigns:
-        no_campaign: No Campaign
-        no_group: No Group
-        campaign_information_legend: Campaign Information
-        salesperson_information_legend: Salesperson Information
-        affiliate_information_legend: Affiliate Information
+      visits:
+        breadcrumb_title: Campaign Activity
+        index_title: "Campaign: %{parent}"

data/config/routes.rb

@@ -1,9 +1,10 @@
 Rails.application.routes.draw do
   crm_path = 'admin/crm'
 
-  get '/autocomplete/contacts'  => E9Crm::Rack::ContactAutoCompleter
-  get '/autocomplete/companies' => E9Crm::Rack::CompanyAutoCompleter
-  get '/users/email_test.json'  => E9Crm::Rack::EmailAvailabilityChecker
+  get '/autocomplete/contacts'        => E9Crm::Rack::ContactAutoCompleter
+  get '/autocomplete/companies'       => E9Crm::Rack::CompanyAutoCompleter
+  get '/autocomplete/email_campaigns' => E9Crm::Rack::EmailCampaignAutoCompleter
+  get '/users/email_test.json'        => E9Crm::Rack::EmailAvailabilityChecker
 
   scope :module => :e9_crm do
     resources :offers, :as => :public_offer, :only => :show do
@@ -18,9 +19,6 @@ Rails.application.routes.draw do
 
     resources :companies, :except => :show
     resources :contacts do
-      # page_views currently not routed, but near working
-      #resources :page_views, :path => 'activity', :only => :index
-
       collection { get :templates }
       member do
         post   :upload_avatar
@@ -28,13 +26,9 @@ Rails.application.routes.draw do
       end
     end
 
-    resources :deals
+    resources :page_views, :path => 'activity', :only => :index
 
-    # contact_emails are generated by email templates, and end up in the sent emails list
-    resources :contact_emails,  :except => [:index, :show]
-    resources :email_templates do
-      collection { get :select }
-    end
+    resources :deals
 
     resources :dated_costs, :path => 'advertising_costs', :only => [:index] do
       collection do
@@ -43,11 +37,10 @@ Rails.application.routes.draw do
     end
 
     resources :campaigns, :only  => [:index, :destroy, :new] do
-      # page_views currently not routed, but near working
-      #resources :page_views, :path => 'activity', :only => :index
+      resources :visits, :path => 'activity', :only => :index
     end
     scope :path => :campaigns do
-      #get '/activity', :to => redirect("/#{crm_path}/campaigns/all/activity")
+
       resources :campaign_groups, :path => 'groups', :except => [:show]
 
       resources :sales_campaigns,       :path => 'sales',       :except => [:show, :index]
@@ -79,7 +72,6 @@ Rails.application.routes.draw do
       campaigns/sales
       campaigns/groups
       deals
-      email_templates
       menu_options
       offers
     ).each do |path|

data/e9_crm.gemspec

@@ -19,14 +19,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("rails", "~> 3.0.0")
-  s.add_dependency("inherited_resources", "~> 1.1.2")
-  s.add_dependency("has_scope")
   s.add_dependency("money")
-  s.add_dependency("e9_rails")
-  s.add_dependency("e9_tags")
-  s.add_dependency("e9_attributes")
-  s.add_dependency("will_paginate")
   s.add_dependency("kramdown", "~> 0.13")
-  s.add_dependency("state_machine", "~> 1.0")
 end

data/lib/e9_crm/controller.rb

@@ -9,12 +9,10 @@ module E9Crm
     included do
       helper_method :tracking_cookie, :tracking_campaign
 
-      prepend_before_filter do
-        E9Crm.log("E9Crm controller request")
-      end
-
+      #
+      # monkey patch liquid_env to insert campaign
+      #
       alias :liquid_env_without_crm :liquid_env
-
       def liquid_env
         liquid_env_without_crm.tap do |env|
           env[:campaign] = tracking_campaign
@@ -37,6 +35,14 @@ module E9Crm
       end
     end
 
+    def _user_from_params
+      if user_id = params.delete(E9Crm.query_user_id)
+        @_user_from_params = User.find_by_id(user_id)
+      end
+
+      @_user_from_params
+    end
+
     #
     # Loads or installs the tracking cookie
     #
@@ -44,7 +50,7 @@ module E9Crm
       @_tracking_cookie ||= begin
         E9Crm.log "Begin load or install cookie: cookie_name[#{E9Crm.cookie_name}] query_param[#{E9Crm.query_param}]"
 
-        code = params.delete(E9Crm.query_param)
+        code    = params.delete(E9Crm.query_param)
 
         if hid = cookies[E9Crm.cookie_name]
           E9Crm.log("Installed cookie found: hid(#{hid})")
@@ -66,9 +72,14 @@ module E9Crm
           else
             attrs = {}
 
-            if current_user && @_tracking_cookie.user_id.nil?
-              E9Crm.log("Cookie has no user, setting as current_user (#{current_user.id})")
-              attrs[:user] = current_user
+            if @_tracking_cookie.user_id.nil?
+              if current_user
+                E9Crm.log("Cookie has no user, setting as current_user (#{current_user.id})")
+                attrs[:user] = current_user
+              elsif _user_from_params
+                E9Crm.log("Cookie has no user, setting as user from params (#{_user_from_params.id})")
+                attrs[:user] = _user_from_params
+              end
             end
 
             if code.present? && code != @_tracking_cookie.code && Campaign.find_by_code(code)
@@ -79,15 +90,19 @@ module E9Crm
               session[:new_visit] = true
             end
 
-            E9Crm.log(attrs.blank? ? "Cookie unchanged, no update" : "Cookie changed, new attrs: #{attrs.inspect}")
-            @_tracking_cookie.update_attributes(attrs) unless attrs.blank?
+            if attrs.blank?
+              E9Crm.log "Cookie unchanged, no update"
+            else
+              E9Crm.log "Cookie changed, new attrs: #{attrs.inspect}"
+              @_tracking_cookie.update_attributes(attrs)
+            end
           end
         end
 
         @_tracking_cookie ||= begin
           session[:new_visit] = true
 
-          TrackingCookie.create(:code => code, :user => current_user).tap do |cookie|
+          TrackingCookie.create(:code => code, :user => current_user || _user_from_params).tap do |cookie|
             E9Crm.log "Installing new cookie (#{E9Crm.cookie_name} : #{cookie.hid})"
             cookies.permanent[E9Crm.cookie_name] = cookie.hid
           end

data/lib/e9_crm/model.rb

@@ -35,11 +35,12 @@ module E9Crm
     end
 
     def create_contact_if_missing!
-      if contact.blank?
-        # when creating a contact we should assume we're primary
-        self.options.primary = true
-        create_contact(create_contact_parameters)
-      end
+      return true unless contact.blank?
+
+      # when creating a contact we should assume we're primary
+      self.options.primary = true
+      build_contact(create_contact_parameters)
+      save
     end
 
     protected

data/lib/e9_crm/rack/email_campaign_auto_completer.rb

@@ -0,0 +1,29 @@
+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 EmailCampaignAutoCompleter
+    DEFAULT_LIMIT = 10
+
+    def self.call(env)
+      params = Rack::Request.new(env).params
+      
+      if term = params['term']
+        relation = EmailCampaign.
+                     select('name, code').
+                     limit(params['limit'] || DEFAULT_LIMIT).
+                     attr_like(:code, term, :matcher => '%s%%')
+
+        json = ::ActiveRecord::Base.connection.send(:select, relation.to_sql, 'Email Campaign Autocomplete').map do |row|
+          { :label => "#{row['code']} - #{row['name']}", :value => row['code'] }
+        end.to_json
+      else
+        json = []
+      end
+
+      [200, {"Content-Type" => "application/json", "Cache-Control" => "no-cache"}, [json]]
+    end
+  end
+end

data/lib/e9_crm/rails_extensions.rb

@@ -110,36 +110,3 @@ module ActiveModel
     end
   end
 end
-
-module E9Crm
-  #
-  # Fairly straightforward hack to allow e9_crm views to inherit from resources.
-  # If a missing template error is raised by a view looking for a template prefixed with
-  # "e9_crm", redirect the lookup to "e9_crm/resources"
-  #
-  # This would be worth looking into further but inherited templates are a feature coming 
-  # up in Rails anyway.
-  #
-
-  module ActionView
-    extend ActiveSupport::Concern
-
-    included do
-      def self.process_view_paths(value)
-        value.is_a?(::E9Crm::ActionView::PathSet) ?
-          value.dup : ::E9Crm::ActionView::PathSet.new(Array.wrap(value))
-      end
-    end
-    
-    class PathSet < ::ActionView::PathSet
-      def find(path, prefix = nil, partial = false, details = {}, key = nil)
-        super
-      rescue ::ActionView::MissingTemplate
-        raise $! unless prefix =~ /^e9_crm/
-        super(path, "e9_crm/resources", partial, details, key)
-      end
-    end
-  end
-end
-
-ActionView::Base.send(:include, E9Crm::ActionView)

data/lib/e9_crm/tracking_controller.rb

@@ -3,11 +3,7 @@ module E9Crm
     extend ActiveSupport::Concern
 
     included do
-      before_filter  :track_page_view
-
-      prepend_before_filter do
-        E9Crm.log("E9Crm tracking controller request")
-      end
+      after_filter :track_page_view
     end
 
     protected 
@@ -35,6 +31,8 @@ module E9Crm
           :campaign     => tracking_campaign,
           :new_visit    => session[:new_visit].present?
         })
+
+        E9Crm.log("Page View: #{@_page_view.inspect}")
       end
     end
   end

data/lib/e9_crm/version.rb

@@ -1,3 +1,3 @@
 module E9Crm
-  VERSION = '0.1.26'
+  VERSION = '0.1.27'
 end

data/lib/e9_crm.rb

@@ -6,14 +6,14 @@ 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 :SystemEmailsController,     'e9_crm/system_emails_controller'
 
   module Rack
-    autoload :ContactAutoCompleter,     'e9_crm/rack/contact_auto_completer'
-    autoload :CompanyAutoCompleter,     'e9_crm/rack/company_auto_completer'
-    autoload :EmailAvailabilityChecker, 'e9_crm/rack/email_availability_checker'
+    autoload :ContactAutoCompleter,       'e9_crm/rack/contact_auto_completer'
+    autoload :CompanyAutoCompleter,       'e9_crm/rack/company_auto_completer'
+    autoload :EmailCampaignAutoCompleter, 'e9_crm/rack/email_campaign_auto_completer'
+    autoload :EmailAvailabilityChecker,   'e9_crm/rack/email_availability_checker'
   end
 
   mattr_accessor :cookie_name
@@ -22,6 +22,9 @@ module E9Crm
   mattr_accessor :query_param
   @@query_param = 'code'
 
+  mattr_accessor :query_user_id
+  @@query_user_id = 'cuid'
+
   mattr_accessor :log_level
   @@log_level = :debug
 
@@ -54,7 +57,6 @@ module E9Crm
 
     ApplicationController.send(:include, E9Crm::Controller)
 
-    ::Email.send(:include, E9Crm::Email)
     ::Admin::SystemEmailsController.send(:include, E9Crm::SystemEmailsController)
 
     E9Crm.tracking_controllers.each do |controller|