e9_crm 0.1.18 → 0.1.19

data/app/controllers/e9_crm/deals_controller.rb

@@ -7,7 +7,7 @@ class E9Crm::DealsController < E9Crm::ResourcesController
 
   filter_access_to :leads, :reports, :require => :read, :context => :admin
 
-  skip_after_filter :flash_to_headers
+  skip_after_filter :flash_to_headers, :except => :destroy
 
   prepend_before_filter :set_leads_index_title, :only => :leads
   prepend_before_filter :set_reports_index_title, :only => :reports

data/app/controllers/e9_crm/offers_controller.rb

@@ -7,6 +7,7 @@ class E9Crm::OffersController < E9Crm::ResourcesController
   skip_before_filter :authenticate_user!, :filter_access_filter, :only => :show
 
   before_filter :throw_forbidden_unless_offer_cookied, :only => :show
+  before_filter :ensure_mailing_list_ids, :only => [:create, :update]
 
   has_scope :of_type, :as => :type, :only => :index do |_, scope, value|
     scope.of_type("#{value}_offer".classify)
@@ -29,11 +30,7 @@ class E9Crm::OffersController < E9Crm::ResourcesController
   end
 
   def find_current_page
-    if params[:action] != 'show'
-      super
-    else
-      @current_page ||= Offer.page || super
-    end
+    @current_page ||= params[:action] == 'show' && Offer.page || super
   end
 
   def determine_layout
@@ -47,4 +44,8 @@ class E9Crm::OffersController < E9Crm::ResourcesController
   def default_ordered_dir
     :ASC
   end
+
+  def ensure_mailing_list_ids
+    params[:offer][:mailing_list_ids] ||= []
+  end
 end

data/app/helpers/e9_crm/base_helper.rb

@@ -1,11 +1,5 @@
 module E9Crm::BaseHelper
 
-  #def kramdown(string)
-    #Kramdown::Document.new(string).to_html.html_safe
-  #end
-
-  #alias :k :kramdown
-
   ##
   # Field maps
   #
@@ -28,64 +22,6 @@ module E9Crm::BaseHelper
     base_map
   end
 
-
-  ##
-  # Misc
-  #
-
-  #def link_to_add_record_attribute(association_name)
-    #link_to(
-      #t(:add_record_attribute, :scope => :e9_crm), 
-      #'javascript:;', 
-      #:class => 'add-nested-association', 
-      #'data-association' => association_name
-    #)
-  #end
-
-  #def link_to_destroy_record_attribute
-    #link_to(
-      #t(:destroy_record_attribute, :scope => :e9_crm), 
-      #'javascript:;', 
-      #:class => 'destroy-nested-association'
-    #)
-  #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!
-
-    #association = resource.send(association_name)
-
-    #unless association.empty?
-      #form.fields_for(association_name) do |f|
-        #concat record_attribute_template(association_name, f, options)
-      #end
-    #end
-  #end
-
-  #def record_attribute_template(association_name, builder, options = {})
-    #options.symbolize_keys!
-
-    #render(
-      #:partial => options[:partial] || "e9_crm/record_attributes/#{association_name.to_s.singularize}",
-      #:locals => { :f => builder }
-    #)
-  #end
-
-  ## tries to build an associated resource, looking to the assocatiaon's model for a method
-  ## named "%{association_name}_build_parameters}" first for any default params
-  #def build_associated_resource(association_name)
-    #params_method = "#{association_name}_build_parameters"
-    #build_params = resource_class.send(params_method) if resource_class.respond_to?(params_method)
-    #resource.send(association_name).build(build_params || {})
-  #end
-
   def sortable_controller?
     @_sortable_controller ||= controller.class.ancestors.member?(E9Rails::Controllers::Sortable)
   end

data/app/helpers/e9_crm/deals_helper.rb

@@ -24,7 +24,7 @@ module E9Crm::DealsHelper
 
   def deal_category_select_options
     @_deal_category_select_options ||= begin
-      options = MenuOption.options_for('Deal Category').sort
+      options = MenuOption.options_for('Deal Category')
       options.unshift ['All Categories', nil]
       options_for_select(options)
     end

data/app/helpers/e9_crm/offers_helper.rb

