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.

Include all User addresses in lookup, also fixes ransack errors on Rails 6.0

Damian Legawieca1268812329f
diff --git a/backend/app/assets/javascripts/spree/backend/checkouts/edit.js b/backend/app/assets/javascripts/spree/backend/checkouts/edit.js
index d0dd63983b..ee8d04a3c9 100644
--- a/backend/app/assets/javascripts/spree/backend/checkouts/edit.js
+++ b/backend/app/assets/javascripts/spree/backend/checkouts/edit.js
@@ -80,10 +80,8 @@ $.fn.customerAutocomplete = function() {
filter: {
'm': 'or',
email_i_cont: params.term,
- ship_address_firstname_start: params.term,
- ship_address_lastname_start: params.term,
- bill_address_firstname_start: params.term,
- bill_address_lastname_start: params.term
+ addresses_firstname_start: params.term,
+ addresses_lastname_start: params.term
},
include: 'ship_address.country,ship_address.state,bill_address.country,bill_address.state'
}
diff --git a/core/app/models/concerns/spree/user_methods.rb b/core/app/models/concerns/spree/user_methods.rb
index ed53d7c91e..d97af19575 100644
--- a/core/app/models/concerns/spree/user_methods.rb
+++ b/core/app/models/concerns/spree/user_methods.rb
@@ -27,7 +27,7 @@ module Spree
belongs_to :ship_address, class_name: 'Spree::Address', optional: true
belongs_to :bill_address, class_name: 'Spree::Address', optional: true
- self.whitelisted_ransackable_associations = %w[bill_address ship_address]
+ self.whitelisted_ransackable_associations = %w[bill_address ship_address addresses]
self.whitelisted_ransackable_attributes = %w[id email]
def self.with_email(query)