spree_core 5.2.0.rc3 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 531657763d76e0ce76fb2845acfeb30c110343666bc5e8e727de1f21249da4cd
-  data.tar.gz: 2d4f33f07d6b90d61c9578575889c7c597a39b98e19597c90f902e312832af2c
+  metadata.gz: ae177c6a311a310cbcb6d6faf5b879afc52177f9f6bf4c7063edb5ece85fc755
+  data.tar.gz: 54794ac79f785c9965c7a1f69fe0c88470fdf751cb789cab9db047b6d9ddbaa4
 SHA512:
-  metadata.gz: 1a5aa4b5e32b63a67c2cb557a77014fe1d6cbd55d4f1df437480ff2c3502e4f9fbb533caea745e90a3cb7fd8013439d591f4247c5203e44e75dec638a62abf3e
-  data.tar.gz: 7b66c4d564e21310dbc962eb1398886441a0a374b85f955a1e317cdbaef8fb27ea312d1987c33c611138e6ff1bf48e9f4de6a7301f0666423658bf7f831ec0ab
+  metadata.gz: a0f404ec813d9fc4eaabcab6cac7a461aae2671d43a55c5b59b3e53c10fbb442acf6fa01171690999f576f93e90ab77a26f767881f77dbe6f14dd73ec5619689
+  data.tar.gz: d4bacd845e8c842ab4ee8e394feb1006a4289c85ca7569e017eee6053fe29492dfc30466e413793b1af07b00a2f2575487d8746cf9a9ecdf959292b4cc0e6763

data/app/helpers/spree/integrations_helper.rb

@@ -9,7 +9,7 @@ module Spree
     end
 
     def grouped_available_store_integrations
-      Rails.application.config.spree.integrations.group_by(&:integration_group).sort_by { |group, _| group }
+      Spree.integrations.group_by(&:integration_group).sort_by { |group, _| group }
     end
   end
 end

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

@@ -13,7 +13,7 @@ module Spree
 
         Spree::Image.ensure_metafield_definition_exists!(Spree::Image::EXTERNAL_URL_METAFIELD_KEY)
 
-        external_url = external_url.downcase.strip
+        external_url = external_url.strip
         external_id = external_id.to_s.downcase.strip if external_id.present?
 
         image = find_or_initialize_image(viewable, external_url, external_id)

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

@@ -30,7 +30,7 @@ module Spree
       end
 
       def self.spree_calculators
-        Rails.application.config.spree.calculators
+        Spree.calculators
       end
     end
   end

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

@@ -160,7 +160,7 @@ module Spree
     private
 
     def check_completed_orders
-      raise Spree::Core::DestroyWithOrdersError if !has_spree_role?(Spree::Role::ADMIN_ROLE) && orders.complete.present?
+      raise Spree::Core::DestroyWithOrdersError if !spree_admin? && orders.complete.present?
     end
 
     def clone_billing_address

data/app/models/spree/address.rb

@@ -76,7 +76,7 @@ module Spree
                                     allow_nil: true }
 
     def address_validators
-      Rails.application.config.spree.validators.addresses.each do |validator|
+      Spree.validators.addresses.each do |validator|
         validates_with validator
       end
     end

data/app/models/spree/adjustable/adjustments_updater.rb

@@ -55,7 +55,7 @@ module Spree
       end
 
       def adjusters
-        Rails.application.config.spree.adjusters
+        Spree.adjusters
       end
 
       def tax_adjuster

data/app/models/spree/asset.rb

@@ -22,7 +22,7 @@ module Spree
     scope :with_session_uploaded_assets_uuid, lambda { |uuid|
       where(session_id: uuid)
     }
-    scope :with_external_url, ->(url) { url.present? ? with_metafield_key_value(EXTERNAL_URL_METAFIELD_KEY, url.downcase.strip) : none }
+    scope :with_external_url, ->(url) { url.present? ? with_metafield_key_value(EXTERNAL_URL_METAFIELD_KEY, url.strip) : none }
 
     def product
       @product ||= viewable_type == 'Spree::Variant' ? viewable&.product : nil
@@ -33,7 +33,7 @@ module Spree
     end
 
     def external_url=(url)
-      set_metafield(EXTERNAL_URL_METAFIELD_KEY, url.downcase.strip)
+      set_metafield(EXTERNAL_URL_METAFIELD_KEY, url.strip)
     end
 
     def skip_import?

