fat_free_crm 0.17.1 → 0.18.2

data/app/helpers/accounts_helper.rb

@@ -26,11 +26,13 @@ module AccountsHelper
   # and prepends the currently selected account, if any.
   #----------------------------------------------------------------------------
   def account_select(options = {})
-    options[:selected] = @account&.id || 0
+    options[:selected] = @account&.id.to_i
     accounts = ([@account.new_record? ? nil : @account] + Account.my(current_user).order(:name).limit(25)).compact.uniq
     collection_select :account, :id, accounts, :id, :name,
-                      { prompt: t(:select_an_account), include_blank: false },
-                      style: 'width:330px;', class: 'select2'
+                      { include_blank: true },
+                      style: 'width:330px;', class: 'select2',
+                      placeholder: t(:select_an_account),
+                      "data-url": auto_complete_accounts_path(format: 'json')
   end
 
   # Select an existing account or create a new one.
@@ -42,10 +44,10 @@ module AccountsHelper
     content_tag(:div, class: 'label') do
       t(:account).html_safe +
         content_tag(:span, id: 'account_create_title') do
-          "(#{t :create_new} #{t :or} <a href='#' onclick='crm.show_select_account(); return false;'>#{t :select_existing}</a>):".html_safe
+          " (#{t :create_new} #{t :or} <a href='#' onclick='crm.show_select_account(); return false;'>#{t :select_existing}</a>):".html_safe
         end +
         content_tag(:span, id: 'account_select_title') do
-          "(<a href='#' onclick='crm.show_create_account(); return false;'>#{t :create_new}</a> #{t :or} #{t :select_existing}):".html_safe
+          " (<a href='#' onclick='crm.show_create_account(); return false;'>#{t :create_new}</a> #{t :or} #{t :select_existing}):".html_safe
         end +
         content_tag(:span, ':', id: 'account_disabled_title')
     end +

data/app/helpers/application_helper.rb

@@ -7,7 +7,7 @@
 #------------------------------------------------------------------------------
 module ApplicationHelper
   def tabs(tabs = nil)
-    tabs ||= controller_path =~ /admin/ ? FatFreeCRM::Tabs.admin : FatFreeCRM::Tabs.main
+    tabs ||= controller_path.match?(/admin/) ? FatFreeCRM::Tabs.admin : FatFreeCRM::Tabs.main
     if tabs
       @current_tab ||= tabs.first[:text] # Select first tab by default.
       tabs.each { |tab| tab[:active] = (@current_tab == tab[:text] || @current_tab == tab[:url][:controller]) }
@@ -254,7 +254,7 @@ module ApplicationHelper
       if site == :skype
         url = "callto:" + url
       else
