fat_free_crm 0.24.2 → 0.25.0

data/config/locales/fat_free_crm.zh-CN.yml

@@ -345,7 +345,7 @@ zh-CN:
   actual: 实际
   actual_performance: 实际效益
   budget: 预算
-  budget_label: 预算(￥)
+  budget_label: 预算(%{currency})
   campaign: 促销
   campaign_and_leads: 促销与领导
   campaign_small: 促销
@@ -371,7 +371,7 @@ zh-CN:
 
   objectives_small: 战役目标
   revenue: 收入
-  revenue_label: 收入(￥)
+  revenue_label: 收入(%{currency})
   revenue_number: 收入%{value}
   save_campaign: 保存促销
   start_date: 开始日期
@@ -475,7 +475,7 @@ zh-CN:
   closes_today: 预计今天结束!
   closing_date: 结束日期是 %{value}
   create_opportunity: 创建商机
-  currency: (￥)
+  currency: "￥"
   days_late: 晚了
   days_left: 天剩余
   discount: 折扣

data/config/settings.default.yml

@@ -80,7 +80,7 @@
 :email_dropbox:
   :server                     : ""        # IMAP server name.
   :port                       : ""        # IMAP server port number.
-  :ssl                        : ""        # True for secure IMAP connection, false othewise.
+  :ssl                        : ""        # True for secure IMAP connection, false otherwise.
   :address                    : ""        # Dropbox email address.
   :user                       : ""        # User to login to the IMAP server.
   :password                   : ""        # Password to login to the IMAP server.
@@ -99,7 +99,7 @@
 :email_comment_replies:
   :server                     : ""        # IMAP server name.
   :port                       : ""        # IMAP server port number.
-  :ssl                        : ""        # True for secure IMAP connection, false othewise.
+  :ssl                        : ""        # True for secure IMAP connection, false otherwise.
   :address                    : ""        # Comment reply email address.
   :user                       : ""        # User to login to the IMAP server.
   :password                   : ""        # Password to login to the IMAP server.
@@ -358,3 +358,11 @@ task_completed:
   - :completed_last_week
   - :completed_this_month
   - :completed_last_month
+
+# Phone Numbers
+#------------------------------------------------------------------------------
+# Enforce international phone number format (e.g. +1-555-555-5555)
+# When set to true, a 'pattern' attribute will be added to all phone input fields
+# to help guide users to enter phone numbers in international format.
+#
+:enforce_international_phone_format: false

data/db/demo/accounts.yml

@@ -44,4 +44,6 @@ account<%= i %>:
   category         : <%= category.sample %>
   created_at       : <%= created_at = (rand(60) + 2).days.ago + rand(600).minutes; created_at.to_fs(:db) %>
   updated_at       : <%= (created_at + rand(36_000).seconds).to_fs(:db) %>
+  latitude         : <%= FFaker::Geolocation.lat %>
+  longitude        : <%= FFaker::Geolocation.lng %>
 <% end %>

data/db/migrate/20100928030623_create_addresses.rb

@@ -34,7 +34,7 @@ class CreateAddresses < ActiveRecord::Migration[4.2]
       Address.create(street1: asset.address, full_address: asset.address, address_type: "Business", addressable: asset)
     end
 
-    # Remove addresses columns from assets allready migrated
+    # Remove addresses columns from assets already migrated
     remove_column(:contacts, :address)
     remove_column(:accounts, :billing_address)
     remove_column(:accounts, :shipping_address)

data/db/migrate/20230526212613_convert_to_active_storage.rb

@@ -11,8 +11,8 @@ class ConvertToActiveStorage < ActiveRecord::Migration[5.2]
                     else
                       'LASTVAL()'
                     end
-      get_blob_id = 'LAST_INSERT_ROWID()' if conn.is_a?(SQLite3::Database)
-      if conn.is_a?(::PG::Connection)
+      get_blob_id = 'LAST_INSERT_ROWID()' if Object.const_defined?("SQLite3") && conn.is_a?(SQLite3::Database)
+      if Object.const_defined?("PG") && conn.is_a?(::PG::Connection)
         get_blob_id = 'LASTVAL()'
         conn.prepare('active_storage_blobs', <<-SQL)
           INSERT INTO active_storage_blobs (

data/db/migrate/20250805093408_add_latitude_and_longitude_to_accounts.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddLatitudeAndLongitudeToAccounts < ActiveRecord::Migration[4.2]
+  def change
+    add_column :accounts, :latitude, :decimal, precision: 10, scale: 6
+    add_column :accounts, :longitude, :decimal, precision: 10, scale: 6
+  end
+end

data/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2023_05_26_212613) do
+ActiveRecord::Schema[7.1].define(version: 2025_08_05_093408) do
   create_table "account_contacts", force: :cascade do |t|
     t.integer "account_id"
     t.integer "contact_id"
@@ -48,6 +48,9 @@ ActiveRecord::Schema[7.1].define(version: 2023_05_26_212613) do
     t.text "subscribed_users"
     t.integer "contacts_count", default: 0
     t.integer "opportunities_count", default: 0
+    t.string "wikidata_id"
+    t.decimal "latitude", precision: 10, scale: 6
+    t.decimal "longitude", precision: 10, scale: 6
     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
@@ -366,6 +369,14 @@ ActiveRecord::Schema[7.1].define(version: 2023_05_26_212613) do
     t.index ["user_id", "name"], name: "index_preferences_on_user_id_and_name"
   end
 
+  create_table "research_tools", force: :cascade do |t|
+    t.string "name"
+    t.string "url_template"
+    t.boolean "enabled", default: false, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "sessions", force: :cascade do |t|
     t.string "session_id", null: false
     t.text "data"

data/lib/fat_free_crm/fields.rb

@@ -25,6 +25,9 @@ module FatFreeCRM
     module SingletonMethods
       def field_groups
         # catches cases where this code runs before database has been created or migrated
+        return [] unless ActiveRecord::Base.connection.active?
+        return [] unless ActiveRecord::Base.connection.table_exists?(:field_groups)
+
         FieldGroup.where(klass_name: name).order(:position)
       rescue ActiveRecord::NoDatabaseError, ActiveRecord::StatementInvalid
         []

data/lib/fat_free_crm/mail_processor/dropbox.rb

@@ -232,7 +232,7 @@ module FatFreeCRM
         # Search for domain name in Accounts.
         account = Account.where('(lower(email) like ? OR lower(website) like ?)', "%#{recipient_domain.downcase}", "%#{recipient_domain.downcase}%").first
         if account
-          log "asociating new contact #{recipient} with the account #{account.name}"
+          log "associating new contact #{recipient} with the account #{account.name}"
           defaults[:account] = account
         else
           log "creating new account #{recipient_domain.capitalize} for the contact #{recipient}"

data/lib/fat_free_crm/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fat_free_crm
 version: !ruby/object:Gem::Version
-  version: 0.24.2
+  version: 0.25.0
 platform: ruby
 authors:
 - Michael Dvorkin
@@ -228,19 +228,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: acts_as_commentable2
+  name: acts_as_commentable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
@@ -382,7 +382,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: responds_to_parent2
+  name: responds_to_parent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -1090,9 +1090,9 @@ files:
 - db/demo/tasks.yml
 - db/demo/users.yml
 - db/fat_free_crm_development.sqlite3
+- db/fat_free_crm_development.sqlite3-shm
+- db/fat_free_crm_development.sqlite3-wal
 - db/fat_free_crm_test.sqlite3
-- db/fat_free_crm_test.sqlite3-shm
-- db/fat_free_crm_test.sqlite3-wal
 - db/migrate/20100928030598_create_sessions.rb
 - db/migrate/20100928030599_create_users.rb
 - db/migrate/20100928030600_create_openid_tables.rb
@@ -1168,6 +1168,7 @@ files:
 - db/migrate/20230422234321_optionally_create_action_text_tables.action_text.rb
 - db/migrate/20230526211831_create_active_storage_tables.active_storage.rb
 - db/migrate/20230526212613_convert_to_active_storage.rb
+- db/migrate/20250805093408_add_latitude_and_longitude_to_accounts.rb
 - db/schema.rb
 - db/seeds.rb
 - db/seeds/fields.rb