solidus_core 4.7.1 → 4.8.0

data/lib/spree/app_configuration.rb

@@ -70,11 +70,25 @@ module Spree
 
     # @!attribute [rw] allow_return_item_amount_editing
     #   @return [Boolean] Determines whether an admin is allowed to change a return item's pre-calculated amount (default: +false+)
+    #   @deprecated Unused since a6755a7f0f; remove it from your initializer.
     preference :allow_return_item_amount_editing, :boolean, default: false
+    msg = "`Spree::Config.allow_return_item_amount_editing` has had no effect since commit a6755a7f0f; remove it from your initializer."
+    deprecate(
+      allow_return_item_amount_editing: msg,
+      "allow_return_item_amount_editing=": msg,
+      deprecator: Spree.deprecator
+    )
 
     # @!attribute [rw] alternative_billing_phone
     #   @return [Boolean] Request an extra phone number for bill address (default: +false+)
+    #   @deprecated Unused since c40d4cbeef; remove it from your initializer.
     preference :alternative_billing_phone, :boolean, default: false
+    msg = "`Spree::Config.alternative_billing_phone` has had no effect since commit c40d4cbeef; remove it from your initializer."
+    deprecate(
+      alternative_billing_phone: msg,
+      "alternative_billing_phone=": msg,
+      deprecator: Spree.deprecator
+    )
 
     # @!attribute [rw] alternative_shipping_phone
     #   @return [Boolean] Request an extra phone number for shipping address (default: +false+)
@@ -94,7 +108,14 @@ module Spree
 
     # @!attribute [rw] auto_capture_exchanges
     #   @return [Boolean] Automatically capture the credit card (as opposed to just authorize and capture later) (default: +false+)
+    #   @deprecated Unused since ca63667027; remove it from your initializer.
     preference :auto_capture_exchanges, :boolean, default: false
+    msg = "`Spree::Config.auto_capture_exchanges` has had no effect since commit ca63667027; remove it from your initializer."
+    deprecate(
+      auto_capture_exchanges: msg,
+      "auto_capture_exchanges=": msg,
+      deprecator: Spree.deprecator
+    )
 
     # @!attribute [rw] automatic_default_address
     #   The default value of true preserves existing backwards compatible feature of
@@ -142,7 +163,14 @@ module Spree
 
     # @!attribute [rw] customer_returns_per_page
     #   @return [Integer] Customer returns to show per-page in the admin (default: +15+)
+    #   @deprecated Unused since 834a24a695; remove it from your initializer.
     preference :customer_returns_per_page, :integer, default: 15
+    msg = "`Spree::Config.customer_returns_per_page` has had no effect since commit 834a24a695; remove it from your initializer."
+    deprecate(
+      customer_returns_per_page: msg,
+      "customer_returns_per_page=": msg,
+      deprecator: Spree.deprecator
+    )
 
     # @!attribute [rw] default_country_iso
     #   Default customer country ISO code
@@ -207,7 +235,14 @@ module Spree
 
     # @!attribute [rw] order_capturing_time_window
     #   @return [Integer] the number of days to look back for fully-shipped/cancelled orders in order to charge for them
+    #   @deprecated Unused since 9c5107fcae; remove it from your initializer.
     preference :order_capturing_time_window, :integer, default: 14
+    msg = "`Spree::Config.order_capturing_time_window` has had no effect since commit 9c5107fcae; remove it from your initializer."
+    deprecate(
+      order_capturing_time_window: msg,
+      "order_capturing_time_window=": msg,
+      deprecator: Spree.deprecator
+    )
 
     # @!attribute [rw] order_mutex_max_age
     #   @return [Integer] Max age of {Spree::OrderMutex} in seconds (default: 2 minutes)
@@ -250,10 +285,18 @@ module Spree
     #   @return [Boolean] Whether to recalculate cart prices when recalculating (default: +false+)
     versioned_preference :recalculate_cart_prices, :boolean, initial_value: false, boundaries: {"5.0.0.alpha" => true}
 
+    # @!attribute [rw] refundable_payment_states
+    #   @return [Array<String>] Payment states in which refunds may be created (default: +["completed", "pending"]+)
+    preference :refundable_payment_states, :array, default: %w[completed pending]
+
     # @!attribute [rw] require_master_price
     #   @return [Boolean] Require a price on the master variant of a product (default: +true+)
     preference :require_master_price, :boolean, default: true
 