-        url = "http://" + url unless url =~ /^https?:\/\//
+        url = "http://" + url unless url.match?(/^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

data/app/helpers/leads_helper.rb

@@ -11,7 +11,7 @@ module LeadsHelper
   #----------------------------------------------------------------------------
   def stars_for(lead)
     star = '★'
-    rating = lead.rating || 0
+    rating = lead.rating.to_i
     (star * rating).html_safe + content_tag(:font, (star * (RATING_STARS - rating)).html_safe, color: 'gainsboro')
   end
 

data/app/helpers/opportunities_helper.rb

@@ -20,9 +20,9 @@ module OpportunitiesHelper
     summary << (opportunity.stage ? t(opportunity.stage) : t(:other))
     summary << number_to_currency(opportunity.weighted_amount, precision: 0)
     unless %w[won lost].include?(opportunity.stage)
-      amount << number_to_currency(opportunity.amount || 0, precision: 0)
+      amount << number_to_currency(opportunity.amount.to_f, precision: 0)
       amount << (opportunity.discount ? t(:discount_number, number_to_currency(opportunity.discount, precision: 0)) : t(:no_discount))
-      amount << t(:probability_number, (opportunity.probability || 0).to_s + '%')
+      amount << t(:probability_number, opportunity.probability.to_i.to_s + '%')
       summary << amount.join(' ')
     end
     summary << if opportunity.closes_on
@@ -37,11 +37,64 @@ module OpportunitiesHelper
   # and prepends the currently selected campaign, if any.
   #----------------------------------------------------------------------------
   def opportunity_campaign_select(options = {})
-    options[:selected] ||= @opportunity.campaign_id || 0
+    options[:selected] ||= @opportunity.campaign_id.to_i
     selected_campaign = Campaign.find_by_id(options[:selected])
     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
+
+  # Generates the inline revenue message for the opportunity list table.
+  #----------------------------------------------------------------------------
+  def opportunity_revenue_message(opportunity, detailed = false)
+    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
+
+    unless won_or_lost
+      if detailed
+        if opportunity.amount.to_f != 0
+          msg << number_to_currency(opportunity.amount.to_f, precision: 0)
+        end
+
+        if opportunity.discount.to_f != 0
+          msg << t(:discount) + ' ' + number_to_currency(opportunity.discount, precision: 0)
+        end
+      end
+
+      if opportunity.probability.to_i != 0
+        msg << t(:probability) + ' ' + opportunity.probability.to_s + '%'
+      end
+    end
+
+    msg << opportunity_closes_on_message(opportunity, won_or_lost)
+
+    msg.join(' | ').html_safe
+  end
+
+  private
+
+  def opportunity_closes_on_message(opportunity, won_or_lost)
+    if opportunity.closes_on
+      if won_or_lost
+        if opportunity.closes_on >= Date.today
+          t(:closing_date, l(opportunity.closes_on, format: :mmddyy))
+        else
+          t(:closed_ago_on, time_ago: distance_of_time_in_words(opportunity.closes_on, Date.today), date: l(opportunity.closes_on, format: :mmddyy))
+        end
+      elsif opportunity.closes_on > Date.today
+        t(:expected_to_close, time: distance_of_time_in_words(Date.today, opportunity.closes_on), date: l(opportunity.closes_on, format: :mmddyy))
+      elsif opportunity.closes_on == Date.today
+        content_tag(:span, t(:closes_today), class: 'warn')
+      else
+        content_tag(:span, t(:past_due, distance_of_time_in_words(opportunity.closes_on, Date.today)), class: 'warn')
+      end
+    else
+      t(:no_closing_date)
+    end
+  end
 end

data/app/helpers/tags_helper.rb

@@ -17,7 +17,7 @@ module TagsHelper
       elsif !query.include?(hashtag)
         query += " #{hashtag}"
       end
-      out << link_to_function(tag, "crm.search_tagged('#{query}', '#{model.class.to_s.tableize}')", title: tag)
+      out << link_to_function(tag, "crm.search_tagged('#{escape_javascript(query)}', '#{model.class.to_s.tableize}')", title: tag)
     end
   end
 

data/app/models/entities/lead.rb

@@ -104,13 +104,6 @@ class Lead < ActiveRecord::Base
     end
   end
 
-  # Deprecated: see update_with_lead_counters
-  #----------------------------------------------------------------------------
-  def update_with_permissions(attributes, _users = nil)
-    ActiveSupport::Deprecation.warn "lead.update_with_permissions is deprecated and may be removed from future releases, use user_ids and group_ids inside attributes instead and call lead.update_with_lead_counters"
-    update_with_lead_counters(attributes)
-  end
-
   # Update lead attributes taking care of campaign lead counters when necessary.
   #----------------------------------------------------------------------------
   def update_with_lead_counters(attributes)

data/app/models/entities/opportunity.rb

@@ -50,10 +50,11 @@ class Opportunity < ActiveRecord::Base
   scope :not_lost,    -> { where("opportunities.stage <> 'lost'") }
   scope :pipeline,    -> { where("opportunities.stage IS NULL OR (opportunities.stage != 'won' AND opportunities.stage != 'lost')") }
   scope :unassigned,  -> { where("opportunities.assigned_to IS NULL") }
+  scope :weighted_sort, -> { select('*, amount*probability') }
 
   # Search by name OR id
   scope :text_search, ->(query) {
-    if query =~ /\A\d+\z/
+    if query.match?(/\A\d+\z/)
       where('upper(name) LIKE upper(:name) OR opportunities.id = :id', name: "%#{query}%", id: query)
     else
       ransack('name_cont' => query).result
@@ -100,7 +101,7 @@ class Opportunity < ActiveRecord::Base
 
   #----------------------------------------------------------------------------
   def weighted_amount
-    ((amount || 0) - (discount || 0)) * (probability || 0) / 100.0
+    (amount.to_f - discount.to_f) * probability.to_i / 100.0
   end
 
   # Backend handler for [Create New Opportunity] form (see opportunity/create).

data/app/models/observers/opportunity_observer.rb

@@ -12,7 +12,7 @@ class OpportunityObserver < ActiveRecord::Observer
 
   def after_create(item)
     if item.campaign && item.stage == "won"
-      update_campaign_revenue(item.campaign, (item.amount || 0) - (item.discount || 0))
+      update_campaign_revenue(item.campaign, item.amount.to_f - item.discount.to_f)
     end
   end
 
@@ -24,11 +24,11 @@ class OpportunityObserver < ActiveRecord::Observer
     original = @@opportunities.delete(item.id)
     if original
       if original.stage != "won" && item.stage == "won" # :other to :won -- add to total campaign revenue.
-        update_campaign_revenue(item.campaign, (item.amount || 0) - (item.discount || 0))
+        update_campaign_revenue(item.campaign, item.amount.to_f - item.discount.to_f)
         item.update_attribute(:probability, 100) # Set probability to 100% if won
         return log_activity(item, :won)
       elsif original.stage == "won" && item.stage != "won" # :won to :other -- substract from total campaign revenue.
-        update_campaign_revenue(original.campaign, -((original.amount || 0) - (original.discount || 0)))
+        update_campaign_revenue(original.campaign, -(original.amount.to_f - original.discount.to_f))
       elsif original.stage != "lost" && item.stage == "lost"
         item.update_attribute(:probability, 0) # Set probability to 0% if lost
       end
@@ -42,7 +42,7 @@ class OpportunityObserver < ActiveRecord::Observer
   end
 
   def update_campaign_revenue(campaign, revenue)
-    campaign&.update_attribute(:revenue, (campaign.revenue || 0) + revenue)
+    campaign&.update_attribute(:revenue, campaign.revenue.to_f + revenue)
   end
 
   ActiveSupport.run_load_hooks(:fat_free_crm_opportunity_observer, self)

data/app/models/users/ability.rb

@@ -47,10 +47,9 @@ class Ability
           scope = scope.or(t[:group_id].eq_any(group_ids))
         end
 
-        entities.each do |klass|
-          if (asset_ids = Permission.where(scope.and(t[:asset_type].eq(klass.name))).pluck(:asset_id)).any?
-            can :manage, klass, id: asset_ids
-          end
+        permissions = Permission.select(:asset_type, :asset_id).where(scope).where(asset_type: entities.map { |k| k.name.to_s })
+        permissions.each do |p|
+          can :manage, p.asset_type.constantize, id: p.asset_id
         end
       end
 

data/app/views/campaigns/_metrics.html.haml

@@ -9,8 +9,8 @@
 %dt
   - unless objectives.empty?
     %b #{t :actual}:
-  = t(:revenue_number, number_to_currency(campaign.revenue || 0, precision: 0)) + " | "
-  = t('pluralize.lead', campaign.leads_count || 0) + " | "
-  = t('pluralize.opportunity', campaign.opportunities_count || 0)
+  = t(:revenue_number, number_to_currency(campaign.revenue.to_f, precision: 0)) + " | "
+  = t('pluralize.lead', campaign.leads_count.to_i) + " | "
+  = t('pluralize.opportunity', campaign.opportunities_count.to_i)
   - if campaign.opportunities_count? && campaign.leads_count? && campaign.leads_count != 0
     = " | " + t(:conversion_number, number_to_percentage(campaign.opportunities_count * 100 / campaign.leads_count, precision: 1))

data/app/views/home/_opportunity.html.haml

@@ -17,25 +17,10 @@
         = t(:added_ago, value: timeago(opportunity.created_at)).html_safe
     - unless current_user.preference[:opportunities_index_view] == "opportunities_index_brief"
       %dt
-        %b= number_to_currency(opportunity.weighted_amount, precision: 0) + " | "
-        - won_or_lost = %w(won lost).include?(opportunity.stage)
-        - unless won_or_lost
-          = t(:probability_number, (opportunity.probability || 0).to_s + '%') + " | "
-        - if opportunity.closes_on
-          - if won_or_lost
-            - if opportunity.closes_on >= Date.today
-              = t(:closing_date, l(opportunity.closes_on, format: :mmddyy))
-            - else
-              = t(:closed_ago_on, time_ago: distance_of_time_in_words(opportunity.closes_on, Date.today), date: l(opportunity.closes_on, format: :mmddyy))
-          - elsif opportunity.closes_on > Date.today
-            = t(:expected_to_close,  time: distance_of_time_in_words(Date.today, opportunity.closes_on), date: l(opportunity.closes_on, format: :mmddyy))
-          - elsif opportunity.closes_on == Date.today
-            %span.warn= t(:closes_today)
-          - else
-            %span.warn= t(:past_due, distance_of_time_in_words(opportunity.closes_on, Date.today))
-        - else
-          = t(:no_closing_date)
+        = opportunity_revenue_message(opportunity)
+
       - if opportunity.tags.present?
         %dt
           .tags= tags_for_dashboard(opportunity)
-      = hook(:opportunity_bottom, self, opportunity: opportunity)
+
+      = hook(:opportunity_bottom, self, opportunity: opportunity)

data/app/views/opportunities/_index_long.html.haml

@@ -27,30 +27,7 @@
         = t(:added_ago, value: timeago(opportunity.created_at)).html_safe
 
     %dt
-      %b= number_to_currency(opportunity.weighted_amount, precision: 0) + " | "
-      - won_or_lost = %w(won lost).include?(opportunity.stage)
-      - unless won_or_lost
-        = number_to_currency(opportunity.amount || 0, precision: 0)
-        - if opportunity.discount
-          = t(:discount_number, number_to_currency(opportunity.discount, precision: 0))
-        - else
-          = t(:no_discount)
-        = t(:probability_number, (opportunity.probability || 0).to_s + '%') + " | "
-
-      - if opportunity.closes_on
-        - if won_or_lost
-          - if opportunity.closes_on >= Date.today
-            = t(:closing_date, l(opportunity.closes_on, format: :mmddyy))
-          - else
-            = t(:closed_ago_on, time_ago: distance_of_time_in_words(opportunity.closes_on, Date.today), date: l(opportunity.closes_on, format: :mmddyy))
-        - elsif opportunity.closes_on > Date.today
-          = t(:expected_to_close,  time: distance_of_time_in_words(Date.today, opportunity.closes_on), date: l(opportunity.closes_on, format: :mmddyy))
-        - elsif opportunity.closes_on == Date.today
-          %span.warn= t(:closes_today)
-        - else
-          %span.warn= t(:past_due, distance_of_time_in_words(opportunity.closes_on, Date.today))
-      - else
-        = t(:no_closing_date)
+      = opportunity_revenue_message(opportunity, true)
 
       - if opportunity.tags.present?
         %dt

data/app/views/opportunities/_sidebar_show.html.haml

@@ -19,16 +19,16 @@
     %dt= @opportunity.probability ? @opportunity.probability.to_s + "%" : t(:n_a)
     %tt #{t :probability}:
   %li
-    %dt= @opportunity.amount ? number_to_currency(@opportunity.amount || 0, precision: 0) : t(:n_a)
+    %dt= @opportunity.amount ? number_to_currency(@opportunity.amount.to_f, precision: 0) : t(:n_a)
     %tt #{t :amount}:
   %li
-    %dt= @opportunity.discount ? number_to_currency(@opportunity.discount || 0, precision: 0) : t(:n_a)
+    %dt= @opportunity.discount ? number_to_currency(@opportunity.discount.to_f, precision: 0) : t(:n_a)
     - if @opportunity.amount && @opportunity.discount
       %tt== Discount (#{number_to_percentage(@opportunity.discount / @opportunity.amount * 100, precision: 1)}):
     - else
       %tt #{t :discount}:
   %li
-    %dt= @opportunity.amount ? number_to_currency(@opportunity.weighted_amount || 0, precision: 0) : t(:n_a)
+    %dt= @opportunity.amount ? number_to_currency(@opportunity.weighted_amount.to_f, precision: 0) : t(:n_a)
     %tt #{t :weighted_amount}:
   %li
     %dt= @opportunity.assigned_to ? truncate(@opportunity.assignee.full_name, length: 16) : nil

data/app/views/opportunities/_top_section.html.haml

@@ -37,7 +37,7 @@
           %td
             != account_select_or_create(a) do |options|
               -# Add [-- None --] account choice when editing existing opportunity that has an account.
-              - options[:selected] = @account.id || 0
+              - options[:selected] = @account.id.to_i
 
           %td= spacer
           %td

data/config/initializers/ransack.rb

@@ -17,6 +17,6 @@ Ransack.configure do |config|
   config.ajax_options = {
     url: '/:controller/auto_complete.json',
     type: 'POST',
-    key: 'auto_complete_query'
+    key: 'term'
   }
 end

data/db/schema.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -54,7 +52,6 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.text "subscribed_users"
     t.integer "contacts_count", default: 0
     t.integer "opportunities_count", default: 0
-    t.integer "pipeline_opportunities_count", default: 0
     t.index ["assigned_to"], name: "index_accounts_on_assigned_to"
     t.index ["user_id", "name", "deleted_at"], name: "index_accounts_on_user_id_and_name_and_deleted_at", unique: true
   end

data/fat_free_crm.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.email = ['mike@fatfreecrm.com', 'nathan@fatfreecrm.com', 'warp@fatfreecrm.com', 'steveyken@gmail.com', 'daniel.oconnor@gmail.com']
   gem.files = files
   gem.version = FatFreeCRM::VERSION::STRING
-  gem.required_ruby_version = '>= 2.3.0'
+  gem.required_ruby_version = '>= 2.4.0'
   gem.license = 'MIT'
 
   gem.add_dependency 'rails', '~> 5.1.0'

data/lib/fat_free_crm/core_ext/string.rb

@@ -21,7 +21,7 @@ class String
   end
 
   def to_url
-    match(/^https?:\/\//) ? self : "http://#{self}"
+    match?(/^https?:\/\//) ? self : "http://#{self}"
   end
 
   def true?

data/lib/fat_free_crm/engine.rb

@@ -13,8 +13,8 @@ module FatFreeCRM
     config.active_record.observers = %i[lead_observer opportunity_observer
                                         task_observer entity_observer]
 
-    initializer "model_core.factories", after: "factory_girl.set_factory_paths" do
-      FactoryGirl.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__) if defined?(FactoryGirl)
+    initializer "model_core.factories", after: "factory_bot.set_factory_paths" do
+      FactoryBot.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__) if defined?(FactoryBot)
     end
 
     initializer :append_migrations do |app|

data/lib/fat_free_crm/fields.rb

@@ -75,7 +75,7 @@ module FatFreeCRM
       end
 
       def method_missing(method_id, *args, &block)
-        if method_id.to_s =~ /\Acf_.*[^=]\Z/
+        if method_id.to_s.match?(/\Acf_.*[^=]\Z/)
           # Refresh columns and try again.
           self.class.reset_column_information
           # If new record, create new object from class, else reload class

data/lib/fat_free_crm/permissions.rb

@@ -76,20 +76,6 @@ module FatFreeCRM
         permissions_to_remove.each { |p| permissions.delete(p); p.destroy }
       end
 
-      # Save the model along with its permissions if any.
-      #--------------------------------------------------------------------------
-      def save_with_permissions(_users = nil)
-        ActiveSupport::Deprecation.warn "save_with_permissions is deprecated and may be removed from future releases, use user_ids and group_ids inside attributes instead."
-        save
-      end
-
-      # Update the model along with its permissions if any.
-      #--------------------------------------------------------------------------
-      def update_with_permissions(attributes, _users = nil)
-        ActiveSupport::Deprecation.warn "update_with_permissions is deprecated and may be removed from future releases, use user_ids and group_ids inside attributes instead."
-        update_attributes(attributes)
-      end
-
       # Save the model copying other model's permissions.
       #--------------------------------------------------------------------------
       def save_with_model_permissions(model)

data/lib/fat_free_crm/version.rb

@@ -8,8 +8,8 @@
 module FatFreeCRM
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 17
-    TINY  = 1
+    MINOR = 18
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/tasks/ffcrm/setup.rake

@@ -18,7 +18,7 @@ namespace :ffcrm do
       end
 
       # Don't continue unless user typed y(es)
-      if proceed =~ /y(?:es)*/i
+      if proceed.match?(/y(?:es)*/i)
         Rake::Task["db:migrate"].invoke
         Rake::Task["ffcrm:setup:admin"].invoke
       else
@@ -44,7 +44,7 @@ namespace :ffcrm do
 
           password ||= "manager"
           print "Password [#{password}]: "
-          echo = ->(toggle) { return if RUBY_PLATFORM =~ /mswin/; system(toggle ? "stty echo && echo" : "stty -echo") }
+          echo = ->(toggle) { return if RUBY_PLATFORM.match?(/mswin/); system(toggle ? "stty echo && echo" : "stty -echo") }
           begin
             echo.call(false)
             reply = STDIN.gets.strip
@@ -68,8 +68,8 @@ namespace :ffcrm do
             reply = STDIN.gets.strip
             break unless reply.blank?
           end
-          break if reply =~ /y(?:es)*/i
-          redo if reply =~ /no*/i
+          break if reply.match?(/y(?:es)*/i)
+          redo if reply.match?(/no*/i)
           puts "No admin user was created."
           exit
         end