data/app/models/spree/calculator.rb

@@ -26,7 +26,7 @@ module Spree
 
     # Returns all calculators applicable for kind of work
     def self.calculators
-      Rails.application.config.spree.calculators
+      Spree.calculators
     end
 
     def to_s

data/app/models/spree/data_feed.rb

@@ -33,7 +33,7 @@ module Spree
       end
 
       def available_types
-        Rails.application.config.spree.data_feed_types
+        Spree.data_feed_types
       end
     end
   end

data/app/models/spree/export.rb

@@ -175,7 +175,7 @@ module Spree
 
     class << self
       def available_types
-        Rails.application.config.spree.export_types
+        Spree.export_types
       end
 
       def available_models

data/app/models/spree/gateway/bogus.rb

@@ -60,7 +60,7 @@ module Spree
     end
 
     def void(_response_code, _credit_card, _options = {})
-      ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345')
+      ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: 'void-12345')
     end
 
     def cancel(_response_code, _payment = nil)

data/app/models/spree/import.rb

@@ -224,7 +224,7 @@ module Spree
       # Returns the available types for the import
       # @return [Array<Class>]
       def available_types
-        Rails.application.config.spree.import_types
+        Spree.import_types
       end
 
       # Returns the available models for the import

data/app/models/spree/metafield_definition.rb

@@ -61,13 +61,13 @@ module Spree
     # Returns the available types
     # @return [Array<Class>]
     def self.available_types
-      Rails.application.config.spree.metafield_types
+      Spree.metafields.types
     end
 
     # Returns the available resources
     # @return [Array<Class>]
     def self.available_resources
-      Rails.application.config.spree.metafield_enabled_resources
+      Spree.metafields.enabled_resources
     end
 
     private
@@ -81,7 +81,7 @@ module Spree
     end
 
     def set_default_type
-      self.metafield_type ||= Rails.application.config.spree.metafield_types.first.to_s
+      self.metafield_type ||= Spree.metafields.types.first.to_s
     end
 
     def set_name_from_key

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

@@ -44,6 +44,8 @@ module Spree
         def process_payments_with(method)
           # Don't run if there is nothing to pay.
           return if payment_total >= total
+          # Don't run if there are authorized payments
+          return if pending_payments.any? && unprocessed_payments.empty?
           # Prevent orders from transitioning to complete without a successfully processed payment.
           raise Core::GatewayError, Spree.t(:no_payment_found) if unprocessed_payments.empty?
 

data/app/models/spree/order.rb

@@ -910,6 +910,7 @@ module Spree
         payments.completed.store_credits.each(&:void!)
       else
         payments.completed.each(&:cancel!)
+        payments.incomplete.not_store_credits.each(&:void_transaction!)
         payments.store_credits.pending.each(&:void!)
       end
 

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

@@ -26,6 +26,19 @@ module Spree
         handle_payment_preconditions { process_purchase }
       end
 
+      # Confirms a payment by completing it or pending it depending on the payment method's auto_capture setting
+      # Useful for payments that are authorized/captured with SDK/Drop-in elements
+      def confirm!
+        started_processing! if checkout?
+
+        if payment_method&.auto_capture? && can_complete?
+          complete!
+          capture_events.create!(amount: amount)
+        elsif can_pend?
+          pend!
+        end
+      end
+
       # Takes the amount in cents to capture.
       # Can be used to capture partial amounts of a payment, and will create
       # a new pending payment record for the remaining amount to capture later.

data/app/models/spree/payment.rb

@@ -255,6 +255,26 @@ module Spree
       payment_method&.source_required?
     end
 
+    def add_gateway_processing_error(error_message)
+      if has_metafield?('gateway.processing_errors')
+        errors = JSON.parse(get_metafield('gateway.processing_errors').value)
+        errors << { message: error_message }
+
+        set_metafield('gateway.processing_errors', errors.to_json)
+      else
+        set_metafield('gateway.processing_errors', [{ message: error_message }].to_json)
+      end
+    end
+
+    def gateway_processing_error_messages
+      @gateway_processing_error_messages ||= begin
+        errors = JSON.parse(get_metafield('gateway.processing_errors')&.value || '[]')
+        errors.map { |error| error['message'] }
+      rescue JSON::ParserError
+        []
+      end
+    end
+
     private
 
     def set_amount

