e9_crm 0.1.17 → 0.1.18

data/app/controllers/e9_crm/offers_controller.rb

@@ -14,7 +14,8 @@ class E9Crm::OffersController < E9Crm::ResourcesController
 
   def show
     clear_breadcrumbs
-    @show_title = resource.name
+    add_home_crumb
+    add_breadcrumb! @show_title = resource.name
   end
 
   protected
@@ -38,4 +39,12 @@ class E9Crm::OffersController < E9Crm::ResourcesController
   def determine_layout
     request.xhr? ? false : super
   end
+
+  def default_ordered_on
+    :name
+  end
+
+  def default_ordered_dir
+    :ASC
+  end
 end

data/app/controllers/e9_crm/resources_controller.rb

@@ -1,4 +1,6 @@
 class E9Crm::ResourcesController < E9Crm::BaseController
+  inherit_resources
+
   include E9Rails::Helpers::ResourceErrorMessages
 
   # NOTE depending on e9_base pagination (which should eventually use this module)
@@ -12,8 +14,6 @@ class E9Crm::ResourcesController < E9Crm::BaseController
   class_inheritable_accessor :should_paginate_index
   self.should_paginate_index = true
 
-  inherit_resources
-
   respond_to :js
 
   add_resource_breadcrumbs

data/app/helpers/e9_crm/campaigns_helper.rb

@@ -1,12 +1,18 @@
 module E9Crm::CampaignsHelper
   def display_campaign_fee(val)
-    Money === val && val || 'n/a'
+    Money === val && val.format || 'n/a'
   end
 
   def no_money
     @_no_money ||= Money.new(0)
   end
 
+  def m(val)
+    val ||= no_money
+    val = val.to_money
+    val.format
+  end
+
   def display_campaign_code(val)
     val && "?#{E9Crm.query_param}=#{val}" || 'n/a'
   end

data/app/helpers/e9_crm/deals_helper.rb

@@ -16,6 +16,7 @@ module E9Crm::DealsHelper
   def deal_status_select_options
     @_deal_status_select_options ||= begin
       options = Deal::Status::OPTIONS - %w(lead)
+      options.map! {|o| [o.titleize, o] }
       options.unshift ['All Statuses', nil]
       options_for_select(options)
     end
@@ -23,7 +24,7 @@ module E9Crm::DealsHelper
 
   def deal_category_select_options
     @_deal_category_select_options ||= begin
-      options = MenuOption.options_for('Deal Category')
+      options = MenuOption.options_for('Deal Category').sort
       options.unshift ['All Categories', nil]
       options_for_select(options)
     end
@@ -31,7 +32,7 @@ module E9Crm::DealsHelper
 
   def deal_owner_select_options
     @_deal_owner_select_options ||= begin
-      options = Contact.deal_owners.all.map {|c| [c.name, c.id] }
+      options = deal_contacts_array
       options.unshift ['All Responsible', nil]
       options_for_select(options)
     end
@@ -39,7 +40,7 @@ module E9Crm::DealsHelper
 
   def deal_offer_select_options
     @_deal_offer_select_options ||= begin
-      options = Offer.all.map {|c| [c.name, c.id] }
+      options = Offer.all.map {|c| [c.name, c.id] }.sort_by {|name, id| name.upcase }
       options.unshift ['Any/No Offer', nil]
       options_for_select(options)
     end
@@ -84,11 +85,11 @@ module E9Crm::DealsHelper
   def deal_contacts
     @_eligible_responsible_contacts ||= begin
       roles = E9::Roles.list.map(&:role).select {|r| r > 'user' && r < 'e9_user' }
-      User.includes(:contact).for_roles(roles).all.map(&:contact).compact
+      User.includes(:contact).for_roles(roles).all.map(&:contact).compact.sort_by {|c| c.name.upcase }
     end
   end
 
   def deal_contacts_array
-    deal_contacts.map {|c| [c.name, c.id] }.sort_by {|name, id| name.upcase }
+    deal_contacts.map {|c| [c.name, c.id] }
   end
 end

data/app/models/campaign.rb

@@ -70,4 +70,12 @@ class Campaign < ActiveRecord::Base
   def to_s
     name.tap {|n| n << " (#{code})" if code.present? }
   end
