fat_free_crm 0.16.4 → 0.17.1

data/app/helpers/authentications_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/app/helpers/campaigns_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -29,6 +31,6 @@ module CampaignsHelper
   def campaign_summary(campaign)
     status  = render file: "campaigns/_status.html.haml",  locals: { campaign: campaign }
     metrics = render file: "campaigns/_metrics.html.haml", locals: { campaign: campaign }
-    "#{t(campaign.status)}, " << [status, metrics].map { |str| strip_tags(str) }.join(' ').delete("\n")
+    "#{t(campaign.status)}, " + [status, metrics].map { |str| strip_tags(str) }.join(' ').delete("\n")
   end
 end

data/app/helpers/comments_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/app/helpers/contacts_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -7,11 +9,11 @@ module ContactsHelper
   # Contact summary for RSS/ATOM feeds.
   #----------------------------------------------------------------------------
   def contact_summary(contact)
-    summary = [""]
+    summary = ['']
     summary << contact.title.titleize if contact.title?
     summary << contact.department if contact.department?
-    if contact.account && contact.account.name?
-      summary.last << " #{t(:at)} #{contact.account.name}"
+    if contact.account&.name?
+      summary.last += " #{t(:at)} #{contact.account.name}"
     end
     summary << contact.email if contact.email.present?
     summary << "#{t(:phone_small)}: #{contact.phone}" if contact.phone.present?

data/app/helpers/emails_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/app/helpers/fields_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/app/helpers/groups_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/app/helpers/home_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/app/helpers/javascript_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/app/helpers/leads_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -18,8 +20,7 @@ module LeadsHelper
     link_to(t(:convert), convert_lead_path(lead),
             method: :get,
             with:   "{ previous: crm.find_form('edit_lead') }",
-            remote: true
-    )
+            remote: true)
   end
 
   #----------------------------------------------------------------------------
@@ -33,7 +34,7 @@ module LeadsHelper
     yes = link_to(t(:yes_button), reject_lead_path(lead), method: :put)
     no = link_to_function(t(:no_button), "$('#menu').html($('#confirm').html());")
     text = "$('#confirm').html( $('#menu').html() );\n"
-    text << "$('#menu').html('#{question} #{yes} : #{no}');"
+    text += "$('#menu').html('#{question} #{yes} : #{no}');"
     text.html_safe
   end
 

data/app/helpers/lists_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/app/helpers/opportunities_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -23,11 +25,11 @@ module OpportunitiesHelper
       amount << t(:probability_number, (opportunity.probability || 0).to_s + '%')
       summary << amount.join(' ')
     end
-    if opportunity.closes_on
-      summary << t(:closing_date, l(opportunity.closes_on, format: :mmddyy))
-    else
-      summary << t(:no_closing_date)
-    end
+    summary << if opportunity.closes_on
+                 t(:closing_date, l(opportunity.closes_on, format: :mmddyy))
+               else
+                 t(:no_closing_date)
+               end
     summary.compact.join(', ')
   end
 
@@ -37,11 +39,9 @@ module OpportunitiesHelper
   def opportunity_campaign_select(options = {})
     options[:selected] ||= @opportunity.campaign_id || 0
     selected_campaign = Campaign.find_by_id(options[:selected])
-    campaigns = ([selected_campaign] + Campaign.my.order(:name).limit(25)).compact.uniq
-    collection_select :opportunity, :campaign_id, campaigns, :id, :name, options,
-                      "data-placeholder": t(:select_a_campaign),
-                      "data-url": auto_complete_campaigns_path(format: 'json'),
-                      style: "width:330px; display:none;",
-                      class: 'ajax_chosen'
+    campaigns = ([selected_campaign] + Campaign.my(current_user).order(:name).limit(25)).compact.uniq
+    collection_select :opportunity, :campaign_id, campaigns, :id, :name,
+                      { selected: options[:selected], prompt: t(:select_a_campaign) },
+                      style: 'width:330px;', class: 'select2'
   end
 end

data/app/helpers/passwords_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/app/helpers/remote_link_pagination_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/app/helpers/tags_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -7,7 +9,7 @@ module TagsHelper
   # Generate tag links for use on asset index pages.
   #----------------------------------------------------------------------------
   def tags_for_index(model)
-    model.tag_list.inject("".html_safe) do |out, tag|
+    model.tags.inject("".html_safe) do |out, tag|
       query = controller.send(:current_query) || ""
       hashtag = "##{tag}"
       if query.empty?