data/app/models/spree/payment_method.rb

@@ -29,7 +29,7 @@ module Spree
     has_many :gateway_customers, class_name: 'Spree::GatewayCustomer', dependent: :destroy
 
     def self.providers
-      Rails.application.config.spree.payment_methods
+      Spree.payment_methods
     end
 
     def provider_class

data/app/models/spree/product.rb

@@ -255,8 +255,6 @@ module Spree
     delegate :display_amount, :display_price, :has_default_price?, :track_inventory?,
              :display_compare_at_price, :images, to: :default_variant
 
-    delegate :name, to: :brand, prefix: true, allow_nil: true
-
     alias master_images images
 
     state_machine :status, initial: :draft do
@@ -550,7 +548,22 @@ module Spree
       super || variants_including_master.with_deleted.find_by(is_master: true)
     end
 
+    # Returns the brand for the product
+    # If a brand association is defined (e.g., belongs_to :brand), it will be used
+    # Otherwise, falls back to brand_taxon for compatibility
+    # @return [Spree::Brand, Spree::Taxon]
     def brand
+      if self.class.reflect_on_association(:brand)
+        super
+      else
+        Spree::Deprecation.warn('Spree::Product#brand is deprecated and will be removed in Spree 6. Please use Spree::Product#brand_taxon instead.')
+        brand_taxon
+      end
+    end
+
+    # Returns the brand taxon for the product
+    # @return [Spree::Taxon]
+    def brand_taxon
       @brand ||= if Spree.use_translations?
                    taxons.joins(:taxonomy).
                      join_translation_table(Taxonomy).
@@ -564,7 +577,28 @@ module Spree
                  end
     end
 
+    # Returns the brand name for the product
+    # @return [String]
+    def brand_name
+      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 6. 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 ||= if Spree.use_translations?
                       taxons.joins(:taxonomy).
                         join_translation_table(Taxonomy).
@@ -580,7 +614,7 @@ module Spree
     end
 
     def main_taxon
-      category || taxons.first
+      category_taxon || taxons.first
     end
 
     def taxons_for_store(store)

data/app/models/spree/stock/coordinator.rb

@@ -60,7 +60,7 @@ module Spree
 
       def splitters(_stock_location)
         # extension point to return custom splitters for a location
-        Rails.application.config.spree.stock_splitters
+        Spree.stock_splitters
       end
     end
   end

data/app/models/spree/taxon.rb

@@ -324,6 +324,7 @@ module Spree
     # indicate which filters should be used for a taxon
     # this method should be customized to your own site
     def applicable_filters
+      Spree::Deprecation.warn('applicable_filters is deprecated and will be removed in Spree 6.0')
       fs = []
       # fs << ProductFilters.taxons_below(self)
       ## unless it's a root taxon? left open for demo purposes

data/app/models/spree/theme.rb

@@ -56,7 +56,7 @@ module Spree
     #
     # @return [Array<Spree::Theme>]
     def self.available_themes
-      @available_themes ||= Rails.application.config.spree.themes.sort_by(&:display_name)
+      @available_themes ||= Spree.page_builder.themes.sort_by(&:display_name)
     end
 
     def self.metadata
@@ -98,7 +98,7 @@ module Spree
     end
 
     def create_default_pages
-      Rails.application.config.spree.pages.map(&:to_s).map(&:constantize).each do |page_class|
+      Spree.page_builder.pages.map(&:to_s).map(&:constantize).each do |page_class|
         next if page_class == Spree::Pages::Custom
 
         page_class.where(pageable: self).first_or_create!
@@ -160,7 +160,7 @@ module Spree
     # @return [Array<Class>]
     def available_layout_sections
       [
-        *Rails.application.config.spree.theme_layout_sections,
+        *Spree.page_builder.theme_layout_sections,
         *custom_layout_sections
       ]
     end
