e9_crm 0.1.7 → 0.1.8

data/config/locales/en.yml

@@ -23,9 +23,9 @@ en:
         show: '%{model}'
 
     links:
-      edit: "Edit"
-      destroy: "Delete"
-      show: "View"
+      edit: "Edit %{model}"
+      destroy: "Delete %{model}"
+      show: "View %{model}"
       index: "Manage %{models}"
 
       campaign_group: 
@@ -55,22 +55,32 @@ en:
               invalid: "Status must be one of (%{options})"
 
     models:
-      sales_campaign: Sales Campaign
-      email_campaign: Email Campaign
-      email_template: Email Template
-      affiliate_campaign: Affiliate Campaign
+      address_attribute: Address
       advertising_campaign: Advertising Campaign
+      affiliate_campaign: Affiliate Campaign
       campaign: Campaign
-      campaign_type: Campaign Type
+      campaign_group: Campaign Group
       company: Company
       contact: Contact
+      contact_email: Contact Email
+      contact_offer: Contact Offer
       dated_cost: Advertising Cost
       deal: Deal
-      page_view: Page View
-      tracking_cookie: Tracking Cookie
-      address_attribute: Address
+      email_campaign: Email Campaign
+      email_template: Email Template
+      file_download_offer: File Download Offer
       instant_messaging_handle_attribute: IM Handle
+      menu_options: Menu Option
+      new_content_subscription_offer: New Content Subscription Offer
+      newsletter_subscription_offer: Newsletter Subscription Offer
+      no_campaign: '(No Campaign)'
+      offer: Offer
+      page_view: Page View
       phone_number_attrubute: Phone
+      record_attribute: Attribute
+      sales_campaign: Sales Campaign
+      tracking_cookie: Tracking Cookie
+      video_offer: Video Offer
       website_attribute: Website
     attributes:
       campaign:
@@ -86,9 +96,16 @@ en:
         info: Background Information
       company:
         info: Background Information
-      no_campaign:
-        name: No Campaign
+      deal:
+        info: Details
+        custom_info: Lead Information
+        lead_email: Email
+        lead_name: First Name
+        campaign_code: Code
+        offer_name: Offer
+        created_at: Date
       offer:
+        template: Teaser Text
         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/config/routes.rb

@@ -1,6 +1,12 @@
 Rails.application.routes.draw do
   crm_path = 'admin/crm'
 
+  scope :module => :e9_crm do
+    resources :offers, :as => :public_offer, :only => :show do
+      resources :leads, :as => :deals, :only => [:new, :create], :path => ''
+    end
+  end
+
   scope :path => crm_path, :module => :e9_crm do
     resources :companies, :except => :show
     resources :contacts do
@@ -13,8 +19,8 @@ Rails.application.routes.draw do
         delete :reset_avatar
       end
     end
+
     resources :deals, :except => :show
-    resources :offers, :except => :show
 
     # contact_emails are generated by email templates, and end up in the sent emails list
     resources :contact_emails,  :except => [:index, :show]
@@ -38,11 +44,11 @@ Rails.application.routes.draw do
       #get '/activity', :to => redirect("/#{crm_path}/campaigns/all/activity")
       resources :campaign_groups, :path => 'groups', :except => [:show]
 
-      resources :sales_campaigns, :path => 'sales', :except => [:show, :index]
-      resources :affiliate_campaigns, :path => 'affiliate', :except => [:show, :index]
-      resources :email_campaigns, :path => 'email', :except => [:show, :index]
+      resources :sales_campaigns,       :path => 'sales',       :except => [:show, :index]
+      resources :affiliate_campaigns,   :path => 'affiliate',   :except => [:show, :index]
+      resources :email_campaigns,       :path => 'email',       :except => [:show, :index]
       resources :advertising_campaigns, :path => 'advertising', :except => [:show, :index] do
-        resources :dated_costs, :path => 'costs'
+        resources :dated_costs,         :path => 'costs'
       end
 
       %w( advertising affiliate email sales ).each do |path|
@@ -50,9 +56,26 @@ Rails.application.routes.draw do
       end
     end
 
