spree_core 5.1.7 → 5.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3e90428ce89c62f05918a8c7d2645e3ed5a0c8f6e2bf5d504449c02d061d2e0
-  data.tar.gz: a35d5f33881801b2378568cd6b74ece89ea605be53eb55a0c2dbcf1e4858cdd6
+  metadata.gz: faafdd12eff02906a36f5bb9fd89cf7a18b406299b6a2a8590296617ec91d793
+  data.tar.gz: b5c27ee712ea65fa8f4ab6d64b465c740b01338269753a880dc3fb04090470a1
 SHA512:
-  metadata.gz: 58de2ea5287871bd79d851c088e26db20f8446702dd29f01ec9f26c2814fdfa511910df3fbeaeb1a48d70c715545602fade93a454b0247bc6891516b52436dbc
-  data.tar.gz: 5e990e7726d44c047abb3d3ee65eb221953ace057e0465b69fb619cb1b78c19d5c151bd3af20e3ea5e1452bc61acbe5a7194dafbadf5f7befa0899d374bb8c4c
+  metadata.gz: '0951f885c20e251d7ec9238d6ab8f3ab32a73d0bafa9ac7978a1afeaacd34f0dfb9cbc94e99a0d96a73e7effa80077a0d5bed960536aee70c802a8abe6ec69ff'
+  data.tar.gz: f1afa96f4c463494168c1a6831effb3ea81c95a42ff72691ab8b1b351ad037da784cd2343c1002af72c574939b4cd2eff772837f888b3b67dd1a14c3b3151e68

data/app/helpers/spree/currency_helper.rb

@@ -1,18 +1,23 @@
 module Spree
   module CurrencyHelper
+    # Returns the list of all currencies as options for a select field.
+    # By default the value is the default currency of the default store.
+    # @param selected_value [String] the selected value
+    # @return [String] the options for a select field
     def currency_options(selected_value = nil)
       selected_value ||= Spree::Store.default.default_currency
       currencies = ::Money::Currency.table.map do |_code, details|
-        iso = details[:iso_code]
-        [iso, "#{details[:name]} (#{iso})"]
+        currency_presentation(details[:iso_code])
       end
-      options_from_collection_for_select(currencies, :first, :last, selected_value)
+      options_from_collection_for_select(currencies, :last, :first, selected_value)
     end
 
+    # Returns the list of supported currencies for the current store as options for a select field.
+    # @return [String] the options for a select field
     def supported_currency_options
       return if current_store.nil?
 
-      current_store.supported_currencies_list.map(&:iso_code).map { |currency| currency_presentation(currency) }
+      @supported_currency_options ||= current_store.supported_currencies_list.map(&:iso_code).map { |currency| currency_presentation(currency) }
     end
 
     def should_render_currency_dropdown?
@@ -21,22 +26,32 @@ module Spree
       current_store.supported_currencies_list.size > 1
     end
 
+    # Returns the currency symbol for the given currency.
+    # @param currency [String] the currency ISO code
+    # @return [String] the currency symbol
     def currency_symbol(currency)
       ::Money::Currency.find(currency).symbol
     end
 
+    # @param currency [String] the currency ISO code
+    # @return [Array] the currency presentation and ISO code
     def currency_presentation(currency)
-      label = [currency_symbol(currency), currency].compact.join(' ')
+      currency_money = currency_money(currency)
+      label = "#{currency_money.name} (#{currency_money.iso_code})"
 
       [label, currency]
     end
 
+    # Returns the list of supported currencies for the current store.
+    # @return [Array<Money::Currency>] the list of supported currencies
     def preferred_currencies
+      Spree::Deprecation.warn('preferred_currencies is deprecated and will be removed in Spree 6.0. Use current_store.supported_currencies_list instead.')
       @preferred_currencies ||= current_store.supported_currencies_list
     end
 
     def preferred_currencies_select_options