@@ -181,7 +181,7 @@ module Spree
       return @available_page_sections if @available_page_sections
 
       @available_page_sections ||= [
-        *Rails.application.config.spree.page_sections.find_all do |section_class|
+        *Spree.page_builder.page_sections.find_all do |section_class|
           section_class.role == 'content'
         end,
         *custom_page_sections

data/app/services/spree/compare_line_items.rb

@@ -4,7 +4,7 @@ module Spree
     prepend Spree::ServiceModule::Base
 
     def call(order:, line_item:, options: {}, comparison_hooks: nil)
-      comparison_hooks ||= Rails.application.config.spree.line_item_comparison_hooks
+      comparison_hooks ||= Spree.line_item_comparison_hooks
 
       legacy_part = comparison_hooks.all? do |hook|
         order.send(hook, line_item, options)

data/app/views/spree/shared/_base_mailer_stylesheets.html.erb

@@ -253,6 +253,11 @@
 
   .purchase_image {
     padding: 5px;
+    width: 100px;
+
+    img {
+      width: 100px;
+    }
   }
 
   .purchase_item p {

data/config/locales/en.yml

@@ -105,6 +105,8 @@ en:
         phone: Shipping address phone
         state: Shipping address state
         zipcode: Shipping address zipcode
+      spree/page_link:
+        open_in_new_tab: Open in new tab
       spree/payment:
         amount: Amount
         number: Number
@@ -200,6 +202,7 @@ en:
       spree/taxonomy:
         name: Name
       spree/user:
+        avatar: Avatar
         email: Email
         password: Password
         password_confirmation: Password Confirmation
@@ -1622,6 +1625,7 @@ en:
     payment_updated: Payment Updated
     payments: Payments
     payments_count: Payments count
+    payments_gateway_processing_errors: "%{payment_method_name} processing errors"
     pending: Pending
     pending_sale: Pending Sale
     percent: Percent

data/lib/generators/spree/cursor_rules/templates/spree_rules.mdc

@@ -255,7 +255,7 @@ bin/rails g spree:storefront:theme MyTheme
 
 ```ruby
 # Register theme in config/initializers/spree.rb
-Rails.application.config.spree.themes << Spree::Themes::MyTheme
+Spree.page_builder.themes << Spree::Themes::MyTheme
 ```
 
 #### View Overrides

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -61,33 +61,40 @@ end
 # uncomment lines below to add your own custom business logic
 # such as promotions, shipping methods, etc
 Rails.application.config.after_initialize do
-  # Rails.application.config.spree.shipping_methods << Spree::ShippingMethods::SuperExpensiveNotVeryFastShipping
-  # Rails.application.config.spree.payment_methods << Spree::PaymentMethods::VerySafeAndReliablePaymentMethod
+  # Payment methods and shipping calculators
+  # Spree.payment_methods << Spree::PaymentMethods::VerySafeAndReliablePaymentMethod
+  # Spree.calculators.shipping_methods << Spree::ShippingMethods::SuperExpensiveNotVeryFastShipping
+  # Spree.calculators.tax_rates << Spree::TaxRates::FinanceTeamForcedMeToCodeThis
 
-  # Rails.application.config.spree.calculators.tax_rates << Spree::TaxRates::FinanceTeamForcedMeToCodeThis
-
-  # Rails.application.config.spree.stock_splitters << Spree::Stock::Splitters::SecretLogicSplitter
-
-  # Rails.application.config.spree.adjusters << Spree::Adjustable::Adjuster::TaxTheRich
+  # Stock splitters and adjusters
+  # Spree.stock_splitters << Spree::Stock::Splitters::SecretLogicSplitter
+  # Spree.adjusters << Spree::Adjustable::Adjuster::TaxTheRich
 
   # Custom promotions
-  # Rails.application.config.spree.calculators.promotion_actions_create_adjustments << Spree::Calculators::PromotionActions::CreateAdjustments::AddDiscountForFriends
-  # Rails.application.config.spree.calculators.promotion_actions_create_item_adjustments << Spree::Calculators::PromotionActions::CreateItemAdjustments::FinanceTeamForcedMeToCodeThis
-  # Rails.application.config.spree.promotions.rules << Spree::Promotions::Rules::OnlyForVIPCustomers
-  # Rails.application.config.spree.promotions.actions << Spree::Promotions::Actions::GiftWithPurchase
-
-  # Rails.application.config.spree.taxon_rules << Spree::TaxonRules::ProductsWithColor
-
-  # Rails.application.config.spree.exports << Spree::Exports::Payments
-  # Rails.application.config.spree.reports << Spree::Reports::MassivelyOvercomplexReportForCfo
-
-  # Themes and page builder
-  # Rails.application.config.spree.themes << Spree::Themes::NewShinyTheme
-  # Rails.application.config.spree.theme_layout_sections << Spree::PageSections::SuperImportantCeoBio
-  # Rails.application.config.spree.page_sections << Spree::PageSections::ContactFormToGetInTouch
-  # Rails.application.config.spree.page_blocks << Spree::PageBlocks::BigRedButtonToCallSales
-
-  # Rails.application.config.spree_storefront.head_partials << 'spree/shared/that_js_snippet_that_marketing_forced_me_to_include'
+  # Spree.calculators.promotion_actions_create_adjustments << Spree::Calculators::PromotionActions::CreateAdjustments::AddDiscountForFriends
+  # Spree.calculators.promotion_actions_create_item_adjustments << Spree::Calculators::PromotionActions::CreateItemAdjustments::FinanceTeamForcedMeToCodeThis
+  # Spree.promotions.rules << Spree::Promotions::Rules::OnlyForVIPCustomers
+  # Spree.promotions.actions << Spree::Promotions::Actions::GiftWithPurchase
+
+  # Taxon rules
+  # Spree.taxon_rules << Spree::TaxonRules::ProductsWithColor
+
+  # Exports and reports
+  # Spree.export_types << Spree::Exports::Payments
+  # Spree.reports << Spree::Reports::MassivelyOvercomplexReportForCfo
+
+  # Page builder (themes, pages, sections, blocks)
+  # Spree.page_builder.themes << Spree::Themes::NewShinyTheme
+  # Spree.page_builder.theme_layout_sections << Spree::PageSections::SuperImportantCeoBio
+  # Spree.page_builder.pages << Spree::Pages::CustomLandingPage
+  # Spree.page_builder.page_sections << Spree::PageSections::ContactFormToGetInTouch
+  # Spree.page_builder.page_blocks << Spree::PageBlocks::BigRedButtonToCallSales
+
+  # Storefront partials
+  # Spree.storefront.partials.head << 'spree/shared/that_js_snippet_that_marketing_forced_me_to_include'
+
+  # Admin partials
+  # Spree.admin.partials.product_form << 'spree/admin/products/custom_section'
 end
 
 Spree.user_class = <%= (options[:user_class].blank? ? 'Spree::LegacyUser' : options[:user_class]).inspect %>

data/lib/generators/spree/model/model_generator.rb

@@ -0,0 +1,21 @@
+require "rails/generators/active_record/model/model_generator"
+
+module Spree
+  class ModelGenerator < ActiveRecord::Generators::ModelGenerator
+
+    def self.source_paths
+      paths = superclass.source_paths
+      paths << File.expand_path('templates', __dir__)
+      paths.flatten
+    end
+
+    class_option :parent, type: :string, default: "Spree::Base", desc: "The parent class for the generated model"
+
+    desc 'Creates a new Spree model'
+
+    # Override to prevent module file from being created
+    def create_module_file
+      return
+    end
+  end
+end

data/lib/generators/spree/model/templates/model.rb.tt

@@ -0,0 +1,22 @@
+module Spree
+  class <%= class_name.demodulize %> < <%= parent_class_name.classify %>
+<% attributes.select(&:reference?).each do |attribute| -%>
+    belongs_to :<%= attribute.name %><%= ", polymorphic: true" if attribute.polymorphic? %>
+<% end -%>
+<% attributes.select(&:rich_text?).each do |attribute| -%>
+    has_rich_text :<%= attribute.name %>
+<% end -%>
+<% attributes.select(&:attachment?).each do |attribute| -%>
+    has_one_attached :<%= attribute.name %>
+<% end -%>
+<% attributes.select(&:attachments?).each do |attribute| -%>
+    has_many_attached :<%= attribute.name %>
+<% end -%>
+<% attributes.select(&:token?).each do |attribute| -%>
+    has_secure_token<% if attribute.name != "token" %> :<%= attribute.name %><% end %>
+<% end -%>
+<% if attributes.any?(&:password_digest?) -%>
+    has_secure_password
+<% end -%>
+  end
+end

data/lib/generators/spree/model_decorator/model_decorator_generator.rb

@@ -0,0 +1,37 @@
+module Spree
+  class ModelDecoratorGenerator < Rails::Generators::NamedBase
+    desc 'Creates a model decorator for a Spree model'
+
+    argument :name, type: :string, required: true, banner: 'Spree::ModelName'
+
+    def self.source_paths
+      paths = superclass.source_paths
+      paths << File.expand_path('templates', __dir__)
+      paths.flatten
+    end
+
+    def create_model_decorator_file
+      template 'model_decorator.rb.tt', "app/models/#{file_path}_decorator.rb"
+    end
+
+    private
+
+    # Returns the model name without the Spree:: prefix
+    # e.g., "Spree::Product" => "Product", "Product" => "Product"
+    def model_name
+      name.sub(/^Spree::/, '').classify
+    end
+
+    # Returns the decorator module name
+    # e.g., "Spree::Product" => "ProductDecorator"
+    def decorator_name
+      "#{model_name}Decorator"
+    end
+
+    # Returns the file path for the decorator
+    # e.g., "Spree::Product" => "spree/product", "Product" => "spree/product"
+    def file_path
+      "spree/#{model_name.underscore}"
+    end
+  end
+end

data/lib/generators/spree/model_decorator/templates/model_decorator.rb.tt

@@ -0,0 +1,12 @@
+module Spree
+  module <%= decorator_name %>
+    def self.prepended(base)
+      # base.belongs_to :brand
+    end
+
+    # add custom methods here
+  end
+end
+
+Spree::<%= model_name %>.prepend Spree::<%= decorator_name %>
+

data/lib/spree/analytics.rb

@@ -1,11 +1,11 @@
 module Spree
   module Analytics
     def self.events
-      @@supported_events ||= Rails.application.config.spree.analytics_events
+      @@supported_events ||= Spree.analytics.events
     end
 
     def self.event_handlers
-      @@event_handlers ||= Rails.application.config.spree.analytics_event_handlers
+      @@event_handlers ||= Spree.analytics.handlers
     end
   end
 end

data/lib/spree/core/engine.rb

@@ -24,14 +24,14 @@ module Spree
                                :page_blocks,
                                :reports,
                                :translatable_resources,
-                               :metafield_types,
-                               :metafield_enabled_resources,
+                               :metafields,
                                :analytics_events,
                                :analytics_event_handlers,
                                :integrations)
       SpreeCalculators = Struct.new(:shipping_methods, :tax_rates, :promotion_actions_create_adjustments, :promotion_actions_create_item_adjustments)
       PromoEnvironment = Struct.new(:rules, :actions)
       SpreeValidators = Struct.new(:addresses)
+      MetafieldsEnvironment = Struct.new(:types, :enabled_resources)
       isolate_namespace Spree
       engine_name 'spree'
 
@@ -66,6 +66,12 @@ module Spree
       initializer 'spree.register.adjustable_adjusters' do |app|
       end
 
+      initializer 'spree.register.metafields' do |app|
+        app.config.spree.metafields = MetafieldsEnvironment.new
+        app.config.spree.metafields.types = []
+        app.config.spree.metafields.enabled_resources = []
+      end
+
       # We need to define promotions rules here so extensions and existing apps
       # can add their custom classes on their initializer files
       initializer 'spree.promo.environment' do |app|
@@ -260,7 +266,7 @@ module Spree
           Spree::Policy
         ]
 
