e9_crm 0.1.7 → 0.1.8

data/app/models/offer.rb

@@ -2,46 +2,57 @@
 # offers are tracked as +Leads+
 #
 class Offer < Renderable
+  include E9Rails::ActiveRecord::STI
+  include E9Rails::ActiveRecord::Initialization
+  include E9Rails::ActiveRecord::InheritableOptions
+
   has_many :deals, :inverse_of => :offer
   has_many :leads, :class_name => 'Deal', :conditions => ["deals.status = ?", Deal::Status::Lead]
 
-  class << self
-    def conversion_email
-      SystemEmail.find_by_identifier(Identifiers::CONVERSION_EMAIL)
-    end
+  validates :conversion_alert_email, :email => { :allow_blank => true }
 
-    def page
-      SystemPage.find_by_identifier(Identifiers::PAGE)
-    end
-  end
+  mount_uploader :file, FileUploader
 
-  include E9Rails::ActiveRecord::InheritableOptions
   self.delegate_options_methods = true
   self.options_parameters = [
     :submit_button_text,
     :success_alert_text,
+    :success_page_text,
     :download_link_text,
     :conversion_alert_email,
-    :success_page_text,
     :custom_form_html
   ]
 
-  mount_uploader :file, FileUploader
+  class << self
+    def conversion_email
+      SystemEmail.find_by_identifier(Identifiers::CONVERSION_EMAIL)
+    end
 
-  validates :conversion_alert_email, :email => { :allow_blank => true }
+    def page
+      SystemPage.find_by_identifier(Identifiers::PAGE)
+    end
+
+    def partial_path
+      'e9_crm/offers/offer'
+    end
+
+    def element
+      'offer'
+    end
+  end
 
   def to_s
     name
   end
 
-  def as_json(options={})
-    {}.tap do |hash|
-      hash[:id]       = self.id,
-      hash[:name]     = self.name,
-      hash[:template] = self.template,
-      hash[:errors]   = self.errors
+
+  protected
+
+    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
-  end
 
   module Identifiers
     CONVERSION_EMAIL = 'offer_conversion_email'

data/app/models/subscription_offer.rb

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

data/app/models/video_offer.rb

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

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

@@ -1,6 +1,6 @@
 .toolbar
   .toolbar-left
-    = form_tag(resource_class, :method => :get, :id => 'campaign_search_form') do
+    = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
       %select{:name => 'type'}
         = campaign_type_select_options
       %select{:name => 'group'}
@@ -13,4 +13,4 @@
       = label_tag 'new_campaign_type_select', t('activerecord.links.new', :model => Campaign.model_name.human)
       %select{:name => 'type', :id => 'new_campaign_type_select'}
         = campaign_type_select_options(false)
-        = submit_tag t(:go)
+        = submit_tag t(:go), :name => nil

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

@@ -0,0 +1,5 @@
+= render 'e9_crm/offers/form_inner', :f => f
+
+.field{:class => request.xhr? ? 'tinymcexhr' : 'tinymce'}
+  = f.label :success_page_text, nil, :class => :req
+  = f.text_area :success_page_text

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

@@ -1,3 +1,5 @@
+= render_record_attribute_form(:users, f)
+
 %fieldset.contact-standard-fields
   %legend= e9_t(:form_legend_standard)
   .field
@@ -22,7 +24,6 @@
 
 %fieldset.contact-contact-fields
   %legend= e9_t(:form_legend_contact)
-  = render_record_attribute_form(:users                               , f)
   = render_record_attribute_form(:phone_number_attributes             , f)
   = render_record_attribute_form(:instant_messaging_handle_attributes , f)
   = render_record_attribute_form(:website_attributes                  , f)

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

@@ -0,0 +1,30 @@
+.actions
+  = link_to_new_resource(Contact)
+  = link_to_new_resource(Company)
+
+-# Email actions (template, newsletter)
+- etag, ntag = contact_email_template_select_tag, contact_newsletter_select_tag
+- if [etag, ntag].any?(&:present?)
+  %fieldset
+    %legend= e9_t(:email_actions_legend)
+    - if etag
+      = 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
+        = etag
+        = hidden_field_tag 'uids', @contact_ids.join(','), :id => 'contact_email_uids'
+        = submit_tag e9_t(:send_email_template), :name => nil
+    - if ntag
+      = 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
+        = ntag
+        = hidden_field_tag 'uids', @contact_ids.join(','), :id => 'contact_newsletter_uids'
+        = submit_tag e9_t(:send_email_newsletter), :name => nil
+
+-# Search filter options
+%fieldset
+  %legend= e9_t(:search_options_legend)
+  = 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
+  = render 'tag_table'
+  .actions
+    = submit_tag t(:clear), :name => nil, :id => 'contact_search_clear'

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

