spree_core 5.4.0.beta4 → 5.4.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29b95e3e3222214cdeef8094a1a9553636c875d88857244241431196d06399d2
-  data.tar.gz: 93c9f4d387fce7ba5e2e9f4b6454f9c46f1b8a15cfe180a16739c17bf76a5125
+  metadata.gz: a2a4eae0b4e102ba4160e435fe81d656ced27b014ed013670226bb8a522b5996
+  data.tar.gz: c8c6737253472a4456f29b06f1ae028b2c4144732fba6dae7d8dd8c5e2b92d8f
 SHA512:
-  metadata.gz: 5c8a23c3edd35dacb0493c5435e28d114fc2611b4b25a0d85b4b5e4579f38402fb61a3a65a9f3b361fae8f67d5f58ac73984b6ab2cd4bcbb0326813589a18330
-  data.tar.gz: 1fabd1160061e412e2e9a4a1e92083686938a5313c3b29193e410bc07d6118d60af4bd7c2951794273c20f8b053f1dfc5acba8dfe748a722f5895aacc17d33d9
+  metadata.gz: ec9479d52b6bcbd036354511897d0ee360da7784aef051f20affe23991b1eaebe8525b7a0173fbc7cdc1310a977909e4b78a33b0cd677869d579d1666bbada7a
+  data.tar.gz: 44b40ddca311ed24ae26cd99b5455a7259a0aa986cb8a9a76598101e4c42ea48042b8f1256365b2734c7e43218337ec7963c78b0bcffc5ab70f62e0f794d4b9e

data/app/jobs/spree/images/save_from_url_job.rb

@@ -1,12 +1,15 @@
 require 'open-uri'
 require 'openssl'
+require 'ssrf_filter'
+require 'tempfile'
 
 module Spree
   module Images
     class SaveFromUrlJob < ::Spree::BaseJob
       queue_as Spree.queues.images
-      retry_on ActiveRecord::RecordInvalid, OpenURI::HTTPError, wait: :polynomially_longer, attempts: Spree::Config.images_save_from_url_job_attempts.to_i
+      retry_on ActiveRecord::RecordInvalid, wait: :polynomially_longer, attempts: Spree::Config.images_save_from_url_job_attempts.to_i
       discard_on URI::InvalidURIError
+      discard_on SsrfFilter::Error
 
       def perform(viewable_id, viewable_type, external_url, external_id = nil, position = nil)
         viewable = viewable_type.safe_constantize.find(viewable_id)
@@ -29,34 +32,55 @@ module Spree
         # still trigger save! if position has changed
         image.save! and return if image_already_saved?(image, external_url)
 
-        uri = URI.parse(external_url)
-        unless %w[http https].include?(uri.scheme)
-          raise URI::InvalidURIError, "Invalid URL scheme: #{uri.scheme}. Only http and https are allowed."
-        end
-
-        file = uri.open(
-          'User-Agent' => 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
-          'Accept' => 'image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8',
-          'Accept-Language' => 'en-US,en;q=0.9',
-          'Accept-Encoding' => 'gzip, deflate, br',
-          'Cache-Control' => 'no-cache',
-          'Pragma' => 'no-cache',
-          read_timeout: 60,
-          ssl_verify_mode: OpenSSL::SSL::VERIFY_PEER,
-          redirect: true
-        )
-        filename = File.basename(uri.path)
-
-        image.attachment.attach(io: file, filename: filename)
-        image.external_url = external_url
-        image.external_id = external_id if external_id.present? && image.respond_to?(:external_id)
-        image.save!
+        download_and_attach_image(external_url, image, external_id)
       rescue ActiveStorage::IntegrityError => e
         raise e unless Rails.env.test?
       end
 
       private
 
+      def download_and_attach_image(external_url, image, external_id)
+        max_size = Spree::Config.max_image_download_size
+
+        response = SsrfFilter.get(
+          external_url,
+          headers: {
+            'User-Agent' => 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
+            'Accept' => 'image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8',
+            'Accept-Language' => 'en-US,en;q=0.9',
+            'Accept-Encoding' => 'gzip, deflate, br',
+            'Cache-Control' => 'no-cache',
+            'Pragma' => 'no-cache'
+          },
+          http_options: {
+            read_timeout: 60,
+            open_timeout: 30
+          }
+        )
+
+        body = response.body
+        if body.bytesize > max_size
+          raise StandardError, "Image file size exceeds the maximum allowed size of #{max_size} bytes"
+        end
+
+        uri = URI.parse(external_url)
+        filename = File.basename(uri.path)
+        tempfile = Tempfile.new(['spree_image', File.extname(uri.path)], binmode: true)
+
+        begin
+          tempfile.write(body)
+          tempfile.rewind
+
+          image.attachment.attach(io: tempfile, filename: filename)
+          image.external_url = external_url
+          image.external_id = external_id if external_id.present? && image.respond_to?(:external_id)
+          image.save!
+        ensure
+          tempfile.close
+          tempfile.unlink
+        end
+      end
+
       def image_already_saved?(image, external_url)
         image.persisted? && image.attachment.attached? && image.external_url.present? && external_url == image.external_url
       end

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

@@ -41,32 +41,38 @@ module Spree
         order(price_table_name => { amount: :desc })
       end
 
-      # Price sorting scopes that use subqueries to get prices across all variants
-      # These ensure products with only variant prices (no master price) are included in results
+      # Price sorting scopes that use a derived table JOIN to get prices across all variants.
+      # These ensure products with only variant prices (no master price) are included in results.
+      #
+      # Uses Arel::Nodes::As for select expressions so that:
+      # - PG allows ORDER BY with DISTINCT (expressions must appear in SELECT list)
+      # - Mobility's select_for_count can safely call .right on all select_values
       add_search_scope :ascend_by_price do
-        price_subquery = Price
-          .non_zero
-          .joins(:variant)
-          .where("#{Variant.table_name}.product_id = #{Product.table_name}.id")
-          .select('MIN(amount)')
+        price_agg_sql = Price.non_zero.joins(:variant)
+                            .select("#{Variant.table_name}.product_id AS product_id, MIN(#{Price.table_name}.amount) AS agg_price")
+                            .group("#{Variant.table_name}.product_id")
+                            .to_sql
 
-        price_sort_sql = "COALESCE((#{price_subquery.to_sql}), 999999999)"
+        price_expr = Arel.sql('COALESCE(price_agg.agg_price, 999999999)')
 
-        select("#{Product.table_name}.*", "#{price_sort_sql} AS min_price").
-          order(Arel.sql("#{price_sort_sql} ASC"))
+        joins("LEFT JOIN (#{price_agg_sql}) AS price_agg ON price_agg.product_id = #{Product.table_name}.id").
+          select("#{Product.table_name}.*").
+          select(Arel::Nodes::As.new(price_expr, Arel.sql('min_price'))).
+          order(price_expr.asc)
       end
 
       add_search_scope :descend_by_price do
-        price_subquery = Price
-          .non_zero
-          .joins(:variant)
-          .where("#{Variant.table_name}.product_id = #{Product.table_name}.id")
-          .select('MAX(amount)')
+        price_agg_sql = Price.non_zero.joins(:variant)
+                            .select("#{Variant.table_name}.product_id AS product_id, MAX(#{Price.table_name}.amount) AS agg_price")
+                            .group("#{Variant.table_name}.product_id")
+                            .to_sql
 
-        price_sort_sql = "COALESCE((#{price_subquery.to_sql}), 0)"
+        price_expr = Arel.sql('COALESCE(price_agg.agg_price, 0)')
 
-        select("#{Product.table_name}.*", "#{price_sort_sql} AS max_price").
-          order(Arel.sql("#{price_sort_sql} DESC"))
+        joins("LEFT JOIN (#{price_agg_sql}) AS price_agg ON price_agg.product_id = #{Product.table_name}.id").
+          select("#{Product.table_name}.*").
+          select(Arel::Nodes::As.new(price_expr, Arel.sql('max_price'))).
+          order(price_expr.desc)
       end
 
       add_search_scope :price_between do |low, high|