-        Rails.application.config.spree.metafield_types = [
+        Rails.application.config.spree.metafields.types = [
           Spree::Metafields::ShortText,
           Spree::Metafields::LongText,
           Spree::Metafields::RichText,
@@ -269,7 +275,7 @@ module Spree
           Spree::Metafields::Json
         ]
 
-        Rails.application.config.spree.metafield_enabled_resources = [
+        Rails.application.config.spree.metafields.enabled_resources = [
           Spree::Address,
           Spree::Asset,
           Spree::CreditCard,

data/lib/spree/core/partials.rb

@@ -0,0 +1,42 @@
+# Ability to define partial injection points for Admin and Storefront
+module Spree
+  module Core
+    class Partials
+      def initialize(config, environment)
+        @config = config
+        @environment = environment
+        define_dynamic_methods
+      end
+
+      attr_reader :config, :environment
+
+      def partial_members
+        environment.members.select { |member| member.to_s.end_with?('_partials') }
+      end
+
+      def keys
+        partial_members.map { |member| member.to_s.sub(/_partials$/, '') }
+      end
+
+      private
+
+      def define_dynamic_methods
+        # Get all members that end with _partials from the Environment
+        partial_members.each do |member|
+          # Strip the _partials suffix for the method name
+          method_name = member.to_s.sub(/_partials$/, '')
+
+          # Define getter method on singleton class
+          singleton_class.define_method(method_name) do
+            config.send(member)
+          end
+
+          # Define setter method on singleton class
+          singleton_class.define_method("#{method_name}=") do |value|
+            config.send("#{member}=", value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/token_generator.rb

@@ -2,6 +2,7 @@ module Spree
   module Core
     module TokenGenerator
       def generate_token(model_class = Spree::Order)
+        Spree::Deprecation.warn('generate_token is deprecated and will be removed in Spree 6.0. Please use Rails secure token generator: https://api.rubyonrails.org/classes/ActiveRecord/SecureToken/ClassMethods.html')
         loop do
           token = "#{random_token}#{unique_ending}"
           break token unless model_class.exists?(token: token)

data/lib/spree/core/version.rb

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

data/lib/spree/core.rb

@@ -168,6 +168,196 @@ module Spree
     yield(Spree::Dependencies)
   end
 
+  # Environment accessors for easier configuration access
+  # Instead of Rails.application.config.spree.payment_methods
+  # you can use Spree.payment_methods
+
+  def self.calculators
+    Rails.application.config.spree.calculators
+  end
+
+  def self.calculators=(value)
+    Rails.application.config.spree.calculators = value
+  end
+
+  def self.validators
+    Rails.application.config.spree.validators
+  end
+
+  def self.validators=(value)
+    Rails.application.config.spree.validators = value
+  end
+
+  def self.payment_methods
+    Rails.application.config.spree.payment_methods
+  end
+
+  def self.payment_methods=(value)
+    Rails.application.config.spree.payment_methods = value
+  end
+
+  def self.adjusters
+    Rails.application.config.spree.adjusters
+  end
+
+  def self.adjusters=(value)
+    Rails.application.config.spree.adjusters = value
+  end
+
+  def self.stock_splitters
+    Rails.application.config.spree.stock_splitters
+  end
+
+  def self.stock_splitters=(value)
+    Rails.application.config.spree.stock_splitters = value
+  end
+
+  def self.promotions
+    Rails.application.config.spree.promotions
+  end
+
+  def self.promotions=(value)
+    Rails.application.config.spree.promotions = value
+  end
+
+  def self.line_item_comparison_hooks
+    Rails.application.config.spree.line_item_comparison_hooks
+  end
+
+  def self.line_item_comparison_hooks=(value)
+    Rails.application.config.spree.line_item_comparison_hooks = value
+  end
+
+  def self.data_feed_types
+    Rails.application.config.spree.data_feed_types
+  end
+
+  def self.data_feed_types=(value)
+    Rails.application.config.spree.data_feed_types = value
+  end
+
+  def self.export_types
+    Rails.application.config.spree.export_types
+  end
+
+  def self.export_types=(value)
+    Rails.application.config.spree.export_types = value
+  end
+
+  def self.import_types
+    Rails.application.config.spree.import_types
+  end
+
+  def self.import_types=(value)
+    Rails.application.config.spree.import_types = value
+  end
+
+  def self.taxon_rules
+    Rails.application.config.spree.taxon_rules
+  end
+
+  def self.taxon_rules=(value)
+    Rails.application.config.spree.taxon_rules = value
+  end
+
+  def self.reports
+    Rails.application.config.spree.reports
+  end
+
+  def self.reports=(value)
+    Rails.application.config.spree.reports = value
+  end
+
+  def self.translatable_resources
+    Rails.application.config.spree.translatable_resources
+  end
+
+  def self.translatable_resources=(value)
+    Rails.application.config.spree.translatable_resources = value
+  end
+
+  def self.metafields
+    Rails.application.config.spree.metafields
+  end
+
+  def self.integrations
+    Rails.application.config.spree.integrations
+  end
+
+  def self.integrations=(value)
+    Rails.application.config.spree.integrations = value
+  end
+
+  # Page Builder configuration accessor
+  def self.page_builder
+    @page_builder ||= PageBuilderConfig.new
+  end
+
+  class PageBuilderConfig
+    def themes
+      Rails.application.config.spree.themes
+    end
+
+    def themes=(value)
+      Rails.application.config.spree.themes = value
+    end
+
+    def theme_layout_sections
+      Rails.application.config.spree.theme_layout_sections
+    end
+
+    def theme_layout_sections=(value)
+      Rails.application.config.spree.theme_layout_sections = value
+    end
+
+    def pages
+      Rails.application.config.spree.pages
+    end
+
+    def pages=(value)
+      Rails.application.config.spree.pages = value
+    end
+
+    def page_sections
+      Rails.application.config.spree.page_sections
+    end
+
+    def page_sections=(value)
+      Rails.application.config.spree.page_sections = value
+    end
+
+    def page_blocks
+      Rails.application.config.spree.page_blocks
+    end
+
+    def page_blocks=(value)
+      Rails.application.config.spree.page_blocks = value
+    end
+  end
+
+  def self.analytics
+    @analytics ||= AnalyticsConfig.new
+  end
+
+  # Group analytics configuration options together, but still make it backwards compatible.
+  class AnalyticsConfig
+    def events
+      Rails.application.config.spree.analytics_events
+    end
+
+    def events=(value)
+      Rails.application.config.spree.analytics_events = value
+    end
+
+    def handlers
+      Rails.application.config.spree.analytics_event_handlers
+    end
+
+    def handlers=(value)
+      Rails.application.config.spree.analytics_event_handlers = value
+    end
+  end
+
   module Core
     autoload :ProductFilters, 'spree/core/product_filters'
     autoload :TokenGenerator, 'spree/core/token_generator'
@@ -192,6 +382,7 @@ require 'spree/service_module'
 require 'spree/database_type_utilities'
 require 'spree/analytics'
 
+require 'spree/core/partials'
 require 'spree/core/importer'
 require 'spree/core/query_filters'
 require 'spree/core/controller_helpers/auth'

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

@@ -73,7 +73,7 @@ FactoryBot.define do
 
         after(:create) do |order, evaluator|
           order.refresh_shipment_rates(evaluator.shipping_method_filter)
-          order.update_column(:completed_at, Time.current)
+          order.update_column(:completed_at, order.completed_at || Time.current)
         end
 
         factory :completed_order_with_pending_payment do
@@ -110,13 +110,16 @@ FactoryBot.define do
           end
 
           factory :shipped_order do
+            shipment_state { 'shipped' }
+
             after(:create) do |order|
               order.shipments.each do |shipment|
                 shipment.inventory_units.update_all state: 'shipped'
-                shipment.update_column('state', 'shipped')
+                shipment.update_columns(
+                  state: 'shipped',
+                  tracking: '1234567890'
+                )
               end
-              order.update_column('shipment_state', 'shipped')
-              order.reload
             end
           end
         end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.2.0.rc3
+  version: 5.2.0
 platform: ruby
 authors:
 - Sean Schofield
 - Spark Solutions Sp. z o.o.
 - Vendo Connect Inc.
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -1478,6 +1477,10 @@ files:
 - lib/generators/spree/dummy_model/templates/model.rb.tt
 - lib/generators/spree/install/install_generator.rb
 - lib/generators/spree/install/templates/config/initializers/spree.rb
+- lib/generators/spree/model/model_generator.rb
+- lib/generators/spree/model/templates/model.rb.tt
+- lib/generators/spree/model_decorator/model_decorator_generator.rb
+- lib/generators/spree/model_decorator/templates/model_decorator.rb.tt
 - lib/mobility/plugins/store_based_fallbacks.rb
 - lib/normalize_string.rb
 - lib/spree/analytics.rb
@@ -1500,6 +1503,7 @@ files:
 - lib/spree/core/importer/order.rb
 - lib/spree/core/importer/product.rb
 - lib/spree/core/number_generator.rb
+- lib/spree/core/partials.rb
 - lib/spree/core/preferences/configuration.rb
 - lib/spree/core/preferences/preferable.rb
 - lib/spree/core/preferences/preferable_class_methods.rb
@@ -1656,10 +1660,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.2.0.rc3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.2.0
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.2.0.rc3
-post_install_message:
+  source_code_uri: https://github.com/spree/spree/tree/v5.2.0
 rdoc_options: []
 require_paths:
 - lib
@@ -1674,8 +1677,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: The bare bones necessary for Spree
 test_files: []