@@ -15,7 +17,7 @@ module TagsHelper
       elsif !query.include?(hashtag)
         query += " #{hashtag}"
       end
-      out << link_to_function(tag, "crm.search_tagged('#{escape_javascript(query)}', '#{model.class.to_s.tableize}')", title: tag)
+      out << link_to_function(tag, "crm.search_tagged('#{query}', '#{model.class.to_s.tableize}')", title: tag)
     end
   end
 

data/app/helpers/tasks_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -46,7 +48,7 @@ module TasksHelper
   #----------------------------------------------------------------------------
   def link_to_task_complete(pending, bucket)
     onclick = %{$("##{dom_id(pending, :name)}").css({textDecoration: "line-through"});}
-    onclick << %{$.ajax("#{complete_task_path(pending)}", {type: "PUT", data: {bucket: "#{bucket}"}});}
+    onclick + %{$.ajax("#{complete_task_path(pending)}", {type: "PUT", data: {bucket: "#{bucket}"}});}
   end
 
   #----------------------------------------------------------------------------
@@ -86,7 +88,7 @@ module TasksHelper
   #----------------------------------------------------------------------------
   def hide_task_and_possibly_bucket(task, bucket)
     text = "$('##{h dom_id(task)}').remove();\n"
-    text << "$('#list_#{h bucket.to_s}').fadeOut({ duration:500 });\n" if Task.bucket_empty?(bucket, current_user, @view)
+    text += "$('#list_#{h bucket.to_s}').fadeOut({ duration:500 });\n" if Task.bucket_empty?(bucket, current_user, @view)
     text.html_safe
   end
 
@@ -95,29 +97,28 @@ module TasksHelper
     partial = task.assigned_to && task.assigned_to != current_user.id ? "assigned" : "pending"
     html = render(partial: "tasks/#{partial}", collection: [task], locals: { bucket: bucket })
     text = "$('##{dom_id(task)}').html('#{j html}');\n".html_safe
-
     text
   end
 
   #----------------------------------------------------------------------------
   def insert_content(task, bucket, view)
-    text = "$('#list_#{bucket}').show();\n"
     html = render(partial: view, collection: [task], locals: { bucket: bucket })
-    text << "$('##{h bucket.to_s}').prepend('#{j html}');\n"
-    text << "$('##{dom_id(task)}').effect('highlight', { duration:1500 });\n"
+    text = "$('#list_#{bucket}').show();\n"
+    text += "$('##{h bucket.to_s}').prepend('#{j html}');\n"
+    text += "$('##{dom_id(task)}').effect('highlight', { duration:1500 });\n"
     text.html_safe
   end
 
   #----------------------------------------------------------------------------
   def tasks_flash(message)
     text = "$('#flash').html('#{sanitize(message)}');\n"
-    text << "crm.flash('notice', true)\n"
+    text += "crm.flash('notice', true)\n"
     text.html_safe
   end
 
   #----------------------------------------------------------------------------
   def reassign(task)
-    text = "".html_safe
+    text = ''.html_safe
     if @view == "pending" && @task.assigned_to.present? && @task.assigned_to != current_user.id
       text << hide_task_and_possibly_bucket(task, @task_before_update.bucket)
       text << tasks_flash(t(:task_assigned, (h @task.assignee.try(:full_name))) + " (#{link_to(t(:view_assigned_tasks), url_for(controller: :tasks, view: :assigned))})")
@@ -134,8 +135,8 @@ module TasksHelper
   #----------------------------------------------------------------------------
   def reschedule(task)
     text = hide_task_and_possibly_bucket(task, @task_before_update.bucket)
-    text << insert_content(task, task.bucket, @view)
-    text << refresh_sidebar(:index, :filters)
+    text += insert_content(task, task.bucket, @view)
+    text += refresh_sidebar(:index, :filters)
     text
   end
 end

data/app/helpers/users_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -25,7 +27,7 @@ module UsersHelper
     user_options = user_options_for_select(users, myself)
     select(asset, :assigned_to, user_options,
            { include_blank: t(:unassigned) },
-           style:         "width:160px",
+           style: 'width: 160px;',
            class: 'select2')
   end
 

data/app/helpers/versions_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/app/inputs/date_pair_input.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/app/inputs/date_time_input.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/app/inputs/datetime_pair_input.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/app/inputs/text_input.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/app/mailers/dropbox_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/app/mailers/subscription_mailer.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-
 class SubscriptionMailer < ActionMailer::Base
   def comment_notification(user, comment)
     @entity = comment.commentable