@@ -81,6 +87,25 @@ module Spree
         where(Price.table_name => { amount: price.. })
       end
 
+      # Joins spree_variants and spree_stock_items directly (without association
+      # aliases) so that the table names stay as-is. This avoids alias conflicts
+      # when combined with other scopes (e.g., price sorting) that also join
+      # spree_variants through associations which generate aliases.
+      def self.join_variants_and_stock_items
+        joins("INNER JOIN #{Variant.table_name} ON #{Variant.table_name}.deleted_at IS NULL AND #{Variant.table_name}.product_id = #{Product.table_name}.id").
+          joins("LEFT OUTER JOIN #{StockItem.table_name} ON #{StockItem.table_name}.deleted_at IS NULL AND #{StockItem.table_name}.variant_id = #{Variant.table_name}.id")
+      end
+      private_class_method :join_variants_and_stock_items
+
+      # Mirrors Spree::Variant.in_stock_or_backorderable logic using raw table
+      # names (to pair with join_variants_and_stock_items).
+      scope :in_stock_or_backorderable_condition, -> {
+        where(
+          "#{Variant.table_name}.track_inventory = ? OR #{StockItem.table_name}.count_on_hand > ? OR #{StockItem.table_name}.backorderable = ?",
+          false, 0, true
+        )
+      }
+
       # Can't use add_search_scope for this as it needs a default argument
       # Ransack calls with '1' to activate, '0' or nil to skip
       # In Ruby code: in_stock(true) for in-stock, in_stock(false) for out-of-stock
@@ -88,7 +113,7 @@ module Spree
         if in_stock == '0' || !in_stock
           all
         else
-          joins(:variants_including_master).merge(Spree::Variant.in_stock_or_backorderable)
+          join_variants_and_stock_items.in_stock_or_backorderable_condition
         end
       end
 
@@ -105,17 +130,17 @@ module Spree
         if out_of_stock == '0' || !out_of_stock
           all
         else
-          where.not(id: joins(:variants_including_master).merge(Spree::Variant.in_stock_or_backorderable))
+          where.not(id: join_variants_and_stock_items.in_stock_or_backorderable_condition)
         end
       end
       search_scopes << :out_of_stock
 
       add_search_scope :backorderable do
-        joins(:variants_including_master).merge(Spree::Variant.backorderable)
+        join_variants_and_stock_items.where(StockItem.table_name => { backorderable: true })
       end
 
       add_search_scope :in_stock_or_backorderable do
-        joins(:variants_including_master).merge(Spree::Variant.in_stock_or_backorderable)
+        join_variants_and_stock_items.in_stock_or_backorderable_condition
       end
 
       # This scope selects products in taxon AND all its descendants
@@ -140,6 +165,11 @@ module Spree
           where("#{Classification.table_name}.taxon_id" => taxon.cached_self_and_descendants_ids).distinct
       end
 
+      # Alias for in_taxon — public API name
+      add_search_scope :in_category do |category|
+        in_taxon(category)
+      end
+
       # This scope selects products in all taxons AND all its descendants
       # If you need products only within one taxon use
       #
@@ -204,9 +234,7 @@ module Spree
 
         return none if actual_ids.empty?
 
-        group("#{Spree::Product.table_name}.id").
-          joins(variants: :option_values).
-          where(Spree::OptionValue.table_name => { id: actual_ids })
+        joins(variants: :option_values).where(Spree::OptionValue.table_name => { id: actual_ids })
       end
 
       # Finds all products which have an option value with the name matching the one given
@@ -325,25 +353,22 @@ module Spree
       end
 
       # Orders products by best selling based on units_sold_count and revenue
-      # stored in spree_products_stores table.
-      #
-      # These metrics are updated asynchronously when orders are completed
-      # via the ProductMetricsSubscriber.
+      # from spree_products_stores (already joined via store.products).
       #
-      # @param order_direction [Symbol] :desc (default) or :asc
-      # @return [ActiveRecord::Relation]
+      # Uses Arel::Nodes::As so that ORDER BY expressions appear in SELECT
+      # and work with DISTINCT (same pattern as the price sorting scopes).
       add_search_scope :by_best_selling do |order_direction = :desc|
-        store_id = Spree::Current.store&.id
-        sp_table = StoreProduct.arel_table
-        products_table = Product.arel_table
-
-        conditions = sp_table[:product_id].eq(products_table[:id]).and(sp_table[:store_id].eq(store_id))
-
-        units_sold = Arel::Nodes::NamedFunction.new('COALESCE', [sp_table.project(sp_table[:units_sold_count]).where(conditions), 0])
-        revenue = Arel::Nodes::NamedFunction.new('COALESCE', [sp_table.project(sp_table[:revenue]).where(conditions), 0])
+        sp_table = StoreProduct.table_name
+        units_expr = Arel.sql("COALESCE(#{sp_table}.units_sold_count, 0)")
+        revenue_expr = Arel.sql("COALESCE(#{sp_table}.revenue, 0)")
 
         order_dir = order_direction == :desc ? :desc : :asc
-        order(units_sold.send(order_dir)).order(revenue.send(order_dir))
+
+        select("#{Product.table_name}.*").
+          select(Arel::Nodes::As.new(units_expr, Arel.sql('best_selling_units'))).
+          select(Arel::Nodes::As.new(revenue_expr, Arel.sql('best_selling_revenue'))).
+          order(units_expr.send(order_dir)).
+          order(revenue_expr.send(order_dir))
       end
 
       # .search_by_name

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

@@ -4,6 +4,7 @@ module Spree
 
     include Spree::PrefixedId
     include Spree::Metafields
+    include Spree::Metadata
     include Spree::UserPaymentSource
     include Spree::UserReporting
     include Spree::UserRoles

data/app/models/spree/category.rb

@@ -0,0 +1,6 @@
+module Spree
+  # Public API name for Taxon. Will become the base class in 6.0
+  # when spree_taxons table is renamed to spree_categories.
+  class Category < Taxon
+  end
+end

data/app/models/spree/payment/gateway_options.rb

@@ -34,6 +34,10 @@ module Spree
         payment.number
       end
 
+      def idempotency_key
+        "spree-#{payment.number}"
+      end
+
       def shipping
         order.ship_total * exchange_multiplier
       end
@@ -66,6 +70,7 @@ module Spree
           :ip,
           :order_id,
           :payment_id,
+          :idempotency_key,
           :shipping,
           :tax,
           :subtotal,

data/app/models/spree/product.rb

@@ -40,9 +40,9 @@ module Spree
 
     publishes_lifecycle_events
 
