solidus_core 4.8.0 → 4.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '01835b000500c6523be13d69e3b323203e5e5e5e8cdc0879c20b80aecbc4ab6e'
-  data.tar.gz: 81ad53d980d3d2c9fca7cce88e1b9fa0546114e6431d064ac53b46edfeb85e92
+  metadata.gz: 65ac35251045489c988ae7b0f045d1ceaa8e5eb8d1a17b270af8519d9da262fc
+  data.tar.gz: d96ab2c3eabbf7b0bd7cb37359e8381c8e5c1746e32345a1c42a740d5f8a917f
 SHA512:
-  metadata.gz: af199e02adbf3b4ee94bfb927bc2a6f7b5320737a65a7de7147700e3f5a4bec71147ae1b20881f27b71d522321833c9eaab60873bfb3cfe91eee48bcb40f9c53
-  data.tar.gz: 9ca9fbf1c2706cc69e11654026e6f64f2a623051c70dce63e57a9db46ba03542f98888371751e1c6fa19d2f731f35c839612f9423ca9d78ee968abf3cd93f0bf
+  metadata.gz: faed629daa09f387fedc413fb1c202cf9f04a268034bfe30d140a022437a537eddef0fefa02d2de47de481b3cd0f66dc716aded47500d1fd7903e33601139957
+  data.tar.gz: 73b6283308f00372da233356573f0c44ed4ffb254aba4929850ba90f40da72d323b85d604660e49d4f6678c9d52866dcadb2489a72b15a7b5f3a344efac99d3a

data/app/models/spree/order.rb

@@ -330,8 +330,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/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "4.8.0"
+  VERSION = "4.8.1"
 
   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.8.0
+  version: 4.8.1
 platform: ruby
 authors:
 - Solidus Team
@@ -1123,7 +1123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 4.0.20
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.
 test_files: []