@@ -1,13 +1,18 @@
 module E9Crm::OffersHelper
   def records_table_field_map_for_offer
     {
-      :fields => { 
-        :name => nil,
-        :type => lambda {|r| r.class.model_name.human }
-      }
+      :fields => { :name => nil }
     }
   end
 
+  def offer_mailing_lists
+    @_offer_mailing_lists ||= begin
+      retv =  MailingList.newsletters.all
+      retv << MailingList.new_content_alerts
+      retv.compact
+    end
+  end
+
   def offer_select_options(with_all_option = true)
     options = %w(contact file_download new_content_subscription newsletter_subscription video).map {|t| [t.titleize, t] }
     options.unshift(['All Types', nil]) if with_all_option

data/app/models/campaign.rb

@@ -8,13 +8,13 @@ class Campaign < ActiveRecord::Base
 
   belongs_to :campaign_group
 
-  has_many   :deals, :inverse_of => :campaign, :dependent => :nullify
-  has_many   :won_deals, :class_name => 'Deal', :conditions => ['deals.status = ?', Deal::Status::Won]
-  has_many   :lost_deals, :class_name => 'Deal', :conditions => ['deals.status = ?', Deal::Status::Lost]
-  has_many   :pending_deals, :class_name => 'Deal', :conditions => ['deals.status = ?', Deal::Status::Pending]
-  has_many   :leads, :class_name => 'Deal', :conditions => ['deals.status = ?', Deal::Status::Lead]
-  has_many   :non_leads, :class_name => 'Deal', :conditions => ['deals.status != ?', Deal::Status::Lead]
-  has_many   :page_views, :inverse_of => :campaign, :dependent => :nullify
+  has_many :deals, :inverse_of => :campaign, :dependent => :nullify
+  has_many :won_deals, :class_name => 'Deal', :conditions => ['deals.status = ?', Deal::Status::Won]
+  has_many :lost_deals, :class_name => 'Deal', :conditions => ['deals.status = ?', Deal::Status::Lost]
+  has_many :pending_deals, :class_name => 'Deal', :conditions => ['deals.status = ?', Deal::Status::Pending]
+  has_many :leads, :class_name => 'Deal', :conditions => ['deals.status = ?', Deal::Status::Lead]
+  has_many :non_leads, :class_name => 'Deal', :conditions => ['deals.status != ?', Deal::Status::Lead]
+  has_many :page_views, :inverse_of => :campaign, :dependent => :nullify
 
   # only advertising campaigns use this association
   has_many :dated_costs, :as => :costable

data/app/models/dated_cost.rb

@@ -8,7 +8,7 @@ class DatedCost < ActiveRecord::Base
   money_columns :cost
   belongs_to :costable, :polymorphic => true
   validates :date, :date => true
-  validates :cost, :numericality => { :greater_than => 0 }
+  validates :cost, :numericality => true
 
   attr_accessor :temp_id
 

data/app/models/deal.rb

@@ -13,24 +13,28 @@ class Deal < ActiveRecord::Base
   belongs_to :user
 
   belongs_to :owner, :class_name => 'Contact', :foreign_key => :contact_id
+  belongs_to :dated_cost, :dependent => :delete
+
   has_and_belongs_to_many :contacts
 
   money_columns :value
 
   validates :value,      :numericality => true
   validates :campaign,   :presence     => true
+  validate do |record|
+    if !Status::OPTIONS.include?(record.status)
+      record.errors.add(:status, :inclusion, :options => Status::OPTIONS)
+    elsif record.status_changed? && record.won? || record.lost? and record.status_was == Status::Lead
+      record.errors.add(:status, :illegal_conversion)
+    end
+  end
 
   # non-lead validations (deals in the admin)
-  # require a deal name
-  validates :name,       :presence => { :unless => lambda {|r| r.lead? } }
+  validates :name, :presence => true, :unless => lambda {|r| r.lead? }
 
   # 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? } }
-
-  # NOTE should offer be validated?
-  #validates :offer,      :presence => { :if => lambda {|r| r.lead? } }
+  validates :lead_name,  :presence => true, :if => lambda {|r| r.lead? }
+  validates :lead_email, :presence => true, :email => { :allow_blank => true }, :if => lambda {|r| r.lead? }
 
   # If a lead with a user, get the lead_name and lead_email from the user before validation
   before_validation :get_name_and_email_from_user, :on => :create
@@ -39,14 +43,15 @@ class Deal < ActiveRecord::Base
   # copy temp options over into info column
   before_create :transform_options_column
 
+  # 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_lead_creation, :if => lambda {|r| r.lead? }
+
   # denormalize campaign code and offer name columns
   before_save :ensure_denormalized_columns
   before_save :ensure_associated_campaign
-
-  # 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
+  before_save :handle_status_conversion, :if => lambda {|r| r.status_changed? }
+  before_save :handle_dated_cost, :if => lambda {|r| r.status_changed? || r.campaign_id_changed? }
 
   # money column definitions for pseudo attributes (added on the reports scope)
   %w(total_value average_value total_cost average_cost).each do |money_column|
@@ -73,38 +78,17 @@ class Deal < ActiveRecord::Base
       campaigns.name                                 campaign_name,
       campaigns.new_visits                           new_visits,
       campaigns.repeat_visits                        repeat_visits,
-
       deals.closed_at                                closed_at,
       deals.created_at                               created_at,
-
       campaign_groups.name                           campaign_group,
       SUM(IF(deals.status != 'lead',1,0))            deal_count, 
       COUNT(deals.id)                                lead_count,
       SUM(IF(deals.status='won',1,0))                won_deal_count,
       SUM(IF(deals.status='won',deals.value,0))      total_value, 
       AVG(IF(deals.status='won',deals.value,NULL))   average_value, 
-      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)                                         total_cost,
-      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) / SUM(IF(deals.status='won',1,0))      average_cost,
+      SUM(dated_costs.cost)                          total_cost,
+      SUM(dated_costs.cost) / 
+        SUM(IF(deals.status='won',1,0))              average_cost,
       FLOOR(AVG(
         DATEDIFF(
           deals.closed_at,
@@ -126,33 +110,6 @@ class Deal < ActiveRecord::Base
     select(selects).joins(joins).group('campaigns.id')
   }
 
-  validate do |record|
-    return unless record.status_changed?
-
-    case record.status
-    when Status::Lead
-      if [Status::Won, Status::Lost].member?(record.status_was)
-        record.errors.add(:status, :illegal_reversion)
-      elsif record.persisted?
-        # "revert" isn't happening on new records
-        record.send :_do_revert
-      end
-    when Status::Pending
-      if record.status_was == Status::Lead
-        record.send :_do_convert
-      end
-    when Status::Won, Status::Lost
-      if record.status_was == Status::Lead
-        record.errors.add(:status, :illegal_conversion)
-      elsif record.persisted?
-        # "close" isn't happening on new records
-        record.send :_do_close
-      end
-    else
-      record.errors.add(:status, :invalid, :options => Status::OPTIONS.join(', '))
-    end
-  end
-
   scope :column_op, lambda {|op, column, value, reverse=false|
     conditions = arel_table[column].send(op, value)
     conditions = conditions.not if reverse
@@ -177,6 +134,10 @@ class Deal < ActiveRecord::Base
     Drop.new(self)
   end
 
+  def closed?
+    [Status::Won, Status::Lost].include? status
+  end
+
   protected
 
     def write_options(obj={})
@@ -195,29 +156,15 @@ class Deal < ActiveRecord::Base
       end
     end
 
-    def _do_convert
-      self.converted_at = Time.now.utc
-      notify_observers :before_convert
-    end
-
-    def _do_revert
-      self.converted_at = nil
-      notify_observers :before_revert
-    end
-
-    def _do_close
-      self.closed_at = Time.now.utc
-      notify_observers :before_close
-    end
-  
     # Typically, new Deals are 'pending', with the assumption that offers
     # explicitly create Deals as 'lead' when they convert.
     def _assign_initialization_defaults
       self.status ||= Status::Pending
     end
 
+    # this is for leads
     def transform_options_column
-      self.info = options.to_hash.map {|k, v| "%s:\n%s\n\n" % [k.to_s.titleize, v] }.join
+      self.info ||= options.to_hash.map {|k, v| "%s:\n%s\n\n" % [k.to_s.titleize, v] }.join
     end
 
     def ensure_denormalized_columns
@@ -236,31 +183,34 @@ class Deal < ActiveRecord::Base
       end
     end
 
-    def handle_user_if_lead
-      if lead? 
-        if user.blank? && lead_email
-          user = User.find_by_email(lead_email) || create_prospect
-          update_attribute(:user_id, u.id)
-        end
+    def handle_lead_creation
+      # If user is not set explicitly yet a lead_email was passed, set the 
+      # user, first by attempting to find it by lead_email, and on that 
+      # failing, by creating a new prospect.
+      if user.blank?
+        self.user = User.find_by_email(lead_email) || create_prospect
+        update_attribute(:user_id, user.id)
+      end
 
-        if user.present?
-          user.create_contact_if_missing!
-          self.contacts << user.contact
+      # Assign the user's contact to the lead, creating it first if it does 
+      # not yet exist
+      user.create_contact_if_missing!
+      self.contacts << user.contact
 
-          if @mailing_list_ids
-            user.mailing_list_ids |= @mailing_list_ids
-          end
-        end
+      # finally if mailing_list_ids were passed in the creation of this lead
+      # pass them along to the user.
+      if @mailing_list_ids
+        user.mailing_list_ids |= @mailing_list_ids
       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)
+      begin
+        if offer && alert_email = offer.conversion_alert_email.presence
+          Rails.logger.debug("Sending Deal Conversion Alert to [#{alert_email}]")
+          Offer.conversion_email.send!(alert_email, :offer => offer, :lead => self)
+        end
+      rescue
+        Rails.logger.debug("Deal conversion alert failed: #{$!}")
       end
-    rescue
-      Rails.logger.debug("Deal conversion alert failed: #{$!}")
     end
 
     def update_to_pending_status
@@ -277,11 +227,34 @@ class Deal < ActiveRecord::Base
       ) 
     end
 
+    def handle_status_conversion
+      case status
+      when Status::Lead
+        self.converted_at = nil
+      when Status::Pending
+        self.converted_at = Time.now.utc
+        self.closed_at = nil
+      when Status::Won, Status::Lost
+        self.converted_at ||= Time.now.utc
+        self.closed_at = Time.now.utc
+      end
+    end
+
+    def handle_dated_cost
+      if campaign.respond_to?(:set_cost)
+        dated_cost.try(:delete)
+
+        if status == Status::Won
+          create_dated_cost(:cost => campaign.cost, :costable => campaign, :date => converted_at.to_date)
+        end
+      end
+    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
+    date_methods   :closed_at, :converted_at
   end
 
   module Status

data/app/models/offer.rb

@@ -16,13 +16,22 @@ class Offer < Renderable
   self.delegate_options_methods = true
   self.options_parameters = [
     :submit_button_text,
-    :success_alert_text,
     :success_page_text,
-    :download_link_text,
     :conversion_alert_email,
-    :custom_form_html
+    :custom_form_html,
+    :mailing_list_ids
   ]
 
+  def has_mailing_list?(ml)
+    (mailing_list_ids || []).map(&:to_s).member?(ml.id.to_s)
+  end
+
+  def mailing_lists
+    @_mailing_lists ||= begin
+      mailing_list_ids ? MailingList.find_all_by_id(mailing_list_ids) : []
+    end
+  end
+
   class << self
     def conversion_email
       SystemEmail.find_by_identifier(Identifiers::CONVERSION_EMAIL)
@@ -53,7 +62,6 @@ class Offer < Renderable
 
     def _assign_initialization_defaults
       self.submit_button_text ||= 'Submit!'
-      self.download_link_text ||= 'Click to download your file'
       self.success_page_text  ||= 'Thank you!'
     end
 

data/app/models/sales_campaign.rb

@@ -14,4 +14,9 @@ class SalesCampaign < Campaign
   def cost
     sales_fee
   end
+
+  def set_cost(options = {})
+    dated_costs.clear
+    dated_costs.create(options.merge(:cost => cost))
+  end
 end

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

@@ -23,6 +23,14 @@
     %select{:name => 'company', :id => 'contact_company_select'}
       = company_select_options
 
-  = render 'tag_table'
+  .field#contact_tag_list
+    %label{:for => 'contact_tag_autocomplete'} Tags
+    %input#contact_tag_autocomplete.list{:type => 'text', 'data-iname' => 'contact', 'data-field' => '[tagged]', :placeholder => 'Enter a tag...'}
+    %ul#contact_tag_select.select
+      - Array.wrap(params[:tagged]).each do |tag|
+        %li.ui-state-default
+          %span.content= tag
+          %a{:class => :remove, :title => "Remove", :alt => "Remove"} Remove
+
   .actions
     = submit_tag t(:clear_all_filters), :name => nil, :id => 'contact_search_clear'

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

@@ -1,9 +1,6 @@
 .actions.top
   - if resource.persisted?
-    - if resource.lead?
-      = link_to 'Back to Leads', leads_path
-    - else
-      = link_to_destroy_resource(resource, :remote => false)
+    = link_to_destroy_resource(resource, :remote => false) 
 
 .field
   = f.label :name, nil, :class => :req

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

@@ -29,9 +29,6 @@
             = record.info
           %td.actions
             - if record.contacts.present?
-              = link_to_show_resource(record.contacts.first)
+              = link_to 'View Contact', record.contacts.first
             = link_to 'Create Deal', edit_deal_path(record)
             = link_to 'Delete Lead', record, :method => :delete, :remote => true, :confirm => I18n.t("#{resource_class.i18n_scope}.links.confirm_destroy")
-
-- if @controller.should_paginate_index
-  = will_paginate collection

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

@@ -40,6 +40,3 @@
         %td.record-totals.num
           = dat[:value].sum.to_money.format
         %td
-
-- if @controller.should_paginate_index
-  = will_paginate collection

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

@@ -12,9 +12,9 @@
 
   = @offer.custom_form_html.html_safe
 
-  - if @offer.kind_of?(SubscriptionOffer)
+  - if @offer.mailing_lists.any?
     %fieldset
-      - @offer.class.mailing_lists.each do |ml|
+      - @offer.mailing_lists.each do |ml|
         .field.checkbox
           = label_tag "#{resource_instance_name}_mailing_list_ids_#{ml.id}", ml.description
           = check_box_tag "#{resource_instance_name}[mailing_list_ids][]", ml.id, true, :id => "#{resource_instance_name}_mailing_list_ids_#{ml.id}"

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

@@ -2,10 +2,5 @@ var $offer = $('#offer_<%= @offer.id %>_body');
 <% if resource.errors.any? %>
 $('form .errors', $offer).html("<%= escape_javascript(resource_error_messages!) %>");
 <% else %>
-  <% if @offer.kind_of?(SubscriptionOffer) %>
-$('form .errors', $offer).html("");
-$('form .notice', $offer).html("<%= escape_javascript(@offer.success_alert_text) %>");
-  <% else %>
-window.location = "<%= public_offer_path(@offer) %>";
-  <% end %>
+setTimeout(function(){ location.href="<%= public_offer_path(@offer) %>"; },0)
 <% end %>

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

@@ -1,9 +1,28 @@
+- content_for :bottom_javascripts do
+  -#= render 'shared/admin/tiny_mce') if use_tiny_mce?
+  = render 'shared/admin/tiny_mce'
+
 .field
   = f.label :name, nil, :class => :req
   = f.text_field :name
 
+.field
+  = f.label :submit_button_text
+  = f.text_field :submit_button_text
+
+.field
+  = f.label :conversion_alert_email
+  = f.text_field :conversion_alert_email
+
+%fieldset
+  %legend= f.label(:mailing_list_ids)
+  - offer_mailing_lists.each do |ml|
+    .field.checkbox
+      = check_box_tag "offer[mailing_list_ids][]", ml.id, resource.has_mailing_list?(ml), :id => "offer_mailing_list_ids_#{ml.id}"
+      = label_tag "offer_mailing_list_ids_#{ml.id}", ml.name
+
 .field.tinymce
-  = help_label(f, :template, :markdown => true)
+  = f.label :template
   = f.text_area :template
 
 .field
@@ -18,11 +37,3 @@
       = hidden_field_tag 'offer[node_ids][]', id, :id => "offer_node_ids_#{i}"
 - else
   = render 'shared/admin/region_type_select', :f => f
-
-.field
-  = f.label :submit_button_text
-  = f.text_field :submit_button_text
-
-.field
-  = f.label :conversion_alert_email
-  = f.text_field :conversion_alert_email

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

@@ -5,8 +5,4 @@
         = offer_select_options
 
   .toolbar-right
-    = form_tag new_contact_offer_path, :method => :get, :id => 'new_offer_form' do
-      = label_tag 'new_offer_select', t('activerecord.links.new', :model => Offer.model_name.human)
-      %select{:name => 'type', :id => 'new_offer_select'}
-        = offer_select_options(false)
-        = submit_tag t(:go), :name => nil
+    = link_to_new_resource(Offer)

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

@@ -1,6 +1,2 @@
 #offer-body
   = k resource.success_page_text
-
-- if resource.file?
-  #offer-download-link
-    = link_to(resource.download_link_text, resource.file_url)

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

@@ -9,3 +9,6 @@
 - else
   %div#records_table
     = render 'table', :resources => collection
+
+- if controller.should_paginate_index
+  = will_paginate collection

data/config/locales/en.yml

@@ -62,10 +62,13 @@ en:
               blank: "None of the contacts selected are configured with primary emails.  Please correct this and try again."
         deal:
           attributes:
+            campaign:
+              closed_no_change: You cannot change the campaign of a closed deal. To do so, you must commit the status as "pending" then try again.
             status:
               illegal_conversion: A Deal with "lead" status can only be converted to "pending"
               illegal_reversion: A Deal that has been marked "won" or "lost" cannot be reverted to a "lead"
-              invalid: "Status must be one of (%{options})"
+              closed_no_destroy: You cannot delete a closed deal. To remove it, you must commit the status as "pending" then try again.
+              inclusion: "Status must be one of (%{options})"
 
     models:
       address_attribute: Address
@@ -148,6 +151,7 @@ en:
         owner: Responsible
         won_deal_count: Won count 
       offer:
+        mailing_list_ids: Subscriptions
         template: Teaser Text
         template_help: |
           <h3>Variables:</h3>

data/config/routes.rb

@@ -61,22 +61,7 @@ Rails.application.routes.draw do
       end
     end
 
-    resources :offers, :only  => [:index, :destroy]
-    scope :path => :offers do
-      resources :contact_offers,                  :path => 'contact',                  :except => [:show, :index]
-      resources :file_download_offers,            :path => 'file_download',            :except => [:show, :index]
-      resources :new_content_subscription_offers, :path => 'new_content_subscription', :except => [:show, :index]
-      resources :newsletter_subscription_offers,  :path => 'newsletter_subscription',  :except => [:show, :index]
-      resources :video_offers,                    :path => 'video',                    :except => [:show, :index]
-
-      %w( contact file_download new_content_subscription newsletter_subscription video ).each do |path|
-        get "/#{path}", :as => "#{path}_offers_redirect", :to => redirect("/#{crm_path}/offers?type=#{path}")
-        get "/#{path}/:id", :as => "#{path}_offers_edit_redirect", :to => redirect("/#{crm_path}/#{path}/%{id}/edit"), :constraints => { :id => /\d+/ }
-      end
-      
-      %w( contact file_download new_content_subscription newsletter_subscription video ).each do |path|
-      end
-    end
+    resources :offers, :except => :show
 
     # leads are simply a scoped view of deals (only index)
     get :leads,            :as => :leads,          :to => 'deals#leads'

data/e9_crm.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |s|
   s.add_dependency("e9_attributes")
   s.add_dependency("will_paginate")
   s.add_dependency("kramdown", "~> 0.13")
+  s.add_dependency("state_machine", "~> 1.0")
 end

data/lib/e9_crm/system_emails_controller.rb

@@ -0,0 +1,27 @@
+module E9Crm
+  module SystemEmailsController
+    extend ActiveSupport::Concern
+
+    included do
+      alias :send_test_email_without_crm :send_test_email
+
+      def send_test_email(email, current_user)
+        if email.try(:identifier) == Offer::Identifiers::CONVERSION_EMAIL
+          offer = Offer.new(:name => 'TEST OFFER')
+          lead  = Deal.new(:offer      => offer,
+                           :lead_email => 'LEAD_EMAIL@example.com',
+                           :lead_name  => 'LEAD_NAME',
+                           :info       => 'Some Info',
+                           :created_at => DateTime.now)
+
+          Offer.conversion_email.send!(current_user, {
+            :offer => offer, 
+            :lead => lead
+          })
+        else
+          send_test_email_without_crm(email)
+        end
+      end
+    end
+  end
+end

data/lib/e9_crm/version.rb

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

data/lib/e9_crm.rb

@@ -8,6 +8,7 @@ module E9Crm
   autoload :Model,                  'e9_crm/model'
   autoload :Email,                  'e9_crm/email'
   autoload :TrackingController,     'e9_crm/tracking_controller'
+  autoload :SystemEmailsController, 'e9_crm/system_emails_controller'
 
   module Rack
     autoload :ContactAutoCompleter, 'e9_crm/rack/contact_auto_completer'
@@ -53,6 +54,7 @@ module E9Crm
     ApplicationController.send(:include, E9Crm::Controller)
 
     ::Email.send(:include, E9Crm::Email)
+    ::Admin::SystemEmailsController.send(:include, E9Crm::SystemEmailsController)
 
     E9Crm.tracking_controllers.each do |controller|
       controller.send(:include, E9Crm::TrackingController)

metadata

@@ -2,7 +2,7 @@
 name: e9_crm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors: 
 - Travis Cox
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-12 00:00:00 Z
+date: 2011-09-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -111,6 +111,17 @@ dependencies:
         version: "0.13"
   type: :runtime
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: state_machine
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id010
 description: |
   *NOTE his plugin requires the private e9_base CMS gem and WILL NOT WORK without it.*
   
@@ -164,23 +175,17 @@ files:
 - app/controllers/e9_crm/companies_controller.rb
 - app/controllers/e9_crm/contact_emails_controller.rb
 - app/controllers/e9_crm/contact_merges_controller.rb
-- app/controllers/e9_crm/contact_offers_controller.rb
 - app/controllers/e9_crm/contacts_controller.rb
 - app/controllers/e9_crm/dated_costs_controller.rb
 - app/controllers/e9_crm/deals_controller.rb
 - app/controllers/e9_crm/email_campaigns_controller.rb
 - app/controllers/e9_crm/email_templates.controller.rb
-- app/controllers/e9_crm/file_download_offers_controller.rb
 - app/controllers/e9_crm/leads_controller.rb
-- app/controllers/e9_crm/new_content_subscription_offers_controller.rb
-- app/controllers/e9_crm/newsletter_subscription_offers_controller.rb
-- app/controllers/e9_crm/offer_subclass_controller.rb
 - app/controllers/e9_crm/offers_controller.rb
 - app/controllers/e9_crm/page_views_controller.rb
 - app/controllers/e9_crm/resources_controller.rb
 - app/controllers/e9_crm/sales_campaigns_controller.rb
 - app/controllers/e9_crm/users_controller.rb
-- app/controllers/e9_crm/video_offers_controller.rb
 - app/helpers/e9_crm/base_helper.rb
 - app/helpers/e9_crm/campaign_groups_helper.rb
 - app/helpers/e9_crm/campaigns_helper.rb
@@ -200,21 +205,15 @@ files:
 - app/models/company.rb
 - app/models/contact.rb
 - app/models/contact_email.rb
-- app/models/contact_offer.rb
 - app/models/dated_cost.rb
 - app/models/deal.rb
 - app/models/email_campaign.rb
 - app/models/email_template.rb
-- app/models/file_download_offer.rb
-- app/models/new_content_subscription_offer.rb
-- app/models/newsletter_subscription_offer.rb
 - app/models/no_campaign.rb
 - app/models/offer.rb
 - app/models/page_view.rb
 - app/models/sales_campaign.rb
-- app/models/subscription_offer.rb
 - app/models/tracking_cookie.rb
-- app/models/video_offer.rb
 - app/observers/deal_observer.rb
 - app/uploaders/file_uploader.rb
 - app/views/e9_crm/advertising_campaigns/_form_inner.html.haml
@@ -234,7 +233,6 @@ 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/contact_offers/_form_inner.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
@@ -280,8 +278,6 @@ 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/new_content_subscription_offers/_form_inner.html.haml
-- app/views/e9_crm/newsletter_subscription_offers/_form_inner.html.haml
 - app/views/e9_crm/offers/_form_inner.html.haml
 - app/views/e9_crm/offers/_header.html.haml
 - app/views/e9_crm/offers/_offer.html.haml
@@ -301,8 +297,6 @@ files:
 - app/views/e9_crm/resources/show.html.haml
 - app/views/e9_crm/resources/update.js.erb
 - app/views/e9_crm/sales_campaigns/_form_inner.html.haml
-- app/views/e9_crm/subscription_offers/_form_inner.html.haml
-- app/views/e9_crm/video_offers/_form_inner.html.haml
 - app/views/record_attributes/_user.html.haml
 - config/initializers/inflections.rb
 - config/locales/e9.en.yml
@@ -317,6 +311,7 @@ files:
 - lib/e9_crm/rack/company_auto_completer.rb
 - lib/e9_crm/rack/contact_auto_completer.rb
 - lib/e9_crm/rails_extensions.rb
+- lib/e9_crm/system_emails_controller.rb
 - lib/e9_crm/tracking_controller.rb
 - lib/e9_crm/version.rb
 - lib/generators/e9_crm/install_generator.rb

data/app/controllers/e9_crm/contact_offers_controller.rb

@@ -1,3 +0,0 @@
-class E9Crm::ContactOffersController < E9Crm::OfferSubclassController
-  defaults :resource_class => ContactOffer
-end

data/app/controllers/e9_crm/file_download_offers_controller.rb

@@ -1,3 +0,0 @@
-class E9Crm::FileDownloadOffersController < E9Crm::OfferSubclassController
-  defaults :resource_class => FileDownloadOffer
-end

data/app/controllers/e9_crm/new_content_subscription_offers_controller.rb

@@ -1,3 +0,0 @@
-class E9Crm::NewContentSubscriptionOffersController < E9Crm::OfferSubclassController
-  defaults :resource_class => NewContentSubscriptionOffer
-end

data/app/controllers/e9_crm/newsletter_subscription_offers_controller.rb

@@ -1,3 +0,0 @@
-class E9Crm::NewsletterSubscriptionOffersController < E9Crm::OfferSubclassController
-  defaults :resource_class => NewsletterSubscriptionOffer
-end

data/app/controllers/e9_crm/offer_subclass_controller.rb

@@ -1,11 +0,0 @@
-class E9Crm::OfferSubclassController < E9Crm::ResourcesController
-  protected
-
-    def add_index_breadcrumb
-      add_breadcrumb! Offer.model_name.collection.titleize, offers_path 
-    end
-
-    def determine_layout
-      request.xhr? ? false : super
-    end
-end

data/app/controllers/e9_crm/video_offers_controller.rb

@@ -1,3 +0,0 @@
-class E9Crm::VideoOffersController < E9Crm::OfferSubclassController
-  defaults :resource_class => VideoOffer
-end

data/app/models/contact_offer.rb

@@ -1,2 +0,0 @@
-class ContactOffer < Offer
-end

data/app/models/file_download_offer.rb

@@ -1,2 +0,0 @@
-class FileDownloadOffer < Offer
-end

data/app/models/new_content_subscription_offer.rb

@@ -1,5 +0,0 @@
-class NewContentSubscriptionOffer < SubscriptionOffer
-  def self.mailing_lists
-    [::MailingList.new_content_alerts]
-  end
-end

data/app/models/newsletter_subscription_offer.rb

@@ -1,5 +0,0 @@
-class NewsletterSubscriptionOffer < SubscriptionOffer
-  def self.mailing_lists
-    [::MailingList.newsletter]
-  end
-end

data/app/models/subscription_offer.rb

@@ -1,3 +0,0 @@
-class SubscriptionOffer < Offer
-  def self.mailing_lists; [] end
-end

data/app/models/video_offer.rb

@@ -1,2 +0,0 @@
-class VideoOffer < Offer
-end

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

@@ -1,5 +0,0 @@
-= render 'e9_crm/offers/form_inner', :f => f
-
-.field{:class => request.xhr? ? 'tinymcexhr' : 'tinymce'}
-  = 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/new_content_subscription_offers/_form_inner.html.haml

@@ -1 +0,0 @@
-= render 'e9_crm/subscription_offers/form_inner', :f => f

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

@@ -1 +0,0 @@
-= render 'e9_crm/subscription_offers/form_inner', :f => f

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

@@ -1,5 +0,0 @@
-= render 'e9_crm/offers/form_inner', :f => f
-
-.field
-  = f.label :success_alert_text
-  = f.text_field :success_alert_text

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

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