spree_core 4.5.0 → 4.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f53d1d3ed70fd19d1ae3665df1dfabac01948cd28e71b3a68c86c8a8f7afcf1a
-  data.tar.gz: 87e8a6e4d121d979fadbe0d44d89d30f0f6d55c89b64d3bcd0c2354c794b9ef1
+  metadata.gz: 96a1ab3dd325e2cd0053b0ad881b73ddb153624fd04dba62dd61d4e01ab2aca4
+  data.tar.gz: 1e947a1bba157dd1df4ba6773d869675da4bffa856f4f1c57f63a4c7b5a592aa
 SHA512:
-  metadata.gz: 51b6d8e283837db0d607f9528f1527d8cfc46c020a804bc3f2797c392eb040d6b7081df92d52eafac617c2fff64c6e98b500912173266f4c04286f32ab5fbdac
-  data.tar.gz: d2305b19b0364a34e379955ce76fb453702c385f7377a23f40a65ae61f93de5a5d157bd4978c757b563c6c263f5375a32f224840129b29085af424cc00f6712d
+  metadata.gz: 6307ed6baf1241414853b53c6528f08448fb465fcdd4603e96f29aaf507fa2188a7f481f4e000b5ec9370e7894c49680ad86ad61d39b1c2e36d7735988c36c95
+  data.tar.gz: 1d75cd60145ae2fe99f9d9a8e2c13cd7c3b9026847b561c31299ce1bbd0596c7f4e14499e01f658dfe0e8c87e5335ee718d6983213d8ac1d8338a3300836d1f3

data/app/finders/spree/countries/find.rb

@@ -8,7 +8,7 @@ module Spree
       end
 
       def call
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           Spree::Countries::Find.new.call is deprecated and will be removed in Spree 5.0.
           Please use Spree::Countries::Find.new.execute instead
         DEPRECATION

data/app/finders/spree/option_values/find_available.rb

@@ -9,7 +9,7 @@ module Spree
       end
 
       def execute
-        find_available(scope, products_scope).select(select_args).order(order_args)
+        find_available(scope, products_scope).includes(:translations).select(select_args).order(order_args)
       end
 
       private

data/app/finders/spree/product_properties/find_available.rb

@@ -9,7 +9,7 @@ module Spree
       end
 
       def execute
-        find_available(scope, products_scope)
+        find_available(scope, products_scope).includes(:translations)
       end
 
       private

data/app/finders/spree/products/find.rb

@@ -5,7 +5,7 @@ module Spree
         @scope = scope
 
         if current_currency.present?
-          ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+          Spree::Deprecation.warn(<<-DEPRECATION, caller)
             `current_currency` param is deprecated and will be removed in Spree 5.
             Please pass `:currency` in `params` hash instead.
           DEPRECATION
@@ -146,7 +146,10 @@ module Spree
       def by_name(products)
         return products unless name?
 
-        products.like_any([:name], [name])
+        product_name = name
+
+        # i18n mobility scope doesn't automatically get set for query blocks (Mobility issue #599) - set it explicitly
+        products.i18n { name.matches("%#{product_name}%") }
       end
 
       def by_options(products)
@@ -183,7 +186,7 @@ module Spree
 
           next if values.empty?
 
-          ids = products.with_property_values(property_filter_param, values).ids
+          ids = scope.unscope(:order, :includes).with_property_values(property_filter_param, values).ids
           product_ids = index == 0 ? ids : product_ids & ids
           index += 1
         end
@@ -209,21 +212,19 @@ module Spree
             products
           end
         when 'name-a-z'
-          products.order(name: :asc)
+          # workaround for Mobility issue #596 - explicitly select fields to avoid error when selecting distinct
+          products.i18n.
+            select("#{Product.table_name}.*").select(:name).order(name: :asc)
         when 'name-z-a'
-          products.order(name: :desc)
+          # workaround for Mobility issue #596
+          products.i18n.
+            select("#{Product.table_name}.*").select(:name).order(name: :desc)
         when 'newest-first'
           products.order(available_on: :desc)
         when 'price-high-to-low'
