spree_core 4.6.6 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fae2e48673736c835ed7a9d9b5fdf18a35df19ce09eb27a92c6b13376e62a46e
-  data.tar.gz: e48f60fe8dcbeaa67028bb4ce9e23baba71f33afb32ff04be86636c60c9ed378
+  metadata.gz: b694ef25dfdd98db89c6c36a42cc50de19b6dab09cc827c5273e57dc066f38d6
+  data.tar.gz: '09ecb007e8e2181ace749a1b6776c8fe62eafdb07f321238d5fd69670f209206'
 SHA512:
-  metadata.gz: 706d673aa098f26442eafe06fd1b7eab7dd7267bb9514b3c6f2f1124eff2ea950c5d1dfdde5f8d1c7258c41c9fb5456e0655a2249fa91331267ebef397bf97c8
-  data.tar.gz: 2bb5c0f817b50bdafd1a83708bf6f85cf0b9d69ca605bb48c936d7225fdf3fcf036a0f44e5e901ed9365bf17fc6b826f5190af5841d0e5eb6c1b5ce02e1e49c2
+  metadata.gz: 3620378de0b17967f36b2d0a4c72e302aa25dae3f700aaf09e2d9b9cec73bf4b924a81a273beb9da245571c1c48128e5ad53c26539a7f8de04b0c38cdbb31d20
+  data.tar.gz: f902de746ff1dfbeef5f778f6cc204db4c47477fd76c8a0eeea60874fa45a188be8cf33ca1462240f636f57394cf790f71ce6dbdd2ac48bf756aa4e3379b059f

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/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

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

@@ -65,15 +65,9 @@ module Spree
       def by_parent_permalink(taxons)
         return taxons unless parent_permalink?
 
-        if Rails::VERSION::STRING >= '6.1'
-          taxons.joins(:parent).
-            join_translation_table(Taxon, 'parents_spree_taxons').
-            where(["#{Taxon.translation_table_alias}.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").
-            join_translation_table(Taxon, 'parent_taxon').
-            where(["#{Taxon.translation_table_alias}.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)

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
@@ -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/translatable_resource.rb

@@ -18,7 +18,7 @@ module Spree
       end
 
       def translation_table_alias
-        "#{self::Translation.table_name}_#{Mobility.normalize_locale(Mobility.locale)}"
+        "#{self::Translation.table_name}_#{Mobility.locale}"
       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 Spree::Metadata
+    include 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 Spree::Metadata
+    include Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/base.rb

@@ -1,6 +1,10 @@
 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

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

@@ -2,7 +2,7 @@ require_dependency 'spree/calculator'
 
 module Spree
   class Calculator::DefaultTax < Calculator
-    include Spree::VatPriceCalculation
+    include 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 Spree::DisplayLink
+    include 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 Spree::DisplayLink
+    include 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 Spree::Metadata
+    include 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 Spree::NumberIdentifier
-    include Spree::Metadata
+    include NumberIdentifier
+    include Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/digital_link.rb

@@ -1,6 +1,10 @@
 module Spree
   class DigitalLink < Spree::Base
-    has_secure_token
+    if Rails::VERSION::STRING >= '7.1.0'
+      has_secure_token on: :save
+    else
+      has_secure_token
+    end
 
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks

data/app/models/spree/line_item.rb

@@ -1,6 +1,6 @@
 module Spree
   class LineItem < Spree::Base
-    include Spree::Metadata
+    include Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/option_type.rb

@@ -1,8 +1,8 @@
 module Spree
   class OptionType < Spree::Base
-    include Spree::UniqueName
-    include Spree::Metadata
-    include Spree::TranslatableResource
+    include UniqueName
+    include Metadata
+    include TranslatableResource
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/option_value.rb

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

data/app/models/spree/order/store_credit.rb

@@ -1,14 +1,6 @@
 module Spree
   class Order < Spree::Base
     module StoreCredit
-      def add_store_credit_payments(amount = nil)
-        Spree::Dependencies.checkout_add_store_credit_service.constantize.call(order: self, amount: amount)
-      end
-
-      def remove_store_credit_payments
-        Spree::Dependencies.checkout_remove_store_credit_service.constantize.call(order: self)
-      end
-
       def covered_by_store_credit?
         return false unless user
 

data/app/models/spree/order.rb

@@ -20,10 +20,10 @@ module Spree
     include Spree::Core::NumberGenerator.new(prefix: 'R')
     include Spree::Core::TokenGenerator
 
-    include Spree::NumberIdentifier
-    include Spree::NumberAsParam
+    include NumberIdentifier
+    include NumberAsParam
     include SingleStoreResource
-    include Spree::MemoizedData
+    include MemoizedData
     include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
@@ -415,7 +415,7 @@ module Spree
 
     def available_payment_methods(store = nil)
       if store.present?
-        ActiveSupport::Deprecation.warn('The `store` parameter is deprecated and will be removed in Spree 5. Order is already associated with Store')
+        Spree::Deprecation.warn('The `store` parameter is deprecated and will be removed in Spree 5. Order is already associated with Store')
       end
 
       @available_payment_methods ||= collect_payment_methods(store)
@@ -449,7 +449,7 @@ module Spree
     end
 
     def empty!
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         `Order#empty!` is deprecated and will be removed in Spree 5.0.
         Please use `Spree::Cart::Empty.call(order: order)` instead.
       DEPRECATION
@@ -647,7 +647,7 @@ module Spree
     end
 
     def validate_payments_attributes(attributes)
-      ActiveSupport::Deprecation.warn('`Order#validate_payments_attributes` is deprecated and will be removed in Spree 5')
+      Spree::Deprecation.warn('`Order#validate_payments_attributes` is deprecated and will be removed in Spree 5')
 
       # Ensure the payment methods specified are allowed for this user
       payment_method_ids = available_payment_methods.map(&:id).map(&:to_s)
@@ -745,7 +745,7 @@ module Spree
 
     def collect_payment_methods(store = nil)
       if store.present?
-        ActiveSupport::Deprecation.warn('The `store` parameter is deprecated and will be removed in Spree 5. Order is already associated with Store')
+        Spree::Deprecation.warn('The `store` parameter is deprecated and will be removed in Spree 5. Order is already associated with Store')
       end
       store ||= self.store
 

data/app/models/spree/payment.rb

@@ -3,9 +3,9 @@ require_dependency 'spree/payment/processing'
 module Spree
   class Payment < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'P', letters: true, length: 7)
-    include Spree::NumberIdentifier
-    include Spree::NumberAsParam
-    include Spree::Metadata
+    include NumberIdentifier
+    include NumberAsParam
+    include Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end
@@ -222,18 +222,10 @@ module Spree
 
     def validate_source
       if source && !source.valid?
-        if Rails::VERSION::STRING >= '6.1'
-          source.errors.map { |error| { field: error.attribute, message: error&.message } }.each do |err|
-            next if err[:field].blank? || err[:message].blank?
-
-            add_source_error(err[:field], err[:message])
-          end
-        else
-          source.errors.messages.each do |field, error|
-            next if field.blank? || error.empty?
-
-            add_source_error(field, error.first)
-          end
+        source.errors.map { |error| { field: error.attribute, message: error&.message } }.each do |err|
+          next if err[:field].blank? || err[:message].blank?
+
+          add_source_error(err[:field], err[:message])
         end
       end
       !errors.present?

data/app/models/spree/payment_method.rb

@@ -3,7 +3,7 @@ module Spree
     acts_as_paranoid
     acts_as_list
 
-    include Spree::MultiStoreResource
+    include MultiStoreResource
     include Spree::Metadata
     if defined?(Spree::Security::PaymentMethods)
       include Spree::Security::PaymentMethods

data/app/models/spree/payment_source.rb

@@ -1,6 +1,6 @@
 module Spree
   class PaymentSource < Spree::Base
-    include Spree::Metadata
+    include Metadata
 
     belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
     belongs_to :user, class_name: 'Spree::User', optional: true

data/app/models/spree/preference.rb

@@ -1,5 +1,9 @@
 class Spree::Preference < Spree::Base
-  serialize :value
+  if Rails::VERSION::STRING >= '7.1.0'
+    serialize :value, coder: YAML
+  else
+    serialize :value
+  end
 
   validates :key, presence: true,
                   uniqueness: { case_sensitive: false, allow_blank: true, scope: spree_base_uniqueness_scope }

data/app/models/spree/price.rb

@@ -1,6 +1,6 @@
 module Spree
   class Price < Spree::Base
-    include Spree::VatPriceCalculation
+    include VatPriceCalculation
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/product.rb

@@ -21,13 +21,12 @@
 module Spree
   class Product < Spree::Base
     extend FriendlyId
-    include Spree::ProductScopes
-    include Spree::MultiStoreResource
-    include Spree::TranslatableResource
-    include Spree::TranslatableResourceSlug
-    include Spree::MemoizedData
-    include Spree::Metadata
-
+    include ProductScopes
+    include MultiStoreResource
+    include TranslatableResource
+    include TranslatableResourceSlug
+    include MemoizedData
+    include Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end
@@ -508,18 +507,10 @@ module Spree
       # We call master.default_price here to ensure price is initialized.
       # Required to avoid Variant#check_price validation failing on create.
       unless master.default_price && master.valid?
-        if Rails::VERSION::STRING >= '6.1'
-          master.errors.map { |error| { field: error.attribute, message: error&.message } }.each do |err|
-            next if err[:field].blank? || err[:message].blank?
-
-            errors.add(err[:field], err[:message])
-          end
-        else
-          master.errors.messages.each do |field, error|
-            next if field.blank? || error.empty?
+        master.errors.map { |error| { field: error.attribute, message: error&.message } }.each do |err|
+          next if err[:field].blank? || err[:message].blank?
 
-            errors.add(field, error.first)
-          end
+          errors.add(err[:field], err[:message])
         end
       end
     end

data/app/models/spree/product_property.rb

@@ -33,7 +33,7 @@ module Spree
     delegate :name, :presentation, to: :property, prefix: true, allow_nil: true
 
     def property_name=(name)
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         `ProductProperty#property_name=` is deprecated and will be removed in Spree 5.0.
       DEPRECATION
       if name.present?

data/app/models/spree/promotion.rb

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

data/app/models/spree/property.rb

@@ -1,8 +1,8 @@
 module Spree
   class Property < Spree::Base
     include Spree::FilterParam
-    include Spree::Metadata
-    include Spree::TranslatableResource
+    include Metadata
+    include TranslatableResource
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/prototype.rb

@@ -1,6 +1,6 @@
 module Spree
   class Prototype < Spree::Base
-    include Spree::Metadata
+    include Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/refund.rb

@@ -1,6 +1,6 @@
 module Spree
   class Refund < Spree::Base
-    include Spree::Metadata
+    include Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/reimbursement.rb

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

data/app/models/spree/return_authorization.rb

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

data/app/models/spree/return_item.rb

@@ -62,7 +62,11 @@ module Spree
     scope :exchange_required, -> { eager_load(:exchange_inventory_units).where(spree_inventory_units: { original_return_item_id: nil }).distinct }
     scope :resellable, -> { where resellable: true }
 
-    serialize :acceptance_status_errors
+    if Rails::VERSION::STRING >= '7.1.0'
+      serialize :acceptance_status_errors, coder: YAML
+    else
+      serialize :acceptance_status_errors
+    end
 
     delegate :eligible_for_return?, :requires_manual_intervention?, to: :validator
     delegate :variant, to: :inventory_unit