e9_crm 0.1.16 → 0.1.17

data/app/controllers/e9_crm/base_controller.rb

@@ -1,5 +1,3 @@
 class E9Crm::BaseController < AdminController
   include E9Rails::Helpers::ResourceLinks
-  include E9Rails::Helpers::Title
-  include E9Rails::Helpers::Translation
 end

data/app/controllers/e9_crm/campaigns_controller.rb

@@ -26,7 +26,7 @@ class E9Crm::CampaignsController < E9Crm::ResourcesController
     end
 
     def default_ordered_on
-      'campaign_group_name,name'
+      'type,campaign_group_name,name'
     end
 
     def default_ordered_dir

data/app/controllers/e9_crm/contacts_controller.rb

@@ -95,7 +95,7 @@ class E9Crm::ContactsController < E9Crm::ResourcesController
     'first_name'
   end
 
-  def default_ordered_at
+  def default_ordered_dir
     'ASC'
   end
 end

data/app/controllers/e9_crm/deals_controller.rb

@@ -12,6 +12,8 @@ class E9Crm::DealsController < E9Crm::ResourcesController
   prepend_before_filter :set_leads_index_title, :only => :leads
   prepend_before_filter :set_reports_index_title, :only => :reports
 
+  before_filter :prepop_deal_owner_contact, :only => [:new, :edit]
+
   ##
   # All Scopes
   #
@@ -103,6 +105,14 @@ class E9Crm::DealsController < E9Crm::ResourcesController
     end
   end
 
+  def prepop_deal_owner_contact
+    object = params[:id] ? resource : build_resource
+
+    if !object.owner && contact = current_user.contact
+      object.owner = contact
+    end
+  end
+
   def set_leads_index_title
     @index_title = I18n.t(:index_title, :scope => 'e9.e9_crm.leads')
   end
@@ -114,4 +124,12 @@ class E9Crm::DealsController < E9Crm::ResourcesController
   def ordered_if 
     %w(index leads reports).member? params[:action]
   end
+
+  def default_ordered_on 
+    'name' 
+  end
+
+  def default_ordered_dir 
+    'ASC' 
+  end
 end

data/app/controllers/e9_crm/email_templates.controller.rb

@@ -28,6 +28,10 @@ class E9Crm::EmailTemplatesController < E9Crm::ResourcesController
 
   protected
 
+  def collection
+    @email_templates ||= end_of_association_chain.order(:name).all
+  end
+
   def default_ordered_on
     'name'
   end

data/app/controllers/e9_crm/resources_controller.rb

@@ -3,6 +3,7 @@ class E9Crm::ResourcesController < E9Crm::BaseController
 
   # NOTE depending on e9_base pagination (which should eventually use this module)
   #include E9Rails::Helpers::Pagination
+  include E9::DestroyRestricted::Controller
 
   # TODO implement role on e9_crm models?
   #include E9::Roles::Controller

data/app/helpers/e9_crm/contacts_helper.rb

@@ -4,6 +4,7 @@ module E9Crm::ContactsHelper
     @_contact_tags ||= begin 
       relation = Tagging.joins(:tag).select('distinct tags.name')
                         .where(:context => E9Tags.escape_context('users*'))
+                        .order('tags.name ASC')
 
       Tagging.connection.send(:select_values, relation.to_sql, 'Contact Tags Select')
     end

data/app/helpers/e9_crm/deals_helper.rb

@@ -32,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.unshift ['Any Owner', nil]
+      options.unshift ['All Responsible', nil]
       options_for_select(options)
     end
   end
@@ -69,4 +69,26 @@ module E9Crm::DealsHelper
 
     options_for_select(options)
   end
+
+  def deal_cost(deal)
+    campaign = deal.campaign
+     
+    if campaign.blank?
+      0
+    else
+      c = campaign.non_leads.count
+      c > 0 ? campaign.cost.to_f / c : campaign.cost
+    end.to_money
+  end
+
+  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
+    end
+  end
+
+  def deal_contacts_array
+    deal_contacts.map {|c| [c.name, c.id] }.sort_by {|name, id| name.upcase }
+  end
 end

data/app/models/campaign.rb

@@ -13,6 +13,7 @@ class Campaign < ActiveRecord::Base
   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