-          products.
-            select("#{Product.table_name}.*, #{Spree::Price.table_name}.amount").
-            reorder('').
-            send(:descend_by_master_price)
+          order_by_price(products, :descend_by_master_price)
         when 'price-low-to-high'
-          products.
-            select("#{Product.table_name}.*, #{Spree::Price.table_name}.amount").
-            reorder('').
-            send(:ascend_by_master_price)
+          order_by_price(products, :ascend_by_master_price)
         end
       end
 
@@ -265,6 +266,13 @@ module Spree
         taxons = store.taxons.where(id: taxons_ids.to_s.split(','))
         taxons.map(&:cached_self_and_descendants_ids).flatten.compact.uniq.map(&:to_s)
       end
+
+      def order_by_price(scope, order_type)
+        scope.
+          select("#{Product.table_name}.*, #{Spree::Price.table_name}.amount").
+          reorder('').
+          send(order_type)
+      end
     end
   end
 end

data/app/finders/spree/taxons/find.rb

@@ -50,10 +50,6 @@ module Spree
         name.present?
       end
 
-      def name_matcher
-        Spree::Taxon.arel_table[:name].matches("%#{name}%")
-      end
-
       def by_ids(taxons)
         return taxons unless ids?
 
@@ -69,11 +65,9 @@ module Spree
       def by_parent_permalink(taxons)
         return taxons unless parent_permalink?
 
-        if Rails::VERSION::STRING >= '6.1'
-          taxons.joins(:parent).where(parent: { permalink: parent_permalink })
-        else
-          taxons.joins("INNER JOIN #{Spree::Taxon.table_name} AS parent_taxon ON parent_taxon.id = #{Spree::Taxon.table_name}.parent_id").where(["parent_taxon.permalink = ?", parent_permalink])
-        end
+        taxons.joins(:parent).
+          join_translation_table(Taxon, 'parents_spree_taxons').
+          where(["#{Taxon.translation_table_alias}.permalink = ?", parent_permalink])
       end
 
       def by_taxonomy(taxons)
@@ -91,7 +85,10 @@ module Spree
       def by_name(taxons)
         return taxons unless name?
 
-        taxons.where(name_matcher)
+        taxon_name = name
+
+        # i18n mobility scope doesn't automatically get set for query blocks (Mobility issue #599) - set it explicitly
+        taxons.i18n { name.matches("%#{taxon_name}%") }
       end
     end
   end

data/app/helpers/spree/base_helper.rb

@@ -55,7 +55,7 @@ module Spree
     end
 
     def logo(image_path = nil, options = {})
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         `BaseHelper#logo` is deprecated and will be removed in Spree 5.0.
         Please use `FrontendHelper#logo` instead
       DEPRECATION
@@ -113,8 +113,8 @@ module Spree
       meta = {}
 
       if object.is_a? ApplicationRecord
-        meta[:keywords] = object.meta_keywords if object[:meta_keywords].present?
-        meta[:description] = object.meta_description if object[:meta_description].present?
+        meta[:keywords] = object.meta_keywords if object.try(:meta_keywords).present?
+        meta[:description] = object.meta_description if object.try(:meta_description).present?
       end
 
       if meta[:description].blank? && object.is_a?(Spree::Product)
@@ -174,10 +174,6 @@ module Spree
       Spree::Core::Engine.frontend_available?
     end
 
-    def rails_5?
-      Rails::VERSION::STRING < '6.0'
-    end
-
     def spree_storefront_resource_url(resource, options = {})
       if defined?(locale_param) && locale_param.present?
         options.merge!(locale: locale_param)

data/app/helpers/spree/products_helper.rb

@@ -53,7 +53,7 @@ module Spree
     end
 
     def cache_key_for_products(products = @products, additional_cache_key = nil)
-      max_updated_at = (products.except(:group, :order).maximum(:updated_at) || Date.today).to_s(:number)
+      max_updated_at = (products.except(:group, :order).maximum(:updated_at) || Date.today).to_formatted_s(:number)
       products_cache_keys = "spree/products/#{products.map(&:id).join('-')}-#{params[:page]}-#{params[:sort_by]}-#{max_updated_at}-#{@taxon&.id}"
       (common_product_cache_keys + [products_cache_keys] + [additional_cache_key]).compact.join('/')
     end
