e9_crm 0.1.6 → 0.1.7

data/app/controllers/e9_crm/deals_controller.rb

@@ -14,9 +14,15 @@ class E9Crm::DealsController < E9Crm::ResourcesController
   # Index/Reports Scopes
   #
 
-  has_scope :leads, :only => :leads, :default => true
-  has_scope :leads, :except => [:leads, :reports], :default => false
+  # NOTE default => 'true' only exists to ensure this scope is called
+  has_scope :only_leads, :only => :leads, :default => 'true' do |controller, scope|
+    scope.leads(true)
+  end
 
+  # NOTE default => 'false' only exists to ensure this scope is called
+  has_scope :no_leads, :except => [:leads, :reports], :default => 'false' do |controller, scope|
+    scope.leads(false)
+  end
 
   ##
   # Reports scopes
@@ -42,7 +48,6 @@ class E9Crm::DealsController < E9Crm::ResourcesController
     end
   end
 
-
   ##
   # Actions
   #
@@ -63,7 +68,9 @@ class E9Crm::DealsController < E9Crm::ResourcesController
         if params[:action] == 'reports'
           end_of_association_chain.all
         else
-          end_of_association_chain.paginate(pagination_parameters)
+          end_of_association_chain
+            .joins("left outer join contacts on contacts.id = deals.contact_id")
+            .select("deals.*, contacts.first_name owner_name")
         end
       )
     end

data/app/helpers/e9_crm/deals_helper.rb

@@ -1,16 +1,16 @@
 module E9Crm::DealsHelper
-  def records_table_field_map_for_deal
-    {
-      :fields => { 
-        :created_at => nil,
-        :offer => nil,
-        :campaign => nil
-      },
-
-      :links => proc {|r|
-        []
-      }
-    }
+  def deal_contact_select_options
+    @_deal_contact_select_options ||= begin
+      contacts = Contact.available_to_deal(resource)
+
+      options = contacts.map {|contact| [contact.name, contact.id] }
+      options.unshift ['Add Contact', nil]
+      options_for_select options
+    end
+  end
+
+  def deal_contact_select
+    select_tag 'contacts_ids', deal_contact_select_options
   end
 
   def deal_date_select_options(ending_month = false)

data/app/models/contact.rb

@@ -13,6 +13,8 @@ class Contact < ActiveRecord::Base
   # Associations
   #
   belongs_to :company
+  has_many :owned_deals, :class_name => 'Deal'
+  has_and_belongs_to_many :associated_deals, :class_name => 'Deal'
 
   has_many :users, :inverse_of => :contact, :dependent => :nullify do
 
@@ -158,6 +160,20 @@ class Contact < ActiveRecord::Base
     end
   }
 
+  def self.available_to_deal(deal) 
+    return all unless deal.persisted?
+
+    sql = <<-SQL
+      SELECT distinct contacts.* FROM `contacts` 
+        LEFT OUTER JOIN `contacts_deals` 
+          ON `contacts_deals`.`contact_id` = `contacts`.`id` 
+        WHERE (`contacts_deals`.`deal_id` IS NULL 
+          OR `contacts_deals`.`deal_id` != #{deal.id})
+    SQL
+
+    find_by_sql(sql)
+  end
+
   #
   # Carrierwave
   #

data/app/models/deal.rb

@@ -9,13 +9,20 @@ class Deal < ActiveRecord::Base
   belongs_to :tracking_cookie, :inverse_of => :deals
   belongs_to :offer, :inverse_of => :deals
 
+  belongs_to :owner, :class_name => 'Contact', :foreign_key => :contact_id
+  has_and_belongs_to_many :contacts
+
   money_columns :value
+
+  validates :name,  :presence => true
   validates :value, :numericality => true
 
   %w(total_value average_value total_cost average_cost).each do |money_column|
     class_eval("def #{money_column}; (r = read_attribute(:#{money_column})) && Money.new(r) end")
   end
 
+  delegate :name, :to => :owner, :prefix => true, :allow_nil => true
+
   scope :reports, lambda {
     select_sql = <<-SELECT.gsub(/\s+/, ' ')
       campaigns.id                            campaign_id,
@@ -120,7 +127,6 @@ class Deal < ActiveRecord::Base
   scope :won,     lambda {|reverse=true| column_eq(:status, Status::Won, !reverse) }
   scope :lost,    lambda {|reverse=true| column_eq(:status, Status::Lost, !reverse) }
 
-
   protected
 
     def method_missing(method_name, *args)

data/app/models/menu_option.rb

@@ -30,4 +30,8 @@ class MenuOption < ActiveRecord::Base
   def self.fetch_values(key)
     connection.send(:select_values, options_for(key).order(:position).project('value').to_sql, 'Menu Option Select')
   end
+
+  def to_s
+    value
+  end
 end

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

@@ -1,4 +1,3 @@
-- contact_ids = collection.map(&:id)
 .toolbar
   .toolbar-left
     = form_tag(resource_class, :method => :get, :id => 'contact_search_form') do
@@ -12,7 +11,7 @@
         = tag
         = hidden_field_tag 'uids', @contact_ids.join(','), :id => 'contact_email_uids'
         = submit_tag e9_t(:send_email_template), :name => nil
-    - if (tag = contact_email_template_select_tag).present?
+    - if (tag = contact_newsletter_select_tag).present?
       = 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
         = tag
         = hidden_field_tag 'uids', @contact_ids.join(','), :id => 'contact_newsletter_uids'

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

@@ -0,0 +1,16 @@
+- field_map = local_assigns[:field_map] || records_table_field_map
+
+%table.records
+  %tbody
+    - if collection.empty?
+      %tr
+        %td{:colspan => field_map[:fields].length + 1}= e9_t(:no_records_text)
+    - else
+      - collection.each do |record|
+        %tr{:id => "ids_#{record.id}", :class => cycle('odd', 'even')}
+          - field_map[:fields].each do |key, value|
+            %td{:class => "record-#{key.to_s.dasherize}"}
+              = value.respond_to?(:call) ? value.call(record) : record.send(key)
+          %td.links
+            - field_map[:links][record].each do |link|
+              = link

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

@@ -1,12 +1,38 @@
 = title (@index_title || e9_t(:index_title))
 
-#index-header
-  = render 'header'
+#index-body
+  #records_table
+    = render 'table', :resources => collection
+  = render 'footer'
 
-#contact-tag-list
-  = render 'tag_table'
+#index-sidebar
+  .actions
+    = link_to_new_resource(Contact)
+    = link_to_new_resource(Company)
 
-#records_table
-  = render 'table', :resources => collection
+  -# Email actions (template, newsletter)
+  - etag, ntag = contact_email_template_select_tag, contact_newsletter_select_tag
+  - if [etag, ntag].any?(&: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
 
-= render 'footer'
+  -# 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
+    = render 'tag_table'
+    .actions
+      = submit_tag t(:clear), :name => nil, :id => 'contact_search_clear'

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

@@ -19,6 +19,6 @@
         = google_search_link(company.name)
         = google_news_link(company.name)
       - if company.info.present?
-        = contact_simple_format(text)
+        = contact_simple_format(company.info)
 .contact-sidebar
   = render 'sidebar'

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

@@ -1,5 +1,27 @@
-- resource.attributes.each_pair do |field, value|
-  - next if ['id', 'created_at', 'updated_at'].include?(field)
-  .field
-    = f.label field
-    = f.text_field field
+.actions
+  = link_to_destroy_resource(resource, :remote => false) if resource.persisted?
+.field
+  = f.label :name, nil, :class => :req
+  = f.text_field :name
+.field
+  = f.label :info
+  = f.text_area :info
+.field
+  = f.label :value, nil, :class => :req
+  = f.text_field :value
+.field.select
+  = f.label :contacts
+  %select.list{'data-iname' => resource_instance_name, 'data-field' => '[contact_ids]'}
+    = deal_contact_select_options
+  %ul.select
+    - f.object.contacts.each do |contact|
+      %li
+        %span= contact.name
+        %input{:type => :hidden, :name => "contact[contact_ids][]", :value => contact.id}
+        %a{:class => :remove, :title => "Remove", :alt => "Remove"} Remove
+.field.select
+  = f.label :owner
+  = f.collection_select :contact_id, Contact.all, :id, :name
+.field.select
+  = f.label :category
+  = f.select :category, MenuOption.options_for('Deal Category'), :include_blank => 'No Category'

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

@@ -0,0 +1,41 @@
+%table.records
+  %thead
+    %tr
+      %th= orderable_column_link(:name)
+      %th= orderable_column_link(:status)
+      %th= orderable_column_link(:category)
+      %th= orderable_column_link('owner_name', :owner)
+      %th= orderable_column_link(:value)
+      %th= t(:actions)
+  %tbody
+    -# prepare a hash to store the accumulated row data for calculations
+    - dat = Hash.new {|k,v| k[v] = [] }
+
+    - if collection.empty?
+      %tr
+        %td{:colspan => 6}= e9_t(:no_records_text, :scope => 'e9_crm.deals')
+    - else
+      - collection.each do |record|
+        %tr{:id => "ids_#{record.id}", :class => cycle('odd', 'even')}
+          %td.record-name
+            = record.name
+          %td.record-status
+            = record.status
+          %td.record-category
+            = record.category
+          %td.record-owner
+            = record.owner_name
+          %td.record-value
+            - dat[:value] << record.value
+            = record.value
+          %td.actions
+            = link_to_edit_resource(record)
+            = link_to_destroy_resource(record)
+
+    %tfooter
+      %tr{:class => 'record-totals'}
+        %td.record-totals-label{:colspan => 4}
+          #{t(:total)}:
+        %td.record-totals
+          = dat[:value].sum
+        %td

data/config/locales/e9.en.yml

@@ -18,6 +18,8 @@ en:
         send_email_newsletter: Send Newsletter
         contact_newsletter_confirmation: "The system will send the newsletter to all of the selected contacts (%{count}) if they are subscribed to receieve email.  Are you sure you want to proceed?"
         no_contacts_notification: "You cannot send an email with no recipients!"
+        email_actions_legend: Email Actions
+        search_options_legend: Search Filters
       contact_merges:
         new_title: Merge Contacts
         no_value: (No Value)

data/config/locales/en.yml

@@ -1,14 +1,16 @@
 en:
+  actions: Actions
   clear: Clear
+  edit_dated_costs: Edit Costs
   go: Go
-  search: Search
-  view: View
-  none: None
-  totals: Totals
   inline_help_link: '[?]'
-  edit_dated_costs: Edit Costs
-  news: News
   map: Map
+  news: News
+  none: None
+  search: Search
+  total: Total
+  totals: Totals
+  view: View
 
   e9_crm:
     add_record_attribute: Add

data/lib/e9_crm/version.rb

@@ -1,3 +1,3 @@
 module E9Crm
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

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

@@ -1,27 +1,15 @@
 jQuery(function($) {
-  var selector_prefix = 'body.controller-e9-crm-contacts', 
-      $selector       = $(selector_prefix);
 
-  $.fn.exclusiveCheck = function() {
-    var selector = $(this);
-    return this.each(function(i) {
-      $(this).click(function(e) {
-        var clicked = this;
-        if (this.checked) {
-          selector.each(function() {
-            if (this != clicked) this.checked = false;
-          });
-        }
-      });
-    });
-  }
+  $('.dated-costs > .actions a').bind('ajax:success', function(e, data, status, xhr) {
+    $(data).insertBefore($(this).closest('.actions'));
+  });
 
   /*
    * A function might exist for this already, but basically this stores the query variables
    * in a hash when the page loads for later re-use/modification.
    */
-  $.query = (function() {
-    var qs = document.location.search;
+  function query_to_hash(qs) {
+    if (!qs) qs = document.location.search;
 
     if (!qs.length) return {};
       
@@ -44,7 +32,118 @@ jQuery(function($) {
     }
 
     return params;
-  })();
+  }
+
+  $.query = query_to_hash();
+
+  $.fn.bindSelectChange = function(callback) {
+    this.bind($.browser.msie ? 'propertychange' : 'change', callback);
+  }
+
+  $("#campaign_code_field input").keyup(function() {
+    $.event.trigger('campaign_code_change', [$(this).val()]);
+  });
+
+  $("#campaign_code_hint").bind("campaign_code_change", function(e, code) {
+    $(this).html(function(i, v) {
+      return v.replace(/=(.*)$/, '='+code);
+    });
+  });
+
+  $('.ordered-column a').live('click', function(e) {
+    e.preventDefault();
+
+    var $this = $(this),
+         href = $this.attr('href'),
+         qs   = href.match(/\?.*$/)[0];
+
+    var qh = qs && query_to_hash(qs) || {};
+
+    $.extend($.query, {
+      order : qh.order,
+      sort  : qh.sort
+    });
+
+    submit_with_query();
+  });
+
+  $("#campaign_search_form").each(function(i, el) {
+    var 
+    $form = $(el),
+    $st   = $(el).find('select[name=type]'),
+    $sg   = $(el).find('select[name=group]'),
+    $sa   = $(el).find('select[name=active]'),
+    $sf   = $(el).find('select[name=from]'),
+    $su   = $(el).find('select[name=until]')
+    ;
+
+    $st.val($.query.type);
+    $sg.val($.query.group);
+    $sa.val($.query.active);
+    $sf.val($.query.from);
+    $su.val($.query.until);
+
+    $('select', $form).bindSelectChange(function() {
+      var opts = {}, v;
+      if (v = $st.val()) {
+        opts['type'] = v;
+      } else {
+        delete $.query['type'];
+      }
+      if (v = $sg.val()) { 
+        opts['group']  = v;
+      } else {
+        delete $.query['group'];
+      }
+      if (v = $sa.val()) {
+        opts['active'] = v;
+      } else {
+        delete $.query['active'];
+      }
+      if (v = $sf.val()) {
+        opts['from'] = v;
+      } else {
+        delete $.query['from'];
+      }
+      if (v = $su.val()) {
+        opts['until'] = v;
+      } else {
+        delete $.query['until'];
+      }
+      $.extend($.query, opts);
+      submit_with_query();
+    });
+  });
+
+  $("#new_campaign_form").each(function(i, el) {
+    var $form = $(el);
+
+    $('select', $form).bindSelectChange(function() {
+      var $this = $(this);
+
+      $form.attr("action", function(i, val) {
+        return val.replace(/\/\w*\/new$/, '/'+$this.val()+'/new');
+      });
+    });
+  });
+
+  var selector_prefix = 'body.controller-e9-crm-contacts', 
+      $selector       = $(selector_prefix);
+
+  $.fn.exclusiveCheck = function() {
+    var selector = $(this);
+    return this.each(function(i) {
+      $(this).click(function(e) {
+        var clicked = this;
+        if (this.checked) {
+          selector.each(function() {
+            if (this != clicked) this.checked = false;
+          });
+        }
+      });
+    });
+  }
+
 
   /*
    * The status of "primary" for a User login is stored on the individual records, but must be exlcusive in
@@ -57,33 +156,33 @@ jQuery(function($) {
     $('.nested-association input[type=radio][name$="[primary]"]', $(selector_prefix)).exclusiveCheck();
   })();
 
-  /**
+  /*
    * Adds a new nested assocation.  Depends on the nested association
    * js templates being loaded.
    */
   $('a.add-nested-association').click(function(e) {
     e.preventDefault();
 
-    var $this   = $(this), 
-        $parent = $this.closest('.nested-associations'),
-        template,
-        index;
+    var $this = $(this), template;
 
+    // get the template for this attribute type
     try { 
       template = E9CRM.js_templates[this.getAttribute('data-association')];
     } catch(e) { return }
 
+    // sub in the current index and increment it
     template = template.replace(
       new RegExp(E9CRM.js_templates.start_child_index, 'g'), 
       ++E9CRM.js_templates.current_child_index
     );
 
-    $(template).appendTo($parent);
+    // and insert the new template before this link
+    $(template).insertBefore($this);
 
     exclusifyEmailRadios();
   });
 
-  /**
+  /*
    * Effectively destroys an added nested association, removing the container
    * the association is not persisted, or hiding it and setting the _destroy
    * parameter for the association if it is.
@@ -91,17 +190,22 @@ jQuery(function($) {
   $('a.destroy-nested-association').live('click', function(e) {
     e.preventDefault();
 
+    // grab the parent nested-association and attempt to get its hidden
+    // 'destroy' input if it exists.
     var $parent = $(this).closest('.nested-association').hide(),
         $destro = $parent.find('input[id$=__destroy]');
 
-    if ($destro.length) {
-      $destro.val('1');
-    } else {
-      $parent.remove();
-    }
+    // If a in input ending in __destroy was found it means that this is a
+    // persisted record.  Set that input's value to '1' so it will be destroyed
+    // on record commit.
+    if ($destro.length) { $destro.val('1'); }
+
+    // otherwise this record was created locally and has not been saved, so
+    // simply remove it.
+    else { $parent.remove(); }
   });
 
-  var filter_contacts = function(data) {
+  var submit_with_query = function(data) {
     $.ajax({
       dataType: 'script',
       url: window.location.pathname,
@@ -156,7 +260,7 @@ jQuery(function($) {
       'tagged[]': $.makeArray($(this).find('input[name="tagged[]"]').map(function(i, el) { return $(el).attr('checked') ? $(el).val() : null }))
     });
 
-    filter_contacts();
+    submit_with_query();
   });
 
   $('form#contact_search_form', $(selector_prefix)).live('submit', function(e) {
@@ -166,7 +270,7 @@ jQuery(function($) {
       'search': $(this).find('input[name=search]').val()
     });
 
-    filter_contacts();
+    submit_with_query();
   });
 
   $('input#contact_search_clear', $(selector_prefix)).live('click', function(e) {
@@ -178,10 +282,10 @@ jQuery(function($) {
 
     $.query = {};
 
-    filter_contacts();
+    submit_with_query();
   });
 
-  //$('#menu_option_key_select_form select').change(function(e) {
+  //$('#menu_option_key_select_form select').bindSelectChange(function(e) {
     //$(this).submit();
   //});
 });

data/lib/generators/e9_crm/templates/migration.rb

@@ -68,9 +68,16 @@ class CreateE9CrmStructure < ActiveRecord::Migration
       t.timestamps
     end
 
+    create_table :contacts_deals, :force => true, :id => false do |t|
+      t.references :contact, :deal
+    end
+
     create_table :deals, :force => true do |t|
       t.string :type
-      t.references :offer, :campaign, :tracking_cookie
+      t.string :name
+      t.string :category
+      t.text :info
+      t.references :offer, :campaign, :tracking_cookie, :contact
       t.timestamp :created_at, :updated_at, :converted_at, :closed_at
       t.string :status, :limit => 32
       t.integer :value, :default => 0

metadata

@@ -2,7 +2,7 @@
 name: e9_crm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Travis Cox
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 -04:00
+date: 2011-05-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -215,6 +215,7 @@ files:
 - app/views/e9_crm/contacts/_form_inner.html.haml
 - app/views/e9_crm/contacts/_header.html.haml
 - app/views/e9_crm/contacts/_sidebar.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
 - app/views/e9_crm/contacts/index.html.haml
@@ -233,9 +234,11 @@ files:
 - app/views/e9_crm/dated_costs/new.html.haml
 - app/views/e9_crm/dated_costs/show.html.haml
 - app/views/e9_crm/dated_costs/update.js.erb
+- app/views/e9_crm/deals/_footer.html.haml
 - app/views/e9_crm/deals/_form_inner.html.haml
 - app/views/e9_crm/deals/_header.html.haml
 - app/views/e9_crm/deals/_reports_table.html.haml
+- app/views/e9_crm/deals/_table.html.haml
 - app/views/e9_crm/deals/leads.html.haml
 - app/views/e9_crm/deals/reports.html.haml
 - app/views/e9_crm/deals/reports.js.erb