spree_core 5.2.0.rc2 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dab40885bc7e0251d44dd6a304b6481ecfd0769bb010ac31d52934545e2c6757
-  data.tar.gz: 4997a5779b19f924e737192f1b0539cc84da5ae357110af959ebf0720cfd079f
+  metadata.gz: ae177c6a311a310cbcb6d6faf5b879afc52177f9f6bf4c7063edb5ece85fc755
+  data.tar.gz: 54794ac79f785c9965c7a1f69fe0c88470fdf751cb789cab9db047b6d9ddbaa4
 SHA512:
-  metadata.gz: c54c706398a2f808628857c04ff03fad05107f9649acd18ff5ec879e273d93575b05e009a2a1915d7109f7d62b38582d6c314d536b4448b942872f092528950f
-  data.tar.gz: 50bdfa531705e422848a0207caf2dc52c36bae0464cc9a867df66b4b8723b869a3eeb33cc610ff875d7b5efecbe3bc2fc33f3978833a585a33ca138be596052d
+  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

@@ -1,10 +1,11 @@
 require 'open-uri'
+require 'openssl'
 
 module Spree
   module Images
     class SaveFromUrlJob < ::Spree::BaseJob
       queue_as Spree.queues.images
-      retry_on ActiveRecord::RecordInvalid, OpenURI::HTTPError, wait: :polynomially_longer, attempts: 2
+      retry_on ActiveRecord::RecordInvalid, OpenURI::HTTPError, wait: :polynomially_longer, attempts: Spree::Config.images_save_from_url_job_attempts.to_i
       discard_on URI::InvalidURIError
 
       def perform(viewable_id, viewable_type, external_url, external_id = nil, position = nil)
@@ -12,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)
@@ -33,7 +34,17 @@ module Spree
           raise URI::InvalidURIError, "Invalid URL scheme: #{uri.scheme}. Only http and https are allowed."
         end
 
-        file = uri.open
+        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)

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/import_row.rb

@@ -76,6 +76,7 @@ module Spree
       self.item = import.row_processor_class.new(self).process!
       complete!
     rescue StandardError => e
+      Rails.error.report(e, handled: true, context: { import_row_id: id }, source: 'spree.core')
       self.validation_errors = e.message
       fail!
     end

data/app/models/spree/import_schemas/products.rb

@@ -26,7 +26,7 @@ module Spree
         { name: 'inventory_count', label: 'Inventory Count' },
         { name: 'inventory_backorderable', label: 'Inventory Backorderable' },
         { name: 'tax_category', label: 'Tax Category' },
-        { name: 'digital', label: 'Digital' },
+        { name: 'shipping_category', label: 'Shipping Category' },
         { name: 'image1_src', label: 'Image 1 URL' },
         { name: 'image2_src', label: 'Image 2 URL' },
         { name: 'image3_src', label: 'Image 3 URL' },

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/post.rb

@@ -39,8 +39,8 @@ module Spree
     # Associations
     #
     belongs_to :author, class_name: Spree.admin_user_class.to_s, optional: true
-    belongs_to :store, class_name: 'Spree::Store'
-    belongs_to :post_category, class_name: 'Spree::PostCategory', optional: true
+    belongs_to :store, class_name: 'Spree::Store', inverse_of: :posts
+    belongs_to :post_category, class_name: 'Spree::PostCategory', optional: true, touch: true, inverse_of: :posts
     alias category post_category
 
     #

data/app/models/spree/post_category.rb

@@ -9,8 +9,8 @@ module Spree
     #
     # Associations
     #
-    belongs_to :store, class_name: 'Spree::Store'
-    has_many :posts, class_name: 'Spree::Post'
+    belongs_to :store, class_name: 'Spree::Store', inverse_of: :post_categories
+    has_many :posts, class_name: 'Spree::Post', dependent: :nullify, inverse_of: :post_category
 
     #
     # Validations
@@ -18,8 +18,16 @@ module Spree
     validates :title, :store, presence: true
     validates :slug, presence: true, uniqueness: { scope: :store_id }
 
+    #
+    # ActionText
+    #
     has_rich_text :description
 
+    #
+    # Ransack
+    #
+    self.whitelisted_ransackable_attributes = %w[title slug]
+
     def should_generate_new_friendly_id?
       slug.blank? || title_changed?
     end

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/shipping_rate.rb