@@ -76,7 +76,7 @@ module Spree
 
     # will return a human readable string
     def available_status(product)
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         `Spree::ProductsHelper#available_status` method from spree/core is deprecated and will be removed.
         Please use `Spree::Admin::ProductsHelper#available_status` from spree_backend instead.
       DEPRECATION
@@ -140,7 +140,7 @@ module Spree
     end
 
     def related_products
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         ProductsHelper#related_products is deprecated and will be removed in Spree 5.0.
         Please use ProductsHelper#relations from now on.
       DEPRECATION

data/app/models/concerns/spree/metadata.rb

@@ -5,8 +5,13 @@ module Spree
     included do
       attribute :public_metadata, default: {}
       attribute :private_metadata, default: {}
-      serialize :public_metadata, HashSerializer
-      serialize :private_metadata, HashSerializer
+      if Rails::VERSION::STRING >= '7.1.0'
+        serialize :public_metadata, coder: HashSerializer
+        serialize :private_metadata, coder: HashSerializer
+      else
+        serialize :public_metadata, HashSerializer
+        serialize :private_metadata, HashSerializer
+      end
     end
 
     # https://nandovieira.com/using-postgresql-and-jsonb-with-ruby-on-rails

data/app/models/concerns/spree/named_type.rb

@@ -6,7 +6,7 @@ module Spree
       scope :active, -> { where(active: true) }
       default_scope { order(Arel.sql("LOWER(#{table_name}.name)")) }
 
-      include UniqueName
+      include Spree::UniqueName
     end
   end
 end

data/app/models/concerns/spree/product_scopes.rb

@@ -32,15 +32,16 @@ module Spree
       end
 
       def self.property_conditions(property)
-        properties = Property.table_name
+        properties_table = Property.table_name
+        property_translations_table = Property.translation_table_alias
         case property
-        when Property then { "#{properties}.id" => property.id }
-        when Integer  then { "#{properties}.id" => property }
+        when Property then { "#{properties_table}.id" => property.id }
+        when Integer  then { "#{properties_table}.id" => property }
         else
           if Property.column_for_attribute('id').type == :uuid
-            ["#{properties.name} = ? OR #{properties.id} = ?", property, property]
+            ["#{property_translations_table.name} = ? OR #{properties_table.id} = ?", property, property]
           else
-            { "#{properties}.name" => property }
+            { "#{property_translations_table}.name" => property }
           end
         end
       end
@@ -126,21 +127,25 @@ module Spree
 
       # a scope that finds all products having property specified by name, object or id
       add_search_scope :with_property do |property|
-        joins(:properties).where(property_conditions(property))
+        joins(:properties).join_translation_table(Property).where(property_conditions(property))
       end
 
       # a simple test for product with a certain property-value pairing
       # note that it can test for properties with NULL values, but not for absent values
       add_search_scope :with_property_value do |property, value|
         joins(:properties).
-          where("#{ProductProperty.table_name}.value = ?", value).
+          join_translation_table(Property).
+          join_translation_table(ProductProperty).
+          where("#{ProductProperty.translation_table_alias}.value = ?", value).
           where(property_conditions(property))
       end
 
       add_search_scope :with_property_values do |property_filter_param, property_values|
         joins(product_properties: :property).
-          where(Property.table_name => { filter_param: property_filter_param }).
-          where(ProductProperty.table_name => { filter_param: property_values.map(&:parameterize) })
+          join_translation_table(Property).
+          join_translation_table(ProductProperty).
+          where(Property.translation_table_alias => { filter_param: property_filter_param }).
+          where(ProductProperty.translation_table_alias => { filter_param: property_values.map(&:parameterize) })
       end
 
       add_search_scope :with_option do |option|
@@ -151,7 +156,9 @@ module Spree
         elsif OptionType.column_for_attribute('id').type == :uuid
           joins(:option_types).where(spree_option_types: { name: option }).or(Product.joins(:option_types).where(spree_option_types: { id: option }))
         else
-          joins(:option_types).where(spree_option_types: { name: option })
+          joins(:option_types).
+            join_translation_table(OptionType).
+            where(OptionType.translation_table_alias => { name: option })
         end
       end
 
@@ -164,6 +171,7 @@ module Spree
                              OptionType.where(id: option).or(OptionType.where(name: option))&.first&.id
                            else
                              OptionType.where(name: option)&.first&.id
+                             OptionType.where(name: option)&.first&.id
                            end
                          end
 
@@ -171,7 +179,9 @@ module Spree
 
         group("#{Spree::Product.table_name}.id").
           joins(variants_including_master: :option_values).
-          where(Spree::OptionValue.table_name => { name: value, option_type_id: option_type_id })
+          join_translation_table(Spree::OptionValue).
+          where(Spree::OptionValue.translation_table_alias => { name: value },
+                Spree::OptionValue.table_name => { option_type_id: option_type_id })
       end
 
       # Finds all products which have either:
@@ -295,19 +305,10 @@ module Spree
       # .search_by_name
       if defined?(PgSearch)
         include PgSearch::Model
-
-        if defined?(SpreeGlobalize)
-          pg_search_scope :search_by_name, associated_against: { translations: :name }, using: { tsearch: { any_word: true, prefix: true } }
-        else
-          pg_search_scope :search_by_name, against: :name, using: { tsearch: { any_word: true, prefix: true } }
-        end
+        pg_search_scope :search_by_name, against: :name, using: { tsearch: { any_word: true, prefix: true } }
       else
         def self.search_by_name(query)
-          if defined?(SpreeGlobalize)
-            joins(:translations).order(:name).where("LOWER(#{Product::Translation.table_name}.name) LIKE LOWER(:query)", query: "%#{query}%").distinct
-          else
-            where("LOWER(#{Product.table_name}.name) LIKE LOWER(:query)", query: "%#{query}%")
-          end
+          i18n { name.lower.matches("%#{query.downcase}%") }
         end
       end
       search_scopes << :search_by_name
@@ -339,7 +340,10 @@ module Spree
           case t
           when ApplicationRecord then t
           else
-            Taxon.where(Taxon.arel_table[:name].eq(t)).or(Taxon.where(Taxon.arel_table[:id].eq(t))).or(Taxon.where(Taxon.arel_table[:permalink].matches("%/#{t}/"))).or(Taxon.where(Taxon.arel_table[:permalink].matches("#{t}/"))).first
+            Taxon.where(name: t).
+              or(Taxon.where(Taxon.arel_table[:id].eq(t))).
+              or(Taxon.where(Taxon.arel_table[:permalink].matches("%/#{t}/"))).
+              or(Taxon.where(Taxon.arel_table[:permalink].matches("#{t}/"))).first
           end
         end.compact.flatten.uniq
       end

data/app/models/concerns/spree/translatable_resource.rb

@@ -0,0 +1,25 @@
+module Spree
+  module TranslatableResource
+    extend ActiveSupport::Concern
+
+    included do
+      extend Mobility
+      default_scope { i18n }
+
+      def get_field_with_locale(locale, field_name, fallback: false)
+        # method will return nil if no translation is present due to fallback: false setting
+        public_send(field_name, locale: locale, fallback: fallback)
+      end
+    end
+
+    class_methods do
+      def translatable_fields
+        const_get(:TRANSLATABLE_FIELDS)
+      end
+
+      def translation_table_alias
+        "#{self::Translation.table_name}_#{Mobility.normalize_locale(Mobility.locale)}"
+      end
+    end
+  end
+end

data/app/models/concerns/spree/translatable_resource_scopes.rb