-      preferred_currencies.map { |currency| ["#{currency.name} - #{currency.iso_code}", currency] }
+      Spree::Deprecation.warn('preferred_currencies_select_options is deprecated and will be removed in Spree 6.0. Use supported_currency_options instead.')
+      preferred_currencies.map { |currency| currency_presentation(currency) }
     end
 
     def currency_money(currency = current_currency)

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

@@ -61,7 +61,7 @@ module Spree
           name_conditions << multi_search_condition(self, :last_name, full_name.last)
         end
 
-        where(email: sanitized_query).or(where(name_conditions.reduce(:or)))
+        where(arel_table[:email].lower.eq(query.downcase)).or(where(name_conditions.reduce(:or)))
       end
 
       self.whitelisted_ransackable_associations = %w[bill_address ship_address addresses tags spree_roles]
@@ -131,7 +131,11 @@ module Spree
     # Returns true if the user can be deleted
     # @return [Boolean]
     def can_be_deleted?
-      orders.complete.none?
+      if role_users.where(resource: Spree::Store.current).exists?
+        Spree::Store.current.users.where.not(id: id).exists?
+      else
+        orders.complete.none?
+      end
     end
 
     private

data/app/models/spree/address.rb

@@ -177,7 +177,9 @@ module Spree
     end
 
     def require_phone?
-      Spree::Config[:address_requires_phone]
+      # We want to collect phone number for quick checkout but not to validate it
+      # as it's not available before payment by browser.
+      !quick_checkout && Spree::Config[:address_requires_phone]
     end
 
     def require_zipcode?

data/app/models/spree/calculator.rb

@@ -2,7 +2,7 @@ module Spree
   class Calculator < Spree.base_class
     acts_as_paranoid
 
-    belongs_to :calculable, polymorphic: true, optional: true, inverse_of: :calculator
+    belongs_to :calculable, polymorphic: true, optional: true, inverse_of: :calculator, touch: true
 
     # This method calls a compute_<computable> method. must be overridden in concrete calculator.
     #

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

@@ -72,6 +72,10 @@ module Spree
       true
     end
 
+    def confirmation_required?
+      true
+    end
+
     def payment_profiles_supported?
       true
     end

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

@@ -8,6 +8,10 @@ module Spree
       Spree::PaymentSource
     end
 
+    def confirmation_required?
+      true
+    end
+
     def payment_profiles_supported?
       true
     end

data/app/models/spree/gift_card.rb

@@ -14,11 +14,13 @@ module Spree
 
       event :redeem do
         transition active: :redeemed
+        transition partially_redeemed: :redeemed
       end
       after_transition to: :redeemed, do: :after_redeem
 
       event :partial_redeem do
         transition active: :partially_redeemed
+        transition partially_redeemed: :partially_redeemed
       end
     end
 

data/app/models/spree/line_item.rb

@@ -68,7 +68,7 @@ module Spree
       if variant
         update_price if price.nil?
         self.cost_price = variant.cost_price if cost_price.nil?
-        self.currency = variant.currency if currency.nil?
+        self.currency = order.currency if currency.nil?
       end
     end
 

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

@@ -20,7 +20,7 @@ module Spree
         #   :allow_checkout_on_gateway_error is set to false
         #
         def process_payments!
-          process_payments_with(:process!)
+          with_lock { process_payments_with(:process!) }
         end
 
         def authorize_payments!

data/app/models/spree/order.rb

@@ -228,7 +228,7 @@ module Spree
         conditions << multi_search_condition(Spree::Address, :lastname, full_name.last)
       end
 
-      left_joins(:bill_address).where(email: sanitized_query).or(where(conditions.reduce(:or)))
+      left_joins(:bill_address).where(arel_table[:email].lower.eq(query.downcase)).or(where(conditions.reduce(:or)))
     end
 
     # Use this method in other gems that wish to register their own custom logic
@@ -268,16 +268,14 @@ module Spree
     end
 
     def order_refunded?