-    # leads are simply a scoped view of offers (only index)
-    get :leads, :as => :leads, :to => 'deals#leads'
-    get :marketing_report, :to => 'deals#reports', :only => :index
+    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
+
+    # leads are simply a scoped view of deals (only index)
+    get :leads,            :as => :leads,          :to => 'deals#leads'
+    get :marketing_report,                         :to => 'deals#reports'
 
     get  '/merge_contacts/:contact_a_id/and/:contact_b_id', :as => :new_contact_merge, :to => 'contact_merges#new'
     post '/merge_contacts', :as => :contact_merges, :to => 'contact_merges#create'

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.14")
+  s.add_dependency("e9_rails", "~> 0.0.15")
   s.add_dependency("e9_tags", "~> 0.0.11")
   s.add_dependency("will_paginate")
 end

data/lib/e9_crm/controller.rb

@@ -0,0 +1,94 @@
+module E9Crm
+  #
+  # This module is included into all controllers and makes available the current +tracking_cookie+
+  # and +tracking_campaign+ as controller and helper methods
+  #
+  module Controller
+    extend ActiveSupport::Concern
+
+    included do
+      helper_method :tracking_cookie, :tracking_campaign
+
+      prepend_before_filter do
+        E9Crm.log("E9Crm controller request")
+      end
+    end
+
+    protected
+
+    #
+    # Attempts to get the Campaign associated with the loaded tracking cookie, and will
+    # install a tracking cookie first if one is not found.
+    #
+    # Falls back the the default campaign (typically No Campaign) if the tracking cookie
+    # is not associated with a campaign.
+    #
+    def tracking_campaign
+      @_tracking_campaign ||= begin
+        tracking_cookie.code.present? && Campaign.find_by_code(tracking_cookie.code) || Campaign.default
+      end
+    end
+
+    #
+    # Loads or installs the tracking cookie
+    #
+    def tracking_cookie
+      @_tracking_cookie ||= begin
+        E9Crm.log "Begin load or install cookie: cookie_name[#{E9Crm.cookie_name}] query_param[#{E9Crm.query_param}]"
+
+        code = params.delete(E9Crm.query_param)
+
+        if hid = cookies[E9Crm.cookie_name]
+          E9Crm.log("Installed cookie found: hid(#{hid})")
+          @_tracking_cookie = TrackingCookie.find_by_hid(hid)
+
+          unless @_tracking_cookie
+            # This should only happen in developemnt, as it means the cookie has been
+            # installed then removed from the database.
+            E9Crm.log("Installed cookie's hash id does not match any stored cookies!")
+          end
+        end
+
+        E9Crm.log(@_tracking_cookie ? "Cookie loaded: (#{E9Crm.cookie_name} : #{@_tracking_cookie.hid})" : "Cookie not found")
+
+        if @_tracking_cookie
+          if current_user && @_tracking_cookie.user_id? && @_tracking_cookie.user_id != current_user.id
+            E9Crm.log "Tracking user_id not matched: found(#{@_tracking_cookie.user_id}), current(#{current_user.id}"
+            @_tracking_cookie = nil
+          else
+            attrs = {}
+
+            if current_user && !@_tracking_cookie.user_id?
+              E9Crm.log("Cookie user (#{@_tracking_cookie.user_id}) not current_user (#{current_user.id}), changing...")
+              attrs[:user] = current_user
+            end
+
+            if code.present? && code != @_tracking_cookie.code && Campaign.find_by_code(code)
+              E9Crm.log "Code present and cookie code(#{@_tracking_cookie.code}) does not match (#{code}), changing..."
+              attrs[:code] = code
+
+              E9Crm.log "Cookie marked as new"
+              session[:new_visit] = true
+            end
+
+            E9Crm.log(attrs.blank? ? "Cookie unchanged, no update" : "Cookie changed, new attrs: #{attrs.inspect}")
+            @_tracking_cookie.update_attributes(attrs) unless attrs.blank?
+          end
+        end
+
+        @_tracking_cookie ||= begin
+          session[:new_visit] = true
+
+          TrackingCookie.create(:code => code, :user => current_user).tap do |cookie|
+            E9Crm.log "Installing new cookie (#{E9Crm.cookie_name} : #{cookie.hid})"
+            cookies.permanent[E9Crm.cookie_name] = cookie.hid
+          end
+        end
+
+        E9Crm.log("Final Cookie : #{@_tracking_cookie.inspect}")
+
+        @_tracking_cookie
+      end
+    end
+  end
+end

data/lib/e9_crm/model.rb

