Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Fix admin email search to support underscores in orders and customers (#13177)

Jawaria Warisb10c510fc005
diff --git a/core/app/models/concerns/spree/user_methods.rb b/core/app/models/concerns/spree/user_methods.rb
index 094c060f88..ef35ab3e1d 100644
--- a/core/app/models/concerns/spree/user_methods.rb
+++ b/core/app/models/concerns/spree/user_methods.rb
@@ -62,7 +62,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]
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index 2b6676b40b..3d8e6856ad 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -229,7 +229,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
diff --git a/core/spec/models/spree/concerns/user_methods_spec.rb b/core/spec/models/spree/concerns/user_methods_spec.rb
index 0e9e1e358f..ac5ecd684e 100644
--- a/core/spec/models/spree/concerns/user_methods_spec.rb
+++ b/core/spec/models/spree/concerns/user_methods_spec.rb
@@ -119,27 +119,31 @@ describe Spree::UserMethods do
let!(:user_1) { create(:user, email: '[email protected]', first_name: 'John', last_name: 'Doe') }
let!(:user_2) { create(:user, email: '[email protected]', first_name: 'Jane', last_name: 'Gone') }
let!(:user_3) { create(:user, email: '[email protected]', first_name: 'Mary', last_name: 'Moe') }
+ let!(:user_4) { create(:user, email: '[email protected]', first_name: 'Ayn', last_name: 'Rand') }
+ let!(:user_5) { create(:user, email: '[email protected]', first_name: 'John', last_name: 'Doe') }
it 'returns users based on an email' do
expect(Spree.user_class.multi_search('[email protected]')).to eq([user_1])
expect(Spree.user_class.multi_search('[email protected]')).to eq([user_2])
+ expect(Spree.user_class.multi_search('[email protected]')).to eq([user_4])
+ expect(Spree.user_class.multi_search('[email protected]')).to eq([user_5])
expect(Spree.user_class.multi_search('mary.moe@')).to eq([])
end
it 'returns users based on the first name' do
- expect(Spree.user_class.multi_search('joh')).to eq([user_1])
+ expect(Spree.user_class.multi_search('joh')).to eq([user_1, user_5])
expect(Spree.user_class.multi_search('jan')).to eq([user_2])
expect(Spree.user_class.multi_search('greg')).to eq([])
end
it 'returns users based on the last name' do
- expect(Spree.user_class.multi_search('do')).to eq([user_1])
+ expect(Spree.user_class.multi_search('do')).to eq([user_1, user_5])
expect(Spree.user_class.multi_search('moe')).to eq([user_3])
expect(Spree.user_class.multi_search('smith')).to eq([])
end
it 'returns users based on the full name' do
- expect(Spree.user_class.multi_search('joh do')).to eq([user_1])
+ expect(Spree.user_class.multi_search('joh do')).to eq([user_1, user_5])
expect(Spree.user_class.multi_search('ane gon')).to eq([user_2])
expect(Spree.user_class.multi_search('mary moe')).to eq([user_3])
expect(Spree.user_class.multi_search('jane moe')).to eq([user_2, user_3])
diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rb
index a90423cfb9..212339be02 100644
--- a/core/spec/models/spree/order_spec.rb
+++ b/core/spec/models/spree/order_spec.rb
@@ -39,10 +39,14 @@ describe Spree::Order, type: :model do
let!(:order_1) { create(:order, number: 'R100', user: create(:user, email: '[email protected]'), bill_address: create(:address, first_name: 'Don', last_name: 'Roe')) }
let!(:order_2) { create(:order, number: 'R101', user: create(:user, email: '[email protected]'), bill_address: create(:address, first_name: 'Jane', last_name: 'Gone')) }
let!(:order_3) { create(:order, number: 'R200', user: create(:user, email: '[email protected]'), bill_address: create(:address, first_name: 'Mary', last_name: 'Moe')) }
+ let!(:order_4) { create(:order, number: 'R300', user: create(:user, email: '[email protected]'), bill_address: create(:address, first_name: 'Ayn', last_name: 'Rand')) }
+ let!(:order_5) { create(:order, number: 'R400', user: create(:user, email: '[email protected]'), bill_address: create(:address, first_name: 'John', last_name: 'Doe')) }
it 'returns orders based on an email' do
expect(described_class.multi_search('[email protected]')).to eq([order_1])
expect(described_class.multi_search('[email protected]')).to eq([order_2])
+ expect(described_class.multi_search('[email protected]')).to eq([order_4])
+ expect(described_class.multi_search('[email protected]')).to eq([order_5])
expect(described_class.multi_search('mary.moe@')).to eq([])
end