@@ -7,9 +7,9 @@ module Spree
 
     money_methods :base_price, :final_price, :tax_amount
 
-    delegate :order, :currency, :free?, :with_free_shipping_promotion?, to: :shipment
-    delegate :name,             to: :shipping_method
-    delegate :code,             to: :shipping_method, prefix: true
+    delegate :order, :currency, :with_free_shipping_promotion?, to: :shipment
+    delegate :name, to: :shipping_method
+    delegate :code, to: :shipping_method, prefix: true
 
     def display_price
       price = display_base_price.to_s
@@ -27,6 +27,10 @@ module Spree
     alias display_cost display_price
     alias_attribute :base_price, :cost
 
+    def free?
+      final_price.zero?
+    end
+
     def tax_amount
       @tax_amount ||= tax_rate&.calculator&.compute_shipping_rate(self) || BigDecimal(0)
     end

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/store.rb

@@ -106,8 +106,8 @@ module Spree
     has_many :custom_domains, class_name: 'Spree::CustomDomain', dependent: :destroy
     has_one :default_custom_domain, -> { where(default: true) }, class_name: 'Spree::CustomDomain'
 
-    has_many :posts, class_name: 'Spree::Post'
-    has_many :post_categories, class_name: 'Spree::PostCategory'
+    has_many :posts, class_name: 'Spree::Post', dependent: :destroy, inverse_of: :store
+    has_many :post_categories, class_name: 'Spree::PostCategory', dependent: :destroy, inverse_of: :store
 
     has_many :integrations, class_name: 'Spree::Integration'
 

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/presenters/spree/csv/product_variant_presenter.rb

@@ -32,7 +32,7 @@ module Spree
         'inventory_count',
         'inventory_backorderable',
         'tax_category',
-        'digital',
+        'shipping_category',
         'image1_src',
         'image2_src',
         'image3_src',
@@ -66,7 +66,7 @@ module Spree
       # For the primary variant row (when the index is zero), product-level details such as name,
       # slug, status, vendor and brand names, description, meta tags, and tag/label lists are included.
       # In all cases, variant-specific attributes (e.g., id, SKU, pricing, dimensions, weight,
-      # availability dates, inventory count, digital flag, tax category, image URLs via original_url,
+      # availability dates, inventory count, shipping category, tax category, image URLs via original_url,
       # and the first three option types and corresponding option values) are appended.
       # Additionally, when the index is zero, associated taxons and properties are added.
       #
@@ -103,7 +103,7 @@ module Spree
           total_on_hand == BigDecimal::INFINITY ? '∞' : total_on_hand,
           variant.backorderable?,
           variant.tax_category&.name,
-          variant.digital?,
+          product.shipping_category&.name,
           spree_image_url(variant.images[0], image_url_options),
           spree_image_url(variant.images[1], image_url_options),
           spree_image_url(variant.images[2], image_url_options),

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/services/spree/imports/row_processors/product_variant.rb

@@ -33,6 +33,12 @@ module Spree
           variant.depth = attributes['depth'] if attributes['depth'].present?
           variant.track_inventory = attributes['track_inventory'] if attributes['track_inventory'].present?
           variant.option_value_variants = prepare_option_value_variants
+
+          if attributes['tax_category'].present?
+            tax_category = prepare_tax_category
+            variant.tax_category = tax_category if tax_category.present?
+          end
+
           variant.save!
 
           if attributes['price'].present?
@@ -94,10 +100,27 @@ module Spree
           product.status = to_spree_status(attributes['status']) if attributes['status'].present?
           product.tag_list = attributes['tags'] if attributes['tags'].present?
 
-          product.taxons = prepare_taxons if options.empty?
+          if options.empty?
+            if attributes['shipping_category'].present?
+              shipping_category = prepare_shipping_category
+              product.shipping_category = shipping_category if shipping_category.present?
+            end
+            product.taxons = prepare_taxons
+          end
+
           product
         end
 
+        def prepare_shipping_category
+          shipping_category_name = attributes['shipping_category'].strip
+          Spree::ShippingCategory.find_by(name: shipping_category_name)
+        end
+
+        def prepare_tax_category
+          tax_category_name = attributes['tax_category'].strip
+          Spree::TaxCategory.find_by(name: tax_category_name)
+        end
+
         def prepare_taxons
           taxon_pretty_names = [
             attributes['category1'],

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