solidus_core 4.7.2 → 4.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3d8242467851026fff5d6e6c31639174974d747193e9bef00a77acbd7c6e912
-  data.tar.gz: 7336f44aad6dc32d2d477acffe0de1af5acb1df5fa7bd399b3b754e3647269e3
+  metadata.gz: 6016be6a4a01809df118c168c5dd345f73ed968f3ad53262c45594680491d4cb
+  data.tar.gz: 64faf68ec42068af0ca862a72f5253fd1f72c99b12b0616178d10c11879e550a
 SHA512:
-  metadata.gz: e0521407fa49fac2011d849d4fa08f03a165c32751ffdda07656dd985c3aa73a3ea0b90e4d7b6dfc7157a310fc371d3195b9e7e3f1d1b1b517d3c927370d01c8
-  data.tar.gz: 4619fdf8d485b61ba1610d4c579fd83f82e4f0710648719b07c4ec4e246915a6d2de458f351560c375b212c84a37db01d9b9463608f1f141e27e531e363a958f
+  metadata.gz: c9b6182a1739ef955f53359f927874aee7bcbed451362e4d228b32ee9526ace50bddca9816fa9383662c41352824a03dcbe6a5d6064ab085271a56c0ae02d7bd
+  data.tar.gz: cc30e67a19c56e0f0948501a813e2bdf3810eb19e08ecf18482c771aeff678217d4eb4b1ff050a2f92688cd36bfbb1ca3c55e037fcda9bed71fa4edd04e385c0

data/app/jobs/spree/base_job.rb

@@ -2,7 +2,7 @@
 
 module Spree
   # Base class for all Solidus background jobs
-  class BaseJob < ActiveJob::Base # rubocop:disable Rails/ApplicationJob
+  class BaseJob < ActiveJob::Base
     # Automatically retry jobs that encountered a deadlock
     retry_on ActiveRecord::Deadlocked
 

data/app/models/spree/order.rb

@@ -321,8 +321,15 @@ module Spree
 
     # Associates the specified user with the order.
     def associate_user!(user, override_email = true)
+      user_changed = user_id != user.try(:id)
       self.user = user
       attrs_to_set = {user_id: user.try(:id)}
+
+      if user_changed
+        self.guest_token = nil
+        attrs_to_set[:guest_token] = create_token
+      end
+
       attrs_to_set[:email] = user.try(:email) if override_email
       attrs_to_set[:created_by_id] = user.try(:id) if created_by.blank?
 

data/app/models/spree/payment_create.rb

@@ -11,7 +11,7 @@ module Spree
     #     * :gateway_customer_profile_id, :gateway_payment_profile_id (String): Gateway
     #       identifiers for a new {CreditCard}, e.g. a one-time token. Raises
     #       ActiveRecord::RecordNotFound if either already belongs to a {CreditCard}
-    #       owned by a different user.
+    #       owned by a different user or order.
     # @param request_env [Hash] rack env of user creating the payment
     # @param payment [Payment] Internal use only. Instead of making a new payment, change the attributes for an existing one.
     def initialize(order, attributes, payment: nil, request_env: {})
@@ -57,11 +57,11 @@ module Spree
       end
     end
 
-    # Gateway profile ids may only be submitted for a new source when they are
+    # Gateway profile IDs may only be submitted for a new source when they are
     # unknown to the store (e.g. a one-time token) or already belong to the
     # order's user. Raises if either id is stored on a {CreditCard} owned by a
-    # different user, so customers cannot pay with another customer's stored
-    # gateway credential.
+    # different user or no user, so customers cannot pay with another
+    # customer's stored gateway credential.
     def ensure_gateway_profile_ownership!(source_class)
       return unless source_class <= Spree::CreditCard
 
@@ -69,8 +69,10 @@ module Spree
         value = source_attributes[attribute]
         next if value.blank?
 
-        foreign_cards = Spree::CreditCard.where(attribute => value).where.not(user_id: nil)
-        foreign_cards = foreign_cards.where.not(user_id: order.user_id) if order&.user_id
+        foreign_cards = Spree::CreditCard.where(attribute => value)
+        if order&.user_id
+          foreign_cards = foreign_cards.where(user_id: nil).or(foreign_cards.where.not(user_id: order.user_id))
+        end
         raise ActiveRecord::RecordNotFound if foreign_cards.exists?
       end
     end

data/app/models/spree/store.rb

@@ -25,7 +25,7 @@ module Spree
     self.allowed_ransackable_attributes = %w[name url code]
 
     before_save :ensure_default_exists_and_is_unique
-    before_destroy :validate_not_default
+    before_destroy :validate_not_default, prepend: true
 
     enum :reverse_charge_status, {
       disabled: 0,
@@ -73,6 +73,7 @@ module Spree
     def validate_not_default
       if default
         errors.add(:base, :cannot_destroy_default_store)
+        throw :abort
       end
     end
   end

data/lib/generators/solidus/install/app_templates/authentication/existing.rb

@@ -4,9 +4,7 @@ begin
   user_class.classify.constantize
 rescue NameError
   say_status :error, "Can't find an existing user class named #{user_class.classify}, plese set up one before using this authentication option.", :red
-  # rubocop:disable Rails/Exit
   abort
-  # rubocop:enable Rails/Exit
 end
 
 generate "spree:custom_user #{user_class.shellescape}"

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "4.7.2"
+  VERSION = "4.7.3"
 
   def self.solidus_version = VERSION
 

data/lib/spree/preferences/preferable_class_methods.rb

@@ -111,5 +111,9 @@ module Spree::Preferences
     def allowed_admin_form_preference_types
       DEFAULT_ADMIN_FORM_PREFERENCE_TYPES
     end
+
+    def permitted_preference_attributes
+      new.admin_form_preference_names.map { |name| :"preferred_#{name}" }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 4.7.2
+  version: 4.7.3
 platform: ruby
 authors:
 - Solidus Team