+
+  def to_liquid
+    Drop.new(self)
+  end
+
+  class Drop < ::E9::Liquid::Drops::Base
+    source_methods :name, :code
+  end
 end

data/app/models/deal.rb

@@ -27,8 +27,7 @@ class Deal < ActiveRecord::Base
   # lead only validations
   # require lead_name and lead_email; gotten from current_user if it exists
   validates :lead_name,  :presence => { :if => lambda {|r| r.lead? } }
-  validates :lead_email, :presence => { :if => lambda {|r| r.lead? } },
-                         :email    => { :if => lambda {|r| r.lead? }, :allow_blank => true }
+  validates :lead_email, :presence => { :if => lambda {|r| r.lead? } }
 
   # NOTE should offer be validated?
   #validates :offer,      :presence => { :if => lambda {|r| r.lead? } }
@@ -47,6 +46,7 @@ class Deal < ActiveRecord::Base
   # If a lead with no user, find the user by email or create it, then if mailing_lists
   # were passed, assign the user those mailing lists
   after_create :handle_user_if_lead
+  after_create :send_offer_conversion_email_if_lead
 
   # money column definitions for pseudo attributes (added on the reports scope)
   %w(total_value average_value total_cost average_cost).each do |money_column|
@@ -173,6 +173,10 @@ class Deal < ActiveRecord::Base
   scope :owner,    lambda {|owner|    where(:contact_id => owner.to_param) }
   scope :status,   lambda {|status|   where(:status => status) }
 
+  def to_liquid
+    Drop.new(self)
+  end
+
   protected
 
     def write_options(obj={})
@@ -250,6 +254,15 @@ class Deal < ActiveRecord::Base
       end
     end
 
+    def send_offer_conversion_email_if_lead
+      if lead? && offer && email = offer.conversion_alert_email.presence
+        Rails.logger.debug("Sending Deal Conversion Alert to [#{email}]")
+        Offer.conversion_email.send!(email, :offer => offer, :lead => self)
+      end
+    rescue
+      Rails.logger.debug("Deal conversion alert failed: #{$!}")
+    end
+
     def update_to_pending_status
       if self.status == Status::Lead
         self.status = Status::Pending
@@ -264,6 +277,13 @@ class Deal < ActiveRecord::Base
       ) 
     end
 
+  class Drop < ::E9::Liquid::Drops::Base
+    source_methods :name, :category, :lead_email, :lead_name, :info, :offer,
+                   :campaign, :contacts, :owner, :status
+
+    date_methods :closed_at, :converted_at
+  end
+
   module Status
     OPTIONS  = %w(lead pending won lost)
     Lead    = OPTIONS[0]

data/app/models/no_campaign.rb

@@ -6,4 +6,8 @@ class NoCampaign < Campaign
   def cost
     0
   end
+
+  def code
+    'No Code'
+  end
 end

data/app/models/offer.rb

@@ -45,6 +45,9 @@ class Offer < Renderable
     name
   end
 
+  def to_liquid
+    Drop.new(self)
+  end
 
   protected
 
@@ -54,6 +57,10 @@ class Offer < Renderable
       self.success_page_text  ||= 'Thank you!'
     end
 
+  class Drop < ::E9::Liquid::Drops::Base
+    source_methods :name, :deals, :leads
+  end
+
   module Identifiers
     CONVERSION_EMAIL = 'offer_conversion_email'
     PAGE             = 'offer_page'

data/app/observers/deal_observer.rb

@@ -6,9 +6,5 @@ class DealObserver < ActiveRecord::Observer
   end
 
   def before_convert(record)
-    if email = record.offer && record.offer.conversion_alert_email.presence
-      Rails.logger.debug("Sending Offer Conversion Alert to [#{email}]")
-      Offer.conversion_email.try(:send!, email)
-    end
   end
 end

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

@@ -23,9 +23,9 @@
             = record.name
           %td.record-code
             = display_campaign_code(record.code)
-          %td.record-affiliate-fee
+          %td.record-affiliate-fee.num
             = display_campaign_fee(record.affiliate_fee)
-          %td.record-sales-fee
+          %td.record-sales-fee.num
             = display_campaign_fee(record.sales_fee)
           %td.links
             - if record.is_a?(AdvertisingCampaign)

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

@@ -1,5 +1,5 @@
 = render 'e9_crm/offers/form_inner', :f => f
 
 .field{:class => request.xhr? ? 'tinymcexhr' : 'tinymce'}
-  = f.label :success_page_text, nil, :class => :req
+  = help_label(f, :success_page_text, :key => :markdown_help, :header => "Markdown Help", :class => :req)
   = f.text_area :success_page_text

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

@@ -45,7 +45,7 @@
             .contact-deal-status
               = deal.status
             .contact-deal-name
-              = link_to deal.name, edit_deal_path(deal)
+              = link_to deal.name, deal
             .contact-deal-value
               = deal.value
 

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

@@ -10,6 +10,6 @@
   - fid = "dated_cost_cost_#{id}"
   - unless request.xhr?
     = f.label :cost, nil, :class => :req, :for => id
-  = f.text_field :cost, :id => id
+  = f.text_field :cost, :id => id, :value => f.object.cost.to_money
 .actions
   = f.submit

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

@@ -16,21 +16,21 @@
   = f.text_area :info
 .field
   = f.label :value, nil, :class => :req
-  = f.text_field :value
+  = f.text_field :value, :value => f.object.value.to_s
 .field.select
-  = f.label :campaign, :for => 'deal_campaign_select'
+  = f.label :campaign, :for => 'deal_campaign_select', :class => 'req'
   = f.collection_select :campaign_id, Campaign.ordered.all, :id, :to_s, {:prompt => true}, :id => 'deal_campaign_select'
 .field.select
   = f.label :status
   = f.select :status, Deal::Status::OPTIONS[1..-1]
 .field.select
   = f.label :contacts
-  %input#contact_autocomplete.list{:type => 'text', 'data-values' => resource.contact_ids.join(','), 'data-iname' => resource_instance_name, 'data-field' => '[contact_ids]', :id => 'deal_contacts'}
+  %input#contact_autocomplete.list{:type => 'text', 'data-values' => resource.contact_ids.join(','), 'data-iname' => resource_instance_name, 'data-field' => '[contact_ids]'}
   %ul.select
     - f.object.contacts.each do |contact|
       %li.ui-state-default
         %span.content= contact.name
-        %input{:type => :hidden, :name => "contact[contact_ids][]", :value => contact.id}
+        %input{:type => :hidden, :name => "#{resource_instance_name}[contact_ids][]", :value => contact.id}
         %a{:class => :remove, :title => "Remove", :alt => "Remove"} Remove
 .field.select
   = f.label :owner

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

@@ -2,8 +2,8 @@
   %thead
     %tr
       %th= orderable_column_link(:campaign_type)
-      %th= orderable_column_link(:campaign_name)
       %th= orderable_column_link(:campaign_group)
+      %th= orderable_column_link(:campaign_name)
       %th= orderable_column_link(:new_visits)
       %th= orderable_column_link(:repeat_visits)
       %th= orderable_column_link(:lead_count)
@@ -26,61 +26,61 @@
         %tr{:id => "ids_#{record.id}", :class => cycle('odd', 'even')}
           %td.record-campaign-type
             = display_campaign_type(record.campaign_type)
-          %td.record-campaign-name
-            = record.campaign_name || 'n/a'
           %td.record-campaign-group
             = record.campaign_group || 'n/a'
-          %td.record-new-visits
+          %td.record-campaign-name
+            = record.campaign_name || 'n/a'
+          %td.record-new-visits.num
             - dat[:new_visits] << record.new_visits
             = record.new_visits
-          %td.record-repeat-visits
+          %td.record-repeat-visits.num
             - dat[:repeat_visits] << record.repeat_visits
             = record.repeat_visits
-          %td.record-lead-count
+          %td.record-lead-count.num
             - dat[:lead_count] << record.lead_count
             = record.lead_count.to_i
-          %td.record-deal-count
+          %td.record-deal-count.num
             - dat[:deal_count] << record.deal_count
             = record.deal_count.to_i
-          %td.record-won-deal-count
+          %td.record-won-deal-count.num
             - dat[:won_deal_count] << record.won_deal_count
             = record.won_deal_count.to_i
-          %td.record-total-value
+          %td.record-total-value.num
             - dat[:total_value] << record.total_value