-      (payment_state == 'void' && refunds.sum(:amount).positive?) || refunds.sum(:amount) == total
+      (payment_state.in?(%w[void failed]) && refunds.sum(:amount).positive?) ||
+        refunds.sum(:amount) == total_minus_store_credits - additional_tax_total.abs
     end
 
     def partially_refunded?
-      return false if refunds.empty?
+      return false if refunds.empty? || payment_state.in?(%w[void failed])
 
-      # we must deduct not returned amount, otherwise it can look like order has not been fully refunded
-      amount_not_refunded = additional_tax_total.abs + total_applied_store_credit
-
-      refunds.sum(:amount) < total - amount_not_refunded
+      refunds.sum(:amount) < total_minus_store_credits - additional_tax_total.abs
     end
 
     # Indicates whether or not the user is allowed to proceed to checkout.
@@ -301,7 +299,7 @@ module Spree
     # If true, causes the confirmation step to happen during the checkout process
     def confirmation_required?
       Spree::Config[:always_include_confirm_step] ||
-        payments.valid.map(&:payment_method).compact.any?(&:payment_profiles_supported?) ||
+        payments.valid.map(&:payment_method).compact.any?(&:confirmation_required?) ||
         # Little hacky fix for #4117
         # If this wasn't here, order would transition to address state on confirm failure
         # because there would be no valid payments any more.

data/app/models/spree/pages/post_list.rb

@@ -15,7 +15,7 @@ module Spree
 
       def default_sections
         [
-          Spree::PageSections::PageTitle.new,
+          Spree::PageSections::PageTitle.new(preferred_title: DISPLAY_NAME),
           Spree::PageSections::PostGrid.new
         ]
       end

data/app/models/spree/pages/search_results.rb

@@ -30,7 +30,7 @@ module Spree
 
       def default_sections
         [
-          Spree::PageSections::PageTitle.new,
+          Spree::PageSections::PageTitle.new(preferred_title: 'Search Results'),
           Spree::PageSections::ProductGrid.new
         ]
       end

data/app/models/spree/pages/shop_all.rb

@@ -23,7 +23,7 @@ module Spree
 
       def default_sections
         [
-          Spree::PageSections::PageTitle.new,
+          Spree::PageSections::PageTitle.new(preferred_title: Spree.t(:shop_all)),
           Spree::PageSections::ProductGrid.new
         ]
       end

data/app/models/spree/payment_method.rb

@@ -62,6 +62,10 @@ module Spree
       unscoped { find(*args) }
     end
 
+    def confirmation_required?
+      false
+    end
+
     def payment_profiles_supported?
       false
     end

data/app/services/spree/addresses/update.rb

@@ -12,12 +12,19 @@ module Spree
         default_shipping = opts.fetch(:default_shipping, false)
         address_changes_except = opts.fetch(:address_changes_except, [])
         create_new_address_on_update = opts.fetch(:create_new_address_on_update, false)
+        Spree::Deprecation.warn('Spree::Addresses::Update create_new_address_on_update parameter is deprecated and will be removed in Spree 6.') if create_new_address_on_update
 
         prepare_address_params!(address, address_params)
         address.assign_attributes(address_params)
 
-        address_changed = address.changes.except(*address_changes_except).any?
+        address_changes = address.changes.except(*address_changes_except)
 
+        # Ignore changes that are only different in case as encrypted fields are processed by rails as downcased
+        address_changes.reject! do |attr, (old_val, new_val)|
+          old_val.to_s.casecmp?(new_val.to_s)
+        end
+
+        address_changed = address_changes.any?
         if !address_changed && defaults_changed?(address, default_billing, default_shipping)
           assign_to_user_as_default(
             user: address.user,

data/app/services/spree/orders/create_user_account.rb

@@ -7,7 +7,11 @@ module Spree
 
       def call(order:, accepts_email_marketing: false)
         existing_user = Spree.user_class.find_by(email: order.email)
-        return existing_user if existing_user.present?
+        if existing_user.present?
+          order.update_columns(user_id: existing_user.id, updated_at: Time.current)
+          order.user = existing_user
+          return success(existing_user)
+        end
 
         user = create_new_user(order, accepts_email_marketing)
         return failure(:user_creation_failed) unless user.persisted?

data/app/services/spree/products/prepare_nested_attributes.rb

@@ -1,5 +1,21 @@
 module Spree
   module Products
+    # Prepares nested attributes for product updates, handling multi-store scenarios
+    # and permissions.
+    #
+    # This service ensures that when editing a product in one store, taxon associations
+    # from other stores are preserved. This prevents accidental data loss when a store
+    # admin updates product categories in their store without affecting other stores.
+    #
+    # @example
+    #   service = Spree::Products::PrepareNestedAttributes.new(
+    #     product,
+    #     current_store,
+    #     params,
+    #     current_ability
+    #   )
+    #   prepared_params = service.call
+    #
     class PrepareNestedAttributes
       def initialize(product, store, params, ability)
         @product = product
@@ -60,6 +76,12 @@ module Spree
         # ensure there is at least one store
         params[:store_ids] = [store.id] if params[:store_ids].blank?
 
+        # Preserve taxon associations from other stores
+        # Only merge taxon_ids from other stores if taxon_ids are being updated
+        if params.key?(:taxon_ids)
+          params[:taxon_ids] = merge_taxons_from_other_stores(params[:taxon_ids])
+        end
+
         # Add empty list for option_type_ids and mark variants as removed if there are no variants and options
         if params[:variants_attributes].blank? && variants_to_remove.any? && !params.key?(:option_type_ids)
           params[:option_type_ids] = []
@@ -133,6 +155,28 @@ module Spree
         attributes
       end
 
+      # Merges taxon IDs from other stores with submitted taxon IDs from current store.
+      #
+      # This prevents the loss of taxon associations from other stores when a product
+      # is edited in one store. Each store's taxonomy is independent, so editing
+      # categories in Store A should not affect categories in Store B.
+      #
+      # @param submitted_taxon_ids [Array<String>] Taxon IDs from the current store
+      # @return [Array<String>] Combined unique taxon IDs
+      def merge_taxons_from_other_stores(submitted_taxon_ids)
+        return submitted_taxon_ids if product.new_record?
+
+        # Get taxon IDs from other stores that should be preserved
+        other_stores_taxon_ids = product.taxons
+                                        .joins(:taxonomy)
+                                        .where.not(spree_taxonomies: { store_id: store.id })
+                                        .pluck(:id)
+                                        .map(&:to_s)
+
+        # Merge with submitted taxon IDs from current store and remove duplicates
+        (submitted_taxon_ids + other_stores_taxon_ids).uniq
+      end
+
       def update_option_value_variants(option_value_params, existing_variant)
         return {} unless option_value_params.present?
         return {} unless can_manage_option_types?

data/app/{services → validators}/spree/addresses/phone_validator.rb

@@ -8,7 +8,7 @@ module Spree
   module Addresses
     class PhoneValidator < ActiveModel::Validator
       def validate(address)
-        return if !Spree::Config[:address_requires_phone] || address.phone.blank? || address.country.blank? || address.country_iso.blank?
+        return if !address.require_phone? || address.phone.blank? || address.country.blank? || address.country_iso.blank?
 
         phone = Phonelib.parse(address.phone)
         unless phone.valid_for_country?(address.country_iso)

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

@@ -13,12 +13,14 @@
     </div>
   <% elsif source.is_a?(Spree::StoreCredit) %>
     <% if source.originator_type == 'Spree::GiftCard' %>
-      <div class="d-flex align-items-center">
-        <%= icon('gift', height: 30, class: 'mr-3 text-muted opacity-50') %>
-        <div>
-          <p class="mb-1"><%= Spree.t(:gift_card) %>: <strong><%= source.originator.code.upcase %></strong></p>
-          <%= @order.display_gift_card_total %>
-        </div>
+      <% if respond_to?(:heroicon) %>
+        <%= heroicon('gift', options: { style: 'margin-right: 0 !important;' }) %>
+      <% else %>
+        <%= icon('gift', height: 30) %>
+      <% end %>
+      <div>
+        <p class="mb-1"><%= Spree.t(:gift_card) %>: <strong><%= source.originator.code.upcase %></strong></p>
+        <%= @order.display_gift_card_total %>
       </div>
     <% elsif payment_method_icon_tag(payment.payment_method.payment_icon_name).present? %>
       <div class="d-flex flex align-items-center items-center">

data/lib/spree/core/version.rb

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

data/lib/spree/testing_support/common_rake.rb

@@ -30,13 +30,13 @@ namespace :common do
     Spree::DummyGenerator.start dummy_app_args
 
     unless skip_javascript
-      system('bin/rails importmap:install turbo:install stimulus:install')
+      system('bundle exec rails importmap:install turbo:install stimulus:install')
     end
 
     # install devise if it's not the legacy user, useful for testing storefront
     if args[:authentication] == 'devise' && args[:user_class] != 'Spree::LegacyUser'
-      system('bin/rails g devise:install --force --auto-accept')
-      system("bin/rails g devise #{args[:user_class]} --force --auto-accept")
+      system('bundle exec rails g devise:install --force --auto-accept')
+      system("bundle exec rails g devise #{args[:user_class]} --force --auto-accept")
       system('rm -rf spec') # we need to cleanup factories created by devise to avoid naming conflict
     end
 
@@ -59,7 +59,7 @@ namespace :common do
 
     unless ENV['NO_MIGRATE']
       puts 'Setting up dummy database...'
-      system('bin/rails db:environment:set RAILS_ENV=test > /dev/null 2>&1')
+      system('bundle exec rails db:environment:set RAILS_ENV=test > /dev/null 2>&1')
       system('bundle exec rake db:drop db:create > /dev/null 2>&1')
       Spree::DummyModelGenerator.start
       system('bundle exec rake db:migrate > /dev/null 2>&1')
@@ -81,7 +81,7 @@ namespace :common do
 
   task :db_setup do |_t|
     puts 'Setting up dummy database...'
-    system('bin/rails db:environment:set RAILS_ENV=test > /dev/null 2>&1')
+    system('bundle exec rails db:environment:set RAILS_ENV=test > /dev/null 2>&1')
     system('bundle exec rake db:drop db:create > /dev/null 2>&1')
     Spree::DummyModelGenerator.start
     system('bundle exec rake db:migrate > /dev/null 2>&1')

data/lib/tasks/core.rake

@@ -186,10 +186,9 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
   end
 
   task migrate_admin_users_to_role_users: :environment do |_t, _args|
-    Spree.admin_user_class.all.each do |admin_user|
-      Spree::Store.all.each do |store|
-        store.add_user(admin_user)
-      end
+    default_store = Spree::Store.default
+    Spree::RoleUser.where(resource: nil).each do |role_user|
+      role_user.update_columns(resource_type: default_store.class.name, resource_id: default_store.id)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.1.7
+  version: 5.1.8
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-29 00:00:00.000000000 Z
+date: 2025-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -968,7 +968,6 @@ files:
 - app/services/spree/account/update.rb
 - app/services/spree/addresses/create.rb
 - app/services/spree/addresses/helper.rb
-- app/services/spree/addresses/phone_validator.rb
 - app/services/spree/addresses/update.rb
 - app/services/spree/cart/add_item.rb
 - app/services/spree/cart/associate.rb
@@ -1057,6 +1056,7 @@ files:
 - app/sorters/spree/orders/sort.rb
 - app/sorters/spree/products/sort.rb
 - app/validators/email_validator.rb
+- app/validators/spree/addresses/phone_validator.rb
 - app/validators/spree/url_validator.rb
 - app/views/action_text/video_embeds/_thumbnail.html.erb
 - app/views/action_text/video_embeds/_video_embed.html.erb
@@ -1383,9 +1383,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.1.7
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.8
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.1.7
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.8
 post_install_message:
 rdoc_options: []
 require_paths: