fat_free_crm 0.11.3 → 0.11.4

data/app/helpers/opportunities_helper.rb

@@ -19,15 +19,8 @@ module OpportunitiesHelper
 
   # Sidebar checkbox control for filtering opportunities by stage.
   #----------------------------------------------------------------------------
-  def opportunity_stage_checbox(stage, count)
-    checked = (session[:opportunities_filter] ? session[:opportunities_filter].split(",").include?(stage.to_s) : count.to_i > 0)
-    onclick = remote_function(
-      :url      => { :action => :filter },
-      :with     => h(%Q/"stage=" + $$("input[name='stage[]']").findAll(function (el) { return el.checked }).pluck("value")/),
-      :loading  => "$('loading').show()",
-      :complete => "$('loading').hide()"
-    )
-    check_box_tag("stage[]", stage, checked, :id => stage, :onclick => onclick)
+  def opportunity_stage_checkbox(stage, count)
+    entity_filter_checkbox(:stage, stage, count)
   end
 
   # Opportunity summary for RSS/ATOM feeds.

data/app/helpers/{crm_tags_helper.rb → tags_helper.rb}

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #------------------------------------------------------------------------------
 
-module CrmTagsHelper
+module TagsHelper
 
   # Generate tag links for use on asset index pages.
   #----------------------------------------------------------------------------
@@ -32,6 +32,14 @@ module CrmTagsHelper
     end.join(" ").html_safe
   end
 
+  def tags_for_dashboard(model)
+    content_tag(:ul) do
+      model.tag_list.each do |tag|
+        concat(content_tag(:li, tag))
+      end
+    end.html_safe
+  end
+
   # Generate tag links for the asset landing page (shown on a sidebar).
   #----------------------------------------------------------------------------
   def tags_for_show(model)
@@ -40,11 +48,4 @@ module CrmTagsHelper
     end.join(" ").html_safe
   end
 
-  # Return asset tags to be built manually if the asset failed validation.
-  def unsaved_param_tags(asset)
-    params[asset][:tag_list].join.split(",").map {|x|
-      Tag.find_by_name(x.strip)
-    }.compact.uniq
-  end
 end
-

data/app/helpers/tasks_helper.rb

@@ -20,7 +20,7 @@ module TasksHelper
   # Sidebar checkbox control for filtering tasks by due date -- used for
   # pending and assigned views only.
   #----------------------------------------------------------------------------