-            = record.total_value || no_money
-          %td.record-averate-value
+            = m record.total_value
+          %td.record-averate-value.num
             - dat[:average_value] << record.average_value
-            = record.average_value || no_money
-          %td.record-total-cost
+            = m record.average_value
+          %td.record-total-cost.num
             - dat[:total_cost] << record.total_cost
-            = record.total_cost || no_money
-          %td.record-average-cost
+            = m record.total_cost
+          %td.record-average-cost.num
             - dat[:average_cost] << record.average_cost
-            = record.average_cost || no_money
-          %td.record-average-elapsed
+            = m record.average_cost
+          %td.record-average-elapsed.num
             - dat[:average_elapsed] << record.average_elapsed
             = record.average_elapsed && "%s days" % record.average_elapsed || 'n/a'
     %tfooter
       %tr{:class => 'record-totals'}
         %td.record-totals-label{:colspan => 3}
           #{t(:totals)}:
-        %td.record-new-visits
+        %td.record-new-visits.num
           = dat[:new_visits].sum
-        %td.record-repeat-visits
+        %td.record-repeat-visits.num
           = dat[:repeat_visits].sum
-        %td.record-lead-count
+        %td.record-lead-count.num
           = dat[:lead_count].sum
-        %td.record-deal-count
+        %td.record-deal-count.num
           = dat[:deal_count].sum.to_i
-        %td.record-won-deal-count
+        %td.record-won-deal-count.num
           = dat[:won_deal_count].sum.to_i
-        %td.record-total-value
-          = dat[:total_value].compact.sum.to_money
-        %td.record-average-value
-          = dat[:average_value].compact.average.to_money
-        %td.record-total-cost
-          = dat[:total_cost].compact.sum.to_money
-        %td.record-average-cost
-          = dat[:average_cost].compact.average.to_money
-        %td.record-average-elapsed
+        %td.record-total-value.num
+          = m dat[:total_value].compact.sum
+        %td.record-average-value.num
+          = m dat[:average_value].compact.average
+        %td.record-total-cost.num
+          = m dat[:total_cost].compact.sum
+        %td.record-average-cost.num
+          = m dat[:average_cost].compact.average
+        %td.record-average-elapsed.num
           = "%s days" % dat[:average_elapsed].compact.average

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

@@ -1,7 +1,7 @@
 = render 'e9_crm/offers/form_inner', :f => f
 
 .field{:class => request.xhr? ? 'tinymcexhr' : 'tinymce'}
-  = f.label :success_page_text, nil, :class => :req
+  = help_label(f, :success_page_text, :key => :markdown_help, :header => "Markdown Help", :class => :req)
   = f.text_area :success_page_text
 
 %fieldset.upload

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

@@ -1,6 +1,6 @@
 = title @offer.name
 
 .offer-body
-  = @offer.template
+  = k @offer.template
 
 = render 'form'

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

@@ -3,7 +3,7 @@
   = f.text_field :name
 
 .field.tinymce
-  = f.label :template
+  = help_label(f, :template, :markdown => true)
   = f.text_area :template
 
 .field

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

@@ -1,5 +1,5 @@
 #offer-body
-  = resource.success_page_text
+  = k resource.success_page_text
 
 - if resource.file?
   #offer-download-link

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

@@ -1,5 +1,5 @@
 = render 'e9_crm/offers/form_inner', :f => f
 
 .field{:class => request.xhr? ? 'tinymcexhr' : 'tinymce'}
-  = f.label :success_page_text, nil, :class => :req
+  = help_label(f, :success_page_text, :key => :markdown_help, :header => "Markdown Help", :class => :req)
   = f.text_area :success_page_text

data/config/locales/en.yml

@@ -14,6 +14,12 @@ en:
   view: View
   save: Save
 
+  flash:
+    e9_crm:
+      contact_emails:
+        create:
+          notice: Contact email sent to recipients.
+
   e9_crm:
     add_record_attribute: Add
     destroy_record_attribute: Remove
@@ -23,7 +29,6 @@ en:
       show: 'Show %{model}'
       campaign:
         show: '%{model}'
-
     links:
       index: "Manage %{models}"
       new: "New %{model}"
@@ -31,14 +36,12 @@ en:
       destroy: "Delete"
       show: "View"
       confirm_destroy: Are you sure?  This cannot be undone.
