fat_free_crm 0.18.1 → 0.20.0

data/{spec/features/support/maintain_sessions.rb → app/controllers/registrations_controller.rb}

@@ -5,8 +5,15 @@
 # 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
 #------------------------------------------------------------------------------
-#
-# Workaround for ActionDispatch::ClosedError
-# https://github.com/binarylogic/authlogic/issues/262#issuecomment-1804988
-#
-User.acts_as_authentic_config[:maintain_sessions] = false
+class RegistrationsController < Devise::RegistrationsController
+  respond_to :html
+  append_view_path 'app/views/devise'
+
+  def edit
+    redirect_to profile_path
+  end
+
+  def after_inactive_sign_up_path_for(*)
+    new_user_session_path
+  end
+end

data/{lib/development_tasks/gem.rake → app/controllers/sessions_controller.rb}

@@ -5,11 +5,11 @@
 # 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
 #------------------------------------------------------------------------------
-require 'rubygems/package_task'
+class SessionsController < Devise::SessionsController
+  respond_to :html
+  append_view_path 'app/views/devise'
 
-Bundler::GemHelper.install_tasks
-
-gemspec = eval(File.read('fat_free_crm.gemspec'))
-Gem::PackageTask.new(gemspec) do |p|
-  p.gem_spec = gemspec
+  def after_sign_out_path_for(*)
+    new_user_session_path
+  end
 end

data/app/controllers/tasks_controller.rb

@@ -6,7 +6,6 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class TasksController < ApplicationController
-  before_action :require_user
   before_action :set_current_tab, only: %i[index show]
   before_action :update_sidebar, only: :index
 
@@ -59,9 +58,7 @@ class TasksController < ApplicationController
     @category = Setting.unroll(:task_category)
     @asset = @task.asset if @task.asset_id?
 
-    if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Task.tracked_by(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
-    end
+    @previous = Task.tracked_by(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
 
     respond_with(@task)
   end
@@ -93,12 +90,10 @@ class TasksController < ApplicationController
                                  end
 
     respond_with(@task) do |_format|
-      if @task.update_attributes(task_params)
+      if @task.update(task_params)
         @task.bucket = @task.computed_bucket
         if called_from_index_page?
-          if Task.bucket_empty?(@task_before_update.bucket, current_user, @view)
-            @empty_bucket = @task_before_update.bucket
-          end
+          @empty_bucket = @task_before_update.bucket if Task.bucket_empty?(@task_before_update.bucket, current_user, @view)
           update_sidebar
         end
       end
@@ -113,9 +108,7 @@ class TasksController < ApplicationController
     @task.destroy
 
     # Make sure bucket's div gets hidden if we're deleting last task in the bucket.
-    if Task.bucket_empty?(params[:bucket], current_user, @view)
-      @empty_bucket = params[:bucket]
-    end
+    @empty_bucket = params[:bucket] if Task.bucket_empty?(params[:bucket], current_user, @view)
 
     update_sidebar if called_from_index_page?
     respond_with(@task)
@@ -125,12 +118,10 @@ class TasksController < ApplicationController
   #----------------------------------------------------------------------------
   def complete
     @task = Task.tracked_by(current_user).find(params[:id])
-    @task&.update_attributes(completed_at: Time.now, completed_by: current_user.id)
+    @task&.update(completed_at: Time.now, completed_by: current_user.id)
 
     # Make sure bucket's div gets hidden if it's the last completed task in the bucket.
-    if Task.bucket_empty?(params[:bucket], current_user)
-      @empty_bucket = params[:bucket]
-    end
+    @empty_bucket = params[:bucket] if Task.bucket_empty?(params[:bucket], current_user)
 
     update_sidebar unless params[:bucket].blank?
     respond_with(@task)
@@ -140,12 +131,10 @@ class TasksController < ApplicationController
   #----------------------------------------------------------------------------
   def uncomplete
     @task = Task.tracked_by(current_user).find(params[:id])
-    @task&.update_attributes(completed_at: nil, completed_by: nil)
+    @task&.update(completed_at: nil, completed_by: nil)
 
     # Make sure bucket's div gets hidden if we're deleting last task in the bucket.
-    if Task.bucket_empty?(params[:bucket], current_user, @view)
-      @empty_bucket = params[:bucket]
-    end
+    @empty_bucket = params[:bucket] if Task.bucket_empty?(params[:bucket], current_user, @view)
 
     update_sidebar
     respond_with(@task)
@@ -173,6 +162,7 @@ class TasksController < ApplicationController
 
   def task_params
     return {} unless params[:task]
+
     params.require(:task).permit(
       :user_id,
       :assigned_to,
@@ -186,7 +176,8 @@ class TasksController < ApplicationController
       :due_at,
       :completed_at,
       :deleted_at,
-      :background_info
+      :background_info,
+      :calendar
     )
   end
 

data/app/controllers/users_controller.rb

@@ -9,6 +9,7 @@ class UsersController < ApplicationController
   before_action :set_current_tab, only: %i[show opportunities_overview] # Don't hightlight any tabs.
 
   check_authorization
+
   load_and_authorize_resource # handles all security
 
   respond_to :html, only: %i[show new]
@@ -21,30 +22,6 @@ class UsersController < ApplicationController
     respond_with(@user)
   end
 
-  # GET /users/new
-  # GET /users/new.js
-  #----------------------------------------------------------------------------
-  def new
-    respond_with(@user)
-  end
-
-  # POST /users
-  # POST /users.js
-  #----------------------------------------------------------------------------
-  def create
-    if @user.save
-      if Setting.user_signup == :needs_approval
-        flash[:notice] = t(:msg_account_created)
-        redirect_to login_url
-      else
-        flash[:notice] = t(:msg_successful_signup)
-        redirect_back_or_default profile_url
-      end
-    else
-      render :new
-    end
-  end
-
   # GET /users/1/edit.js
   #----------------------------------------------------------------------------
   def edit
@@ -55,7 +32,7 @@ class UsersController < ApplicationController
   # PUT /users/1.js
   #----------------------------------------------------------------------------
   def update
-    @user.update_attributes(user_params)
+    @user.update(user_params)
     flash[:notice] = t(:msg_user_updated)
     respond_with(@user)
   end
@@ -77,9 +54,9 @@ class UsersController < ApplicationController
       render
     else
       if params[:avatar]
-        avatar = Avatar.create(avatar_params)
-        if avatar.valid?
-          @user.avatar = avatar
+        @avatar = Avatar.create(avatar_params)
+        if @avatar.valid?
+          @user.avatar = @avatar
         else
           @user.avatar.errors.clear
           @user.avatar.errors.add(:image, t(:msg_bad_image_file))
@@ -104,7 +81,7 @@ class UsersController < ApplicationController
   # PUT /users/1/change_password.js
   #----------------------------------------------------------------------------
   def change_password
-    if @user.valid_password?(params[:current_password], true) || @user.password_hash.blank?
+    if @user.valid_password?(params[:current_password])
       if params[:user][:password].blank?
         flash[:notice] = t(:msg_password_not_changed)
       else
@@ -138,7 +115,10 @@ class UsersController < ApplicationController
 
   def user_params
     return {} unless params[:user]
+
     params[:user][:email].try(:strip!)
+    params[:user][:alt_email].try(:strip!)
+
     params[:user].permit(
       :username,
       :email,
@@ -158,8 +138,9 @@ class UsersController < ApplicationController
 
   def avatar_params
     return {} unless params[:avatar]
+
     params[:avatar]
       .permit(:image)
-      .merge(entity: @user)
+      .merge(entity: @user, user_id: @user.id)
   end
 end

data/app/helpers/accounts_helper.rb

@@ -104,4 +104,16 @@ module AccountsHelper
         end
     text.html_safe
   end
+
+  # We have too much logic in the account views
+  # - a helper that abstracts the logic to the backend
+  def display_value(value)
+    return "N/A" if value.zero?
+    number_to_currency(value, precision: 0)
+  end
+
+  def display_assigned(account)
+    return truncate(account.assignee.full_name, length: 16) if account.assigned_to
+    nil
+  end
 end

data/app/helpers/admin/users_helper.rb

@@ -27,7 +27,7 @@ module Admin::UsersHelper
     summary = []
     title_and_company = user_summary_title_and_company(user)
     summary << title_and_company unless title_and_company.blank?
-    summary << t('pluralize.login', user.login_count) if user.current_login_at && user.login_count > 0
+    summary << t('pluralize.login', user.sign_in_count) if user.last_sign_in_at && user.sign_in_count.positive?
     summary << user.email
     summary << "#{t :phone_small}: #{user.phone}" unless user.phone.blank?
     summary << "#{t :mobile_small}: #{user.mobile}" unless user.mobile.blank?

data/app/helpers/application_helper.rb

@@ -18,7 +18,7 @@ module ApplicationHelper
 
   #----------------------------------------------------------------------------
   def tabless_layout?
-    %w[authentications passwords].include?(controller.controller_name) ||
+    %w[sessions passwords registrations confirmations].include?(controller.controller_name) ||
       ((controller.controller_name == "users") && %w[create new].include?(controller.action_name))
   end
 
@@ -27,6 +27,7 @@ module ApplicationHelper
   def show_flash(options = { sticky: false })
     %i[error warning info notice alert].each do |type|
       next unless flash[type]
+
       html = content_tag(:div, h(flash[type]), id: "flash")
       flash[type] = nil
       return html << content_tag(:script, "crm.flash('#{type}', #{options[:sticky]})".html_safe, type: "text/javascript")
@@ -34,20 +35,23 @@ module ApplicationHelper
     content_tag(:p, nil, id: "flash", style: "display:none;")
   end
 
+  def subtitle_link(id, text, hidden)
+    link_to("<small>#{hidden ? '&#9658;' : '&#9660;'}</small> #{sanitize text}".html_safe,
+            url_for(controller: :home, action: :toggle, id: id),
+            remote: true,
+            onclick: "crm.flip_subtitle(this)")
+  end
+
   #----------------------------------------------------------------------------
   def subtitle(id, hidden = true, text = id.to_s.split("_").last.capitalize)
-    content_tag("div",
-                link_to("<small>#{hidden ? '&#9658;' : '&#9660;'}</small> #{sanitize text}".html_safe,
-                        url_for(controller: :home, action: :toggle, id: id),
-                        remote: true,
-                        onclick: "crm.flip_subtitle(this)"), class: "subtitle")
+    content_tag("div", subtitle_link(id, text, hidden), class: "subtitle")
   end
 
   #----------------------------------------------------------------------------
   def section(related, assets)
     asset = assets.to_s.singularize
-    create_id  = "create_#{asset}"
-    select_id  = "select_#{asset}"
+    create_id = "create_#{asset}"
+    select_id = "select_#{asset}"
     create_url = controller.send(:"new_#{asset}_path")
 
     html = tag(:br)
@@ -76,7 +80,7 @@ module ApplicationHelper
   #----------------------------------------------------------------------------
   def rating_select(name, options = {})
     stars = Hash[(1..5).map { |star| [star, "&#9733;" * star] }].sort
-    options_for_select = %(<option value="0"#{options[:selected].to_i == 0 ? ' selected="selected"' : ''}>#{t :select_none}</option>)
+    options_for_select = %(<option value="0"#{options[:selected].to_i.zero? ? ' selected="selected"' : ''}>#{t :select_none}</option>)
     options_for_select += stars.map { |star| %(<option value="#{star.first}"#{options[:selected] == star.first ? ' selected="selected"' : ''}>#{star.last}</option>) }.join
     select_tag name, options_for_select.html_safe, options
   end
@@ -84,7 +88,6 @@ module ApplicationHelper
   #----------------------------------------------------------------------------
   def link_to_inline(id, url, options = {})
     text = options[:text] || t(id, default: id.to_s.titleize)
-    text = (arrow_for(id) + text) unless options[:plain]
     related = (options[:related] ? "&related=#{options[:related]}" : '')
 
     link_to(text,
@@ -112,7 +115,6 @@ module ApplicationHelper
 
   #----------------------------------------------------------------------------
   def link_to_delete(record, options = {})
-    object = record.is_a?(Array) ? record.last : record
     confirm = options[:confirm] || nil
 
     link_to(t(:delete) + "!",
@@ -231,16 +233,15 @@ module ApplicationHelper
 
   # Reresh sidebar using the action view within the current controller.
   #----------------------------------------------------------------------------
-  def refresh_sidebar(action = nil, shake = nil)
-    refresh_sidebar_for(controller.controller_name, action, shake)
+  def refresh_sidebar(action = nil)
+    refresh_sidebar_for(controller.controller_name, action)
   end
 
   # Refresh sidebar using the action view within an arbitrary controller.
   #----------------------------------------------------------------------------
-  def refresh_sidebar_for(view, action = nil, shake = nil)
+  def refresh_sidebar_for(view, action = nil)
     text = ""
     text += "$('#sidebar').html('#{j render(partial: 'layouts/sidebar', locals: { view: view, action: action })}');"
-    text += "$('##{j shake.to_s}').effect('shake', { duration:200, distance: 3 });" if shake
     text.html_safe
   end
 
@@ -254,7 +255,7 @@ module ApplicationHelper
       if site == :skype
         url = "callto:" + url
       else
-        url = "http://" + url unless url.match?(/^https?:\/\//)
+        url = "http://" + url unless url.match?(%r{^https?://})
       end
       link_to(image_tag("#{site}.gif", size: "15x15"), h(url), "data-popup": true, title: t(:open_in_window, h(url)))
     end.compact.join("\n").html_safe
@@ -296,14 +297,12 @@ module ApplicationHelper
   # Ajax helper to pass browser timezone offset to the server.
   #----------------------------------------------------------------------------
   def get_browser_timezone_offset
-    unless session[:timezone_offset]
-      raw "$.get('#{timezone_path}', {offset: (new Date()).getTimezoneOffset()});"
-    end
+    raw "$.get('#{timezone_path}', {offset: (new Date()).getTimezoneOffset()});" unless session[:timezone_offset]
   end
 
   # Entities can have associated avatars or gravatars. Only calls Gravatar
   # in production env. Gravatar won't serve default images if they are not
-  # publically available: http://en.gravatar.com/site/implement/images
+  # publically available: https://en.gravatar.com/site/implement/images
   #----------------------------------------------------------------------------
   def avatar_for(model, args = {})
     args = { class: 'gravatar', size: :large }.merge(args)
@@ -327,17 +326,12 @@ module ApplicationHelper
 
   # Render a text field that is part of compound address.
   #----------------------------------------------------------------------------
-  def address_field(form, object, attribute, extra_styles)
+  def address_field(form, attribute, extra_styles)
     hint = "#{t(attribute)}..."
-    if object.send(attribute).blank?
-      form.text_field(attribute,
-                      style:   "margin-top: 6px; #{extra_styles}",
-                      placeholder: hint)
-    else
-      form.text_field(attribute,
-                      style:   "margin-top: 6px; #{extra_styles}",
-                      placeholder: hint)
-    end
+
+    form.text_field(attribute,
+                    style:   "margin-top: 6px; #{extra_styles}",
+                    placeholder: hint)
   end
 
   # Return true if:
@@ -353,7 +347,7 @@ module ApplicationHelper
   # Helper to display links to supported data export formats.
   #----------------------------------------------------------------------------
   def links_to_export(action = :index)
-    token = current_user.single_access_token
+    token = current_user.authentication_token
     url_params = { action: action }
     url_params[:id] = params[:id] unless params[:id].blank?
     url_params[:query] = params[:query] unless params[:query].blank?
@@ -389,7 +383,7 @@ module ApplicationHelper
   end
 
   def entity_filter_checkbox(name, value, count)
-    checked = (session["#{controller_name}_filter"].present? ? session["#{controller_name}_filter"].split(",").include?(value.to_s) : count.to_i > 0)
+    checked = (session["#{controller_name}_filter"].present? ? session["#{controller_name}_filter"].split(",").include?(value.to_s) : count.to_i.positive?)
     url = url_for(action: :filter)
     onclick = %{
       var query = $('#query').val(),
@@ -421,7 +415,7 @@ module ApplicationHelper
       fmt_value = if email
                     link_to_email(fmt_value)
                   else
-                    fmt_value.gsub(/((http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&amp;:\/\+#]*[\w\-\@?^=%&amp;\/\+#])?)/, "<a href=\"\\1\">\\1</a>")
+                    fmt_value.gsub(%r{((http|ftp|https)://[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&amp;:/\+#]*[\w\-\@?^=%&amp;/\+#])?)}, "<a href=\"\\1\">\\1</a>")
       end
       out << content_tag(:td, fmt_value, class: last_class)
     end
@@ -433,10 +427,7 @@ module ApplicationHelper
   def section_title(id, hidden = true, text = nil, info_text = nil)
     text = id.to_s.split("_").last.capitalize if text.nil?
     content_tag("div", class: "subtitle show_attributes") do
-      content = link_to("<small>#{hidden ? '&#9658;' : '&#9660;'}</small> #{sanitize text}".html_safe,
-                        url_for(controller: :home, action: :toggle, id: id),
-                        remote:  true,
-                        onclick: "crm.flip_subtitle(this)")
+      content = subtitle_link(id, text, hidden)
       content << content_tag("small", info_text.to_s, class: "subtitle_inline_info", id: "#{id}_intro", style: hidden ? "" : "display:none;")
     end
   end
@@ -455,6 +446,7 @@ module ApplicationHelper
     views = FatFreeCRM::ViewFactory.views_for(controller: controller.controller_name,
                                               action: show_or_index_action)
     return nil unless views.size > 1
+
     lis = ''.html_safe
     content_tag :ul, class: 'format-buttons' do
       views.collect do |view|
@@ -480,6 +472,7 @@ module ApplicationHelper
   # <span class="timeago" datetime="2008-07-17T09:24:17Z">July 17, 2008</span>
   def timeago(time, options = {})
     return unless time
+
     options[:class] ||= "timeago"
     options[:title] = time.getutc.iso8601
     content_tag(:span, I18n.l(time), options)

data/app/helpers/campaigns_helper.rb

@@ -14,7 +14,7 @@ module CampaignsHelper
 
   #----------------------------------------------------------------------------
   def performance(actual, target)
-    if target.to_i > 0 && actual.to_i > 0
+    if target.to_i.positive? && actual.to_i.positive?
       if target > actual
         n = 100 - actual * 100 / target
         html = content_tag(:span, "(-#{number_to_percentage(n, precision: 1)})", class: "warn")

data/app/helpers/contacts_helper.rb

@@ -12,9 +12,7 @@ module ContactsHelper
     summary = ['']
     summary << contact.title.titleize if contact.title?
     summary << contact.department if contact.department?
-    if contact.account&.name?
-      summary.last += " #{t(:at)} #{contact.account.name}"
-    end
+    summary.last += " #{t(:at)} #{contact.account.name}" if contact.account&.name?
     summary << contact.email if contact.email.present?
     summary << "#{t(:phone_small)}: #{contact.phone}" if contact.phone.present?
     summary << "#{t(:mobile_small)}: #{contact.mobile}" if contact.mobile.present?

data/app/helpers/opportunities_helper.rb

@@ -51,24 +51,16 @@ module OpportunitiesHelper
     msg = []
     won_or_lost = %w[won lost].include?(opportunity.stage)
 
-    if opportunity.weighted_amount != 0
-      msg << content_tag(:b, number_to_currency(opportunity.weighted_amount, precision: 0))
-    end
+    msg << content_tag(:b, number_to_currency(opportunity.weighted_amount, precision: 0)) if opportunity.weighted_amount != 0
 
     unless won_or_lost
       if detailed
-        if opportunity.amount.to_f != 0
-          msg << number_to_currency(opportunity.amount.to_f, precision: 0)
-        end
+        msg << number_to_currency(opportunity.amount.to_f, precision: 0) if opportunity.amount.to_f != 0
 
-        if opportunity.discount.to_f != 0
-          msg << t(:discount) + ' ' + number_to_currency(opportunity.discount, precision: 0)
-        end
+        msg << t(:discount) + ' ' + number_to_currency(opportunity.discount, precision: 0) if opportunity.discount.to_f != 0
       end
 
-      if opportunity.probability.to_i != 0
-        msg << t(:probability) + ' ' + opportunity.probability.to_s + '%'
-      end
+      msg << t(:probability) + ' ' + opportunity.probability.to_s + '%' if opportunity.probability.to_i != 0
     end
 
     msg << opportunity_closes_on_message(opportunity, won_or_lost)

data/app/helpers/tasks_helper.rb

@@ -11,7 +11,7 @@ module TasksHelper
   #----------------------------------------------------------------------------
   def task_filter_checkbox(view, filter, count)
     name = "filter_by_task_#{view}"
-    checked = (session[name] ? session[name].split(",").include?(filter.to_s) : count > 0)
+    checked = (session[name] ? session[name].split(",").include?(filter.to_s) : count.positive?)
     url = url_for(action: :filter, view: view)
     onclick = %{
       $('#loading').show();
@@ -128,7 +128,7 @@ module TasksHelper
     else
       text << replace_content(@task, @task.bucket)
     end
-    text << refresh_sidebar(:index, :filters)
+    text << refresh_sidebar(:index)
     text
   end
 
@@ -136,7 +136,7 @@ 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 += refresh_sidebar(:index)
     text
   end
 end

data/app/helpers/users_helper.rb

@@ -7,9 +7,7 @@
 #------------------------------------------------------------------------------
 module UsersHelper
   def language_for(user)
-    if user.preference[:locale]
-      _locale, language = languages.detect { |locale, _language| locale == user.preference[:locale] }
-    end
+    _locale, language = languages.detect { |locale, _language| locale == user.preference[:locale] } if user.preference[:locale]
     language || "English"
   end
 

data/{config/initializers/paper_trail.rb → app/mailers/devise_mailer.rb}

@@ -5,4 +5,8 @@
 # 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
 #------------------------------------------------------------------------------
-PaperTrail.config.track_associations = false
+class DeviseMailer < Devise::Mailer
+  def template_paths
+    ["devise/mailer"]
+  end
+end

data/app/mailers/user_mailer.rb

@@ -6,15 +6,6 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class UserMailer < ActionMailer::Base
-  def password_reset_instructions(user)
-    @edit_password_url = edit_password_url(user.perishable_token)
-
-    mail subject: "Fat Free CRM: " + I18n.t(:password_reset_instruction),
-         to: user.email,
-         from: from_address,
-         date: Time.now
-  end
-
   def assigned_entity_notification(entity, assigner)
     @entity_url = url_for(entity)
     @entity_name = entity.name

data/app/models/entities/account.rb

@@ -28,8 +28,8 @@
 #
 
 class Account < ActiveRecord::Base
-  belongs_to :user
-  belongs_to :assignee, class_name: "User", foreign_key: :assigned_to
+  belongs_to :user, optional: true # TODO: Is this really optional?
+  belongs_to :assignee, class_name: "User", foreign_key: :assigned_to, optional: true
   has_many :account_contacts, dependent: :destroy
   has_many :contacts, -> { distinct }, through: :account_contacts
   has_many :account_opportunities, dependent: :destroy
@@ -46,7 +46,7 @@ class Account < ActiveRecord::Base
   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, ->(filters) {
+  scope :state, lambda { |filters|
     where('category IN (?)' + (filters.delete('other') ? ' OR category IS NULL' : ''), filters)
   }
   scope :created_by,  ->(user) { where(user_id: user.id) }
@@ -54,7 +54,7 @@ class Account < ActiveRecord::Base
 
   scope :text_search, ->(query) { ransack('name_or_email_cont' => query).result }
 
-  scope :visible_on_dashboard, ->(user) {
+  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)
   }
@@ -65,7 +65,7 @@ class Account < ActiveRecord::Base
   acts_as_commentable
   uses_comment_extensions
   acts_as_taggable_on :tags
-  has_paper_trail class_name: 'Version', ignore: [:subscribed_users]
+  has_paper_trail versions: { class_name: 'Version' }, ignore: [:subscribed_users]
   has_fields
   exportable
   sortable by: ["name ASC", "rating DESC", "created_at DESC", "updated_at DESC"], default: "created_at DESC"
@@ -91,6 +91,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
   end
@@ -98,9 +99,7 @@ class Account < ActiveRecord::Base
   # Attach given attachment to the account if it hasn't been attached already.
   #----------------------------------------------------------------------------
   def attach!(attachment)
-    unless send("#{attachment.class.name.downcase}_ids").include?(attachment.id)
-      send(attachment.class.name.tableize) << attachment
-    end
+    send(attachment.class.name.tableize) << attachment unless send("#{attachment.class.name.downcase}_ids").include?(attachment.id)
   end
 
   # Discard given attachment from the account.
@@ -117,14 +116,15 @@ class Account < ActiveRecord::Base
   #----------------------------------------------------------------------------
   def self.create_or_select_for(model, params)
     # Attempt to find existing account
-    if params[:id].present?
-      return Account.find(params[:id])
-    elsif params[:name].present?
+    return Account.find(params[:id]) if params[:id].present?
+
+    if params[:name].present?
       account = Account.find_by(name: params[:name])
       return account if account
     end
 
     # Fallback to create new account
+    params[:user] = model.user if model
     account = Account.new(params)
     if account.access != "Lead" || model.nil?
       account.save

data/app/models/entities/account_contact.rb

@@ -21,7 +21,7 @@ class AccountContact < ActiveRecord::Base
   belongs_to :account, counter_cache: :contacts_count
   belongs_to :contact
 
-  has_paper_trail class_name: 'Version', meta: { related: :contact },
+  has_paper_trail versions: { class_name: 'Version' }, meta: { related: :contact },
                   ignore: %i[id created_at updated_at contact_id]
 
   validates_presence_of :account_id

data/app/models/entities/account_opportunity.rb

@@ -22,7 +22,7 @@ class AccountOpportunity < ActiveRecord::Base
   belongs_to :opportunity
   validates_presence_of :account_id, :opportunity_id
 
-  has_paper_trail class_name: 'Version'
+  has_paper_trail versions: { class_name: 'Version' }
 
   ActiveSupport.run_load_hooks(:fat_free_crm_account_opportunity, self)
 end