data/app/models/contact.rb

@@ -184,7 +184,7 @@ class Contact < ActiveRecord::Base
 
   # The parameters for building the JS template for associated users
   def self.users_build_parameters # :nodoc:
-    { :status => User::Status::Prospect }
+    { :role => :prospect }
   end
 
   ##

data/app/models/deal.rb

@@ -260,7 +260,7 @@ class Deal < ActiveRecord::Base
       create_user(
         :email      => lead_email,
         :first_name => lead_name,
-        :status     => User::Status::Prospect
+        :role       => :prospect
       ) 
     end
 

data/app/models/email_template.rb

@@ -17,4 +17,11 @@ class EmailTemplate < Email
       hash[:text_body] = render(:text_body)
     end
   end
+
+  protected
+
+  def ensure_body_field_presence
+    self.html_body = self.html_body.presence || ''
+    self.text_body = self.text_body.presence || ''
+  end
 end

data/app/models/no_campaign.rb

@@ -1,9 +1,9 @@
 class NoCampaign < Campaign
-  #before_create do |record|
-    #record.code ||= 'nocode'
-  #end
-
   def name
     self.class.model_name.human
   end
+
+  def cost
+    0
+  end
 end

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

@@ -7,4 +7,4 @@
     = f.collection_select :affiliate_id, Contact.affiliates.ordered.all, :id, :name, {:prompt => true}, :id => 'campaign_affiliate_id'
   .field
     = help_label f, :affiliate_fee
-    = f.text_field :affiliate_fee
+    = f.text_field :affiliate_fee, :value => f.object.affiliate_fee.to_s

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

@@ -2,8 +2,8 @@
   %thead
     %tr
       %th= orderable_column_link(:type)
-      %th= orderable_column_link(:name)
       %th= orderable_column_link('campaign_group_name', :campaign_group)
+      %th= orderable_column_link(:name)
       %th= orderable_column_link(:code)
       %th= orderable_column_link(:affiliate_fee)
       %th= orderable_column_link(:sales_fee)
@@ -17,10 +17,10 @@
         %tr{:id => "ids_#{record.id}", :class => cycle('odd', 'even')}
           %td.record-type
             = record.type[/(.*)Campaign/, 1]
-          %td.record-name
-            = record.name
           %td.record-campaign-group
             = record.campaign_group_name || e9_t(:no_group, :scope => 'e9_crm.campaigns')
+          %td.record-name
+            = record.name
           %td.record-code
             = display_campaign_code(record.code)
           %td.record-affiliate-fee

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

@@ -7,4 +7,4 @@
   = render 'field', :column => :company_name, :f => f
   = render 'field', :column => :title, :f => f
   .actions
-    = f.submit
+    = f.submit t(:save)

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

@@ -25,14 +25,14 @@
     %label= Contact.human_attribute_name(:website_attributes)
     - resource.website_attributes.each do |website_attribute|
       .contact-website
-        - url = website_attribute.value =~/^\w+:\/\// ? website_attribute.value : "http://#{website_attribute.value}"
-        = link_to(website_attribute.to_s, website_attribute.to_s, :rel => "external nofollow")
+        = website_attribute.to_s
 
 - if resource.address_attributes.any?
   .contact-addresses
     %label= Contact.human_attribute_name(:address_attributes)
     - resource.address_attributes.each do |address_attribute|
       .contact-address
-        .address= address_attribute.to_html
+        .address
+          = address_attribute.to_s
         .actions
-          = google_maps_link(address_attribute)
+          = address_attribute.link

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

@@ -1,9 +1,8 @@
 - tagged_params = Array.wrap(params[:tagged])
+
 %label= t(:tags_name, :scope => :e9_tags)
-.tag-holder
-  - contact_tags.sort.group_by {|tag| tag[0].upcase }.each do |letter, tags|
-    %ul.tags
-      - tags.each do |tag|; tag_id = "tagged-#{tag.downcase.dasherize}"
-        %li.tag
-          = label_tag(tag_id, tag)
-          = check_box_tag('tagged[]', tag, tagged_params.member?(tag), :id => tag_id)
+%ul.tags
+  - contact_tags.each do |tag|; tag_id = "tagged-#{tag.downcase.dasherize}"
+    %li.tag
+      = label_tag(tag_id, tag)
+      = check_box_tag('tagged[]', tag, tagged_params.member?(tag), :id => tag_id)

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

@@ -14,11 +14,11 @@
   - if (tags = resource.tags(:show_all => true)).present?
     .contact-tags
       %label #{Tag.model_name.human.pluralize}:
-      = contact_tag_list(tags)
+      = contact_tag_list(tags.sort)
 
   .contact-info
     %label #{Contact.human_attribute_name(:info)}:
-    = contact_simple_format(resource.info.presence || t(:none))
+    = resource.info.present? && k(resource.info) || t(:none)
 
   - if company = resource.company
     .contact-company

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

@@ -12,23 +12,41 @@
   = f.label :category
   = f.select :category, MenuOption.options_for('Deal Category'), :include_blank => 'No Category'
 .field
-  = f.label :campaign, :for => 'deal_campaign_select'
-  = f.collection_select :campaign_id, Campaign.ordered.all, :id, :to_s, {:prompt => true}, :id => 'deal_campaign_select'
-.field
-  = f.label :info
+  = help_label(f, :info, :key => :markdown_help, :header => 'Markdown Help')
   = f.text_area :info
 .field
   = f.label :value, nil, :class => :req
   = f.text_field :value
 .field.select
-  = f.label :owner
-  = f.collection_select :contact_id, Contact.sales_persons.all, :id, :name, :prompt => true
+  = f.label :campaign, :for => 'deal_campaign_select'
+  = 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' => f.object.contact_ids.join(','), 'data-iname' => resource_instance_name, 'data-field' => '[contact_ids]'}
+  %input#contact_autocomplete.list{:type => 'text', 'data-values' => resource.contact_ids.join(','), 'data-iname' => resource_instance_name, 'data-field' => '[contact_ids]', :id => 'deal_contacts'}
   %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}
         %a{:class => :remove, :title => "Remove", :alt => "Remove"} Remove
+.field.select
+  = f.label :owner
+  = f.select :contact_id, deal_contacts_array, { :prompt => true }, :id => :deal_owner 
+.field
+  Created At:
+  = l(resource.created_at)
+.field
+  Closed At:
+  = resource.closed_at ? l(resource.closed_at) : 'n/a'
+.field
+  Campaign Cost:
+  = resource.campaign.try(:cost) || 0
+.field
+  Campaign Deal Count:
+  = resource.campaign ? resource.campaign.non_leads.count : 0
+.field
+  Cost:
+  = deal_cost(resource)

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

@@ -6,7 +6,7 @@
       %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= orderable_column_link(:info)
       %th= t(:actions)
   %tbody
     - if collection.empty?
@@ -25,8 +25,8 @@
             = record.lead_name
           %td.record-lead-email
             = record.lead_email
-          %td.record-custom-info
-            = record.custom_info
+          %td.record-info
+            = record.info
           %td.actions
             - if record.contacts.present?
               = link_to_show_resource(record.contacts.first)

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

@@ -25,10 +25,11 @@
             = record.category
           %td.record-owner
             = record.owner_name
-          %td.record-value
+          %td.record-value.num
             - dat[:value] << record.value
-            = record.value
-          %td.actions
+            = record.value.to_money.format
+          %td.links
+            = link_to_show_resource(record)
             = link_to_edit_resource(record)
             = link_to_destroy_resource(record)
 
@@ -36,8 +37,8 @@
       %tr{:class => 'record-totals'}
         %td.record-totals-label{:colspan => 4}
           #{t(:total)}:
-        %td.record-totals
-          = dat[:value].sum
+        %td.record-totals.num
+          = dat[:value].sum.to_money.format
         %td
 
 - if @controller.should_paginate_index

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

@@ -8,5 +8,5 @@
   = f.label :subject
   = f.text_field :subject
 .field
-  = f.label :text_body
+  = help_label(f, :text_body)
   = f.text_area :text_body

data/app/views/e9_crm/email_templates/select.html.haml