@@ -0,0 +1,24 @@
+module Spree
+  module TranslatableResourceScopes
+    extend ActiveSupport::Concern
+
+    class_methods do
+      # To be used when joining on the resource itself does not automatically join on its translations table
+      # This method is to be used when you've already joined on the translatable table itself
+      #
+      # If the resource table is aliased, pass the alias to `join_on_table_alias`, otherwise omit the param
+      def join_translation_table(translatable_class, join_on_table_alias = nil)
+        join_on_table_name = if join_on_table_alias.nil?
+                               translatable_class.table_name
+                             else
+                               join_on_table_alias
+                             end
+        translatable_class_foreign_key = "#{translatable_class.table_name.singularize}_id"
+
+        joins("LEFT OUTER JOIN #{translatable_class::Translation.table_name} #{translatable_class.translation_table_alias}
+             ON #{translatable_class.translation_table_alias}.#{translatable_class_foreign_key} = #{join_on_table_name}.id
+             AND #{translatable_class.translation_table_alias}.locale = '#{Mobility.locale}'")
+      end
+    end
+  end
+end

data/app/models/concerns/spree/translatable_resource_slug.rb

@@ -0,0 +1,15 @@
+module Spree
+  module TranslatableResourceSlug
+    extend ActiveSupport::Concern
+
+    included do
+      def localized_slugs_for_store(store)
+        supported_locales = store.supported_locales_list
+
+        supported_locales.each_with_object({}) do |locale, hash|
+          hash[locale] = I18n.with_locale(locale) { slug }
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/spree/user_roles.rb

@@ -14,19 +14,19 @@ module Spree
       end
 
       def self.admin
-        ActiveSupport::Deprecation.warn('`User#admin` is deprecated and will be removed in Spree 5. Please use `User#spree_admin`')
+        Spree::Deprecation.warn('`User#admin` is deprecated and will be removed in Spree 5. Please use `User#spree_admin`')
 
         spree_admin
       end
 
       def self.admin_created?
-        ActiveSupport::Deprecation.warn('`User#admin_created?` is deprecated and will be removed in Spree 5. Please use `User#spree_admin_created?`')
+        Spree::Deprecation.warn('`User#admin_created?` is deprecated and will be removed in Spree 5. Please use `User#spree_admin_created?`')
 
         spree_admin_created?
       end
 
       def admin?
-        ActiveSupport::Deprecation.warn('`User#admin?` is deprecated and will be removed in Spree 5. Please use `User#spree_admin?`')
+        Spree::Deprecation.warn('`User#admin?` is deprecated and will be removed in Spree 5. Please use `User#spree_admin?`')
 
         spree_admin?
       end

data/app/models/spree/address.rb

@@ -2,7 +2,7 @@ module Spree
   class Address < Spree::Base
     require 'validates_zipcode'
 
-    include Metadata
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end
@@ -10,7 +10,9 @@ module Spree
       include Spree::Security::Addresses
     end
 
-    if Rails::VERSION::STRING >= '6.1'
+    if Rails::VERSION::STRING >= '7.1.0'
+      serialize :preferences, type: Hash, coder: YAML, default: {}
+    else
       serialize :preferences, Hash, default: {}
     end
 
@@ -67,7 +69,7 @@ module Spree
     self.whitelisted_ransackable_associations = %w[country state user]
 
     def self.build_default
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         `Address#build_default` is deprecated and will be removed in Spree 5.0.
         Please use standard rails `Address.new(country: current_store.default_country)`
       DEPRECATION
@@ -75,7 +77,7 @@ module Spree
     end
 
     def self.default(user = nil, kind = 'bill')
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         `Address#default` is deprecated and will be removed in Spree 5.0.
       DEPRECATION
       if user && user_address = user.public_send(:"#{kind}_address")

data/app/models/spree/asset.rb

@@ -1,7 +1,7 @@
 module Spree
   class Asset < Spree::Base
     include Support::ActiveStorage
-    include Metadata
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/base.rb

@@ -1,8 +1,13 @@
 class Spree::Base < ApplicationRecord
   include Spree::Preferences::Preferable
-  serialize :preferences, Hash
+  if Rails::VERSION::STRING >= '7.1.0'
+    serialize :preferences, type: Hash, coder: YAML
+  else
+    serialize :preferences, Hash
+  end
 
   include Spree::RansackableAttributes
+  include Spree::TranslatableResourceScopes
 
   after_initialize do
     if has_attribute?(:preferences) && !preferences.nil?

data/app/models/spree/calculator/default_tax.rb

@@ -2,7 +2,7 @@ require_dependency 'spree/calculator'
 
 module Spree
   class Calculator::DefaultTax < Calculator
-    include VatPriceCalculation
+    include Spree::VatPriceCalculation
     def self.description
       Spree.t(:default_tax)
     end

data/app/models/spree/cms/sections/image_gallery.rb

@@ -3,11 +3,7 @@ module Spree::Cms::Sections
     after_initialize :default_values
     validate :reset_multiple_link_attributes
 
-    LINKED_RESOURCE_TYPE = if Rails::VERSION::STRING < '6.0'
-                             ['Spree::Taxon'].freeze
-                           else
-                             ['Spree::Taxon', 'Spree::Product'].freeze
-                           end
+    LINKED_RESOURCE_TYPE = ['Spree::Taxon', 'Spree::Product'].freeze
 
     LAYOUT_OPTIONS = ['Default', 'Reversed'].freeze
     LABEL_OPTIONS = ['Show', 'Hide'].freeze
@@ -71,8 +67,6 @@ module Spree::Cms::Sections
     private
 
     def reset_multiple_link_attributes
-      return if Rails::VERSION::STRING < '6.0'
-
       if link_type_one_changed?
         return if link_type_one_was.nil?
 

data/app/models/spree/cms/sections/side_by_side_images.rb

@@ -3,11 +3,7 @@ module Spree::Cms::Sections
     after_initialize :default_values
     validate :reset_multiple_link_attributes
 
-    LINKED_RESOURCE_TYPE = if Rails::VERSION::STRING < '6.0'
-                             ['Spree::Taxon'].freeze
-                           else
-                             ['Spree::Taxon', 'Spree::Product'].freeze
-                           end
+    LINKED_RESOURCE_TYPE = ['Spree::Taxon', 'Spree::Product'].freeze
 
     store :content, accessors: [:link_type_one, :link_one, :title_one, :subtitle_one,
                                 :link_type_two, :link_two, :title_two, :subtitle_two], coder: JSON
@@ -49,8 +45,6 @@ module Spree::Cms::Sections
     private
 
     def reset_multiple_link_attributes
-      return if Rails::VERSION::STRING < '6.0'
-
       if link_type_one_changed?
         return if link_type_one_was.nil?
 

data/app/models/spree/cms_page.rb

@@ -1,7 +1,7 @@
 module Spree
   class CmsPage < Base
-    include SingleStoreResource
-    include DisplayLink
+    include Spree::SingleStoreResource
+    include Spree::DisplayLink
 
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks

data/app/models/spree/cms_section.rb

@@ -1,6 +1,6 @@
 module Spree
   class CmsSection < Base
-    include DisplayLink
+    include Spree::DisplayLink
 
     acts_as_list scope: :cms_page
     belongs_to :cms_page, touch: true

data/app/models/spree/country.rb

@@ -19,7 +19,7 @@ module Spree
     validates :name, :iso_name, :iso, :iso3, presence: true, uniqueness: { case_sensitive: false, scope: spree_base_uniqueness_scope }
 
     def self.default(store = nil)
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         `Country#default` is deprecated and will be removed in Spree 5.0.
         Please use `current_store.default_country` instead
       DEPRECATION
@@ -49,7 +49,7 @@ module Spree
     private
 
     def ensure_not_default
-      ActiveSupport::Deprecation.warn('Country#ensure_not_default is deprecated and will be removed in Spree v5')
+      Spree::Deprecation.warn('Country#ensure_not_default is deprecated and will be removed in Spree v5')
 
       if id.eql?(Spree::Config[:default_country_id])
         errors.add(:base, Spree.t(:default_country_cannot_be_deleted))

data/app/models/spree/credit_card.rb

@@ -1,7 +1,7 @@
 module Spree
   class CreditCard < Spree::Base
     include ActiveMerchant::Billing::CreditCardMethods
-    include Metadata
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/customer_return.rb

@@ -1,8 +1,8 @@
 module Spree
   class CustomerReturn < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'CR', length: 9)
-    include NumberIdentifier
-    include Metadata
+    include Spree::NumberIdentifier
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/data_feed/google.rb

@@ -0,0 +1,15 @@
+require_dependency 'spree/data_feed'
+
+module Spree
+  class DataFeed::Google < DataFeed
+    class << self
+      def label
+        'Google Merchant Center Feed'
+      end
+
+      def provider_name
+        'google'
+      end
+    end
+  end
+end