-
       campaign_group: 
         confirm_destroy: Are you sure?  This cannot be undone.  Any campaigns which are associated with this group will become groupless.
 
     errors:
       messages:
         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)."
@@ -46,7 +49,7 @@ en:
             code:
               invalid: "%{attribute} must be comprised of letters and numbers only."
         contact:
-          delete_restricted: "This contact is related to leads and/or deals and can not be deleted."
+          delete_restricted: "You cannot delete a contact that has deals or leads."
           attributes:
             users:
               taken: "Two or more of the login accounts entered share a duplicate email."
@@ -115,6 +118,18 @@ en:
         no_leads: 'There are no leads associated with this contact.'
       company:
         info: Background Information
+      email:
+        body_help:
+          <p>System emails have variable data which you can interpolate into the fields</p>
+          <h3>Offer Conversion Email:</h3>
+          <p>
+            &#123;&#123; offer.name &#125;&#125;<br/>
+            &#123;&#123; lead.lead_email &#125;&#125;<br/>
+            &#123;&#123; lead.lead_name &#125;&#125;<br/>
+            &#123;&#123; lead.info &#125;&#125;<br/>
+            &#123;&#123; lead.created_at &#125;&#125;<br/>
+          </p>
+        
       email_template:
         text_body_help: |
           <h3>Variables:</h3>
@@ -131,8 +146,16 @@ en:
         offer_name: Offer
         created_at: Date
         owner: Responsible
+        won_deal_count: Won count 
       offer:
         template: Teaser Text
+        template_help: |
+          <h3>Variables:</h3>
+          <p>You can insert the following to render variable data in the field</p>
+          <p>
+            &#123;&#123;campaign.name&#125;&#125;<br/>
+            &#123;&#123;campaign.code&#125;&#125;<br/>
+          </p>
         alert_email_instructions: (Enter an email if you want to be notified of conversions)
         submit_button_text: Submit Button Text
         success_alert_text: Success Alert Text

data/lib/e9_crm/controller.rb

@@ -12,6 +12,14 @@ module E9Crm
       prepend_before_filter do
         E9Crm.log("E9Crm controller request")
       end
+
+      alias :liquid_env_without_crm :liquid_env
+
+      def liquid_env
+        liquid_env_without_crm.tap do |env|
+          env[:campaign] = tracking_campaign
+        end
+      end
     end
 
     protected

data/lib/e9_crm/version.rb

@@ -1,3 +1,3 @@
 module E9Crm
-  VERSION = '0.1.17'
+  VERSION = '0.1.18'
 end

data/lib/e9_crm.rb

@@ -1,10 +1,5 @@
 require 'e9_base'
-require 'e9_rails'
-require 'e9_tags'
-require 'e9_attributes'
-
 require 'money'
-
 require 'e9_crm/rails_extensions'
 
 module E9Crm
@@ -55,7 +50,7 @@ module E9Crm
       user_model.send(:include, E9Crm::Model)
     end
 
-    ActionController::Base.send(:include, E9Crm::Controller)
+    ApplicationController.send(:include, E9Crm::Controller)
 
     ::Email.send(:include, E9Crm::Email)
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: e9_crm
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 17
-  version: 0.1.17
+  prerelease: 
+  version: 0.1.18
 platform: ruby
 authors: 
 - Travis Cox
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-09 00:00:00 -04:00
-default_executable: 
+date: 2011-09-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -25,10 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
@@ -40,10 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 2
         version: 1.1.2
   type: :runtime
   version_requirements: *id002
@@ -55,8 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -68,8 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -81,8 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
@@ -94,8 +75,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id006
@@ -107,8 +86,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id007
@@ -120,8 +97,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id008
@@ -133,9 +108,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 13
         version: "0.13"
   type: :runtime
   version_requirements: *id009
@@ -353,7 +325,6 @@ files:
 - lib/generators/e9_crm/templates/migration.rb
 - test/functional/e9_crm/campaign_types_controller_test.rb
 - test/functional/home_controller_test.rb
-has_rdoc: true
 homepage: http://www.e9digital.com
 licenses: []
 
@@ -367,21 +338,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: e9_crm
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: CRM engine plugin for the e9 CMS