-    MEMOIZED_METHODS = %w[total_on_hand taxonomy_ids taxon_and_ancestors category
+    MEMOIZED_METHODS = %w[total_on_hand taxonomy_ids taxon_and_ancestors
                           default_variant_id tax_category default_variant variant_for_images
-                          category_taxon brand_taxon main_taxon
+                          brand_taxon main_taxon
                           purchasable? in_stock? backorderable? digital?]
 
     STATUSES = %w[draft active archived].freeze
@@ -74,6 +74,7 @@ module Spree
     has_many :option_types, through: :product_option_types
     has_many :classifications, -> { order(created_at: :asc) }, dependent: :delete_all, inverse_of: :product
     has_many :taxons, through: :classifications, before_remove: :remove_taxon
+    has_many :categories, through: :classifications, class_name: 'Spree::Category', source: :taxon
     has_many :taxonomies, through: :taxons
 
     has_many :product_promotion_rules, class_name: 'Spree::ProductPromotionRule'
@@ -217,7 +218,7 @@ module Spree
     alias options product_option_types
 
     self.whitelisted_ransackable_attributes = %w[description name slug discontinue_on status available_on created_at updated_at]
-    self.whitelisted_ransackable_associations = %w[taxons stores variants_including_master master variants tags labels
+    self.whitelisted_ransackable_associations = %w[taxons categories stores variants_including_master master variants tags labels
                                                    shipping_category classifications option_types]
     self.whitelisted_ransackable_scopes = %w[not_discontinued search_by_name in_taxon price_between
                                              price_lte price_gte
@@ -556,40 +557,10 @@ module Spree
       brand&.name
     end
 
-    # Returns the category for the product
-    # If a category association is defined (e.g., belongs_to :category), it will be used
-    # Otherwise, falls back to category_taxon for compatibility
-    # @return [Spree::Category, Spree::Taxon]
-    def category
-      if self.class.reflect_on_association(:category)
-        super
-      else
-        Spree::Deprecation.warn('Spree::Product#category is deprecated and will be removed in Spree 5.5. Please use Spree::Product#category_taxon instead.')
-        category_taxon
-      end
-    end
-
-    # Returns the category taxon for the product
-    # @return [Spree::Taxon]
-    def category_taxon
-      @category_taxon ||= if classification_count.zero?
-                            nil
-                          elsif Spree.use_translations?
-                            taxons.joins(:taxonomy).
-                              join_translation_table(Taxonomy).
-                              order(depth: :desc).
-                              find_by(Taxonomy.translation_table_alias => { name: Spree.t(:taxonomy_categories_name) })
-                          elsif taxons.loaded?
-                            taxons.find { |taxon| taxon.taxonomy.name == Spree.t(:taxonomy_categories_name) }
-                          else
-                            taxons.joins(:taxonomy).order(depth: :desc).find_by(Taxonomy.table_name => { name: Spree.t(:taxonomy_categories_name) })
-                          end
-    end
-
     def main_taxon
       return if classification_count.zero?
 
-      @main_taxon ||= category_taxon || taxons.first
+      @main_taxon ||= taxons.first
     end
 
     def taxons_for_store(store)

data/app/models/spree/store.rb

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module Spree
   class Store < Spree.base_class
-    has_prefix_id :store  # Spree-specific: store
+    has_prefix_id :store # Spree-specific: store
 
     include FriendlyId
     include Spree::TranslatableResource
     include Spree::Metafields
     include Spree::Metadata
     include Spree::Stores::Setup
-    include Spree::Stores::Socials
     include Spree::Stores::Markets
     include Spree::Security::Stores if defined?(Spree::Security::Stores)
     include Spree::UserManagement
@@ -23,8 +24,7 @@ module Spree
     #
     # Translations
     #
-    TRANSLATABLE_FIELDS = %i[name meta_description meta_keywords seo_title facebook
-                             twitter instagram customer_support_email
+    TRANSLATABLE_FIELDS = %i[name meta_description meta_keywords seo_title customer_support_email
                              address contact_phone].freeze
     translates(*TRANSLATABLE_FIELDS, column_fallback: !Spree.always_use_translations?)
     self::Translation.class_eval do
@@ -43,9 +43,6 @@ module Spree
     preference :unit_system, :string, default: 'imperial'
     # email preferences
     preference :send_consumer_transactional_emails, :boolean, default: true
-    # SEO preferences
-    preference :index_in_search_engines, :boolean, default: false
-    preference :password_protected, :boolean, default: false
     # Checkout preferences
     preference :guest_checkout, :boolean, default: true
     preference :special_instructions_enabled, :boolean, default: false
@@ -86,6 +83,7 @@ module Spree
 
     has_many :taxonomies, class_name: 'Spree::Taxonomy'
     has_many :taxons, through: :taxonomies, class_name: 'Spree::Taxon'
+    has_many :categories, through: :taxonomies, class_name: 'Spree::Category', source: :taxons
 
     has_many :store_promotions, class_name: 'Spree::StorePromotion'
     has_many :promotions, through: :store_promotions, class_name: 'Spree::Promotion'
@@ -111,21 +109,6 @@ module Spree
 
     has_many :api_keys, class_name: 'Spree::ApiKey', dependent: :destroy
 
-
-    #
-    # ActionText
-    #
-    has_rich_text :checkout_message
-    has_rich_text :customer_terms_of_service
-    has_rich_text :customer_privacy_policy
-    has_rich_text :customer_returns_policy
-    has_rich_text :customer_shipping_policy
-
-    #
-    # Virtual attributes
-    #
-    store_accessor :private_metadata, :storefront_password
-
     #
     # Validations
     #
@@ -137,19 +120,17 @@ module Spree
     validates :mail_from_address, email: { allow_blank: false }
     # FIXME: we should remove this condition in v5
     if !ENV['SPREE_DISABLE_DB_CONNECTION'] &&
-        connected? &&
-        table_exists? &&
-        connection.column_exists?(:spree_stores, :new_order_notifications_email)
+       connected? &&
+       table_exists? &&
+       connection.column_exists?(:spree_stores, :new_order_notifications_email)
       validates :new_order_notifications_email, email: { allow_blank: true }
     end
-    validates :favicon_image, :social_image, :mailer_logo, content_type: Rails.application.config.active_storage.web_image_content_types
+    validates :mailer_logo, content_type: Rails.application.config.active_storage.web_image_content_types
 
     #
     # Attachments
     #
     has_one_attached :logo, service: Spree.public_storage_service_name
-    has_one_attached :favicon_image, service: Spree.public_storage_service_name
-    has_one_attached :social_image, service: Spree.public_storage_service_name
     has_one_attached :mailer_logo, service: Spree.public_storage_service_name
 
     #
@@ -157,8 +138,6 @@ module Spree
     before_validation :set_default_code, on: :create
     before_save :ensure_default_exists_and_is_unique
     after_create :ensure_default_market
-    after_create :ensure_default_taxonomies_are_created
-    after_create :ensure_default_automatic_taxons
     after_create :create_default_policies
 
     #
@@ -233,16 +212,6 @@ module Spree
       @default_country_for_market = country
     end
 
-    def seo_meta_description
-      if meta_description.present?
-        meta_description
-      elsif seo_title.present?
-        seo_title
-      else
-        name
-      end
-    end
-
     def unique_name
       @unique_name ||= "#{name} (#{code})"
     end
@@ -312,18 +281,18 @@ module Spree
     # @return [ActiveRecord::Relation<Spree::Country>]
     def countries_with_shipping_coverage
       zone_ids = Spree::Zone
-        .joins(:shipping_methods)
-        .select(:id)
+                 .joins(:shipping_methods)
+                 .select(:id)
 
       country_zone_country_ids = Spree::ZoneMember
-        .where(zone_id: zone_ids, zoneable_type: 'Spree::Country')
-        .select(:zoneable_id)
+                                 .where(zone_id: zone_ids, zoneable_type: 'Spree::Country')
+                                 .select(:zoneable_id)
 
       state_zone_country_ids = Spree::State
-        .where(id: Spree::ZoneMember
-          .where(zone_id: zone_ids, zoneable_type: 'Spree::State')
-          .select(:zoneable_id))
-        .select(:country_id)
+                               .where(id: Spree::ZoneMember
+                                          .where(zone_id: zone_ids, zoneable_type: 'Spree::State')
+                                          .select(:zoneable_id))
+                               .select(:country_id)
 
       Spree::Country
         .where(id: country_zone_country_ids)
@@ -337,7 +306,8 @@ module Spree
       @default_stock_location ||= begin
         stock_location_scope = Spree::StockLocation.where(default: true)
         stock_location_scope.first || ActiveRecord::Base.connected_to(role: :writing) do
-          stock_location_scope.create(default: true, name: Spree.t(:default_stock_location_name), country: default_country)
+          stock_location_scope.create(default: true, name: Spree.t(:default_stock_location_name),
+                                      country: default_country)
         end
       end
     end
@@ -348,12 +318,6 @@ module Spree
       users
     end
 
-    def favicon
-      return unless favicon_image.attached? && favicon_image.variable?
-
-      favicon_image.variant(resize_to_limit: [32, 32])
-    end
-
     def metric_unit_system?
       preferred_unit_system == 'metric'
     end
@@ -366,14 +330,6 @@ module Spree
       @digital_shipping_category ||= ShippingCategory.find_or_create_by(name: 'Digital')
     end
 
-    %w[customer_terms_of_service customer_privacy_policy customer_returns_policy customer_shipping_policy].each do |policy_method|
-      define_method policy_method do
-        Spree::Deprecation.warn("Store##{policy_method} is deprecated and will be removed in Spree 5.5. Please use Store#policies instead.")
-
-        ActionText::RichText.find_by(name: policy_method, record: self)
-      end
-    end
-
     private
 
     def ensure_default_market
@@ -395,7 +351,25 @@ module Spree
       end
     end
 
+    def create_default_policies
+      Spree::Events.disable do
+        [
+          translate_with_store_locale_fallback('spree.terms_of_service'),
+          translate_with_store_locale_fallback('spree.privacy_policy'),
+          translate_with_store_locale_fallback('spree.returns_policy'),
+          translate_with_store_locale_fallback('spree.shipping_policy')
+        ].each do |policy_name|
+          # Manual exists?/create to work around Mobility bug with find_or_create_by
+          next if policies.with_matching_name(policy_name).exists?
+
+          policies.create(name: policy_name)
+        end
+      end
+    end
+
     def ensure_default_taxonomies_are_created
+      Spree::Deprecation.warn('Store#ensure_default_taxonomies_are_created is deprecated and will be removed in Spree 5.5. Please remove it from your codebase')
+
       Spree::Events.disable do
         [
           translate_with_store_locale_fallback('spree.taxonomy_categories_name'),
@@ -411,13 +385,16 @@ module Spree
     end
 
     def ensure_default_automatic_taxons
+      Spree::Deprecation.warn('Store#ensure_default_automatic_taxons is deprecated and will be removed in Spree 5.5. Please remove it from your codebase')
+
       Spree::Events.disable do
         # Use Mobility-safe lookup for taxonomy
         collections_taxonomy = taxonomies.with_matching_name(translate_with_store_locale_fallback('spree.taxonomy_collections_name')).first
         return unless collections_taxonomy.present?
 
         automatic_taxons_config = [
-          { name: translate_with_store_locale_fallback('spree.automatic_taxon_names.on_sale'), rule_type: 'Spree::TaxonRules::Sale', rule_value: 'true' },
+          { name: translate_with_store_locale_fallback('spree.automatic_taxon_names.on_sale'),
+            rule_type: 'Spree::TaxonRules::Sale', rule_value: 'true' },
           { name: translate_with_store_locale_fallback('spree.automatic_taxon_names.new_arrivals'), rule_type: 'Spree::TaxonRules::AvailableOn', rule_value: 30 }
         ]
 
@@ -439,22 +416,6 @@ module Spree
       end
     end
 
-    def create_default_policies
-      Spree::Events.disable do
-        [
-          translate_with_store_locale_fallback('spree.terms_of_service'),
-          translate_with_store_locale_fallback('spree.privacy_policy'),
-          translate_with_store_locale_fallback('spree.returns_policy'),
-          translate_with_store_locale_fallback('spree.shipping_policy')
-        ].each do |policy_name|
-          # Manual exists?/create to work around Mobility bug with find_or_create_by
-          next if policies.with_matching_name(policy_name).exists?
-
-          policies.create(name: policy_name)
-        end
-      end
-    end
-
     # Translates a key using the store's default locale with fallback to :en
     def translate_with_store_locale_fallback(key)
       locale = default_locale.presence&.to_sym || :en