e9_crm 0.1.4 → 0.1.5

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    e9_crm (0.1.0)
-      e9_rails (~> 0.0.4)
-      e9_tags (~> 0.0.2)
+    e9_crm (0.1.4)
+      e9_rails (~> 0.0.13)
+      e9_tags (~> 0.0.11)
       has_scope
       inherited_resources (~> 1.1.2)
       money
@@ -14,39 +14,39 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.5)
-      actionpack (= 3.0.5)
+    actionmailer (3.0.6)
+      actionpack (= 3.0.6)
       mail (~> 2.2.15)
-    actionpack (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
+    actionpack (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
+      rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
+      i18n (~> 0.5.0)
+    activerecord (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-    activesupport (3.0.5)
+    activeresource (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
+    activesupport (3.0.6)
     acts-as-taggable-on (2.0.6)
     arel (2.0.9)
     builder (2.1.2)
-    e9_rails (0.0.4)
+    e9_rails (0.0.13)
       inherited_resources
       rails (~> 3.0.0)
-    e9_tags (0.0.2)
+    e9_tags (0.0.11)
       acts-as-taggable-on (~> 2.0.6)
       rails (~> 3.0.0)
     erubis (2.6.6)
@@ -56,7 +56,7 @@ GEM
     inherited_resources (1.1.2)
       has_scope (~> 0.5.0)
       responders (~> 0.6.0)
-    mail (2.2.15)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -65,41 +65,34 @@ GEM
     money (3.6.1)
       i18n (~> 0.4)
     polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.2.2)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.5)
-      actionmailer (= 3.0.5)
-      actionpack (= 3.0.5)
-      activerecord (= 3.0.5)
-      activeresource (= 3.0.5)
-      activesupport (= 3.0.5)
+    rails (3.0.6)
+      actionmailer (= 3.0.6)
+      actionpack (= 3.0.6)
+      activerecord (= 3.0.6)
+      activeresource (= 3.0.6)
+      activesupport (= 3.0.6)
       bundler (~> 1.0)
-      railties (= 3.0.5)
-    railties (3.0.5)
-      actionpack (= 3.0.5)
-      activesupport (= 3.0.5)
+      railties (= 3.0.6)
+    railties (3.0.6)
+      actionpack (= 3.0.6)
+      activesupport (= 3.0.6)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    responders (0.6.2)
+    responders (0.6.4)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
-    will_paginate (2.3.15)
+    tzinfo (0.3.27)
+    will_paginate (3.0.pre2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   e9_crm!
-  e9_rails (~> 0.0.4)
-  e9_tags (~> 0.0.2)
-  has_scope
-  inherited_resources (~> 1.1.2)
-  money
-  rails (~> 3.0.0)
-  will_paginate

data/app/controllers/e9_crm/advertising_campaigns_controller.rb

@@ -1,4 +1,4 @@
-class E9Crm::AdvertisingCampaignsController < E9Crm::ResourcesController
+class E9Crm::AdvertisingCampaignsController < E9Crm::CampaignSubclassController
   defaults :resource_class => AdvertisingCampaign
   include E9Rails::Controllers::Orderable
 end

data/app/controllers/e9_crm/affiliate_campaigns_controller.rb

@@ -1,4 +1,4 @@
-class E9Crm::AffiliateCampaignsController < E9Crm::ResourcesController
+class E9Crm::AffiliateCampaignsController < E9Crm::CampaignSubclassController
   defaults :resource_class => AffiliateCampaign
   include E9Rails::Controllers::Orderable
 end

data/app/controllers/e9_crm/campaign_subclass_controller.rb

@@ -0,0 +1,8 @@
+class E9Crm::CampaignSubclassController < E9Crm::ResourcesController
+
+  protected
+
+    def add_index_breadcrumb
+      add_breadcrumb! Campaign.model_name.collection.titleize, campaigns_path
+    end
+end

data/app/controllers/e9_crm/campaigns_controller.rb

@@ -20,22 +20,22 @@ class E9Crm::CampaignsController < E9Crm::ResourcesController
 
   protected
 
-  def set_reports_index_title
-    @index_title = I18n.t(:reports_title, :scope => 'e9.e9_crm.campaigns')
-  end
+    def set_reports_index_title
+      @index_title = I18n.t(:reports_title, :scope => 'e9.e9_crm.campaigns')
+    end
 
-  def collection_scope
-    scope = end_of_association_chain
-    if params[:action] == 'reports'
-      scope = scope.select(
-        'campaigns.*, count(deals.id) won_deals_count, count(deals_campaigns.id) deals_count'
-      ).joins([:deals, :won_deals])
+    def collection_scope
+      scope = end_of_association_chain
+      if params[:action] == 'reports'
+        scope = scope.select(
+          'campaigns.*, count(deals.id) won_deals_count, count(deals_campaigns.id) deals_count'
+        ).joins([:deals, :won_deals])
+      end
+      scope
+    end
+    
+    # no pagination
+    def collection
+      get_collection_ivar || set_collection_ivar(collection_scope.all)
     end
-    scope
-  end
-  
-  # no pagination
-  def collection
-    get_collection_ivar || set_collection_ivar(collection_scope.all)
-  end
 end

data/app/controllers/e9_crm/contact_emails_controller.rb

@@ -17,9 +17,11 @@ class E9Crm::ContactEmailsController < E9Crm::ResourcesController
       object = if params[resource_instance_name]
         ContactEmail.new(params[resource_instance_name] || {})
       else
-        ContactEmail.new_from_template(template, :from_email => current_user.email, :contact_ids => params[:uids])
+        ContactEmail.new_from_template(template, :contact_ids => params[:uids])
       end
 
+      object.from_email ||= current_user.email
+
       object.valid?
 
       set_resource_ivar(object)

data/app/controllers/e9_crm/contacts_controller.rb

@@ -6,8 +6,11 @@ class E9Crm::ContactsController < E9Crm::ResourcesController
 
   respond_to :js, :html
 
+  carrierwave_column_methods :avatar, :context => :admin
+
   before_filter :determine_title, :only => :index
   before_filter :load_contact_ids, :only => :index
+  before_filter :build_nested_associations, :only => [:new, :edit]
 
   has_scope :search, :by_title, :by_company, :only => :index
   has_scope :tagged, :only => :index, :type => :array
@@ -17,8 +20,20 @@ class E9Crm::ContactsController < E9Crm::ResourcesController
   before_filter :build_resource, :only => :templates
   caches_action :templates
 
+  def create
+    create! { resource_path }
+  end
+
+  def update
+    update! { resource_path }
+  end
+
   protected
 
+  #
+  # Load all contact ids for the request (no pagination) using a direct sql query
+  # for the contact_id rather than loading all contacts.
+  #
   def load_contact_ids
     @contact_ids ||= begin
       contact_id_sql = end_of_association_chain.scoped.select('contacts.id').to_sql
@@ -26,6 +41,9 @@ class E9Crm::ContactsController < E9Crm::ResourcesController
     end
   end
 
+  #
+  # Change title depending on search params (tags & search)
+  #
   def determine_title
     params.delete(:search) if params[:search].blank?
 
@@ -38,6 +56,17 @@ class E9Crm::ContactsController < E9Crm::ResourcesController
     end
   end
 
+  def collection_scope
+    #TODO fix eager loading, which totally breaks because of the left outer joins in search
+    #super.includes(:users => :subscriptions)
+    scope = super
+  end
+
+  def build_nested_associations
+    object = params[:id] ? resource : build_resource
+    object.build_all_record_attributes
+  end
+
   def default_ordered_on
     'first_name'
   end

data/app/controllers/e9_crm/dated_costs_controller.rb

@@ -1,5 +1,63 @@
-class E9Crm::DatedCostsController < E9Crm::ResourcesController
-  belongs_to :advertising_campaign
+class E9Crm::DatedCostsController < E9Crm::CampaignSubclassController
+  belongs_to :advertising_campaign, :optional => true
   defaults :resource_class => DatedCost
   include E9Rails::Controllers::Orderable
+
+  filter_access_to :bulk_create, :require => :create, :context => :admin
+
+  before_filter :add_breadcrumbs
+  before_filter :generate_temp_id, :only => :new
+
+  def index
+    if params[:advertising_campaign_id]
+      index!
+    else
+      @advertising_campaigns = AdvertisingCampaign.all
+      render 'bulk_form'
+    end
+  end
+
+  def bulk_create
+    params[:id].zip(params[:cost]) do |id, cost|
+      DatedCost.create(
+        :costable_id   => id,
+        :costable_type => AdvertisingCampaign.base_class.name,
+        :date          => params[:date],
+        :cost          => cost
+      )
+    end
+
+    flash[:notice] = "Advertising Costs Added"
+    redirect_to :marketing_report
+  end
+
+  protected
+
+    def collection
+      get_collection_ivar || set_collection_ivar(end_of_association_chain.all)
+    end
+
+    def default_ordered_on
+      'date'
+    end
+
+    def default_ordered_dir
+      'ASC'
+    end
+
+    def add_breadcrumbs
+      if parent?
+        add_breadcrumb! parent.name, edit_advertising_campaign_path(parent)
+      end
+
+      add_breadcrumb! e9_t(:index_title)
+    end
+
+    def determine_layout
+      request.xhr? ? false : super
+    end
+
+    def generate_temp_id
+      @temp_id ||= DateTime.now.to_i
+    end
 end

data/app/controllers/e9_crm/email_campaigns_controller.rb

@@ -1,4 +1,4 @@
-class E9Crm::EmailCampaignsController < E9Crm::ResourcesController
+class E9Crm::EmailCampaignsController < E9Crm::CampaignSubclassController
   defaults :resource_class => EmailCampaign
   include E9Rails::Controllers::Orderable
 end

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

@@ -1,4 +1,5 @@
 class E9Crm::EmailTemplatesController < E9Crm::ResourcesController
   defaults
   include E9Rails::Controllers::Orderable
+  self.should_paginate_index = false
 end

data/app/controllers/e9_crm/resources_controller.rb

@@ -2,6 +2,9 @@ class E9Crm::ResourcesController < E9Crm::BaseController
   include E9Rails::Helpers::ResourceErrorMessages
   include E9Rails::Helpers::Pagination
 
+  class_inheritable_accessor :should_paginate_index
+  self.should_paginate_index = true
+
   inherit_resources
 
   respond_to :js
@@ -27,11 +30,21 @@ class E9Crm::ResourcesController < E9Crm::BaseController
   helper_method :parent
 
   def add_index_breadcrumb
+    yield if block_given?
     add_breadcrumb! @index_title || e9_t(:index_title), collection_path
   end
 
+  # expose collection scope to be overridden
+  def collection_scope
+    end_of_association_chain
+  end
+
   def collection
-    get_collection_ivar || set_collection_ivar(end_of_association_chain.paginate(pagination_parameters))
+    get_collection_ivar || begin 
+      set_collection_ivar(
+        collection_scope.send *(should_paginate_index ? [:paginate, pagination_parameters] : [:all])
+      )
+    end
   end
 
   def default_ordered_on

data/app/controllers/e9_crm/sales_campaigns_controller.rb

@@ -1,4 +1,4 @@
-class E9Crm::SalesCampaignsController < E9Crm::ResourcesController
+class E9Crm::SalesCampaignsController < E9Crm::CampaignSubclassController
   defaults :resource_class => SalesCampaign
   include E9Rails::Controllers::Orderable
 end

data/app/helpers/e9_crm/base_helper.rb

@@ -6,7 +6,7 @@ module E9Crm::BaseHelper
   
   def records_table_field_map(options = {})
     options.symbolize_keys!
-    options.reverse_merge!(:class_name => resource_class.base_class.name.underscore)
+    options.reverse_merge!(:class_name => resource_class.name.underscore)
 
     base_map = {
       :fields => { :id => nil },
@@ -44,6 +44,13 @@ module E9Crm::BaseHelper
     )
   end
 
+  def render_record_attribute_form(association_name, form)
+    render('e9_crm/record_attributes/form_partial', {
+      :form             => form,
+      :association_name => association_name
+    })
+  end
+
   def render_record_attribute_association(association_name, form, options = {})
     options.symbolize_keys!
 
@@ -59,10 +66,10 @@ module E9Crm::BaseHelper
   def record_attribute_template(association_name, builder, options = {})
     options.symbolize_keys!
 
-    render({
+    render(
       :partial => options[:partial] || "e9_crm/record_attributes/#{association_name.to_s.singularize}",
       :locals => { :f => builder }
-    })
+    )
   end
 
   def build_associated_resource(association_name)

data/app/helpers/e9_crm/companies_helper.rb

@@ -0,0 +1,7 @@
+module E9Crm::CompaniesHelper
+  def records_table_field_map_for_company
+    {
+      :fields => { :name => nil }
+    }
+  end
+end

data/app/helpers/e9_crm/contacts_helper.rb

@@ -12,6 +12,12 @@ module E9Crm::ContactsHelper
     options_for_select( UserEmail.pending.order('name').map {|e| [e.name, e.id] })
   end
 
+  def contact_user_subscribed_to_newsletter?(user)
+    @_newsletter ||= MailingList.newsletter
+
+    user.subscription_ids.include? @_newsletter.id
+  end
+
   def records_table_field_map_for_contact
     {
       :fields => { 
@@ -19,9 +25,11 @@ module E9Crm::ContactsHelper
         :details => proc {|r| render('details', :record => r) }
       },
 
-      :links => proc {|r|
-        [link_to_show_resource(r), link_to_edit_resource(r), link_to_destroy_resource(r)]
-      }
+      :links => proc {|r| [
+        link_to_show_resource(r), 
+        link_to_edit_resource(r), 
+        link_to_destroy_resource(r)
+      ]}
     }
   end
 end

data/app/helpers/e9_crm/email_templates_helper.rb

@@ -0,0 +1,7 @@
+module E9Crm::EmailTemplatesHelper
+  def records_table_field_map_for_email_template
+    {
+      :fields => { :name  => nil }
+    }
+  end
+end

data/app/models/advertising_campaign.rb

@@ -5,6 +5,8 @@
 #
 class AdvertisingCampaign < Campaign
 
+  accepts_nested_attributes_for :dated_costs
+
   ##
   # The sum cost of this campaign
   #

data/app/models/contact.rb

@@ -94,6 +94,14 @@ class Contact < ActiveRecord::Base
     accepts_nested_attributes_for association_name.to_sym, :allow_destroy => true, :reject_if => :reject_record_attribute?
   end
 
+  def build_all_record_attributes
+    RECORD_ATTRIBUTES.each do |attr|
+      params_method = "#{attr}_build_parameters"
+      build_params = self.class.send(params_method) if self.class.respond_to?(params_method)
+      send(attr).send(:build, build_params || {})
+    end
+  end
+
   ##
   # Validations
   #
@@ -119,15 +127,18 @@ class Contact < ActiveRecord::Base
       LEFT OUTER JOIN record_attributes 
         ON record_attributes.record_id = contacts.id
         AND record_attributes.record_type = 'Contact'
-      LEFT OUTER JOIN users
-        ON users.contact_id = contacts.id
+      LEFT OUTER JOIN users AS contacts_users
+        ON contacts_users.contact_id = contacts.id
     }
 
-    joins(join_sql).group('contacts.id').where(
-      any_attrs_like_scope_conditions(:first_name, :last_name, :title, query)
-        .or(RecordAttribute.attr_like_scope_condition(:value, query))
-        .or(User.attr_like_scope_condition(:email, query))
-    )
+    where_sql = any_attrs_like_scope_conditions(:first_name, :last_name, :title, query)
+                  .or(RecordAttribute.attr_like_scope_condition(:value, query))
+                  .to_sql
+
+    ucond = sanitize_sql_array(['contacts_users.email like ?', "%#{query}%"])
+    where_sql << " OR (#{ucond})"
+
+    select("distinct contacts.*").joins(join_sql).where(where_sql)
   }
 
   scope :sales_persons, lambda { where(:status => Status::SalesPerson) }
@@ -152,7 +163,7 @@ class Contact < ActiveRecord::Base
 
   # The parameters for building the JS template for associated users
   def self.users_build_parameters # :nodoc:
-    { :status => User::Status::PROSPECT }
+    { :status => User::Status::Prospect }
   end
 
   ##
@@ -267,8 +278,12 @@ class Contact < ActiveRecord::Base
       reject_record_attribute?(hash) || super 
     end
 
+    #
+    # #TODO figure out exactly how to handle rejection of Users
+    #
     def reject_record_attribute?(attributes)
-      attributes.keys.member?('value') && attributes['value'].blank?
+      attributes.keys.member?('value') && attributes['value'].blank? ||
+        attributes.keys.member?('email') && attributes['email'].blank?
     end
 
   module Status

data/app/models/contact_email.rb

@@ -13,10 +13,11 @@ class ContactEmail < Email
   class << self
     def new_from_template(template, attrs = {})
       new({
-        :name => "#{template.name} - #{DateTime.now.to_i}",
-        :subject => template.subject,
-        :html_body => template.html_body,
-        :text_body => template.text_body
+        :name       => "#{template.name} - #{DateTime.now.to_i}",
+        :subject    => template.subject,
+        :from_email => template.from_email,
+        :html_body  => template.html_body,
+        :text_body  => template.text_body
       }.merge(attrs))
     end
   end

data/app/models/dated_cost.rb

@@ -3,7 +3,31 @@
 # date so sums for date ranges can be generated.
 #
 class DatedCost < ActiveRecord::Base
+  include E9Rails::ActiveRecord::Initialization
+
   money_columns :cost
   belongs_to :costable, :polymorphic => true
   validates :date, :date => true
+  validates :cost, :numericality => { :greater_than => 0 }
+
+  attr_accessor :temp_id
+
+  def as_json(options={})
+    {}.tap do |hash|
+      hash[:id]            = self.id
+      hash[:cost]          = self.cost
+      hash[:date]          = self.date
+      hash[:costable_type] = self.costable_type.try(:underscore)
+      hash[:costable_id]   = self.costable_id
+      hash[:errors]        = self.errors
+
+      hash.merge!(options)
+    end
+  end
+
+  protected
+
+    def _assign_initialization_defaults
+      self.date ||= Date.today
+    end
 end

data/app/models/deal.rb

@@ -31,29 +31,29 @@ class Deal < ActiveRecord::Base
       SUM(IF(deals.status='won',value,0))     total_value, 
       AVG(IF(deals.status='won',value,NULL))  average_value, 
 
-      (CASE campaigns.type
-        WHEN "SalesCampaign"       
-          THEN SUM(campaigns.sales_fee)
+      SUM(CASE campaigns.type
         WHEN "AdvertisingCampaign" 
           THEN dated_costs.cost 
+        WHEN "SalesCampaign"       
+          THEN campaigns.sales_fee
         WHEN "AffiliateCampaign"   
-          THEN SUM(campaigns.sales_fee + 
-                   campaigns.affiliate_fee)
+          THEN campaigns.sales_fee + 
+                 campaigns.affiliate_fee
         ELSE 
           0 
         END)                                   total_cost,
 
-      (CASE campaigns.type
-        WHEN "SalesCampaign"       
-          THEN campaigns.sales_fee
+      SUM(CASE campaigns.type
         WHEN "AdvertisingCampaign" 
           THEN dated_costs.cost 
+        WHEN "SalesCampaign"       
+          THEN campaigns.sales_fee
         WHEN "AffiliateCampaign"   
           THEN campaigns.sales_fee + 
                  campaigns.affiliate_fee
         ELSE 
           0 
-        END / COUNT(deals.id))                 average_cost,
+        END) / SUM(IF(deals.status='won',1,0)) average_cost,
 
       FLOOR(AVG(
         DATEDIFF(

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

@@ -28,4 +28,6 @@
           %td.record-sales-fee
             = display_campaign_fee(record.sales_fee)
           %td.links
+            - if record.is_a?(AdvertisingCampaign)
+              = link_to t(:edit_dated_costs), advertising_campaign_dated_costs_path(record), :class => 'dated-costs'
             = link_to_edit_campaign(record)

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

@@ -0,0 +1,6 @@
+.field
+  = f.label :name, nil, :class => :req
+  = f.text_field :name
+.field.tinymce
+  = f.label :info
+  = f.text_area :info

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

@@ -0,0 +1 @@
+= resource.name

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

@@ -1,10 +1,13 @@
-.contact-who
-  %span.contact-name= record.name
-  - if record.company_id? || record.title?
-    = " - "
-    = link_to_contact_search(:by_title, record.title) if record.title?
-    = " at " if record.company_id? && record.title?
-    = link_to_contact_search(:by_company, record.company_id, record.company_name) if record.company_id?
+= render 'who', :record => record
+
+- if record.users.any?
+  .contact-phone-numbers
+    - record.users.each do |user|
+      .contact-email
+        = '* ' if contact_user_subscribed_to_newsletter?(user)
+        = link_to(user.email, "mailto:#{user.email}")
+        = "(#{user.options.type})" if user.options.type
+        = "(primary)"              if user.primary?
 
 - if record.phone_number_attributes.any?
   .contact-phone-numbers
@@ -19,4 +22,5 @@
 - if record.website_attributes.any?
   .contact-websites
     - record.website_attributes.each do |website_attribute|
-      .contact-website= website_attribute
+      .contact-website
+        = auto_link(website_attribute.to_s, :rel => "external nofollow")

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

@@ -12,40 +12,26 @@
   .field
     = f.label :title
     = f.text_field :title
+  .field
+    = f.label :status
+    = f.select :status, Contact::Status::VALUES.map {|v| [v.titleize, v] }
+
+  = upload_mount_field(resource.avatar, :reset_path => true)
 
 = render 'e9_tags/form', :f => f, :context => [:users, true]
 
 %fieldset.contact-contact-fields
   %legend= e9_t(:form_legend_contact)
-
-  %fieldset.nested-associations
-    %legend
-      %span= f.label(:users)
-      = link_to_add_record_attribute(:users)
-    = render_record_attribute_association(:users, f)
-
-  %fieldset.nested-associations
-    %legend
-      %span= f.label(:phone_number_attributes)
-      = link_to_add_record_attribute(:phone_number_attributes)
-    = render_record_attribute_association(:phone_number_attributes, f)
-
-  %fieldset.nested-associations
-    %legend
-      %span= f.label(:instant_messaging_handle_attributes)
-      = link_to_add_record_attribute(:instant_messaging_handle_attributes)
-    = render_record_attribute_association(:instant_messaging_handle_attributes, f)
-
-  %fieldset.nested-associations
-    %legend
-      %span= f.label(:website_attributes)
-      = link_to_add_record_attribute(:website_attributes)
-    = render_record_attribute_association(:website_attributes, f)
-
-  %fieldset.nested-associations
-    %legend
-      %span= f.label(:address_attributes)
-      = link_to_add_record_attribute(:address_attributes)
-    = render_record_attribute_association(:address_attributes, f)
-
-= javascript_include_tag templates_contacts_path
+  = render_record_attribute_form(:users                               , f)
+  = render_record_attribute_form(:phone_number_attributes             , f)
+  = render_record_attribute_form(:instant_messaging_handle_attributes , f)
+  = render_record_attribute_form(:website_attributes                  , f)
+  = render_record_attribute_form(:address_attributes                  , f)
+
+%fieldset.contact-background-info
+  %legend= f.label(:info)
+  .field.tinymce
+    = f.text_area :info
+
+- content_for :bottom_javascripts do
+  = javascript_include_tag templates_contacts_path

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

@@ -0,0 +1,14 @@
+.contact-who
+  %span.contact-who-name= record.name
+
+  = " - " if record.company_id? || record.title?
+
+  - if record.title?
+    %span.contact-who-title
+      = link_to_contact_search(:by_title, record.title)
+
+  = " at " if record.company_id? && record.title?
+
+  - if record.company_id?
+    %span.contact-who-company
+      = link_to_contact_search(:by_company, record.company_id, record.company_name)

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

@@ -1,13 +1,12 @@
 = title (@index_title || e9_t(:index_title))
 
-
-#index_header
+#index-header
   = render 'header'
 
-#records_table
-  = render 'table', :resources => collection
-
 #contact-tag-list
   = render 'tag_table'
 
+#records_table
+  = render 'table', :resources => collection
+
 = render 'footer'

data/app/views/e9_crm/dated_costs/_dated_cost.html.haml

@@ -0,0 +1,8 @@
+.dated-cost{:id => "dated_cost_#{dated_cost.id}"}
+  .field
+    = l(dated_cost.date)
+  .field.cost{':data-cost' => dated_cost.cost.to_f}
+    = dated_cost.cost
+  .actions
+    = link_to_edit_resource(dated_cost, :remote => true)
+    = link_to_destroy_resource(dated_cost, :remote => true)

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

@@ -0,0 +1,3 @@
+= form_for resource, :url => polymorphic_path([parent, resource]), :remote => request.xhr? do |f|
+  .errors= resource_error_messages!
+  = render 'form_inner', :f => f

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

@@ -0,0 +1,15 @@
+- id = f.object.persisted? ? f.object.id : @temp_id
+.field.date-picker
+  - if temp_id = f.object.temp_id || @temp_id
+    = f.hidden_field :temp_id, :value => temp_id
+  - fid = "dated_cost_date_#{id}"
+  - unless request.xhr?
+    = f.label :date, nil, :class => :req, :for => id
+  = f.text_field :date, :class => 'date-picker', :value => l(f.object.date), :id => id
+.field
+  - fid = "dated_cost_cost_#{id}"
+  - unless request.xhr?
+    = f.label :cost, nil, :class => :req, :for => id
+  = f.text_field :cost, :id => id
+.actions
+  = f.submit

data/app/views/e9_crm/dated_costs/bulk_form.html.haml

@@ -0,0 +1,20 @@
+= form_tag bulk_create_dated_costs_path do
+  .field.date-picker
+    = label_tag 'dated_cost_date', resource_class.human_attribute_name(:date)
+    %input{:id => 'dated_cost_date', :type => 'text', :class => 'date-picker', :name => 'date', :value => l(params[:date] || Date.today)}
+
+  %table
+    %thead
+      %th= AdvertisingCampaign.model_name.human
+      %th= resource_class.human_attribute_name(:cost)
+    %tbody
+      - @advertising_campaigns.each do |ac|
+        %tr
+          %td
+            = ac.name
+          %td
+            %input{:type => 'hidden', :name => 'id[]', :value => ac.id}
+            %input{:type => 'text', :name => 'cost[]'}
+
+  .actions
+    = submit_tag

data/app/views/e9_crm/dated_costs/create.js.erb

@@ -0,0 +1,5 @@
+<% if resource.errors.any? %>
+  $("#dated_cost_<%= resource.temp_id %>").html("<%= escape_javascript(render('form')) %>");  
+<% else %>
+  $("#dated_cost_<%= resource.temp_id %>").replaceWith("<%= escape_javascript(render(resource)) %>");  
+<% end %>

data/app/views/e9_crm/dated_costs/destroy.js.erb

@@ -0,0 +1,3 @@
+<% if !resource.errors.any? %>
+  $("#dated_cost_<%= resource.id %>").fadeOut();
+<% end %>

data/app/views/e9_crm/dated_costs/edit.html.haml

@@ -0,0 +1,3 @@
+- id = resource.persisted? ? "dated_cost_#{resource.id}" : nil
+.dated-cost{:id => id }
+  = render 'form'

data/app/views/e9_crm/dated_costs/edit.js.erb

@@ -0,0 +1 @@
+$("#dated_cost_<%= resource.id %>").html("<%= escape_javascript(render('form')) %>");  

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

@@ -0,0 +1,15 @@
+= title @index_title || e9_t(:index_title)
+
+%fieldset
+  .dated-costs
+    .dated-cost-labels
+      .field
+        = resource_class.human_attribute_name(:date)
+      .field
+        = resource_class.human_attribute_name(:cost)
+
+    = render collection
+
+    .actions
+      = link_to_new_resource(resource_class, :remote => true)
+

data/app/views/e9_crm/dated_costs/new.html.haml

@@ -0,0 +1,2 @@
+.dated-cost{:id => "dated_cost_#{@temp_id}"}
+  = render 'form'

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

@@ -0,0 +1 @@
+= render resource

data/app/views/e9_crm/dated_costs/update.js.erb

@@ -0,0 +1,5 @@
+<% if resource.errors.any? %>
+  $("#dated_cost_<%= resource.id %>").html("<%= escape_javascript(render('form')) %>");  
+<% else %>
+  $("#dated_cost_<%= resource.id %>").replaceWith("<%= escape_javascript(render(resource)) %>");  
+<% end %>

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

@@ -1,6 +1,9 @@
 .field
   = f.label :name, nil, :class => :req
   = f.text_field :name
+.field
+  = f.label :from_email
+  = f.text_field :from_email
 .field
   = f.label :subject, nil, :class => :req
   = f.text_field :subject

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

@@ -0,0 +1,3 @@
+.toolbar
+  .toolbar-right
+    = link_to_new_resource(EmailTemplate)

data/app/views/e9_crm/record_attributes/_form_partial.html.haml

@@ -0,0 +1,4 @@
+%fieldset.nested-associations
+  %legend= form.label(association_name)
+  = render_record_attribute_association(association_name, form)
+  = link_to_add_record_attribute(association_name)

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

@@ -1,2 +1,2 @@
 = title e9_t(:show_title)
-= render 'form'
+= render resource

data/config/locales/en.yml

@@ -6,12 +6,18 @@ en:
   none: None
   totals: Totals
   inline_help_link: '[?]'
+  edit_dated_costs: Edit Costs
 
   e9_crm:
     add_record_attribute: Add
     destroy_record_attribute: Remove
 
   activerecord:
+    titles:
+      show: 'Show %{model}'
+      campaign:
+        show: '%{model}'
+
     links:
       edit: "Edit"
       destroy: "Delete"
@@ -54,6 +60,7 @@ en:
       campaign_type: Campaign Type
       company: Company
       contact: Contact
+      dated_cost: Advertising Cost
       deal: Deal
       page_view: Page View
       tracking_cookie: Tracking Cookie
@@ -62,6 +69,16 @@ en:
       campaign:
         name: Name
         code_hint: Append to URL
+      contact:
+        avatar: Photo
+        users: Email Addresses
+        address_attributes: Addresses
+        instant_messaging_handle_attributes: Instant Messaging Handles
+        phone_number_attrubutes: Phone Numbers
+        website_attributes: Websites
+        info: Background Information
+      company:
+        info: Background Information
       no_campaign:
         name: No Campaign
       offer:

data/config/routes.rb

@@ -3,9 +3,15 @@ Rails.application.routes.draw do
 
   scope :path => crm_path, :module => :e9_crm do
     resources :companies, :except => :show
-    resources :contacts, :except => :show do
+    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
+        delete :reset_avatar
+      end
     end
     resources :deals, :except => :show
     resources :offers, :except => :show
@@ -18,7 +24,14 @@ Rails.application.routes.draw do
       collection { post :update_order }
     end
 
+    resources :dated_costs, :path => 'advertising_costs', :only => [:index] do
+      collection do
+        post :bulk_create
+      end
+    end
+
     resources :campaigns, :only  => [:index, :destroy] do
+      # page_views currently not routed, but near working
       #resources :page_views, :path => 'activity', :only => :index
     end
     scope :path => :campaigns do
@@ -51,7 +64,6 @@ Rails.application.routes.draw do
       campaigns/email
       campaigns/sales
       campaigns/groups
-      contacts
       deals
       email_templates
       menu_options

data/e9_crm.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency("inherited_resources", "~> 1.1.2")
   s.add_dependency("has_scope")
   s.add_dependency("money")
-  s.add_dependency("e9_rails", "~> 0.0.13")
+  s.add_dependency("e9_rails", "~> 0.0.14")
   s.add_dependency("e9_tags", "~> 0.0.11")
   s.add_dependency("will_paginate")
 end

data/lib/e9_crm/model.rb

@@ -21,7 +21,7 @@ module E9Crm
 
       self.options_parameters = [:type, :primary]
 
-      scope :primary, lambda { where(arel_table[:options].matches("%primary: true%")) }
+      scope :primary, lambda { where(%Q{#{table_name}.options REGEXP "primary: [\\"']?true"}) }
 
       before_create :create_contact_if_missing
       after_destroy :cleanup_contact

data/lib/e9_crm/version.rb

@@ -1,3 +1,3 @@
 module E9Crm
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

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

@@ -26,6 +26,7 @@ class CreateE9CrmStructure < ActiveRecord::Migration
       t.string :title
       t.string :avatar
       t.string :status
+      t.text :info
       t.references :company
       t.timestamps
     end
@@ -63,6 +64,7 @@ class CreateE9CrmStructure < ActiveRecord::Migration
 
     create_table :companies, :force => true do |t|
       t.string :name
+      t.text :info
       t.timestamps
     end
 

metadata

@@ -2,7 +2,7 @@
 name: e9_crm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Travis Cox
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 -04:00
+date: 2011-05-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,7 +65,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.0.13
+        version: 0.0.14
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -140,6 +140,7 @@ files:
 - app/controllers/e9_crm/affiliate_campaigns_controller.rb
 - app/controllers/e9_crm/base_controller.rb
 - app/controllers/e9_crm/campaign_groups_controller.rb
+- app/controllers/e9_crm/campaign_subclass_controller.rb
 - app/controllers/e9_crm/campaigns_controller.rb
 - app/controllers/e9_crm/companies_controller.rb
 - app/controllers/e9_crm/contact_emails_controller.rb
@@ -157,9 +158,11 @@ files:
 - app/helpers/e9_crm/base_helper.rb
 - app/helpers/e9_crm/campaign_groups_helper.rb
 - app/helpers/e9_crm/campaigns_helper.rb
+- app/helpers/e9_crm/companies_helper.rb
 - app/helpers/e9_crm/contact_merges_helper.rb
 - app/helpers/e9_crm/contacts_helper.rb
 - app/helpers/e9_crm/deals_helper.rb
+- app/helpers/e9_crm/email_templates_helper.rb
 - app/helpers/e9_crm/menu_options_helper.rb
 - app/helpers/e9_crm/page_views_helper.rb
 - app/models/address_attribute.rb
@@ -189,6 +192,7 @@ files:
 - app/observers/deal_observer.rb
 - app/uploaders/file_uploader.rb
 - app/views/e9_crm/advertising_campaigns/_form_inner.html.haml
+- app/views/e9_crm/advertising_campaigns/costs.html.haml
 - app/views/e9_crm/affiliate_campaigns/_form_inner.html.haml
 - app/views/e9_crm/campaign_groups/_footer.html.haml
 - app/views/e9_crm/campaign_groups/_header.html.haml
@@ -198,6 +202,7 @@ files:
 - app/views/e9_crm/campaigns/_reports_table.html.haml
 - app/views/e9_crm/campaigns/_table.html.haml
 - app/views/e9_crm/campaigns/reports.html.haml
+- app/views/e9_crm/companies/_form_inner.html.haml
 - app/views/e9_crm/contact_emails/_form.html.haml
 - app/views/e9_crm/contact_emails/_form_inner.html.haml
 - app/views/e9_crm/contact_emails/destroy.js.erb
@@ -205,14 +210,28 @@ files:
 - app/views/e9_crm/contact_merges/_field.html.haml
 - app/views/e9_crm/contact_merges/_form.html.haml
 - app/views/e9_crm/contact_merges/new.html.haml
+- app/views/e9_crm/contacts/_contact.html.haml
 - app/views/e9_crm/contacts/_details.html.haml
 - app/views/e9_crm/contacts/_form_inner.html.haml
 - app/views/e9_crm/contacts/_header.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
 - app/views/e9_crm/contacts/index.js.erb
 - app/views/e9_crm/contacts/merge.html.haml
 - app/views/e9_crm/contacts/templates.js.erb
+- app/views/e9_crm/dated_costs/_dated_cost.html.haml
+- app/views/e9_crm/dated_costs/_form.html.haml
+- app/views/e9_crm/dated_costs/_form_inner.html.haml
+- app/views/e9_crm/dated_costs/bulk_form.html.haml
+- app/views/e9_crm/dated_costs/create.js.erb
+- app/views/e9_crm/dated_costs/destroy.js.erb
+- app/views/e9_crm/dated_costs/edit.html.haml
+- app/views/e9_crm/dated_costs/edit.js.erb
+- app/views/e9_crm/dated_costs/index.html.haml
+- 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/_form_inner.html.haml
 - app/views/e9_crm/deals/_header.html.haml
 - app/views/e9_crm/deals/_reports_table.html.haml
@@ -220,7 +239,9 @@ files:
 - app/views/e9_crm/deals/reports.html.haml
 - app/views/e9_crm/deals/reports.js.erb
 - app/views/e9_crm/email_campaigns/_form_inner.html.haml
+- app/views/e9_crm/email_templates/_footer.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/menu_options/_form_inner.html.haml
 - app/views/e9_crm/menu_options/_header.html.haml
 - app/views/e9_crm/offers/_form.html.haml
@@ -228,6 +249,7 @@ files:
 - app/views/e9_crm/offers/_form_inner.html.haml.bak
 - app/views/e9_crm/page_views/_table.html.haml
 - app/views/e9_crm/record_attributes/_address_attribute.html.haml
+- app/views/e9_crm/record_attributes/_form_partial.html.haml
 - app/views/e9_crm/record_attributes/_instant_messaging_handle_attribute.html.haml
 - app/views/e9_crm/record_attributes/_phone_number_attribute.html.haml
 - app/views/e9_crm/record_attributes/_record_attribute.html.haml