Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Fixed: properly compare User/Zone IDs in User/Zone Rule casting them to strings
Damian Legawiec63bf69fddefd
diff --git a/core/app/models/spree/price_rules/user_rule.rb b/core/app/models/spree/price_rules/user_rule.rbindex 59185a9fcb..5b8350cfdd 100644--- a/core/app/models/spree/price_rules/user_rule.rb+++ b/core/app/models/spree/price_rules/user_rule.rb@@ -7,7 +7,8 @@ module Spreereturn false unless context.userreturn true if preferred_user_ids.empty?- preferred_user_ids.include?(context.user.id)+ # Compare as strings to support both integer and UUID primary keys+ preferred_user_ids.map(&:to_s).include?(context.user.id.to_s)enddef self.descriptiondiff --git a/core/app/models/spree/price_rules/zone_rule.rb b/core/app/models/spree/price_rules/zone_rule.rbindex 7004722445..9d9b40230a 100644--- a/core/app/models/spree/price_rules/zone_rule.rb+++ b/core/app/models/spree/price_rules/zone_rule.rb@@ -7,7 +7,8 @@ module Spreereturn false unless context.zonereturn true if preferred_zone_ids.empty?- preferred_zone_ids.include?(context.zone.id)+ # Compare as strings to support both integer and UUID primary keys+ preferred_zone_ids.map(&:to_s).include?(context.zone.id.to_s)enddef self.descriptiondiff --git a/core/spec/models/spree/price_rules/user_rule_spec.rb b/core/spec/models/spree/price_rules/user_rule_spec.rbindex 86f6943de6..eb5430f29a 100644--- a/core/spec/models/spree/price_rules/user_rule_spec.rb+++ b/core/spec/models/spree/price_rules/user_rule_spec.rb@@ -35,5 +35,20 @@ describe Spree::PriceRules::UserRule, type: :model doexpect(rule.applicable?(context)).to be falseendend++ context 'when user_ids preference contains strings' do+ before { rule.preferred_user_ids = [user.id.to_s] }++ it 'returns true when context user matches' do+ context = Spree::Pricing::Context.new(variant: variant, currency: 'USD', user: user)+ expect(rule.applicable?(context)).to be true+ end++ it 'returns false when context user does not match' do+ other_user = create(:user)+ context = Spree::Pricing::Context.new(variant: variant, currency: 'USD', user: other_user)+ expect(rule.applicable?(context)).to be false+ end+ endendenddiff --git a/core/spec/models/spree/price_rules/zone_rule_spec.rb b/core/spec/models/spree/price_rules/zone_rule_spec.rbindex 6637a68541..93eb36ec58 100644--- a/core/spec/models/spree/price_rules/zone_rule_spec.rb+++ b/core/spec/models/spree/price_rules/zone_rule_spec.rb@@ -35,5 +35,20 @@ describe Spree::PriceRules::ZoneRule, type: :model doexpect(rule.applicable?(context)).to be falseendend++ context 'when zone_ids preference contains strings' do+ before { rule.preferred_zone_ids = [zone.id.to_s] }++ it 'returns true when context zone matches' do+ context = Spree::Pricing::Context.new(variant: variant, currency: 'USD', zone: zone)+ expect(rule.applicable?(context)).to be true+ end++ it 'returns false when context zone does not match' do+ other_zone = create(:zone)+ context = Spree::Pricing::Context.new(variant: variant, currency: 'USD', zone: other_zone)+ expect(rule.applicable?(context)).to be false+ end+ endendend