e9_crm 0.1.19 → 0.1.20

data/app/controllers/e9_crm/campaigns_controller.rb

@@ -2,6 +2,8 @@ class E9Crm::CampaignsController < E9Crm::ResourcesController
   defaults :resource_class => Campaign
   include E9Rails::Controllers::Orderable
 
+  before_filter :redirect_new_to_subclass, :only => :new
+
   self.should_paginate_index = false
 
   has_scope :of_group, :as => :group, :only => :index
@@ -11,11 +13,17 @@ class E9Crm::CampaignsController < E9Crm::ResourcesController
   end
 
   has_scope :of_type, :as => :type, :only => :index do |_, scope, value|
-    scope.of_type("#{value}_campaign".classify)
+    scope.of_type("#{type}_campaign".classify)
   end
 
   protected
 
+    def redirect_new_to_subclass
+      types = %w(advertising affiliate email sales)
+      type = types.member?(params[:type]) ? params[:type] : types.first
+      redirect_to send("new_#{type}_campaign_path")
+    end
+
     def collection_scope
       #end_of_association_chain.typed.includes(:campaign_group)
 

data/app/controllers/e9_crm/contact_merges_controller.rb

@@ -2,8 +2,9 @@ class E9Crm::ContactMergesController < E9Crm::BaseController
   before_filter :build_resources
 
   def create
-    if @contact_a.update_attributes(params[:contact])
-      @contact_a.merge_and_destroy!(@contact_b)
+    @contact_a.attributes = params[:contact]
+
+    if @contact_a.merge_and_destroy!(@contact_b)
       redirect_to @contact_a
     else
       render :new
@@ -13,14 +14,8 @@ class E9Crm::ContactMergesController < E9Crm::BaseController
   protected
 
   def build_resources
-    @contact   ||= Contact.new
     @contact_a ||= Contact.find(params[:contact_a_id])
-
-    # NOTE lets see if this works
-    @contact_b ||= if params[:contact]
-                     Contact.new(params[:contact])
-                   else
-                     Contact.find(params[:contact_b_id])
-                   end
+    @contact_b ||= Contact.find(params[:contact_b_id])
+    @contact   ||= Contact.new
   end
 end

data/app/helpers/e9_crm/offers_helper.rb

@@ -12,10 +12,4 @@ module E9Crm::OffersHelper
       retv.compact
     end
   end
-
-  def offer_select_options(with_all_option = true)
-    options = %w(contact file_download new_content_subscription newsletter_subscription video).map {|t| [t.titleize, t] }
-    options.unshift(['All Types', nil]) if with_all_option
-    options_for_select(options)
-  end
 end

data/app/models/contact.rb

@@ -210,16 +210,32 @@ class Contact < ActiveRecord::Base
     [first_name, last_name].join(' ').to_s.strip
   end
 
-  def merge_and_destroy!(other_contact)
-    other_contact.users.clear_primary!
+  # NOTE there's no non-destructive `merge`
+  def merge_and_destroy!(other)
+    merge_tags(other)
 
-    self.users                               |= other_contact.users
-    self.website_attributes                  |= other_contact.website_attributes
-    self.address_attributes                  |= other_contact.address_attributes
-    self.phone_number_attributes             |= other_contact.phone_number_attributes
-    self.instant_messaging_handle_attributes |= other_contact.instant_messaging_handle_attributes
+    if success = save
+      merge_destructive_and_destroy!(other)
+    end
+
+    success
+  end
 
-    other_contact.destroy
+  def merge_tags(other)
+    tags       =  self.tag_list_on('users__h__')
+    other_tags = other.tag_list_on('users__h__')
+    set_tag_list_on('users__h__', tags | other_tags)
+  end
+
+  def merge_destructive_and_destroy!(other)
+    other.users.clear_primary!
+    self.associated_deals                    |= other.associated_deals
+    self.users                               |= other.users
+    self.website_attributes                  |= other.website_attributes
+    self.address_attributes                  |= other.address_attributes
+    self.phone_number_attributes             |= other.phone_number_attributes
+    self.instant_messaging_handle_attributes |= other.instant_messaging_handle_attributes
+    other.destroy
   end
 
   def valid?(context = nil)
@@ -248,33 +264,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
 

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

@@ -9,7 +9,7 @@
         = campaign_active_select_options
 
   .toolbar-right
-    = form_tag new_advertising_campaign_path, :method => :get, :id => 'new_campaign_form' do
+    = form_tag new_campaign_path, :method => :get, :id => 'new_campaign_form' do
       = label_tag 'new_campaign_type_select', t('activerecord.links.new', :model => Campaign.model_name.human)
       %select{:name => 'type', :id => 'new_campaign_type_select'}
         = campaign_type_select_options(false)

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

@@ -1,10 +1,13 @@
+- val = f.object.send(column)
+- a_checked = val == contact_a(column) || val.blank?
+- b_checked = !a_checked
 .field
   = f.label column
   .contact-a-value
     %label{:for => "contact_a_#{column}"}
       = contact_a(column).presence || e9_t(:no_value)
-    = f.radio_button column, contact_a(column), :checked => (f.object.send(column) == contact_a(column) || f.object.send(column).blank?), :id => "contact_a_#{column}"
+    = f.radio_button column, contact_a(column), :checked => a_checked, :id => "contact_a_#{column}"
   .contact-b-value
     %label{:for => "contact_b_#{column}"}
       = contact_b(column).presence || e9_t(:no_value)
-    = f.radio_button column, contact_b(column), :id => "contact_b_#{column}"
+    = f.radio_button column, contact_b(column), :checked => b_checked, :id => "contact_b_#{column}"

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

@@ -6,5 +6,6 @@
   = render 'field', :column => :last_name, :f => f
   = render 'field', :column => :company_name, :f => f
   = render 'field', :column => :title, :f => f
+
   .actions
     = f.submit t(:save)

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

@@ -42,3 +42,6 @@
 
 - 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
+

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

@@ -21,10 +21,14 @@
       = check_box_tag "offer[mailing_list_ids][]", ml.id, resource.has_mailing_list?(ml), :id => "offer_mailing_list_ids_#{ml.id}"
       = label_tag "offer_mailing_list_ids_#{ml.id}", ml.name
 
-.field.tinymce
-  = f.label :template
+.field
+  = help_label(f, :template, :markdown => true)
   = f.text_area :template
 
+.field.tinymce
+  = f.label :success_page_text
+  = f.text_area :success_page_text
+
 .field
   = f.label :custom_form_html
   = f.text_area :custom_form_html

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

@@ -1,8 +1,3 @@
 .toolbar
-  .toolbar-left
-    = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
-      %select{:name => 'type'}
-        = offer_select_options
-
   .toolbar-right
     = link_to_new_resource(Offer)

data/config/locales/en.yml

@@ -1,4 +1,8 @@
 en:
+  email_taken_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>"
+
   actions: Actions
   clear: Clear
   clear_all_filters: Clear All Filters
@@ -41,7 +45,7 @@ en:
 
     errors:
       messages:
-        merge_required: 'Merge Required! <a href="%{merge_path}">MERGE ME</a>.'
+        merge_required:
       models:
         campaign:
           not_a_number: "%{attribute} must be a number (maximum 2 decimal places)."

data/config/routes.rb

@@ -1,8 +1,9 @@
 Rails.application.routes.draw do
   crm_path = 'admin/crm'
 
-  get '/autocomplete/contacts' => E9Crm::Rack::ContactAutoCompleter
+  get '/autocomplete/contacts'  => E9Crm::Rack::ContactAutoCompleter
   get '/autocomplete/companies' => E9Crm::Rack::CompanyAutoCompleter
+  get '/users/email_test.json'  => E9Crm::Rack::EmailAvailabilityChecker
 
   scope :module => :e9_crm do
     resources :offers, :as => :public_offer, :only => :show do
@@ -41,7 +42,7 @@ Rails.application.routes.draw do
       end
     end
 
-    resources :campaigns, :only  => [:index, :destroy] do
+    resources :campaigns, :only  => [:index, :destroy, :new] do
       # page_views currently not routed, but near working
       #resources :page_views, :path => 'activity', :only => :index
     end

data/lib/e9_crm/rack/email_availability_checker.rb

@@ -0,0 +1,31 @@
+module E9Crm::Rack
+  class EmailAvailabilityChecker
+    def self.call(env)
+      @params  = Rack::Request.new(env).params
+      @email   = @params['email']
+      @contact = nil
+      @url     = nil
+
+      if @user = User.find_by_email(@email)
+        if @contact = @user.contact
+          @url = if @params['id'] && c = Contact.find_by_id(@params['id'])
+            "/admin/crm/merge_contacts/#{@contact.id}/and/#{c.id}"
+          else
+            "/admin/crm/contacts/#{@contact.id}/edit"
+          end
+        end
+
+        @body = {
+          :email      => @email,
+          :id         => @user.id,
+          :contact_id => @contact.try(:id),
+          :url        => @url
+        }.to_json
+
+        [200, {"Content-Type" => "application/json"}, [@body]]
+      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.19'
+  VERSION = '0.1.20'
 end

data/lib/e9_crm.rb

@@ -3,16 +3,17 @@ require 'money'
 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 :SystemEmailsController, 'e9_crm/system_emails_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'
+  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 :ContactAutoCompleter,     'e9_crm/rack/contact_auto_completer'
+    autoload :CompanyAutoCompleter,     'e9_crm/rack/company_auto_completer'
+    autoload :EmailAvailabilityChecker, 'e9_crm/rack/email_availability_checker'
   end
 
   mattr_accessor :cookie_name

metadata

@@ -2,7 +2,7 @@
 name: e9_crm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors: 
 - Travis Cox
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-14 00:00:00 Z
+date: 2011-09-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -310,6 +310,7 @@ files:
 - lib/e9_crm/model.rb
 - lib/e9_crm/rack/company_auto_completer.rb
 - lib/e9_crm/rack/contact_auto_completer.rb
+- lib/e9_crm/rack/email_availability_checker.rb
 - lib/e9_crm/rails_extensions.rb
 - lib/e9_crm/system_emails_controller.rb
 - lib/e9_crm/tracking_controller.rb