@@ -23,7 +23,7 @@ module E9Crm
 
       scope :primary, lambda { where(%Q{#{table_name}.options REGEXP "primary: [\\"']?true"}) }
 
-      before_create :create_contact_if_missing
+      before_save :create_contact_if_missing!
       after_destroy :cleanup_contact
     end
 
@@ -34,20 +34,20 @@ module E9Crm
       ["true", true].member? options.primary
     end
 
+    def create_contact_if_missing!
+      if contact.blank?
+        # when creating a contact we should assume we're primary
+        self.options.primary = true
+        create_contact(create_contact_parameters)
+      end
+    end
+
     protected
 
       def create_contact_parameters
         { :first_name => self.first_name, :last_name => self.last_name }
       end
 
-      def create_contact_if_missing
-        if contact.blank?
-          # when creating a contact we should assume we're primary
-          self.options.primary = true
-          create_contact(create_contact_parameters)
-        end
-      end
-
       def cleanup_contact
         # NOTE this is called after_delete, reload the contact to clear the deleted
         #      user from the contact's #users

data/lib/e9_crm/rails_extensions.rb

@@ -2,6 +2,14 @@ require 'active_record/base'
 require 'action_view/base'
 
 class Array
+  #
+  # Simple helper for array calculating averages
+  #
+  # Returns 0 if all array elements do not exist and respond to to_f
+  #
+  # NOTE nil responds to to_f but not to +, which would throw an
+  #      exception on sum if nil was allowed in the array
+  #
   def average
     return 0 unless length > 0 && all? {|n| n && n.respond_to?(:to_f) }
     sum / length
@@ -81,6 +89,7 @@ module E9Crm
   # This would be worth looking into further but inherited templates are a feature coming 
   # up in Rails anyway.
   #
+
   module ActionView
     extend ActiveSupport::Concern
 

data/lib/e9_crm/tracking_controller.rb

@@ -5,91 +5,59 @@ module E9Crm
     included do
       before_filter :check_for_new_session 
       after_filter  :track_page_view
-    end
-
-    protected 
-      def check_for_new_session
-        if request.session_options[:id].blank?
-          E9Crm.log("No session found, page view will increment campaign counter cache")
-          @_should_cache = true
-        end
-      end
 
-      def track_page_view
-        @_page_view ||= tracking_cookie.page_views.create({
-          :request_path => request.fullpath,
-          :user_agent   => request.user_agent,
-          :referer      => request.referer,
-          :remote_ip    => request.remote_ip,
-          :session      => request.session_options[:id],
-          :campaign     => tracking_campaign,
-          :new_visit    => session[:new_visit].present?,
-          :should_cache => !!@_should_cache
-        })
+      prepend_before_filter do
+        E9Crm.log("E9Crm tracking controller request")
       end
+    end
 
-      def tracking_cookie
-        @_tracking_cookie ||= begin
-          E9Crm.log "Begin load or install cookie: cookie_name[#{E9Crm.cookie_name}] query_param[#{E9Crm.query_param}]"
-
-          code = params.delete(E9Crm.query_param)
-
-          if hid = cookies[E9Crm.cookie_name]
-            E9Crm.log("Installed cookie found: hid(#{hid})")
-            @_tracking_cookie = TrackingCookie.find_by_hid(hid)
-
-            unless @_tracking_cookie
-              # This should only happen in developemnt, as it means the cookie has been
-              # installed then removed from the database.
-              E9Crm.log("Installed cookie's hash id does not match any stored cookies!")
-            end
-          end
-
-          E9Crm.log(@_tracking_cookie ? "Cookie loaded: (#{E9Crm.cookie_name} : #{@_tracking_cookie.hid})" : "Cookie not found")
-
-          if @_tracking_cookie
-            if current_user && @_tracking_cookie.user_id? && @_tracking_cookie.user_id != current_user.id
-              E9Crm.log "Tracking user_id not matched: found(#{@_tracking_cookie.user_id}), current(#{current_user.id}"
-              @_tracking_cookie = nil
-            else
-              attrs = {}
-
-              if current_user && !@_tracking_cookie.user_id?
-                E9Crm.log("Cookie user (#{@_tracking_cookie.user_id}) not current_user (#{current_user.id}), changing...")
-                attrs[:user] = current_user
-              end
-
-              if code.present? && code != @_tracking_cookie.code && Campaign.find_by_code(code)
-                E9Crm.log "Code present and cookie code(#{@_tracking_cookie.code}) does not match (#{code}), changing..."
-                attrs[:code] = code
-
-                E9Crm.log "Cookie marked as new"
-                session[:new_visit] = true
-              end
-
-              E9Crm.log(attrs.blank? ? "Cookie unchanged, no update" : "Cookie changed, new attrs: #{attrs.inspect}")
-              @_tracking_cookie.update_attributes(attrs) unless attrs.blank?
-            end
-          end
-
-          @_tracking_cookie ||= begin
-            session[:new_visit] = true
-
-            TrackingCookie.create(:code => code, :user => current_user).tap do |cookie|
-              E9Crm.log "Installing new cookie (#{E9Crm.cookie_name} : #{cookie.hid})"
-              cookies.permanent[E9Crm.cookie_name] = cookie.hid
-            end
-          end
-
-          E9Crm.log("Final Cookie : #{@_tracking_cookie.inspect}")
-
-          @_tracking_cookie
-        end
-      end
+    protected 
 
-      def tracking_campaign
-        @_tracking_campaign ||= tracking_cookie.code.presence && Campaign.find_by_code(tracking_cookie.code) || Campaign.default
+    #
+    # Checks to see if our session is new (a first request).  During such a call 
+    # the session id has not been set yet.
+    #
+    # This is useful when determining whether or not the page view (created afterwards)
+    # should increment the counter cache for its associated Campaign, as this should
+    # only happen once per session.
+    #
+    def check_for_new_session
+      if request.session_options[:id].blank?
+        E9Crm.log("No session found, page view will increment campaign counter cache")
+        @_should_cache = true
       end
+    end
 
+    #
+    # Track a page view and associate it with the loaded cookie.
+    #
+    # === Notable paramters
+    #
+    # [:new_visit]    This is stored in the session during tracking cookie creation
+    #                 if the tracking cookie is either new, or changing campaigns
+    #                 because a user is visiting on a different code.
+    #
+    # [:campaign]     The campaign associated with the tracking cookie or the default
+    #                 campaign (typically the NoCampaign record)
+    #
+    # [:should_cache] Whether or not this page view should increment the page view
+    #                 count for it's associated page.  This should only happen once
+    #                 per session and for this reason, is only true on sessionless
+    #                 (new) requests.  This is determined by looking for a session id
+    #                 during the before filter, as in the after filter the session id
+    #                 has been assigned.
+    #
+    def track_page_view
+      @_page_view ||= tracking_cookie.page_views.create({
+        :request_path => request.fullpath,
+        :user_agent   => request.user_agent,
+        :referer      => request.referer,
+        :remote_ip    => request.remote_ip,
+        :session      => request.session_options[:id],
+        :campaign     => tracking_campaign,
+        :new_visit    => session[:new_visit].present?,
+        :should_cache => !!@_should_cache
+      })
+    end
   end
 end

data/lib/e9_crm/version.rb

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

data/lib/e9_crm.rb

@@ -10,8 +10,9 @@ require 'e9_crm/rails_extensions'
 
 module E9Crm
   autoload :VERSION,            'e9_crm/version'
-  autoload :TrackingController, 'e9_crm/tracking_controller'
+  autoload :Controller,         'e9_crm/controller'
   autoload :Model,              'e9_crm/model'
+  autoload :TrackingController, 'e9_crm/tracking_controller'
 
   mattr_accessor :cookie_name
   @@cookie_name = '_e9_tc'
@@ -35,6 +36,10 @@ module E9Crm
     Rails.logger.send(@@log_level, "e9Crm: #{message}") if @@logging
   end
 
+  def E9Crm.configure
+    yield self
+  end
+
   def E9Crm.init!
     user_model = case @@user_model
     when Class; @@user_model
@@ -45,6 +50,8 @@ module E9Crm
       user_model.send(:include, E9Crm::Model)
     end
 
+    ActionController::Base.send(:include, E9Crm::Controller)
+
     E9Crm.tracking_controllers.each do |controller|
       controller.send(:include, E9Crm::TrackingController)
     end

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

@@ -75,9 +75,10 @@ class CreateE9CrmStructure < ActiveRecord::Migration
     create_table :deals, :force => true do |t|
       t.string :type
       t.string :name
-      t.string :category
+      t.string :lead_name, :lead_email
+      t.string :category, :offer_name, :campaign_code
       t.text :info
-      t.references :offer, :campaign, :tracking_cookie, :contact
+      t.references :offer, :campaign, :contact, :user
       t.timestamp :created_at, :updated_at, :converted_at, :closed_at
       t.string :status, :limit => 32
       t.integer :value, :default => 0
@@ -87,13 +88,6 @@ class CreateE9CrmStructure < ActiveRecord::Migration
     add_index 'deals', 'tracking_cookie_id'
     add_index 'deals', 'status'
 
-    create_table :offers, :force => true do |t|
-      t.string :type
-      t.references :offer, :campaign, :tracking_cookie
-      t.timestamp :created_at, :updated_at, :converted_at, :closed_at
-      t.string :status, :limit => 32
-    end
-
     add_column :users, :contact_id, :integer rescue nil
     add_column :users, :options, :text, :limit => 1.kilobyte rescue nil
   end

metadata

@@ -2,7 +2,7 @@
 name: e9_crm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Travis Cox
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 -04:00
+date: 2011-05-25 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.14
+        version: 0.0.15
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -133,7 +133,6 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - app/controllers/e9_crm/advertising_campaigns_controller.rb
@@ -145,16 +144,23 @@ 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/menu_options_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/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
@@ -163,31 +169,37 @@ files:
 - 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/leads_helper.rb
 - app/helpers/e9_crm/menu_options_helper.rb
+- app/helpers/e9_crm/offers_helper.rb
 - app/helpers/e9_crm/page_views_helper.rb
 - app/models/address_attribute.rb
 - app/models/advertising_campaign.rb
-- app/models/affiliate.rb
 - app/models/affiliate_campaign.rb
 - app/models/campaign.rb
 - app/models/campaign_group.rb
 - 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/instant_messaging_handle_attribute.rb
 - app/models/menu_option.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/phone_number_attribute.rb
 - app/models/record_attribute.rb
 - app/models/sales_campaign.rb
-- app/models/sales_person.rb
+- app/models/subscription_offer.rb
 - app/models/tracking_cookie.rb
+- app/models/video_offer.rb
 - app/models/website_attribute.rb
 - app/observers/deal_observer.rb
 - app/uploaders/file_uploader.rb
@@ -206,14 +218,15 @@ files:
 - 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
-- app/views/e9_crm/contact_emails/send_email.js.erb
 - 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
 - app/views/e9_crm/contacts/_header.html.haml
+- app/views/e9_crm/contacts/_index_sidebar.html.haml
 - app/views/e9_crm/contacts/_sidebar.html.haml
 - app/views/e9_crm/contacts/_table.html.haml
 - app/views/e9_crm/contacts/_tag_table.html.haml
@@ -237,20 +250,34 @@ files:
 - app/views/e9_crm/deals/_footer.html.haml
 - app/views/e9_crm/deals/_form_inner.html.haml
 - app/views/e9_crm/deals/_header.html.haml
+- app/views/e9_crm/deals/_leads_header.html.haml
+- app/views/e9_crm/deals/_leads_table.html.haml
 - app/views/e9_crm/deals/_reports_table.html.haml
 - app/views/e9_crm/deals/_table.html.haml
 - app/views/e9_crm/deals/leads.html.haml
+- app/views/e9_crm/deals/leads.js.erb
+- app/views/e9_crm/deals/offer_form.html.haml
 - 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/file_download_offers/_form.html.haml
+- app/views/e9_crm/file_download_offers/_form_inner.html.haml
+- 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/_form_inner.html.haml
 - app/views/e9_crm/menu_options/_header.html.haml
-- app/views/e9_crm/offers/_form.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/_footer.html.haml
 - app/views/e9_crm/offers/_form_inner.html.haml
-- app/views/e9_crm/offers/_form_inner.html.haml.bak
+- app/views/e9_crm/offers/_header.html.haml
+- app/views/e9_crm/offers/_offer.html.haml
+- app/views/e9_crm/offers/_public_offer.html.haml
+- app/views/e9_crm/offers/show.html.haml
 - 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
@@ -274,12 +301,15 @@ 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
 - config/initializers/inflections.rb
 - config/locales/e9.en.yml
 - config/locales/en.yml
 - config/routes.rb
 - e9_crm.gemspec
 - lib/e9_crm.rb
+- lib/e9_crm/controller.rb
 - lib/e9_crm/model.rb
 - lib/e9_crm/rails_extensions.rb
 - lib/e9_crm/tracking_controller.rb