-  def task_filter_checbox(view, filter, count)
+  def task_filter_checkbox(view, filter, count)
     name = "filter_by_task_#{view}"
     checked = (session[name] ? session[name].split(",").include?(filter.to_s) : count > 0)
     onclick = remote_function(
@@ -68,27 +68,12 @@ module TasksHelper
     onclick << remote_function(:url => complete_task_path(pending), :method => :put, :with => "'bucket=#{bucket}'")
   end
 
-  # Helper to display XLS, CSV, RSS, and ATOM links for tasks.
-  #----------------------------------------------------------------------------
-  def links_to_task_export(view)
-    token = @current_user.single_access_token
-
-    exports = %w(xls csv).map do |format|
-      link_to(format.upcase, "#{tasks_path}.#{format}?view=#{view}", :title => I18n.t(:"to_#{format}"))
-    end
-    feeds = %w(rss atom).map do |format|
-      link_to(format.upcase, "#{tasks_path}.#{format}?view=#{view}&authentication_credentials=#{token}", :title => I18n.t(:"to_#{format}"))
-    end
-
-    (exports + feeds).join(' | ')
-  end
-
   # Task summary for RSS/ATOM feed.
   #----------------------------------------------------------------------------
   def task_summary(task)
     summary = [ task.category.blank? ? t(:other) : t(task.category) ]
     if @view != "completed"
-      if @view == "pending" && task.user != @current_user
+      if @view == "pending" && task.user != current_user
         summary << t(:task_from, task.user.full_name)
       elsif @view == "assigned"
         summary << t(:task_from, task.assignee.full_name)
@@ -116,7 +101,7 @@ module TasksHelper
     update_page do |page|
       page[id].replace ""
 
-      if Task.bucket_empty?(bucket, @current_user, @view)
+      if Task.bucket_empty?(bucket, current_user, @view)
         page["list_#{bucket}"].visual_effect :fade, :duration => 0.5
       end
     end
@@ -124,7 +109,7 @@ module TasksHelper
 
   #----------------------------------------------------------------------------
   def replace_content(task, bucket = nil)
-    partial = (task.assigned_to && task.assigned_to != @current_user.id) ? "assigned" : "pending"
+    partial = (task.assigned_to && task.assigned_to != current_user.id) ? "assigned" : "pending"
     update_page do |page|
       page[dom_id(task)].replace_html :partial => "tasks/#{partial}", :collection => [ task ], :locals => { :bucket => bucket }
     end
@@ -150,7 +135,7 @@ module TasksHelper
   #----------------------------------------------------------------------------
   def reassign(id)
     update_page do |page|
-      if @view == "pending" && @task.assigned_to != @current_user.id
+      if @view == "pending" && @task.assigned_to != current_user.id
         page << hide_task_and_possibly_bucket(id, @task_before_update.bucket)
         page << tasks_flash("#{t(:task_assigned, @task.assignee.full_name)} (" << link_to(t(:view_assigned_tasks), url_for(:controller => :tasks, :view => :assigned)) << ").")
       elsif @view == "assigned" && @task.assigned_to.blank?
@@ -173,4 +158,3 @@ module TasksHelper
   end
 
 end
-

data/app/helpers/users_helper.rb

@@ -26,15 +26,22 @@ module UsersHelper
 
   def sort_by_language
     languages.sort.map do |locale, language|
-      %Q[{ name: "#{language}", on_select: function() { #{redraw(:locale, [ locale, language ], url_for(:action => :redraw))} } }]
+      %Q[{ name: "#{language}", on_select: function() { #{redraw(:locale, [ locale, language ], url_for(:action => :redraw, :id => current_user))} } }]
     end
   end
   
-  def user_select(asset)
-    collection_select asset, :assigned_to, @users, :id, :full_name,
-                      { :include_blank => "" }, 
-                      { :"data-placeholder" => t(:myself),
-                        :style => "width:160px" } 
+  def all_users
+    User.by_name
+  end
+
+  def user_select(asset, users, myself)
+    user_options = user_options_for_select(users, myself)
+    select(asset, :assigned_to, user_options,
+           { :include_blank => t(:unassigned) },
+           { :style         => "width:160px"  })
   end
-end
 
+  def user_options_for_select(users, myself)
+    (users - [myself]).map{|u| [u.full_name, u.id]}.prepend([t(:myself), myself.id])
+  end
+end

data/app/helpers/versions_helper.rb

@@ -0,0 +1,46 @@
+# Fat Free CRM
+# Copyright (C) 2008-2011 by Michael Dvorkin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#------------------------------------------------------------------------------
+
+module VersionsHelper
+
+  # Parse the changes for each version
+  #----------------------------------------------------------------------------
+  def parse_version(attr_name, change)
+    if attr_name =~ /^cf_/ and (field = CustomField.where(:name => attr_name).first).present?
+      label = field.label
+      first = field.render(change.first)
+      second = field.render(change.second)
+    else
+      label = t(attr_name)
+      first = change.first
+      second = change.second
+    end
+
+    # Find account and link to it.
+    if attr_name == 'account_id'
+      if first.present? and (account = Account.find_by_id(first))
+        first = link_to(h(account.name), account_path(account))
+      end
+      if second.present? and (account = Account.find_by_id(second))
+        second  = link_to(h(account.name), account_path(account))
+      end
+    end
+
+    [label, first, second]
+  end
+
+end

data/app/inputs/date_time_input.rb

@@ -16,17 +16,11 @@
 #------------------------------------------------------------------------------
 
 class DateTimeInput < SimpleForm::Inputs::DateTimeInput
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::JavaScriptHelper
 
   def input
     add_autocomplete!
-    field = @builder.text_field(
-      attribute_name,
-      input_html_options.merge(datetime_options(object.send(attribute_name)))
-    )
-    element_id = field[/id="([a-z0-9_]*)"/, 1]
-    field << javascript_tag(%Q{crm.date_select_popup('#{element_id}', false, #{!!(input_type =~ /time/)});})
+    input_html_options.merge(input_options)
+    @builder.text_field(attribute_name, input_html_options)
   end
 
   def label_target
@@ -35,22 +29,11 @@ class DateTimeInput < SimpleForm::Inputs::DateTimeInput
 
   private
 
-    def datetime_options(value = nil)
-      return {} if value.nil?
-      params = if input_type =~ /time/
-        [value.localtime, {:format => :mmddyyyy_hhmm}]
-      else
-        [value.to_date, {:format => :mmddyyyy}]
-      end
-      { :value => I18n.localize(*params).html_safe }
-    end
-
-    def has_required?
-      options[:required]
-    end
+  def has_required?
+    options[:required]
+  end
 
-    def add_autocomplete!
-      input_html_options[:autocomplete] ||= 'off'
-    end
+  def add_autocomplete!
+    input_html_options[:autocomplete] ||= 'off'
+  end
 end
-

data/app/inputs/datepair_input.rb

@@ -0,0 +1,77 @@
+# Fat Free CRM
+# Copyright (C) 2008-2011 by Michael Dvorkin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#------------------------------------------------------------------------------
+
+class DatepairInput < SimpleForm::Inputs::Base
+
+  # Output two date fields: start and end
+  #------------------------------------------------------------------------------
+  def input
+    add_autocomplete!
+    out = "<br />".html_safe
+
+    field1, field2 = get_fields
+    
+    [field1, field2].compact.each do |field|
+      out << '<div>'.html_safe
+      label = field==field1 ? I18n.t('pair.start') : I18n.t('pair.end')
+      [:required, :disabled].each {|k| input_html_options.delete(k)} # ensure these come from field not default options
+      input_html_options.merge!(field.input_options)
+      input_html_options.merge!(:value => value(field))
+      out << "<label#{' class="req"' if input_html_options[:required]}>#{label}</label>".html_safe
+      text = @builder.text_field(field.name, input_html_options)
+      out << text << '</div>'.html_safe
+    end
+
+    out
+  end
+
+  private
+
+  # Returns true if either field is required?
+  #------------------------------------------------------------------------------
+  def required_field?
+    get_fields.map(&:required).any?
+  end
+
+  # Turns autocomplete off unless told otherwise.
+  #------------------------------------------------------------------------------
+  def add_autocomplete!
+    input_html_options[:autocomplete] ||= 'off'
+  end
+  
+  # Datepicker latches onto the 'date' class.
+  #------------------------------------------------------------------------------
+  def input_html_classes
+    super.push('date')
+  end
+  
+  # Returns the pair as [field1, field2]
+  #------------------------------------------------------------------------------
+  def get_fields
+    @field1 ||= CustomField.where(:name => attribute_name).first
+    @field2 ||= @field1.try(:paired_with)
+    [@field1, @field2]
+  end
+  
+  # Serialize into a value recognised by datepicker
+  #------------------------------------------------------------------------------
+  def value(field)
+    val = object.send(field.name)
+    val.present? ? val.strftime('%Y-%m-%d') : nil
+  end
+
+end

data/app/inputs/datetimepair_input.rb

@@ -0,0 +1,37 @@
+# Fat Free CRM
+# Copyright (C) 2008-2011 by Michael Dvorkin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#------------------------------------------------------------------------------
+
+class DatetimepairInput < DatepairInput
+
+  private
+  
+  # Tell datepicker this is a datetime
+  #------------------------------------------------------------------------------
+  def input_html_classes
+    classes = super.dup
+    classes.delete('date')
+    classes.push('datetime')
+  end
+  
+  # Return value recognised by datepicker and ensure timezone properly set by AR
+  #------------------------------------------------------------------------------
+  def value(field)
+    val = object.send(field.name)
+    val.present? ? val.strftime('%Y-%m-%d %H:%M') : nil
+  end
+
+end

data/app/mailers/user_mailer.rb

@@ -26,5 +26,15 @@ class UserMailer < ActionMailer::Base
          :date => Time.now
   end
 
+  def assigned_entity_notification(entity, assigner)
+    @entity_url = url_for(entity)
+    @entity_name = entity.name
+    @entity_type = entity.class.name
+    @assigner_name = assigner.name
+    mail :subject => "Fat Free CRM: You have been assigned #{@entity_name} #{@entity_type}",
+         :to => entity.assignee.email,
+         :from => "Fat Free CRM <notifications@fatfreecrm.com>"
+  end
+
 end
 

data/app/models/entities/account.rb

@@ -47,12 +47,13 @@ class Account < ActiveRecord::Base
   has_many    :tasks, :as => :asset, :dependent => :destroy#, :order => 'created_at DESC'
   has_one     :billing_address, :dependent => :destroy, :as => :addressable, :class_name => "Address", :conditions => "address_type = 'Billing'"
   has_one     :shipping_address, :dependent => :destroy, :as => :addressable, :class_name => "Address", :conditions => "address_type = 'Shipping'"
+  has_many    :addresses, :dependent => :destroy, :as => :addressable, :class_name => "Address" # advanced search uses this
   has_many    :emails, :as => :mediator
 
   serialize :subscribed_users, Set
 
-  accepts_nested_attributes_for :billing_address, :allow_destroy => true
-  accepts_nested_attributes_for :shipping_address, :allow_destroy => true
+  accepts_nested_attributes_for :billing_address,  :allow_destroy => true, :reject_if => proc {|attributes| Address.reject_address(attributes)}
+  accepts_nested_attributes_for :shipping_address, :allow_destroy => true, :reject_if => proc {|attributes| Address.reject_address(attributes)}
 
   scope :state, lambda { |filters|
     where('category IN (?)' + (filters.delete('other') ? ' OR category IS NULL' : ''), filters)
@@ -60,19 +61,27 @@ class Account < ActiveRecord::Base
   scope :created_by, lambda { |user| where(:user_id => user.id) }
   scope :assigned_to, lambda { |user| where(:assigned_to => user.id) }
 
-  scope :text_search, lambda { |query|
-    query = query.gsub(/[^\w\s\-\.'\p{L}]/u, '').strip
-    where('upper(name) LIKE upper(:m) OR upper(email) LIKE upper(:m)', :m => "%#{query}%")
+  scope :text_search, lambda { |query| search('name_or_email_cont' => query).result }
+
+  scope :visible_on_dashboard, lambda { |user|
+    # Show accounts which either belong to the user and are unassigned, or are assigned to the user
+    where('(user_id = :user_id AND assigned_to IS NULL) OR assigned_to = :user_id', :user_id => user.id)
   }
 
+  scope :by_name, order(:name)
+
   uses_user_permissions
   acts_as_commentable
+  uses_comment_extensions
   acts_as_taggable_on :tags
   has_paper_trail :ignore => [ :subscribed_users ]
   has_fields
   exportable
   sortable :by => [ "name ASC", "rating DESC", "created_at DESC", "updated_at DESC" ], :default => "created_at DESC"
 
+  has_ransackable_associations %w(contacts opportunities tags activities emails addresses comments tasks)
+  ransack_can_autocomplete
+
   validates_presence_of :name, :message => :missing_account_name
   validates_uniqueness_of :name, :scope => :deleted_at
   validate :users_for_shared_access
@@ -80,9 +89,8 @@ class Account < ActiveRecord::Base
 
   # Default values provided through class methods.
   #----------------------------------------------------------------------------
-  def self.per_page ; 20     ; end
-  def self.outline  ; "long" ; end
-
+  def self.per_page ; 20 ; end
+  
   # Extract last line of billing address and get rid of numeric zipcode.
   #----------------------------------------------------------------------------
   def location
@@ -111,13 +119,13 @@ class Account < ActiveRecord::Base
 
   # Class methods.
   #----------------------------------------------------------------------------
-  def self.create_or_select_for(model, params, users)
+  def self.create_or_select_for(model, params)
     if params[:id].present?
       account = Account.find(params[:id])
     else
       account = Account.new(params)
       if account.access != "Lead" || model.nil?
-        account.save_with_permissions(users)
+        account.save
       else
         account.save_with_model_permissions(model)
       end
@@ -136,4 +144,3 @@ class Account < ActiveRecord::Base
     self.category = nil if self.category.blank?
   end
 end
-