@@ -1,5 +1,4 @@
-= title e9_t(:select_title)
-= form_tag email_templates_path, :id => "email_templates_select", :method => :get do
+= form_tag email_templates_path, :class => "email-template-sel", :method => :get do
   = hidden_field_tag "contact_id", params[:contact_id]
   = hidden_field_tag "user_id", params[:user_id]
   = select_tag "id", options_for_select(collection.map {|e| [e.name, e.id] })

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

@@ -7,4 +7,4 @@
     = f.collection_select :sales_person_id, Contact.sales_persons.ordered.all, :id, :name, :prompt => true
   .field
     = help_label f, :sales_fee
-    = f.text_field :sales_fee
+    = f.text_field :sales_fee, :value => f.object.sales_fee.to_s

data/app/views/record_attributes/_user.html.haml

@@ -1,5 +1,5 @@
 .record-attribute.nested-association
-  = f.hidden_field :status
+  = f.hidden_field :role
 
   - if f.object.persisted?
     = f.hidden_field :id

data/config/locales/e9.en.yml

@@ -28,8 +28,7 @@ en:
       deals:
         new_title: Create Deal
       email_templates:
-        select_title: Choose a Template
-        select_submit: Go
+        select_submit: Send Email Now
       leads:
         index_title: Leads 
       reports:

data/config/locales/en.yml

@@ -12,16 +12,12 @@ en:
   total: Total
   totals: Totals
   view: View
+  save: Save
 
   e9_crm:
     add_record_attribute: Add
     destroy_record_attribute: Remove
 
-  # activemodel translation looks to %{i18n_scope}.attributes.%{model_name}.%{attribute} 
-  # then simply attributes.%{attribute}, dropping i18n_scope, e.g "activerecord"
-  attributes:
-    markdown_help: "You can style the text in this field using the Markdown syntax as follows:\n\nA line break is created by putting 2 spaces\n\nat the end of the line above and then a return.\n\nA paragraph is created by putting a blank line between the first paragraph and the second paragraph.\n\nThis is the start of the next paragraph.\n\n*italics*\n\n**bold**\n\n***bold and italic text***\n\n* Item in a bulleted list\n\t* A sub-item, indented with 4 spaces\n* Another item in a bulleted list\n\n1. Item in numbered list\n2. Another Item in numbered list\n3. Another Item in numbered list\n\n# First-level heading\n\n## Second-level heading\n\n### Third-level heading\n\n#### Fourth-level heading\n\n> This is a blockquote.\n> Blockquote with hard wrap\n>\n> This is the second paragraph in the blockquote.\n>\n> ## This is an H2 in a blockquote\n\n[This is a link](http://www.google.com \"Google\")\n\n![Image Alt Text](image url \"Image Title\")\n\n--- Horizontal rules are created by 3 hyphens\n\nIf you need to actually render the following characters AND they are NOT rendering, place a backslash before the character like \*italics\* will actually render with the asterisks instead of italicizing the word.\n\n\\\tbackslash\n*\tasterisk\n_\tunderscore\n{}\tcurly braces\n[]\tsquare brackets\n()\tparentheses\n#\thash mark\n+\tplus sign\n-\tminus sign (hyphen)\n.\tdot\n!\texclamation mark"
-
   activerecord:
     titles:
       show: 'Show %{model}'
@@ -119,6 +115,14 @@ en:
         no_leads: 'There are no leads associated with this contact.'
       company:
         info: Background Information
+      email_template:
+        text_body_help: |
+          <h3>Variables:</h3>
+          <p>You can insert the following to render variable data in the field</p>
+          <p>
+            &#123;&#123;contact.first_name&#125;&#125;<br/>
+            &#123;&#123;recipient.email&#125;&#125;<br/>
+          </p>
       deal:
         info: Details
         lead_email: Email

data/config/routes.rb

@@ -27,7 +27,7 @@ Rails.application.routes.draw do
       end
     end
 
-    resources :deals, :except => :show
+    resources :deals
 
     # contact_emails are generated by email templates, and end up in the sent emails list
     resources :contact_emails,  :except => [:index, :show]

data/lib/e9_crm/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 16
-  version: 0.1.16
+  - 17
+  version: 0.1.17
 platform: ruby
 authors: 
 - Travis Cox
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-07 00:00:00 -04:00
+date: 2011-09-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency