spree_core 4.5.0 → 4.7.3

data/lib/spree/core/controller_helpers/locale.rb

@@ -6,6 +6,7 @@ module Spree
 
         included do
           before_action :set_locale
+          before_action :set_fallback_locale
 
           if defined?(helper_method)
             helper_method :supported_locales
@@ -21,16 +22,36 @@ module Spree
           I18n.locale = current_locale
         end
 
+        def set_fallback_locale
+          return unless respond_to?(:current_store) && current_store.present?
+
+          Spree::Locales::SetFallbackLocaleForStore.new.call(store: current_store)
+        end
+
         def current_locale
-          @current_locale ||= if params[:locale].present? && supported_locale?(params[:locale])
+          @current_locale ||= if user_locale?
+                                try_spree_current_user.selected_locale
+                              elsif params_locale?
                                 params[:locale]
-                              elsif respond_to?(:config_locale, true) && config_locale.present?
+                              elsif config_locale?
                                 config_locale
                               else
                                 current_store&.default_locale || Rails.application.config.i18n.default_locale || I18n.default_locale
                               end
         end
 
+        def config_locale?
+          respond_to?(:config_locale, true) && config_locale.present?
+        end
+
+        def params_locale?
+          params[:locale].present? && supported_locale?(params[:locale])
+        end
+
+        def user_locale?
+          Spree::Config.use_user_locale && try_spree_current_user && supported_locale?(try_spree_current_user.selected_locale)
+        end
+
         def supported_locales
           @supported_locales ||= current_store&.supported_locales_list
         end
@@ -54,6 +75,16 @@ module Spree
 
           I18n.locale.to_s
         end
+
+        def find_with_fallback_default_locale(&block)
+          result = begin
+            block.call
+          rescue ActiveRecord::RecordNotFound => _e
+            nil
+          end
+
+          result || Mobility.with_locale(current_store.default_locale) { block.call }
+        end
       end
     end
   end

data/lib/spree/core/dependencies.rb

@@ -3,128 +3,104 @@ require_relative 'dependencies_helper'
 module Spree
   module Core
     class Dependencies
-      include Spree::DependenciesHelper
+      INJECTION_POINTS_WITH_DEFAULTS = {
+        # ability
+        ability_class: 'Spree::Ability',
 
-      INJECTION_POINTS = [
-        :ability_class,
-        :cart_create_service, :cart_add_item_service, :cart_remove_item_service,
-        :cart_remove_line_item_service, :cart_set_item_quantity_service, :cart_recalculate_service,
-        :cms_page_finder, :cart_update_service, :checkout_next_service, :checkout_advance_service, :checkout_update_service,
-        :checkout_complete_service, :checkout_add_store_credit_service, :checkout_remove_store_credit_service, :checkout_get_shipping_rates_service,
-        :coupon_handler, :menu_finder, :country_finder, :current_order_finder, :credit_card_finder,
-        :completed_order_finder, :order_sorter, :cart_compare_line_items_service, :collection_paginator, :products_sorter,
-        :products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service,
-        :account_create_address_service, :account_update_address_service, :account_create_service, :account_update_service,
-        :address_finder, :collection_sorter, :error_handler, :current_store_finder, :cart_empty_service, :cart_destroy_service,
-        :classification_reposition_service, :credit_cards_destroy_service, :cart_associate_service, :cart_change_currency_service,
-        :line_item_create_service, :line_item_update_service, :line_item_destroy_service,
-        :order_approve_service, :order_cancel_service, :shipment_change_state_service, :shipment_update_service,
-        :shipment_create_service, :shipment_add_item_service, :shipment_remove_item_service,
-        :payment_create_service, :address_create_service, :address_update_service,
-        :checkout_select_shipping_method_service
-      ].freeze
-
-      attr_accessor *INJECTION_POINTS
-
-      def initialize
-        set_default_ability
-        set_default_services
-        set_default_finders
-      end
-
-      private
-
-      def set_default_ability
-        @ability_class = 'Spree::Ability'
-      end
-
-      def set_default_services
         # cart
-        @cart_compare_line_items_service = 'Spree::CompareLineItems'
-        @cart_create_service = 'Spree::Cart::Create'
-        @cart_add_item_service = 'Spree::Cart::AddItem'
-        @cart_update_service = 'Spree::Cart::Update'
-        @cart_recalculate_service = 'Spree::Cart::Recalculate'
-        @cart_remove_item_service = 'Spree::Cart::RemoveItem'
-        @cart_remove_line_item_service = 'Spree::Cart::RemoveLineItem'
-        @cart_set_item_quantity_service = 'Spree::Cart::SetQuantity'
-        @cart_estimate_shipping_rates_service = 'Spree::Cart::EstimateShippingRates'
-        @cart_empty_service = 'Spree::Cart::Empty'
-        @cart_destroy_service = 'Spree::Cart::Destroy'
-        @cart_associate_service = 'Spree::Cart::Associate'
-        @cart_change_currency_service = 'Spree::Cart::ChangeCurrency'
+        cart_compare_line_items_service: 'Spree::CompareLineItems',
+        cart_create_service: 'Spree::Cart::Create',
+        cart_add_item_service: 'Spree::Cart::AddItem',
+        cart_update_service: 'Spree::Cart::Update',
+        cart_recalculate_service: 'Spree::Cart::Recalculate',
+        cart_remove_item_service: 'Spree::Cart::RemoveItem',
+        cart_remove_line_item_service: 'Spree::Cart::RemoveLineItem',
+        cart_set_item_quantity_service: 'Spree::Cart::SetQuantity',
+        cart_estimate_shipping_rates_service: 'Spree::Cart::EstimateShippingRates',
+        cart_empty_service: 'Spree::Cart::Empty',
+        cart_destroy_service: 'Spree::Cart::Destroy',
+        cart_associate_service: 'Spree::Cart::Associate',
+        cart_change_currency_service: 'Spree::Cart::ChangeCurrency',
 
         # checkout
-        @checkout_next_service = 'Spree::Checkout::Next'
-        @checkout_advance_service = 'Spree::Checkout::Advance'
-        @checkout_update_service = 'Spree::Checkout::Update'
-        @checkout_complete_service = 'Spree::Checkout::Complete'
-        @checkout_add_store_credit_service = 'Spree::Checkout::AddStoreCredit'
-        @checkout_remove_store_credit_service = 'Spree::Checkout::RemoveStoreCredit'
-        @checkout_get_shipping_rates_service = 'Spree::Checkout::GetShippingRates'
-        @checkout_select_shipping_method_service = 'Spree::Checkout::SelectShippingMethod'
+        checkout_next_service: 'Spree::Checkout::Next',
+        checkout_advance_service: 'Spree::Checkout::Advance',
+        checkout_update_service: 'Spree::Checkout::Update',
+        checkout_complete_service: 'Spree::Checkout::Complete',
+        checkout_add_store_credit_service: 'Spree::Checkout::AddStoreCredit',
+        checkout_remove_store_credit_service: 'Spree::Checkout::RemoveStoreCredit',
+        checkout_get_shipping_rates_service: 'Spree::Checkout::GetShippingRates',
+        checkout_select_shipping_method_service: 'Spree::Checkout::SelectShippingMethod',
 
         # order
-        @order_approve_service = 'Spree::Orders::Approve'
-        @order_cancel_service = 'Spree::Orders::Cancel'
+        order_approve_service: 'Spree::Orders::Approve',
+        order_cancel_service: 'Spree::Orders::Cancel',
 
         # shipment
-        @shipment_change_state_service = 'Spree::Shipments::ChangeState'
-        @shipment_create_service = 'Spree::Shipments::Create'
-        @shipment_update_service = 'Spree::Shipments::Update'
-        @shipment_add_item_service = 'Spree::Shipments::AddItem'
-        @shipment_remove_item_service = 'Spree::Shipments::RemoveItem'
+        shipment_change_state_service: 'Spree::Shipments::ChangeState',
+        shipment_create_service: 'Spree::Shipments::Create',
+        shipment_update_service: 'Spree::Shipments::Update',
+        shipment_add_item_service: 'Spree::Shipments::AddItem',
+        shipment_remove_item_service: 'Spree::Shipments::RemoveItem',
 
         # sorter
-        @collection_sorter = 'Spree::BaseSorter'
-        @order_sorter = 'Spree::BaseSorter'
-        @products_sorter = 'Spree::Products::Sort'
+        collection_sorter: 'Spree::BaseSorter',
+        order_sorter: 'Spree::BaseSorter',
+        products_sorter: 'Spree::Products::Sort',
 
         # paginator
-        @collection_paginator = 'Spree::Shared::Paginate'
+        collection_paginator: 'Spree::Shared::Paginate',
 
         # coupons
         # TODO: we should split this service into 2 separate - Add and Remove
-        @coupon_handler = 'Spree::PromotionHandler::Coupon'
+        coupon_handler: 'Spree::PromotionHandler::Coupon',
 
         # account
-        @account_create_service = 'Spree::Account::Create'
-        @account_update_service = 'Spree::Account::Update'
+        account_create_service: 'Spree::Account::Create',
+        account_update_service: 'Spree::Account::Update',
 
         # addresses
-        @address_create_service = 'Spree::Addresses::Create'
-        @address_update_service = 'Spree::Addresses::Update'
+        address_create_service: 'Spree::Addresses::Create',
+        address_update_service: 'Spree::Addresses::Update',
 
         # credit cards
-        @credit_cards_destroy_service = 'Spree::CreditCards::Destroy'
+        credit_cards_destroy_service: 'Spree::CreditCards::Destroy',
 
         # classifications
-        @classification_reposition_service = 'Spree::Classifications::Reposition'
+        classification_reposition_service: 'Spree::Classifications::Reposition',
 
         # line items
-        @line_item_create_service = 'Spree::LineItems::Create'
-        @line_item_update_service = 'Spree::LineItems::Update'
-        @line_item_destroy_service = 'Spree::LineItems::Destroy'
+        line_item_create_service: 'Spree::LineItems::Create',
+        line_item_update_service: 'Spree::LineItems::Update',
+        line_item_destroy_service: 'Spree::LineItems::Destroy',
 
-        @payment_create_service = 'Spree::Payments::Create'
+        payment_create_service: 'Spree::Payments::Create',
 
         # errors
-        @error_handler = 'Spree::ErrorReporter'
-      end
-
-      def set_default_finders
-        @address_finder = 'Spree::Addresses::Find'
-        @country_finder = 'Spree::Countries::Find'
-        @cms_page_finder = 'Spree::CmsPages::Find'
-        @menu_finder = 'Spree::Menus::Find'
-        @current_order_finder = 'Spree::Orders::FindCurrent'
-        @current_store_finder = 'Spree::Stores::FindCurrent'
-        @completed_order_finder = 'Spree::Orders::FindComplete'
-        @credit_card_finder = 'Spree::CreditCards::Find'
-        @products_finder = 'Spree::Products::Find'
-        @taxon_finder = 'Spree::Taxons::Find'
-        @line_item_by_variant_finder = 'Spree::LineItems::FindByVariant'
-      end
+        error_handler: 'Spree::ErrorReporter',
+
+        # data feeds
+        data_feeds_google_rss_service: 'Spree::DataFeeds::Google::Rss',
+        data_feeds_google_optional_attributes_service: 'Spree::DataFeeds::Google::OptionalAttributes',
+        data_feeds_google_required_attributes_service: 'Spree::DataFeeds::Google::RequiredAttributes',
+        data_feeds_google_optional_sub_attributes_service: 'Spree::DataFeeds::Google::OptionalSubAttributes',
+        data_feeds_google_products_list: 'Spree::DataFeeds::Google::ProductsList',
+
+        # finders
+        address_finder: 'Spree::Addresses::Find',
+        country_finder: 'Spree::Countries::Find',
+        cms_page_finder: 'Spree::CmsPages::Find',
+        menu_finder: 'Spree::Menus::Find',
+        current_order_finder: 'Spree::Orders::FindCurrent',
+        current_store_finder: 'Spree::Stores::FindCurrent',
+        completed_order_finder: 'Spree::Orders::FindComplete',
+        credit_card_finder: 'Spree::CreditCards::Find',
+        products_finder: 'Spree::Products::Find',
+        taxon_finder: 'Spree::Taxons::Find',
+        line_item_by_variant_finder: 'Spree::LineItems::FindByVariant'
+      }.freeze
+
+      include Spree::DependenciesHelper
     end
   end
 end

data/lib/spree/core/dependencies_helper.rb

@@ -1,5 +1,15 @@
 module Spree
   module DependenciesHelper
+    def self.included(base)
+      injection_points = base::INJECTION_POINTS_WITH_DEFAULTS.keys.freeze
+      base.const_set(:INJECTION_POINTS, injection_points)
+      base.attr_accessor(*injection_points)
+    end
+
+    def initialize
+      set_default_values
+    end
+
     def current_values
       values = []
       self.class::INJECTION_POINTS.each do |injection_point|
@@ -7,5 +17,14 @@ module Spree
       end
       values
     end
+
+    private
+
+    def set_default_values
+      self.class::INJECTION_POINTS_WITH_DEFAULTS.each do |injection_point, default_value|
+        value = default_value.respond_to?(:call) ? default_value.call : default_value
+        instance_variable_set("@#{injection_point}", value)
+      end
+    end
   end
 end

data/lib/spree/core/engine.rb

@@ -11,7 +11,8 @@ module Spree
                                :adjusters,
                                :stock_splitters,
                                :promotions,
-                               :line_item_comparison_hooks)
+                               :line_item_comparison_hooks,
+                               :data_feed_types)
       SpreeCalculators = Struct.new(:shipping_methods, :tax_rates, :promotion_actions_create_adjustments, :promotion_actions_create_item_adjustments)
       PromoEnvironment = Struct.new(:rules, :actions)
       isolate_namespace Spree
@@ -26,6 +27,7 @@ module Spree
         app.config.active_record.yaml_column_permitted_classes = [Symbol, BigDecimal]
         Spree::Config = app.config.spree.preferences
         Spree::Dependencies = app.config.spree.dependencies
+        Spree::Deprecation = ActiveSupport::Deprecation.new
       end
 
       initializer 'spree.register.calculators', before: :after_initialize do |app|
@@ -122,6 +124,10 @@ module Spree
           Promotion::Actions::CreateLineItems,
           Promotion::Actions::FreeShipping
         ]
+
+        Rails.application.config.spree.data_feed_types = [
+          Spree::DataFeed::Google
+        ]
       end
 
       initializer 'spree.promo.register.promotions.actions' do |app|

data/lib/spree/core/preferences/preferable_class_methods.rb

@@ -19,7 +19,7 @@ module Spree::Preferences
         value = convert_preference_value(value, type)
         preferences[name] = value
 
-        ActiveSupport::Deprecation.warn("`#{name}` is deprecated. #{deprecated}") if deprecated
+        Spree::Deprecation.warn("`#{name}` is deprecated. #{deprecated}") if deprecated
 
         # If this is an activerecord object, we need to inform
         # ActiveRecord::Dirty that this value has changed, since this is an

data/lib/spree/core/product_duplicator.rb

@@ -26,7 +26,10 @@ module Spree
 
     def duplicate_product
       product.dup.tap do |new_product|
-        new_product.name = "COPY OF #{product.name}"
+        new_product.translations.each do |t|
+          t.name = "COPY OF #{t.name}"
+          t.slug = nil
+        end
         new_product.taxons = product.taxons
         new_product.stores = product.stores
         new_product.created_at = nil

data/lib/spree/core/product_filters.rb

@@ -98,18 +98,21 @@ module Spree
         conds.each do |new_scope|
           scope = scope.or(new_scope)
         end
-        Spree::Product.with_property('brand').where(scope)
+        Product.with_property('brand').join_translation_table(ProductProperty).where(scope)
       end
 
       def self.brand_filter
         brand_property = Spree::Property.find_by(name: 'brand')
         brands = brand_property ? Spree::ProductProperty.where(property_id: brand_property.id).pluck(:value).uniq.map(&:to_s) : []
-        pp = Spree::ProductProperty.arel_table
-        conds = Hash[*brands.map { |b| [b, pp[:value].eq(b)] }.flatten]
+
+        conditions = brands.map do |brand|
+          [brand, { ProductProperty.translation_table_alias => { value: brand } }]
+        end.to_h
+
         {
           name: I18n.t('spree.taxonomy_brands_name'),
           scope: :brand_any,
-          conds: conds,
+          conds: conditions,
           labels: brands.sort.map { |k| [k, k] }
         }
       end

data/lib/spree/core/search/base.rb

@@ -83,7 +83,7 @@ module Spree
         # method should return new scope based on base_scope
         def get_products_conditions_for(base_scope, query)
           unless query.blank?
-            base_scope = base_scope.like_any([:name, :description], [query])
+            base_scope = base_scope.i18n { name.matches("%#{query}%").or(description.matches("%#{query}%")) }
           end
           base_scope
         end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '4.5.0'.freeze
+  VERSION = '4.7.3'.freeze
 
   def self.version
     VERSION

data/lib/spree/core.rb

@@ -13,6 +13,7 @@ require 'cancan'
 require 'friendly_id'
 require 'kaminari'
 require 'monetize'
+require 'mobility'
 require 'paranoia'
 require 'ransack'
 require 'state_machines-activerecord'
@@ -116,6 +117,7 @@ require 'spree/core/version'
 
 require 'spree/core/number_generator'
 require 'spree/migrations'
+require 'spree/translation_migrations'
 require 'spree/core/engine'
 
 require 'spree/i18n'

data/lib/spree/permitted_attributes.rb

@@ -147,7 +147,7 @@ module Spree
 
     # TODO: Should probably use something like Spree.user_class.attributes
     @@user_attributes = [:email, :bill_address_id, :ship_address_id, :password, :first_name, :last_name,
-                         :password_confirmation, { public_metadata: {}, private_metadata: {} }]
+                         :password_confirmation, { public_metadata: {}, private_metadata: {} }, :selected_locale]
 
     @@variant_attributes = [
       :name, :presentation, :cost_price, :discontinue_on, :lock_version,

data/lib/spree/testing_support/controller_requests.rb

@@ -8,7 +8,7 @@ module Spree
       end
 
       def spree_get(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_get is deprecated and will be removed in Spree 5.0.
           Please use get, params: {}
         DEPRECATION
@@ -17,7 +17,7 @@ module Spree
 
       # Executes a request simulating POST HTTP method and set/volley the response
       def spree_post(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_post is deprecated and will be removed in Spree 5.0.
           Please use post, params: {}
         DEPRECATION
@@ -26,7 +26,7 @@ module Spree
 
       # Executes a request simulating PUT HTTP method and set/volley the response
       def spree_put(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_put is deprecated and will be removed in Spree 5.0.
           Please use put, params: {}
         DEPRECATION
@@ -35,7 +35,7 @@ module Spree
 
       # # Executes a request simulating PATCH HTTP method and set/volley the response
       def spree_patch(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_patch is deprecated and will be removed in Spree 5.0.
           Please use patch, params: {}
         DEPRECATION
@@ -44,7 +44,7 @@ module Spree
 
       # Executes a request simulating DELETE HTTP method and set/volley the response
       def spree_delete(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_delete is deprecated and will be removed in Spree 5.0.
           Please use delete, params: {}
         DEPRECATION
@@ -52,35 +52,35 @@ module Spree
       end
 
       def spree_xhr_get(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_xhr_get is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :get)
       end
 
       def spree_xhr_post(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_xhr_post is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :post)
       end
 
       def spree_xhr_put(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_xhr_put is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :put)
       end
 
       def spree_xhr_patch(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_xhr_patch is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :patch)
       end
 
       def spree_xhr_delete(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_xhr_delete is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :delete)

data/lib/spree/testing_support/factories/google_data_feed_factory.rb

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :google_data_feed, class: Spree::DataFeed::Google do
+    id             { 1 }
+    active         { true }
+    store          { create(:store) }
+    name           { 'test' }
+  end
+end

data/lib/spree/testing_support/factories/product_factory.rb

@@ -52,6 +52,12 @@ FactoryBot.define do
       factory :product_with_option_types do
         after(:create) { |product| create(:product_option_type, product: product) }
       end
+      factory :product_with_properties do
+        after(:create) do |product|
+          create(:property, :brand, id: 10)
+          create(:product_property, product: product, property_id: 10, value: 'Epsilon')
+        end
+      end
     end
   end
 end

data/lib/spree/testing_support/factories/product_translation_factory.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :product_translation, class: Spree::Product::Translation do
+    sequence(:name) { |n| "Product #{n}" }
+    description { generate(:random_description) }
+  end
+end

data/lib/spree/testing_support/factories/store_factory.rb

@@ -12,6 +12,9 @@ FactoryBot.define do
     facebook               { 'spreecommerce' }
     twitter                { 'spreecommerce' }
     instagram              { 'spreecommerce' }
+    meta_description       { 'Sample store description.' }
+    digital_asset_authorized_clicks { 5 }
+    digital_asset_authorized_days   { 7 }
 
     trait :with_favicon do
       transient do

data/lib/spree/testing_support/factories/variant_factory.rb

@@ -25,6 +25,10 @@ FactoryBot.define do
     factory :variant do
       # on_hand 5
       product { |p| p.association(:product, stores: [create(:store)]) }
+
+      factory :with_image_variant do
+        images { create_list(:image, 1) }
+      end
     end
 
     factory :master_variant do

data/lib/spree/translation_migrations.rb

@@ -0,0 +1,40 @@
+module Spree
+  class TranslationMigrations
+    def initialize(resource_class, default_locale)
+      @resource_class = resource_class
+      @translations_table = resource_class::Translation.table_name
+      @translatable_fields = resource_class.translatable_fields.join(', ')
+      @foreign_key = "#{resource_class.table_name.singularize}_id"
+      @default_locale = default_locale
+    end
+
+    def transfer_translation_data
+      nullify_translatable_fields = @resource_class.translatable_fields.map { |f| "#{f}=null" }.join(', ')
+
+      unless @resource_class::Translation.exists?
+        ActiveRecord::Base.connection.execute("
+          INSERT INTO #{@translations_table} (#{@translatable_fields}, #{@foreign_key}, locale, created_at, updated_at)
+          SELECT #{@translatable_fields}, id, '#{@default_locale}' as locale, created_at, updated_at FROM #{@resource_class.table_name};
+                                              ")
+        ActiveRecord::Base.connection.execute("
+          UPDATE #{@resource_class.table_name}
+          SET #{nullify_translatable_fields};
+                                              ")
+      end
+    end
+
+    def revert_translation_data_transfer
+      translation_table_fields = @resource_class.translatable_fields.map { |f| "#{@translations_table}.#{f}" }.join(', ')
+      row_expression = @resource_class.translatable_fields.count == 1 ? 'ROW' : ''
+
+      ActiveRecord::Base.connection.execute("
+          UPDATE #{@resource_class.table_name}
+          SET (#{@translatable_fields}) = #{row_expression}(#{translation_table_fields})
+          FROM #{@translations_table}
+          WHERE #{@translations_table}.#{@foreign_key} = #{@resource_class.table_name}.id
+                                            ")
+
+      ActiveRecord::Base.connection.execute("TRUNCATE TABLE #{@translations_table}")
+    end
+  end
+end

data/lib/spree_core.rb

@@ -1,3 +1,4 @@
 require 'friendly_id/paranoia'
+require 'mobility/plugins/store_based_fallbacks'
 
 require 'spree/core'

data/spree_core.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
     "source_code_uri"   => "https://github.com/spree/spree/tree/v#{s.version}",
   }
 
-  s.required_ruby_version     = '>= 2.5.0'
+  s.required_ruby_version     = '>= 3.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.files        = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
     actionpack actionview activejob activemodel activerecord
     activestorage activesupport railties
   ].each do |rails_gem|
-    s.add_dependency rails_gem, '>= 6.1'
+    s.add_dependency rails_gem, '>= 6.1', '< 7.2'
   end
 
   s.add_dependency 'activemerchant', '~> 1.67'
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'money', '~> 6.13'
   s.add_dependency 'monetize', '~> 1.9'
   s.add_dependency 'paranoia', '~> 2.4'
-  s.add_dependency 'ransack', '>= 2.3', '< 3.0'
+  s.add_dependency 'ransack', '>= 4.1'
   s.add_dependency 'rexml'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
   s.add_dependency 'state_machines-activemodel', '~> 0.7'
@@ -54,4 +54,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'image_processing', '~> 1.2'
   s.add_dependency 'active_storage_validations', '~> 0.9', '<= 0.9.5'
   s.add_dependency 'activerecord-typedstore'
+  s.add_dependency 'mobility', '~> 1.2.9'
+  s.add_dependency 'mobility-ransack', '~> 1.2.1'
+  s.add_dependency 'friendly_id-mobility', '~> 1.0.4'
 end