@@ -6,33 +6,4 @@
   = render 'footer'
 
 #index-sidebar
-  .actions
-    = link_to_new_resource(Contact)
-    = link_to_new_resource(Company)
-
-  -# Email actions (template, newsletter)
-  - etag, ntag = contact_email_template_select_tag, contact_newsletter_select_tag
-  - if [etag, ntag].any?(&:present?)
-    %fieldset
-      %legend= e9_t(:email_actions_legend)
-      - if etag
-        = 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
-          = etag
-          = hidden_field_tag 'uids', @contact_ids.join(','), :id => 'contact_email_uids'
-          = submit_tag e9_t(:send_email_template), :name => nil
-      - if ntag
-        = 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
-          = ntag
-          = hidden_field_tag 'uids', @contact_ids.join(','), :id => 'contact_newsletter_uids'
-          = submit_tag e9_t(:send_email_newsletter), :name => nil
-
-  -# Search filter options
-  %fieldset
-    %legend= e9_t(:search_options_legend)
-    = 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
-    = render 'tag_table'
-    .actions
-      = submit_tag t(:clear), :name => nil, :id => 'contact_search_clear'
+  = render 'index_sidebar'

data/app/views/e9_crm/contacts/index.js.erb

@@ -1,5 +1,5 @@
 <% new_title = @index_title || e9_t(:index_title) %>
-$('#index_header').html("<%= escape_javascript(render('header')) %>");
+$('#index-sidebar').html("<%= escape_javascript(render('index_sidebar')) %>");
 $('#records_table').html("<%= escape_javascript(render('table', :resources => collection)) %>");
 document.title = "<%= escape_javascript(meta_title(new_title)) %>";
 $("h1.title, ul.breadcrumbs li.last").html("<%= escape_javascript(new_title) %>");

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

@@ -1,14 +1,28 @@
-.actions
-  = link_to_destroy_resource(resource, :remote => false) if resource.persisted?
+.actions.top
+  - if resource.persisted?
+    - if resource.lead?
+      = link_to 'Back to Leads', leads_path
+    - else
+      = link_to_destroy_resource(resource, :remote => false)
+
 .field
   = f.label :name, nil, :class => :req
   = f.text_field :name
+.field.select
+  = f.label :category
+  = f.select :category, MenuOption.options_for('Deal Category'), :include_blank => 'No Category'
 .field
   = f.label :info
   = f.text_area :info
+.field
+  = f.label :custom_info
+  = f.text_area :custom_info
 .field
   = f.label :value, nil, :class => :req
   = f.text_field :value
+.field.select
+  = f.label :owner
+  = f.collection_select :contact_id, Contact.all, :id, :name, :prompt => true
 .field.select
   = f.label :contacts
   %select.list{'data-iname' => resource_instance_name, 'data-field' => '[contact_ids]'}
@@ -19,9 +33,3 @@
         %span= contact.name
         %input{:type => :hidden, :name => "contact[contact_ids][]", :value => contact.id}
         %a{:class => :remove, :title => "Remove", :alt => "Remove"} Remove
-.field.select
-  = f.label :owner
-  = f.collection_select :contact_id, Contact.all, :id, :name
-.field.select
-  = f.label :category
-  = f.select :category, MenuOption.options_for('Deal Category'), :include_blank => 'No Category'

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

@@ -0,0 +1,13 @@
+.toolbar
+  .toolbar-left
+    = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
+      %select{:name => 'status'}
+        = deal_status_select_options
+      %select{:name => 'category'}
+        = deal_category_select_options 
+      %select{:name => 'owner'}
+        = deal_owner_select_options 
+
+  .toolbar-right
+    = link_to I18n.t('activerecord.links.index', :models => 'Leads'), leads_path
+    = link_to_new_resource(Deal)

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

@@ -0,0 +1,12 @@
+.toolbar
+  .toolbar-left
+    = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
+      %select{:name => 'offer'}
+        = deal_offer_select_options 
+      %select{:name => 'from'}
+        = deal_date_select_options
+      %select{:name => 'until'}
+        = deal_date_select_options(true)
+
+  .toolbar-right
+    = link_to_collection(Deal)

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

@@ -0,0 +1,34 @@
+%table.records
+  %thead
+    %tr
+      %th= orderable_column_link(:created_at)
+      %th= orderable_column_link(:offer_name)
+      %th= orderable_column_link(:campaign_code)
+      %th= orderable_column_link(:lead_name)
+      %th= orderable_column_link(:lead_email)
+      %th= orderable_column_link(:options, :custom_info)
+      %th= t(:actions)
+  %tbody
+    - if collection.empty?
+      %tr
+        %td{:colspan => 7}= e9_t(:no_records_text, :scope => 'e9_crm.leads')
+    - else
+      - collection.each do |record|
+        %tr{:id => "ids_#{record.id}", :class => cycle('odd', 'even')}
+          %td.record-created-at
+            = I18n.l(record.created_at)
+          %td.record-offer-name
+            = record.offer_name
+          %td.record-campaign-code
+            = record.campaign_code
+          %td.record-lead-name
+            = record.lead_name
+          %td.record-lead-email
+            = record.lead_email
+          %td.record-custom-info
+            = record.custom_info
+          %td.actions
+            - if record.contacts.present?
+              = link_to_show_resource(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")

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

@@ -1,13 +1,8 @@
 = title (@index_title || e9_t(:index_title))
 
-= render 'header'
+= render 'leads_header'
 
-- if sortable_controller?
-  = form_tag polymorphic_path([:update_order, resource_class]) do
-    %div#records_table
-      = render 'table', :resources => collection, :field_map => {}
-- else
-  %div#records_table
-    = render 'table', :resources => collection
+%div#records_table
+  = render 'leads_table', :resources => collection
 
-= render 'footer'
+= will_paginate collection

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

@@ -0,0 +1 @@
+$("table.records").replaceWith("<%= escape_javascript(render('leads_table', :collection => collection)) %>");  

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

@@ -0,0 +1,6 @@
+= form_for resource, :url => offer_submit_path, :remote => request.xhr? do |f|
+  .errors= resource_error_messages!
+
+
+  .actions
+    = f.submit

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

@@ -2,7 +2,7 @@
 
 .toolbar
   .toolbar-left
-    = form_tag(resource_class, :method => :get, :id => 'campaign_search_form') do
+    = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
       %select{:name => 'type'}
         = campaign_type_select_options
       %select{:name => 'group'}

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

@@ -0,0 +1,11 @@
+= render 'e9_crm/offers/form_inner', :f => f
+
+.field{:class => request.xhr? ? 'tinymcexhr' : 'tinymce'}
+  = f.label :success_page_text, nil, :class => :req
+  = f.text_area :success_page_text
+
+%fieldset.upload
+  = render 'shared/form_partials/carrierwave_upload_field', :field => :file, :f => f
+  .field
+    = f.label :download_link_text
+    = f.text_field :download_link_text

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

@@ -0,0 +1,26 @@
+= form_for resource, :url => public_offer_deals_path(@offer), :remote => request.xhr? do |f|
+  .errors= resource_error_messages!
+  .notice
+
+  - if f.object.user.blank?
+    .field
+      = f.label :lead_email
+      = f.text_field :lead_email
+    .field
+      = f.label :lead_name
+      = f.text_field :lead_name
+
+  = @offer.custom_form_html.html_safe
+
+  - if @offer.kind_of?(SubscriptionOffer)
+    %fieldset
+      - @offer.class.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}"
+
+  .actions
+    - if @offer.submit_button_text.present?
+      = f.submit @offer.submit_button_text
+    - else
+      = f.submit

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

@@ -0,0 +1,11 @@
+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 %>
+<% end %>

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

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

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

@@ -1,8 +1,7 @@
 .toolbar
   .toolbar-left
-    %form{:action => menu_options_path, :method => :get, :id => 'menu_option_key_select_form'}
+    %form{:action => menu_options_path, :method => :get, :class => 'scope-selects'}
       = label_tag 'menu_option_key_select', t(:view)
-      = select_tag 'key', options_for_select(MenuOption::KEYS.sort, params[:key]), :id => 'menu_option_key_select'
-      = submit_tag t(:go), :name => nil
+      = select_tag 'key', options_for_select(MenuOption::KEYS.sort, params[:key])
   .toolbar-right
-    = link_to_new_resource(MenuOption, :menu_option => {:key => params[:key]})
+    = link_to_new_resource(MenuOption, :menu_option => {:key => params[:key]}, :class => 'new-menu-option')

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

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

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

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

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

@@ -2,10 +2,14 @@
   = f.label :name, nil, :class => :req
   = f.text_field :name
 
-.field{:class => request.xhr? ? 'tinymcexhr' : 'tinymce'}
-  = f.label :template, nil, :class => :req
+.field.tinymce
+  = f.label :template
   = f.text_area :template
 
+.field
+  = f.label :custom_form_html
+  = f.text_area :custom_form_html
+
 - if request.xhr?
   - resource.region_type_ids.each_with_index do |id, i|
     = hidden_field_tag 'offer[region_type_ids][]', id, :id => "offer_region_type_ids_#{i}"
@@ -15,28 +19,10 @@
 - else
   = render 'shared/admin/region_type_select', :f => f
 
-%fieldset.upload
-  = render 'shared/form_partials/carrierwave_upload_field', :field => :file, :f => f
-  .field
-    = f.label :download_link_text
-    = f.text_field :download_link_text
-
-.field
-  = f.label :success_alert_text
-  = f.text_field :success_alert_text
-
 .field
-  = f.label :success_page_text
-  = f.text_area :success_page_text
-
-.field
-  = f.label :success_alert_text
-  = f.text_field :success_alert_text
+  = f.label :submit_button_text
+  = f.text_field :submit_button_text
 
 .field
   = f.label :conversion_alert_email
   = f.text_field :conversion_alert_email
-
-.field
-  = f.label :custom_form_html
-  = f.text_area :custom_form_html

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

@@ -0,0 +1,12 @@
+.toolbar
+  .toolbar-left
+    = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
+      %select{:name => 'type'}
+        = 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

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

@@ -0,0 +1,4 @@
+%div{:id => "offer_#{renderable.id}_body"}
+- content_for :bottom_javascripts do
+  :javascript
+    $(function(){ $("#offer_#{renderable.id}_body").load("#{new_public_offer_deal_path(renderable)}") });

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

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

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

@@ -0,0 +1,2 @@
+= title @show_title || e9_t(:show_title)
+= render 'public_offer', :offer => resource

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

@@ -1,5 +0,0 @@
-- resource.attributes.each_pair do |field, value|
-  - next if ['id', 'created_at', 'updated_at'].include?(field)
-  .field
-    = f.label field
-    = f.text_field field

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

@@ -1,6 +1,7 @@
 <% if resource.errors.any? %>
   $('form .errors').html("<%= escape_javascript(resource_error_messages!) %>");
-  $.fn.colorbox.resize();
+  try { $.fn.colorbox.resize(); } catch(e) {}
 <% else %>
-  window.location.reload(true);
+  try { $.fn.colorbox.close(); } catch(e) {}
+  $('form .errors').html("");
 <% end %>

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

@@ -1,2 +1,2 @@
-= title e9_t(:edit_title)
+= title @edit_title || e9_t(:edit_title)
 = render 'form'

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

@@ -1,2 +1,2 @@
-= title e9_t(:new_title)
+= title @new_title || e9_t(:new_title)
 = render 'form'

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

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

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

@@ -1,5 +1,7 @@
 <% if resource.errors.any? %>
   $('form .errors').html("<%= escape_javascript(resource_error_messages!) %>");
+  try { $.fn.colorbox.resize(); } catch(e) {}
 <% else %>
-  window.location.reload(true);
+  try { $.fn.colorbox.close(); } catch(e) {}
+  $('form .errors').html("");
 <% end %>

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

@@ -0,0 +1,5 @@
+= 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

@@ -0,0 +1,5 @@
+= render 'e9_crm/offers/form_inner', :f => f
+
+.field{:class => request.xhr? ? 'tinymcexhr' : 'tinymce'}
+  = f.label :success_page_text, nil, :class => :req
+  = f.text_area :success_page_text

data/config/locales/e9.en.yml

@@ -13,7 +13,6 @@ en:
         index_title_with_search_and_tags: "%{models} tagged \"%{tagged}\", matching \"%{search}\""
         form_legend_contact: Contact Information
         form_legend_standard: Personal Information
-        form_legend_user: Login Accounts
         send_email_template: Send Email
         send_email_newsletter: Send Newsletter
         contact_newsletter_confirmation: "The system will send the newsletter to all of the selected contacts (%{count}) if they are subscribed to receieve email.  Are you sure you want to proceed?"
@@ -26,8 +25,10 @@ en:
       contact_emails:
         prepare_title: Edit Your Template
         send_email: Send Email
+      deals:
+        new_title: Create Deal
       leads:
-        index_title: Leads
+        index_title: Leads 
       reports:
         index_title: Marketing Report
         no_records_text: No data exists for those query parameters.