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.

V-2725 `Spree::Address#assign_new_default_address_to_user`: define the address scope in a separate method so it can be easily overridden (#12195)

Łukasz Adamczyk2a4a66fdcf17
diff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rb
index 3dabc39c9a..54c3a0d31c 100644
--- a/core/app/models/spree/address.rb
+++ b/core/app/models/spree/address.rb
@@ -257,14 +257,15 @@ module Spree
user.reload
return if user.bill_address != self && user.ship_address != self
- last_address = user.
- addresses.
- reorder(created_at: :desc).
- find { |address| address.id != id && address.valid? }
+ last_address = assign_new_default_address_to_user_scope.find { |address| address.id != id && address.valid? }
user.bill_address = last_address if user.bill_address == self
user.ship_address = last_address if user.ship_address == self
user.save!
end
+
+ def assign_new_default_address_to_user_scope
+ user.addresses.reorder(created_at: :desc)
+ end
end
end