e9_crm 0.1.8 → 0.1.10

data/README.md

@@ -1,9 +1,8 @@
+*NOTE his plugin requires the private e9_base CMS gem and WILL NOT WORK without it.*
+
 CRM Plugin for the e9 CMS
 =========================
 
-It should be noted that while this plugin is intended for use in the
-e9 CMS, it does neither includes nor requires it.
-
 To use, add as a gem and install by running:
 
     rails g e9_crm:install

data/app/controllers/e9_crm/advertising_campaigns_controller.rb

@@ -1,4 +1,6 @@
 class E9Crm::AdvertisingCampaignsController < E9Crm::CampaignSubclassController
   defaults :resource_class => AdvertisingCampaign
   include E9Rails::Controllers::Orderable
+
+  helper 'e9_crm/campaigns'
 end

data/app/controllers/e9_crm/affiliate_campaigns_controller.rb

@@ -1,4 +1,6 @@
 class E9Crm::AffiliateCampaignsController < E9Crm::CampaignSubclassController
   defaults :resource_class => AffiliateCampaign
   include E9Rails::Controllers::Orderable
+
+  helper 'e9_crm/campaigns'
 end

data/app/controllers/e9_crm/campaign_groups_controller.rb

@@ -1,11 +1,15 @@
 class E9Crm::CampaignGroupsController < E9Crm::ResourcesController
   defaults :resource_class => CampaignGroup
   include E9Rails::Controllers::Orderable
+  self.should_paginate_index = false
 
   protected
-  
-  # no pagination
-  def collection
-    get_collection_ivar || set_collection_ivar(end_of_association_chain.all)
+
+  def default_ordered_on
+    'name'
+  end
+
+  def default_ordered_dir
+    'ASC'
   end
 end

data/app/controllers/e9_crm/campaign_subclass_controller.rb

@@ -1,6 +1,21 @@
 class E9Crm::CampaignSubclassController < E9Crm::ResourcesController
 
+  def update
+    update! { parent_redirect_path }
+  end
+
+  def create
+    create! { parent_redirect_path }
+  end
+
   protected
+    def parent_redirect_path
+      campaigns_path(:type => type_param)
+    end
+
+    def type_param
+      resource_class.name[/(.*)Campaign/, 1].underscore
+    end
 
     def add_index_breadcrumb
       add_breadcrumb! Campaign.model_name.collection.titleize, campaigns_path

data/app/controllers/e9_crm/campaigns_controller.rb

@@ -2,11 +2,11 @@ class E9Crm::CampaignsController < E9Crm::ResourcesController
   defaults :resource_class => Campaign
   include E9Rails::Controllers::Orderable
 
-  filter_access_to :reports, :require => :read, :context => :admin
+  self.should_paginate_index = false
 
   has_scope :of_group, :as => :group, :only => :index
 
-  has_scope :active, :only => :index do |_, scope, value|
+  has_scope :active, :only => :index, :default => 'true' do |_, scope, value|
     scope.active(E9.true_value?(value))
   end
 
@@ -14,31 +14,23 @@ class E9Crm::CampaignsController < E9Crm::ResourcesController
     scope.of_type("#{value}_campaign".classify)
   end
 
-  def reports
-    index!
-  end
-
   protected
 
-    def set_reports_index_title
-      @index_title = I18n.t(:reports_title, :scope => 'e9.e9_crm.campaigns')
+    def collection_scope
+      end_of_association_chain.typed.includes(:campaign_group)
+
+      # NOTE this is a pretty ugly join just to be able to sort on campaign group name
+      end_of_association_chain.typed
+        .joins("left outer join campaign_groups on campaign_groups.id = campaigns.campaign_group_id")
+        .select("campaigns.*, campaign_groups.name campaign_group_name")
     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])
-      else
-        # don't include NoCampaign normally
-        scope = scope.typed
-      end
-      scope
+    def default_ordered_on
+      'campaign_group_name,name'
     end
-    
-    # no pagination
-    def collection
-      get_collection_ivar || set_collection_ivar(collection_scope.all)
+
+    def default_ordered_dir
+      'ASC'
     end
+
 end

data/app/controllers/e9_crm/companies_controller.rb

@@ -1,4 +1,15 @@
 class E9Crm::CompaniesController < E9Crm::ResourcesController
   defaults :resource_class => Company
   include E9Rails::Controllers::Orderable
+  include E9::DestroyRestricted::Controller
+
+  protected
+
+  def default_ordered_on
+    'name'
+  end
+
+  def default_ordered_dir
+    'ASC'
+  end
 end

data/app/controllers/e9_crm/email_campaigns_controller.rb

@@ -1,4 +1,6 @@
 class E9Crm::EmailCampaignsController < E9Crm::CampaignSubclassController
   defaults :resource_class => EmailCampaign
   include E9Rails::Controllers::Orderable
+
+  helper 'e9_crm/campaigns'
 end

data/app/controllers/e9_crm/menu_options_controller.rb

@@ -2,6 +2,8 @@ class E9Crm::MenuOptionsController < E9Crm::ResourcesController
   defaults :resource_class => MenuOption
   include E9Rails::Controllers::Sortable
 
+  self.should_paginate_index = false
+
   has_scope :options_for, :as => :key, :only => :index
 
   # NOTE The reason this is set in a filter instead of just a default scope value 

data/app/controllers/e9_crm/resources_controller.rb

@@ -1,6 +1,12 @@
 class E9Crm::ResourcesController < E9Crm::BaseController
   include E9Rails::Helpers::ResourceErrorMessages
-  include E9Rails::Helpers::Pagination
+
+  # NOTE depending on e9_base pagination (which should eventually use this module)
+  #include E9Rails::Helpers::Pagination
+
+  # TODO implement role on e9_crm models?
+  #include E9::Roles::Controller
+  #filter_access_to :update, :edit, :attribute_check => true, :load_method => :filter_target, :context => :admin
 
   class_inheritable_accessor :should_paginate_index
   self.should_paginate_index = true
@@ -25,6 +31,10 @@ class E9Crm::ResourcesController < E9Crm::BaseController
 
   protected
 
+  def filter_target
+    resource
+  end
+
   # NOTE parent is defined so it's always available, it will be overridden on controllers which have belongs_to routes
   def parent; end
   helper_method :parent

data/app/controllers/e9_crm/sales_campaigns_controller.rb

@@ -1,4 +1,6 @@
 class E9Crm::SalesCampaignsController < E9Crm::CampaignSubclassController
   defaults :resource_class => SalesCampaign
   include E9Rails::Controllers::Orderable
+
+  helper 'e9_crm/campaigns'
 end

data/app/helpers/e9_crm/base_helper.rb

@@ -1,5 +1,34 @@
 module E9Crm::BaseHelper
 
+  def kramdown(string)
+    Kramdown::Document.new(string).to_html.html_safe
+  end
+
+  alias :k :kramdown
+
+  def help_tooltip(string)
+    return <<-HTML.strip.html_safe
+      <span class="help" rel="tooltip" title="#{CGI.escape_html(string)}">#{t(:inline_help_link)}</span>
+    HTML
+  end
+
+  def help_label(form_or_id, key, options = {})
+    options[:key] ||= :"#{key}_help"
+
+    help_title = options.delete(:title) || resource_humanize(options.delete(:key))
+
+    str = ''.html_safe
+    str.safe_concat resource_humanize(key)
+    str.safe_concat ' '
+    str.safe_concat help_tooltip(help_title)
+
+    if form_or_id.respond_to?(:label)
+      form_or_id.label(key, str, options)
+    else
+      label_tag(form_or_id, str, options)
+    end
+  end
+
   ##
   # Field maps
   #

data/app/helpers/e9_crm/campaign_groups_helper.rb

@@ -1,7 +1,7 @@
 module E9Crm::CampaignGroupsHelper
   def records_table_field_map_for_campaign_group
     {
-      :fields => { :name => nil },
+      :fields => { 'name' => nil },
       :links => proc {|r| [link_to_edit_resource(r), link_to_destroy_resource(r)] }
     }
   end

data/app/helpers/e9_crm/campaigns_helper.rb

@@ -4,7 +4,7 @@ module E9Crm::CampaignsHelper
   end
 
   def display_campaign_code(val)
-    val || 'n/a'
+    val && "?#{E9Crm.query_param}=#{val}" || 'n/a'
   end
 
   def display_campaign_type(val)
@@ -18,7 +18,7 @@ module E9Crm::CampaignsHelper
   end
 
   def campaign_group_select_options
-    options = CampaignGroup.select('name, id').all.map {|c| [c.name, c.id] }
+    options = CampaignGroup.select('name, id').ordered.all.map {|c| [c.name, c.id] }
     options.unshift(['All Groups', nil])
     options_for_select(options)
   end
@@ -29,8 +29,7 @@ module E9Crm::CampaignsHelper
 
   def campaign_active_select_options
     options = [
-      ['All Statuses', nil],
-      ['Active',      true],
+      ['Active',     true],
       ['Inactive',   false]
     ]
     options_for_select(options)

data/app/models/affiliate_campaign.rb

@@ -4,7 +4,9 @@
 #
 class AffiliateCampaign < SalesCampaign
   money_columns :affiliate_fee
-  belongs_to :affiliate 
+
+  belongs_to :affiliate, :class_name => 'Contact'
+  validates :affiliate, :presence => true
 
   ##
   # The sum cost of this campaign

data/app/models/campaign.rb

@@ -26,9 +26,14 @@ class Campaign < ActiveRecord::Base
     NoCampaign.first || NoCampaign.create
   end
 
+  validates :name,          :presence     => true,
+                            :uniqueness   => { :allow_blank => true, :case_sensitive => false }
+
   validates :code,          :presence     => { :unless => lambda {|r| r.is_a?(NoCampaign) } },
-                            :length       => { :maximum => 32 }, 
-                            :uniqueness   => { :ignore_case => true, :allow_blank => true }
+                            :length       => { :maximum => 32 },
+                            :format       => { :allow_blank => true, :with => /^[\w\d]+$/ },
+                            :uniqueness   => { :case_sensitive => false, :allow_blank => true }
+
   validates :affiliate_fee, :numericality => true
   validates :sales_fee,     :numericality => true
 

data/app/models/campaign_group.rb

@@ -3,7 +3,9 @@
 class CampaignGroup < ActiveRecord::Base
   has_many :campaigns
 
-  validates :name, :uniqueness => { :ignore_case => true }
+  validates :name, :presence => true, :uniqueness => { :allow_nil => true, :case_sensitive => false }
+
+  scope :ordered, lambda { order(arel_table[:name].asc) }
 
   def to_s
     name

data/app/models/company.rb

@@ -2,4 +2,9 @@
 #
 class Company < ActiveRecord::Base
   include E9Rails::ActiveRecord::AttributeSearchable
+
+  has_many :contacts, :dependent => :restrict
+
+  validates :name, :presence   => true, :uniqueness => { :allow_blank => true, :case_sensitive => false }
+
 end

data/app/models/contact.rb

@@ -8,12 +8,13 @@ class Contact < ActiveRecord::Base
   include Rails.application.routes.url_helpers
 
   before_validation :ensure_user_references
+  before_destroy :ensure_no_associated_deals
 
   ##
   # Associations
   #
   belongs_to :company
-  has_many :owned_deals, :class_name => 'Deal'
+  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
@@ -83,6 +84,8 @@ class Contact < ActiveRecord::Base
   end
   accepts_nested_attributes_for :users, :allow_destroy => true
 
+  delegate :email, :to => 'users.primary.first', :allow_nil => true
+
   def page_views
     PageView.by_user(users)
   end
@@ -149,6 +152,7 @@ class Contact < ActiveRecord::Base
   scope :sales_persons, lambda { where(:status => Status::SalesPerson) }
   scope :affiliates, lambda { where(:status => Status::Affiliate) }
   scope :contacts, lambda { where(:status => Status::Contact) }
+  scope :ordered, lambda { order(arel_table[:first_name].asc) }
 
   scope :by_title, lambda {|val| where(:title => val) }
   scope :by_company, lambda {|val| where(:company_id => val) }
@@ -284,6 +288,10 @@ class Contact < ActiveRecord::Base
     end
   end
 
+  def to_liquid
+    Drop.new(self)
+  end
+
   protected
 
     def _assign_initialization_defaults
@@ -307,6 +315,16 @@ class Contact < ActiveRecord::Base
         attributes.keys.member?('email') && attributes['email'].blank?
     end
 
+    def ensure_no_associated_deals
+      unless self.associated_deals.empty?
+        object.errors.add(:associated_deals, :delete_restricted)
+      end
+    end
+
+  class Drop < ::E9::Liquid::Drops::Base
+    source_methods :first_name, :last_name, :name, :email, :title, :company_name
+  end
+
   module Status
     VALUES      = %w(contact sales_person affiliate)
     Contact     = VALUES[0]

data/app/models/menu_option.rb

@@ -2,12 +2,13 @@
 #
 class MenuOption < ActiveRecord::Base
   KEYS = [
+    #'Task Category',
+    #'Task Status',
+    'Address',
     'Deal Category',
     'Email',
     'Instant Messaging Handle',
     'Phone Number',
-    #'Task Category',
-    #'Task Status',
     'Website'
   ].freeze
 
@@ -16,7 +17,7 @@ class MenuOption < ActiveRecord::Base
 
   acts_as_list :scope => 'menu_options.key = \"#{key}\"'
 
-  scope :options_for, lambda {|key| where(:key => key) }
+  scope :options_for, lambda {|key| where(:key => key).order('menu_options.position ASC') }
 
   ##
   # A direct SQL selection of values for a given key

data/app/models/sales_campaign.rb

@@ -4,7 +4,9 @@
 #
 class SalesCampaign < Campaign
   money_columns :sales_fee
-  belongs_to :sales_person
+
+  belongs_to :sales_person, :class_name => 'Contact'
+  validates :sales_person, :presence => true
 
   ##
   # The sum cost of this campaign

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

@@ -3,8 +3,8 @@
 %fieldset
   %legend= e9_t(:affiliate_information_legend, :scope => 'e9_crm.campaigns')
   .field
-    = f.label :affilate_id
-    = f.collection_select :affiliate_id, Contact.affiliates.all, :id, :name, :prompt => true
+    = f.label :affilate, nil, :class => :req, :for => 'campaign_affiliate_id'
+    = f.collection_select :affiliate_id, Contact.affiliates.ordered.all, :id, :name, {:prompt => true}, :id => 'campaign_affiliate_id'
   .field
-    = f.label :affiliate_fee
+    = help_label f, :affiliate_fee
     = f.text_field :affiliate_fee

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

@@ -0,0 +1,3 @@
+.field
+  = f.label :name, nil, :class => :req
+  = f.text_field :name

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

@@ -2,20 +2,17 @@
   %legend= e9_t(:campaign_information_legend, :scope => 'e9_crm.campaigns')
   .field
     = f.label :campaign_group_id
-    = f.collection_select :campaign_group_id, CampaignGroup.all, :id, :name, :include_blank => 'No Group'
+    = f.collection_select :campaign_group_id, CampaignGroup.ordered.all, :id, :name, :include_blank => 'No Group'
   .field
-    = f.label :name
+    = f.label :name, nil, :class => :req
     = f.text_field :name
   - if f.object.new_record?
     .field#campaign_code_field
-      = f.label :code
+      = f.label :code, nil, :class => :req
       = f.text_field :code
   .field
-    %label{:for => 'campaign_code_hint'}
-      = resource_class.human_attribute_name(:code_hint)
-      %span.help{:title => e9_t(:code_help, :scope => 'e9_crm.campaigns', :code => E9Crm.query_param)}= t(:inline_help_link)
-    #campaign_code_hint= "?#{E9Crm.query_param}=#{f.object.code}"
+    = help_label :campaign_code_hint, :code_hint, :title => t('activerecord.attributes.campaign.code_hint_help', :code => E9Crm.query_param)
+    #campaign_code_hint= display_campaign_code(f.object.code || '')
   .field
     = f.label :active
     = f.check_box :active
-

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

@@ -3,7 +3,7 @@
     %tr
       %th= orderable_column_link(:type)
       %th= orderable_column_link(:name)
-      %th= orderable_column_link('campaign_group.name', :campaign_group)
+      %th= orderable_column_link('campaign_group_name', :campaign_group)
       %th= orderable_column_link(:code)
       %th= orderable_column_link(:affiliate_fee)
       %th= orderable_column_link(:sales_fee)
@@ -20,7 +20,7 @@
           %td.record-name
             = record.name
           %td.record-campaign-group
-            = record.campaign_group || e9_t(:no_group, :scope => 'e9_crm.campaigns')
+            = record.campaign_group_name || e9_t(:no_group, :scope => 'e9_crm.campaigns')
           %td.record-code
             = display_campaign_code(record.code)
           %td.record-affiliate-fee

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

@@ -0,0 +1,4 @@
+.toolbar
+  .toolbar-right
+    = link_to_new_resource(Company)
+    = link_to_collection(Contact)

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

@@ -1,21 +0,0 @@
-.toolbar
-  .toolbar-left
-    = 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
-    = submit_tag t(:clear), :name => nil, :id => 'contact_search_clear'
-  .toolbar-middle
-    - if (tag = contact_email_template_select_tag).present?
-      = 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
-        = tag
-        = hidden_field_tag 'uids', @contact_ids.join(','), :id => 'contact_email_uids'
-        = submit_tag e9_t(:send_email_template), :name => nil
-    - 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'
-        = submit_tag e9_t(:send_email_newsletter), :name => nil
-  .toolbar-right
-    = link_to_new_resource(Contact)
-    = link_to_new_resource(Company)

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

@@ -1,6 +1,6 @@
 .actions
   = link_to_new_resource(Contact)
-  = link_to_new_resource(Company)
+  = link_to_collection(Company)
 
 -# Email actions (template, newsletter)
 - etag, ntag = contact_email_template_select_tag, contact_newsletter_select_tag

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

@@ -15,10 +15,12 @@
   - if company = resource.company
     .contact-company
       %label= company.name
+
       .contact-company-links.actions
         = google_search_link(company.name)
         = google_news_link(company.name)
+
       - if company.info.present?
-        = contact_simple_format(company.info)
+        = k(company.info)
 .contact-sidebar
   = render 'sidebar'

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

@@ -2,5 +2,5 @@
   = f.label :key
   = f.select :key, MenuOption::KEYS.sort
 .field
-  = f.label :value
+  = f.label :value, nil, :class => :req
   = f.text_field :value

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

@@ -3,8 +3,11 @@
 %table.records{:class => sortable_controller? ? 'sortable' : nil }
   %thead
     %tr
-      - field_map[:fields].keys.each do |field|
-        %th= resource_class.human_attribute_name(field)
+      - field_map[:fields].keys.each do |key|
+        - if key.is_a?(Symbol)
+          %th= resource_class.human_attribute_name(key)
+        - else
+          %th= orderable_column_link(key)
       %th= e9_t(:actions)
   %tbody
     - if collection.empty?

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

@@ -4,8 +4,8 @@
   %legend= e9_t(:salesperson_information_legend, :scope => 'e9_crm.campaigns')
   .field
     = f.label :sales_person_id
-    = f.collection_select :sales_person_id, Contact.sales_persons.all, :id, :name, :prompt => true
+    = f.collection_select :sales_person_id, Contact.sales_persons.ordered.all, :id, :name, :prompt => true
   .field
-    = f.label :sales_fee
+    = help_label f, :sales_fee
     = f.text_field :sales_fee
 

data/config/locales/e9.en.yml

@@ -38,4 +38,3 @@ en:
         campaign_information_legend: Campaign Information
         salesperson_information_legend: Salesperson Information
         affiliate_information_legend: Affiliate Information
-        code_help: "Be careful when creating tracking codes.  They are NOT EDITABLE after you save them.

To track the success of this campaign, you can append ?%{code}={Your Code} to the end of any and all URLs on your website.

It might look something like this: http://www.example.com/about-us?%{code}=alpha, where \"alpha\" represents the code you created.

You can provide this tracking URL to a salesperson or an affiliate or it can be placed at the end of a link in any of your advertisements."

data/config/locales/en.yml

@@ -36,6 +36,11 @@ en:
         merge_required: 'Merge Required! <a href="%{merge_path}">MERGE ME</a>.'
 
       models:
+        campaign:
+          not_a_number: "%{attribute} must be a number (maximum 2 decimal places)."
+          attributes:
+            code:
+              invalid: "%{attribute} must be comprised of letters and numbers only."
         contact:
           attributes:
             users:
@@ -44,7 +49,7 @@ en:
         contact_email:
           attributes:
             contact_ids:
-              blank: "You cannot send an emailwith no recipients!"
+              blank: "You cannot send an email with no recipients!"
             user_ids:
               blank: "None of the contacts selected are configured with primary emails.  Please correct this and try again."
         deal:
@@ -86,6 +91,11 @@ en:
       campaign:
         name: Name
         code_hint: Append to URL
+        code_hint_help: "Be careful when creating tracking codes.  They are NOT EDITABLE after you save them.\n\nTo track the success of this campaign, you can append ?%{code}={Your Code} to the end of any and all URLs on your website.\n\nIt might look something like this: http://www.example.com/about-us?%{code}=alpha, where \"alpha\" represents the code you created.\n\nYou can provide this tracking URL to a salesperson or an affiliate or it can be placed at the end of a link in any of your advertisements."
+        affiliate_fee: Affiliate Fee
+        affiliate_fee_help: This is the fee payable for each lead this affiliate sends you where it converts to a sale.
+        sales_fee: Sales Fee
+        sales_fee_help: This is the fee payable for each lead this salesperson sends you where it converts to a sale.
       contact:
         avatar: Photo
         users: Email Addresses

data/e9_crm.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |s|
   s.add_dependency("e9_rails", "~> 0.0.15")
   s.add_dependency("e9_tags", "~> 0.0.11")
   s.add_dependency("will_paginate")
+  s.add_dependency("kramdown", "~> 0.13")
 end

data/lib/e9_crm/e9_extensions.rb

@@ -0,0 +1,20 @@
+module E9Crm
+  #
+  # Extends E9Base's Email to attempt to embed the Contact
+  # for the recipient in the liquid template arguments.
+  #
+  module Email
+    extend ActiveSupport::Concern
+
+    included do
+      def locals_with_contact
+        default_locals.merge({
+          :contact => recipient.try(:contact)
+        })
+      end
+
+      alias :default_locals :this_locals
+      alias :this_locals :locals_with_contact
+    end
+  end
+end

data/lib/e9_crm/email.rb

@@ -0,0 +1,16 @@
+module E9Crm
+  module Email
+    extend ActiveSupport::Concern
+
+    included do
+      def locals_with_contact
+        default_locals.merge({
+          :contact => recipient.try(:contact)
+        })
+      end
+
+      alias :default_locals :this_locals
+      alias :this_locals :locals_with_contact
+    end
+  end
+end

data/lib/e9_crm/rails_extensions.rb

@@ -16,6 +16,37 @@ class Array
   end
 end
 
+
+#
+# Money is too clever by half and attempts to deal with parsing Strings into
+# currency e.g. 
+#
+#   "asdf 0.23 asdf".to_money #=> #<Money cents:23 currency:USD>
+#
+# This is problematic if you want to actually validate money as it parses most
+# bogus strings to zero, so unless you want to validate > 0, most any input
+# will pass validation.
+#
+# This silly hack prevents "asdf".to_money from parsing to 0 cents, instead
+# returning itself.  The #cents method allows for our composed_of column to
+# still work, simply returning self, which would fail a numericality validation.
+#
+require 'money'
+
+class String
+  def to_money(currency = nil)
+    if match /^$|[^\$\d\.\,]/
+      self
+    else
+      Money.parse(self, currency)
+    end
+  end
+
+  def cents
+    self
+  end
+end
+
 class ActiveRecord::Base
   #
   # Basic conversion for "money" columns using the Money class and Rails composed_of
@@ -26,7 +57,7 @@ class ActiveRecord::Base
         composed_of :#{column_name},
                     :class_name => 'Money',
                     :mapping => %w(#{column_name} cents),
-                    :converter => Proc.new { |value| value.respond_to?(:to_money) ? value.to_money : Money.empty }
+                    :converter => Proc.new {|v| v.respond_to?(:to_money) ? v.to_money : v }
       EVAL
     end
   end

data/lib/e9_crm/version.rb

@@ -1,3 +1,3 @@
 module E9Crm
-  VERSION = '0.1.8'
+  VERSION = '0.1.10'
 end

data/lib/e9_crm.rb

@@ -5,6 +5,8 @@ require 'money'
 require 'inherited_resources'
 require 'will_paginate'
 require 'has_scope'
+require 'kramdown'
+require 'e9_base'
 
 require 'e9_crm/rails_extensions'
 
@@ -12,6 +14,7 @@ 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'
 
   mattr_accessor :cookie_name
@@ -52,6 +55,8 @@ module E9Crm
 
     ActionController::Base.send(:include, E9Crm::Controller)
 
+    ::Email.send(:include, E9Crm::Email)
+
     E9Crm.tracking_controllers.each do |controller|
       controller.send(:include, E9Crm::TrackingController)
     end

metadata

@@ -2,7 +2,7 @@
 name: e9_crm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors: 
 - Travis Cox
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 -04:00
+date: 2011-05-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,13 +90,23 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: kramdown
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.13"
+  type: :runtime
+  version_requirements: *id008
 description: |
+  *NOTE his plugin requires the private e9_base CMS gem and WILL NOT WORK without it.*
+  
   CRM Plugin for the e9 CMS
   =========================
   
-  It should be noted that while this plugin is intended for use in the
-  e9 CMS, it does neither includes nor requires it.
-  
   To use, add as a gem and install by running:
   
       rails g e9_crm:install
@@ -207,6 +217,7 @@ files:
 - 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/_form_inner.html.haml
 - app/views/e9_crm/campaign_groups/_header.html.haml
 - app/views/e9_crm/campaigns/_footer.html.haml
 - app/views/e9_crm/campaigns/_form_inner.html.haml
@@ -215,6 +226,7 @@ files:
 - 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/companies/_header.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
@@ -268,6 +280,7 @@ files:
 - app/views/e9_crm/leads/_form.html.haml
 - app/views/e9_crm/leads/create.js.erb
 - app/views/e9_crm/leads/new.html.haml
+- app/views/e9_crm/menu_options/_footer.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/new_content_subscription_offers/_form_inner.html.haml
@@ -310,6 +323,8 @@ files:
 - e9_crm.gemspec
 - lib/e9_crm.rb
 - lib/e9_crm/controller.rb
+- lib/e9_crm/e9_extensions.rb
+- lib/e9_crm/email.rb
 - lib/e9_crm/model.rb
 - lib/e9_crm/rails_extensions.rb
 - lib/e9_crm/tracking_controller.rb