fat_free_crm 0.17.3 → 0.18.0

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/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  = 3
+    MINOR = 18
+    TINY  = 0
     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

data/spec/controllers/admin/users_controller_spec.rb

@@ -18,7 +18,7 @@ describe Admin::UsersController do
   #----------------------------------------------------------------------------
   describe "GET index" do
     it "assigns all users as @users and renders [index] template" do
-      @users = [current_user, FactoryGirl.create(:user)]
+      @users = [current_user, create(:user)]
 
       get :index
       expect(assigns[:users].first).to eq(@users.last) # get_users() sorts by id DESC
@@ -27,8 +27,8 @@ describe Admin::UsersController do
     end
 
     it "performs lookup using query string" do
-      @amy = FactoryGirl.create(:user, username: "amy_anderson")
-      @bob = FactoryGirl.create(:user, username: "bob_builder")
+      @amy = create(:user, username: "amy_anderson")
+      @bob = create(:user, username: "bob_builder")
 
       get :index, params: { query: "amy_anderson" }
       expect(assigns[:users]).to eq([@amy])
@@ -42,7 +42,7 @@ describe Admin::UsersController do
   #----------------------------------------------------------------------------
   describe "GET show" do
     it "assigns the requested user as @user and renders [show] template" do
-      @user = FactoryGirl.create(:user)
+      @user = create(:user)
 
       get :show, params: { id: @user.id }
       expect(assigns[:user]).to eq(@user)
@@ -65,7 +65,7 @@ describe Admin::UsersController do
   #----------------------------------------------------------------------------
   describe "GET edit" do
     it "assigns the requested user as @user and renders [edit] template" do
-      @user = FactoryGirl.create(:user)
+      @user = create(:user)
 
       get :edit, params: { id: @user.id }, xhr: true
       expect(assigns[:user]).to eq(@user)
@@ -74,15 +74,15 @@ describe Admin::UsersController do
     end
 
     it "assigns the previous user as @previous when necessary" do
-      @user = FactoryGirl.create(:user)
-      @previous = FactoryGirl.create(:user)
+      @user = create(:user)
+      @previous = create(:user)
 
       get :edit, params: { id: @user.id, previous: @previous.id }, xhr: true
       expect(assigns[:previous]).to eq(@previous)
     end
 
     it "reloads current page with the flash message if user got deleted" do
-      @user = FactoryGirl.create(:user)
+      @user = create(:user)
       @user.destroy
 
       get :edit, params: { id: @user.id }, xhr: true
@@ -91,8 +91,8 @@ describe Admin::UsersController do
     end
 
     it "notifies the view if previous user got deleted" do
-      @user = FactoryGirl.create(:user)
-      @previous = FactoryGirl.create(:user)
+      @user = create(:user)
+      @previous = create(:user)
       @previous.destroy
 
       get :edit, params: { id: @user.id, previous: @previous.id }, xhr: true
@@ -114,7 +114,7 @@ describe Admin::UsersController do
       end
 
       it "assigns a newly created user as @user and renders [create] template" do
-        @user = FactoryGirl.build(:user, username: @username, email: @email)
+        @user = build(:user, username: @username, email: @email)
         allow(User).to receive(:new).and_return(@user)
 
         post :create, params: { user: { username: @username, email: @email, password: @password, password_confirmation: @password } }, xhr: true
@@ -137,7 +137,7 @@ describe Admin::UsersController do
 
     describe "with invalid params" do
       it "assigns a newly created but unsaved user as @user and re-renders [create] template" do
-        @user = FactoryGirl.build(:user, username: "", email: "")
+        @user = build(:user, username: "", email: "")
         allow(User).to receive(:new).and_return(@user)
 
         post :create, params: { user: {} }, xhr: true
@@ -153,7 +153,7 @@ describe Admin::UsersController do
   describe "PUT update" do
     describe "with valid params" do
       it "updates the requested user, assigns it to @user, and renders [update] template" do
-        @user = FactoryGirl.create(:user, username: "flip", email: "flip@example.com")
+        @user = create(:user, username: "flip", email: "flip@example.com")
 
         put :update, params: { id: @user.id, user: { username: "flop", email: "flop@example.com" } }, xhr: true
         expect(assigns[:user]).to eq(@user.reload)
@@ -162,7 +162,7 @@ describe Admin::UsersController do
       end
 
       it "reloads current page is the user got deleted" do
-        @user = FactoryGirl.create(:user)
+        @user = create(:user)
         @user.destroy
 
         put :update, params: { id: @user.id, user: { username: "flop", email: "flop@example.com" } }, xhr: true
@@ -171,7 +171,7 @@ describe Admin::UsersController do
       end
 
       it "assigns admin rights when requested so" do
-        @user = FactoryGirl.create(:user, admin: false)
+        @user = create(:user, admin: false)
         put :update, params: { id: @user.id, user: { admin: "1", username: @user.username, email: @user.email } }, xhr: true
         expect(assigns[:user]).to eq(@user.reload)
         expect(assigns[:user].admin).to eq(true)
@@ -179,7 +179,7 @@ describe Admin::UsersController do
       end
 
       it "revokes admin rights when requested so" do
-        @user = FactoryGirl.create(:user, admin: true)
+        @user = create(:user, admin: true)
         put :update, params: { id: @user.id, user: { admin: "0", username: @user.username, email: @user.email } }, xhr: true
         expect(assigns[:user]).to eq(@user.reload)
         expect(assigns[:user].admin).to eq(false)
@@ -189,7 +189,7 @@ describe Admin::UsersController do
 
     describe "with invalid params" do
       it "doesn't update the requested user, but assigns it to @user and renders [update] template" do
-        @user = FactoryGirl.create(:user, username: "flip", email: "flip@example.com")
+        @user = create(:user, username: "flip", email: "flip@example.com")
 
         put :update, params: { id: @user.id, user: {} }, xhr: true
         expect(assigns[:user]).to eq(@user.reload)
@@ -203,7 +203,7 @@ describe Admin::UsersController do
   #----------------------------------------------------------------------------
   describe "GET confirm" do
     it "assigns the requested user as @user and renders [confirm] template" do
-      @user = FactoryGirl.create(:user)
+      @user = create(:user)
 
       get :confirm, params: { id: @user.id }, xhr: true
       expect(assigns[:user]).to eq(@user)
@@ -211,7 +211,7 @@ describe Admin::UsersController do
     end
 
     it "reloads current page is the user got deleted" do
-      @user = FactoryGirl.create(:user)
+      @user = create(:user)
       @user.destroy
 
       get :confirm, params: { id: @user.id }, xhr: true
@@ -225,7 +225,7 @@ describe Admin::UsersController do
   #----------------------------------------------------------------------------
   describe "DELETE destroy" do
     it "destroys the requested user and renders [destroy] template" do
-      @user = FactoryGirl.create(:user)
+      @user = create(:user)
 
       delete :destroy, params: { id: @user.id }, xhr: true
       expect { User.find(@user.id) }.to raise_error(ActiveRecord::RecordNotFound)
@@ -233,8 +233,8 @@ describe Admin::UsersController do
     end
 
     it "handles the case when the requested user can't be deleted" do
-      @user = FactoryGirl.create(:user)
-      @account = FactoryGirl.create(:account, user: @user) # Plant artifact to prevent the user from being deleted.
+      @user = create(:user)
+      @account = create(:account, user: @user) # Plant artifact to prevent the user from being deleted.
 
       delete :destroy, params: { id: @user.id }, xhr: true
       expect(flash[:warning]).not_to eq(nil)
@@ -247,7 +247,7 @@ describe Admin::UsersController do
   #----------------------------------------------------------------------------
   describe "POST auto_complete" do
     before(:each) do
-      @auto_complete_matches = [FactoryGirl.create(:user, first_name: "Hello")]
+      @auto_complete_matches = [create(:user, first_name: "Hello")]
     end
 
     it_should_behave_like("auto complete")
@@ -258,7 +258,7 @@ describe Admin::UsersController do
   #----------------------------------------------------------------------------
   describe "PUT suspend" do
     it "suspends the requested user" do
-      @user = FactoryGirl.create(:user)
+      @user = create(:user)
 
       put :suspend, params: { id: @user.id }, xhr: true
       expect(assigns[:user].suspended?).to eq(true)
@@ -274,7 +274,7 @@ describe Admin::UsersController do
     end
 
     it "reloads current page is the user got deleted" do
-      @user = FactoryGirl.create(:user)
+      @user = create(:user)
       @user.destroy
 
       put :suspend, params: { id: @user.id }, xhr: true
@@ -288,7 +288,7 @@ describe Admin::UsersController do
   #----------------------------------------------------------------------------
   describe "PUT reactivate" do
     it "re-activates the requested user" do
-      @user = FactoryGirl.create(:user, suspended_at: Time.now.yesterday)
+      @user = create(:user, suspended_at: Time.now.yesterday)
 
       put :reactivate, params: { id: @user.id }, xhr: true
       expect(assigns[:user].suspended?).to eq(false)
@@ -296,7 +296,7 @@ describe Admin::UsersController do
     end
 
     it "reloads current page is the user got deleted" do
-      @user = FactoryGirl.create(:user)
+      @user = create(:user)
       @user.destroy
 
       put :reactivate, params: { id: @user.id }, xhr: true