@@ -13,18 +14,23 @@ class SubscriptionMailer < ActionMailer::Base
     @comment = comment
     @user = comment.user
 
-    if (reply_to = Setting.email_comment_replies[:address]).blank?
-      email_host = Setting.host.present? ? Setting.host : 'example.com'
-      reply_to = "no-reply@#{email_host}"
-    end
-
     # If entity has tags, join them and wrap in parantheses
     subject = "RE: [#{@entity_type.downcase}:#{@entity.id}] #{@entity_name}"
-    subject << " (#{@entity.tag_list.join(', ')})" if @entity.tag_list.any?
+    subject += " (#{@entity.tags.join(', ')})" if @entity.tags.any?
 
     mail subject: subject,
          to: user.email,
-         from: "#{@user.full_name} <#{reply_to}>",
+         from: from_address(@user),
          date: Time.now
   end
+
+  private
+
+  def from_address(user = nil)
+    address = Setting.dig(:email_comment_replies, :address).presence ||
+              Setting.dig(:smtp, :from).presence ||
+              "noreply@fatfreecrm.com"
+    address = "#{user.full_name} <#{address}>" if user && !address.match(/<.+>\z/)
+    address
+  end
 end

data/app/mailers/user_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -26,7 +28,6 @@ class UserMailer < ActionMailer::Base
   private
 
   def from_address
-    from = (Setting.smtp || {})[:from]
-    !from.blank? ? from : "Fat Free CRM <noreply@fatfreecrm.com>"
+    Setting.dig(:smtp, :from).presence || "Fat Free CRM <noreply@fatfreecrm.com>"
   end
 end

data/app/models/entities/account.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -32,6 +34,7 @@ class Account < ActiveRecord::Base
   has_many :contacts, -> { distinct }, through: :account_contacts
   has_many :account_opportunities, dependent: :destroy
   has_many :opportunities, -> { order("opportunities.id DESC").distinct }, through: :account_opportunities
+  has_many :pipeline_opportunities, -> { order("opportunities.id DESC").distinct.pipeline }, through: :account_opportunities, source: :opportunity
   has_many :tasks, as: :asset, dependent: :destroy # , :order => 'created_at DESC'
   has_one :billing_address, -> { where(address_type: "Billing") }, dependent: :destroy, as: :addressable, class_name: "Address"
   has_one :shipping_address, -> { where(address_type: "Shipping") }, dependent: :destroy, as: :addressable, class_name: "Address"
@@ -89,7 +92,7 @@ class Account < ActiveRecord::Base
   def location
     return "" unless self[:billing_address]
     location = self[:billing_address].strip.split("\n").last
-    location.gsub(/(^|\s+)\d+(:?\s+|$)/, " ").strip if location
+    location&.gsub(/(^|\s+)\d+(:?\s+|$)/, " ")&.strip
   end
 
   # Attach given attachment to the account if it hasn't been attached already.
@@ -113,15 +116,20 @@ class Account < ActiveRecord::Base
   # Class methods.
   #----------------------------------------------------------------------------
   def self.create_or_select_for(model, params)
+    # Attempt to find existing account
     if params[:id].present?
-      account = Account.find(params[:id])
+      return Account.find(params[:id])
+    elsif params[:name].present?
+      account = Account.find_by(name: params[:name])
+      return account if account
+    end
+
+    # Fallback to create new account
+    account = Account.new(params)
+    if account.access != "Lead" || model.nil?
+      account.save
     else
-      account = Account.new(params)
-      if account.access != "Lead" || model.nil?
-        account.save
-      else
-        account.save_with_model_permissions(model)
-      end
+      account.save_with_model_permissions(model)
     end
     account
   end
@@ -131,7 +139,7 @@ class Account < ActiveRecord::Base
   # Make sure at least one user has been selected if the account is being shared.
   #----------------------------------------------------------------------------
   def users_for_shared_access
-    errors.add(:access, :share_account) if self[:access] == "Shared" && !permissions.any?
+    errors.add(:access, :share_account) if self[:access] == "Shared" && permissions.none?
   end
 
   def nullify_blank_category

data/app/models/entities/account_contact.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -16,7 +18,7 @@
 #
 
 class AccountContact < ActiveRecord::Base
-  belongs_to :account
+  belongs_to :account, counter_cache: :contacts_count
   belongs_to :contact
 
   has_paper_trail class_name: 'Version', meta: { related: :contact },