+    # @!attribute [rw] require_refundable_payment_state
+    #   @return [Boolean] Whether creating a refund for a payment outside Spree::Config.refundable_payment_states is a validation error rather than a deprecation warning (default: +false+)
+    versioned_preference :require_refundable_payment_state, :boolean, initial_value: false, boundaries: {"5.0.0.alpha" => true}
+
     # @!attribute [rw] require_payment_to_ship
     #   @return [Boolean] Allows shipments to be ready to ship regardless of the order being paid if false (default: +true+)
     preference :require_payment_to_ship, :boolean, default: true # Allows shipments to be ready to ship regardless of the order being paid if false
@@ -354,7 +397,15 @@ module Spree
     #   Spree::Variant::VatPriceGenerator.
     class_name_attribute :variant_vat_prices_generator_class, default: "Spree::Variant::VatPriceGenerator"
 
+    # @!attribute [rw] allocator_class
+    #   @deprecated Never read; use Spree::Config.stock.allocator_class instead.
     class_name_attribute :allocator_class, default: "Spree::Stock::Allocator::OnHandFirst"
+    msg = "`Spree::Config.allocator_class` has never been read; the stock allocator is configured with `Spree::Config.stock.allocator_class`."
+    deprecate(
+      allocator_class: msg,
+      "allocator_class=": msg,
+      deprecator: Spree.deprecator
+    )
 
     class_name_attribute :shipping_rate_sorter_class, default: "Spree::Stock::ShippingRateSorter"
 

data/lib/spree/core/search/base.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "kaminari/activerecord"
+
 module Spree
   module Core
     module Search
@@ -93,7 +95,7 @@ module Spree
           @properties[:include_images] = params[:include_images]
 
           per_page = params[:per_page].to_i
-          @properties[:per_page] = (per_page > 0) ? per_page : Spree::Config[:products_per_page]
+          @properties[:per_page] = (per_page > 0) ? per_page : Spree::Config.products_per_page
           @properties[:page] = (params[:page].to_i <= 0) ? 1 : params[:page].to_i
         end
       end

data/lib/spree/core/version.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "4.7.1"
+  VERSION = "4.8.0"
 
   def self.solidus_version = VERSION
 
   def self.minimum_required_rails_version = "7.2"
 
-  def self.previous_solidus_minor_version = "4.6"
+  def self.previous_solidus_minor_version = "4.7"
 
   def self.solidus_gem_version = Gem::Version.new(solidus_version)
 end

data/lib/spree/core.rb

@@ -16,7 +16,6 @@ require "acts_as_list"
 require "awesome_nested_set"
 require "cancan"
 require "friendly_id"
-require "kaminari/activerecord"
 require "monetize"
 require "paperclip"
 require "ransack"

data/lib/spree/permitted_attributes.rb

@@ -125,7 +125,8 @@ module Spree
     @@store_attributes = [:name, :url, :seo_title, :meta_keywords,
       :meta_description, :default_currency,
       :mail_from_address, :cart_tax_country_iso,
-      :bcc_email, :reverse_charge_status]
+      :bcc_email, :reverse_charge_status,
+      address_attributes:]
 
     @@taxonomy_attributes = [:name]
 
@@ -138,7 +139,7 @@ module Spree
     # by changing a user with higher priveleges' email to one a lower-priveleged
     # admin owns. Creating a user with an email is handled separate at the
     # controller level.
-    @@user_attributes = [:password, :password_confirmation, customer_metadata: {}]
+    @@user_attributes = [:password, :password_confirmation, :timezone, customer_metadata: {}]
 
     @@variant_attributes = [
       :name, :presentation, :cost_price, :lock_version,

data/lib/spree/preferences/statically_configurable.rb

@@ -22,7 +22,8 @@ module Spree
 
       def preferences
         if respond_to?(:preference_source) && preference_source
-          self.class.preference_sources[preference_source] || {}
+          source = self.class.preference_sources[preference_source]
+          source ? default_preferences.merge(source.to_hash) : {}
         else
           self[:preferences]
         end

data/lib/spree/testing_support/capybara_ext.rb

@@ -118,16 +118,6 @@ module Spree
         # find the original.
         find("label:not(.select2-offscreen)", text: /#{Regexp.escape(text)}/i, match: :one)
       end
-
-      def dialog(parent: "body", **options)
-        within(parent) do
-          find("dialog", visible: :all, **options)
-        end
-      end
-
-      def turbo_frame_modal
-        dialog(parent: find("turbo-frame", visible: :all))
-      end
     end
   end
 end

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

@@ -22,4 +22,10 @@ FactoryBot.define do
   factory :shipping_no_amount_calculator, class: "Spree::Calculator::Shipping::FlatRate" do
     preferred_amount { 0 }
   end
+
+  factory :flexi_rate_calculator, class: "Spree::Calculator::Shipping::FlexiRate" do
+    preferred_first_item { 10.0 }
+    preferred_additional_item { 5.0 }
+    preferred_max_items { 100 }
+  end
 end

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

@@ -2,7 +2,15 @@
 
 FactoryBot.define do
   factory :return_item, class: "Spree::ReturnItem" do
-    association(:inventory_unit, factory: :inventory_unit, state: :shipped)
+    inventory_unit do
+      # When a return authorization is given, the inventory unit must belong
+      # to the same order.
+      if __override_names__.include?(:return_authorization) && return_authorization&.order
+        association(:inventory_unit, state: :shipped, order: return_authorization.order)
+      else
+        association(:inventory_unit, state: :shipped)
+      end
+    end
     association(:return_reason, factory: :return_reason)
     return_authorization do |_return_item|
       build(:return_authorization, order: inventory_unit.order)

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

@@ -21,7 +21,7 @@ FactoryBot.define do
 
     transient do
       cost { 10.0 }
-      currency { Spree::Config[:currency] }
+      currency { Spree::Config.currency }
     end
 
     before(:create) do |shipping_method, _evaluator|

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

@@ -6,5 +6,9 @@ FactoryBot.define do
     sequence(:name) { |i| "Spree Test Store #{i}" }
     sequence(:url) { |i| "www.example#{i}.com" }
     mail_from_address { "solidus@example.org" }
+
+    trait :with_address do
+      address
+    end
   end
 end

data/lib/spree/testing_support/order_walkthrough.rb

@@ -18,7 +18,7 @@ module Spree
         # A shipping method must exist for rates to be displayed on checkout page
         ::FactoryBot.create(:shipping_method, zones: [@zone]).tap do |sm|
           sm.calculator.preferred_amount = 10
-          sm.calculator.preferred_currency = Spree::Config[:currency]
+          sm.calculator.preferred_currency = Spree::Config.currency
           sm.calculator.save
         end
 

data/solidus_core.gemspec

@@ -39,13 +39,13 @@ Gem::Specification.new do |s|
   s.add_dependency "cancancan", [">= 2.2", "< 4.0"]
   s.add_dependency "carmen", "~> 1.1.0"
   s.add_dependency "db-query-matchers", "~> 0.14"
-  s.add_dependency "discard", "~> 1.0"
+  s.add_dependency "discard", "~> 2.0"
   s.add_dependency "friendly_id", "~> 5.0"
   s.add_dependency "image_processing", "~> 1.10"
-  s.add_dependency "kaminari-activerecord", "~> 1.1"
+  s.add_dependency "json", "< 3"
   s.add_dependency "mini_magick", "~> 4.10"
   s.add_dependency "monetize", "~> 1.8"
-  s.add_dependency "kt-paperclip", [">= 6.3", "< 8"]
+  s.add_dependency "kt-paperclip", [">= 6.3", "< 8.1"]
   s.add_dependency "psych", [">= 4.0.1", "< 6.0"]
   s.add_dependency "ransack", ["~> 4.0", "< 5"]
   s.add_dependency "state_machines", ["~> 0.6", "< 0.10.0"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 4.7.1
+  version: 4.8.0
 platform: ruby
 authors:
 - Solidus Team
@@ -291,14 +291,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -328,19 +328,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: kaminari-activerecord
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -378,7 +378,7 @@ dependencies:
         version: '6.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -388,7 +388,7 @@ dependencies:
         version: '6.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
@@ -511,6 +511,7 @@ files:
 - app/helpers/spree/core/controller_helpers/search.rb
 - app/helpers/spree/core/controller_helpers/store.rb
 - app/helpers/spree/core/controller_helpers/strong_parameters.rb
+- app/helpers/spree/core/controller_helpers/timezone.rb
 - app/helpers/spree/products_helper.rb
 - app/helpers/spree/store_helper.rb
 - app/helpers/spree/taxons_helper.rb
@@ -862,6 +863,7 @@ files:
 - db/migrate/20250709073151_add_country_foreign_keys.rb
 - db/migrate/20250709084513_add_state_foreign_keys.rb
 - db/migrate/20250726220709_add_fk_to_customer_return.rb
+- db/migrate/20260924120000_add_address_to_spree_stores.rb
 - db/seeds.rb
 - lib/generators/solidus/install/app_templates/authentication/custom.rb
 - lib/generators/solidus/install/app_templates/authentication/devise.rb
@@ -1121,7 +1123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.
 test_files: []