spree_core 5.1.3 → 5.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4653db5977ca32eb547d2b03e5813e9c8fbd20d554c4affed62c6b1eb264204c
-  data.tar.gz: 07f9f6dda2fa6f0a25266d6255db293aa82c97007d0fec0248f006fdc6e29573
+  metadata.gz: 90be1a32290303d4feb6a777d2a5ed2d88232edfa9998e748299df632346543f
+  data.tar.gz: 63b6aebfc73bdb8e56e945471245cb2ac4bff7afb09db4d4377b753ba6bcfe06
 SHA512:
-  metadata.gz: 958124d59a881d5c5acf8e0ed3c0bff113fefeac06bf72cd6da310628122f15bae784f321709d2f7ab0d75fd655621c669e0c3fc97a1b53841d803106fcffe81
-  data.tar.gz: 022d0ac938c12b166d69d4a3e83b3e472da68b5a752079249288b99bcd490cfe3608853d3cd1313453ab21e89b42f130e57f80beb03aad079a2294892e877df0
+  metadata.gz: 6f4cd428b66cee1b390d3710ff2d33d71a4d4ffcfa8648672937eb748a6c91993e1ec8d23495b099e25efc8790a8d0a093d849339f5659be6097ffb878bde293
+  data.tar.gz: 5c7186492fe423d5b8862771dd3767ad9f9d9fb5c00bd71a434c19a5b3d938c9a071579aa54594f235ad16e0c9bac64bfbab8d286a0f40ae5522cffe8c453b82

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

@@ -9,7 +9,7 @@ module Spree
       end
 
       def payment_sources
-        credit_cards.with_payment_profile.not_expired.where(payment_method: Spree::PaymentMethod.active).not_removed
+        credit_cards.capturable.not_expired.where(payment_method: Spree::PaymentMethod.active).not_removed
       end
 
       def drop_payment_source(source)

data/app/models/spree/credit_card.rb

@@ -39,6 +39,7 @@ module Spree
     end
 
     scope :with_payment_profile, -> { where.not(gateway_customer_profile_id: nil) }
+    scope :capturable, -> { where.not(gateway_customer_profile_id: nil).or(where.not(gateway_payment_profile_id: nil)) }
     scope :default, -> { where(default: true) }
     scope :not_expired, lambda {
       where('CAST(spree_credit_cards.year AS DECIMAL) > ?', Time.current.year).

data/app/models/spree/gateway.rb

@@ -67,7 +67,7 @@ module Spree
 
     def sources_by_order(order)
       source_ids = order.payments.where(source_type: payment_source_class.to_s, payment_method_id: id).pluck(:source_id).uniq
-      payment_source_class.where(id: source_ids).with_payment_profile
+      payment_source_class.where(id: source_ids).capturable
     end
 
     def reusable_sources(order)
@@ -75,7 +75,7 @@ module Spree
         sources_by_order order
       else
         if order.user_id
-          credit_cards.where(user_id: order.user_id).with_payment_profile
+          credit_cards.where(user_id: order.user_id).capturable
         else
           []
         end

data/app/models/spree/payment.rb

@@ -32,7 +32,7 @@ module Spree
     has_many :refunds, inverse_of: :payment
 
     validates :payment_method, presence: true
-    validates :source, presence: true, if: -> { payment_method&.source_required? }
+    validates :source, presence: true, if: :source_required?
     validate :payment_method_available_for_order, on: :create
 
     before_validation :validate_source
@@ -50,6 +50,7 @@ module Spree
     after_destroy :update_order
 
     attr_accessor :source_attributes, :request_env, :capture_on_dispatch
+    attribute :skip_source_requirement, :boolean, default: false
 
     after_initialize :build_source
 
@@ -247,6 +248,12 @@ module Spree
       source_class.respond_to?(:display_name) ? source_class.display_name : source_class.name.demodulize.split(/(?=[A-Z])/).join(' ')
     end
 
+    def source_required?
+      return false if skip_source_requirement
+
+      payment_method&.source_required?
+    end
+
     private
 
     def set_amount

data/app/models/spree/product/slugs.rb

@@ -11,11 +11,15 @@ module Spree
         friendly_id :slug_candidates, use: [:history, :slugged, :scoped, :mobility], scope: spree_base_uniqueness_scope, slug_limit: 255
 
         Product::Translation.class_eval do
-          before_save :set_slug
           acts_as_paranoid
           # deleted translation values also need to be accessible for index views listing deleted resources
           default_scope { unscope(where: :deleted_at) }
 
+          before_validation :set_slug
+          before_validation :ensure_slug_is_unique
+
+          validates :slug, presence: true, uniqueness: { allow_blank: true, case_sensitive: true, scope: [*::Spree.base_class.spree_base_uniqueness_scope, :locale] }
+
           private
 
           def set_slug
@@ -31,6 +35,11 @@ module Spree
               slug.to_url
             end
           end
+
+          def ensure_slug_is_unique
+            slug_exists = self.class.where(slug: slug, locale: locale).where.not(id: id).exists?
+            self.slug = [slug, SecureRandom.uuid].join('-') if slug_exists
+          end
         end
 
         before_validation :downcase_slug
@@ -57,8 +66,6 @@ module Spree
       def slug_candidates
         if defined?(:deleted_at) && deleted_at.present?
           [
-            ['deleted', :name],
-            ['deleted', :name, :sku],
             ['deleted', :name, :uuid_for_friendly_id]
           ]
         else
@@ -91,7 +98,7 @@ module Spree
         set_slug
         update_column(:slug, slug)
 
-        new_slug = ->(rec) { "deleted-#{rec.id}_#{rec.slug}"[..254] }
+        new_slug = ->(rec) { "deleted-#{rec.slug}-#{uuid_for_friendly_id}"[..254] }
 
         translations.with_deleted.each { |rec| rec.update_columns(slug: new_slug.call(rec)) }
         slugs.with_deleted.each { |rec| rec.update_column(:slug, new_slug.call(rec)) }

data/lib/spree/core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.1.3
+  version: 5.1.4
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-20 00:00:00.000000000 Z
+date: 2025-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -1382,9 +1382,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.3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.4
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.1.3
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.4
 post_install_message:
 rdoc_options: []
 require_paths: