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
Deprecate Address#default and #build_default
Damian Legawiec99e84948367b
diff --git a/backend/app/controllers/spree/admin/orders/customer_details_controller.rb b/backend/app/controllers/spree/admin/orders/customer_details_controller.rbindex 37cd29c882..e18da72e12 100644--- a/backend/app/controllers/spree/admin/orders/customer_details_controller.rb+++ b/backend/app/controllers/spree/admin/orders/customer_details_controller.rb@@ -11,9 +11,8 @@ module Spreeenddef edit- country_id = Address.default.country_id- @order.build_bill_address(country_id: country_id) if @order.bill_address.nil?- @order.build_ship_address(country_id: country_id) if @order.ship_address.nil?+ @order.build_bill_address(country: current_store.default_country) if @order.bill_address.nil?+ @order.build_ship_address(country: current_store.default_country) if @order.ship_address.nil?@order.bill_address.country_id = country_id if @order.bill_address.country.nil?@order.ship_address.country_id = country_id if @order.ship_address.country.nil?diff --git a/backend/app/views/spree/admin/users/_addresses_form.html.erb b/backend/app/views/spree/admin/users/_addresses_form.html.erbindex 427fbc91fc..88a79f1369 100644--- a/backend/app/views/spree/admin/users/_addresses_form.html.erb+++ b/backend/app/views/spree/admin/users/_addresses_form.html.erb@@ -8,8 +8,7 @@</div><div class="card-body">- <%= f.fields_for :bill_address, (@user.bill_address || Spree::Address.default(@user, "bill")) do |ba_form| %>- <% ba_form.object ||= Spree::Address.new(country: Spree::Country.new) %>+ <%= f.fields_for :bill_address, @user.bill_address || @user.addresses.new(country: current_store.default_country) do |ba_form| %><%= render partial: 'spree/admin/shared/address_form', locals: { f: ba_form, type: "billing" } %><% end %></div>@@ -30,8 +29,7 @@<%= check_box_tag 'user[use_billing]', '1', checked, class: 'checkbox' %><%= label_tag :use_billing, Spree.t(:use_billing_address), for: 'user_use_billing', id: 'use_billing', class: 'form-check-label' %></p>- <%= f.fields_for :ship_address, (@user.ship_address || Spree::Address.default(@user, "ship")) do |sa_form| %>- <% sa_form.object ||= Spree::Address.new(country: Spree::Country.new) %>+ <%= f.fields_for :ship_address, @user.ship_address || @user.addresses.new(country: current_store.default_country) do |sa_form| %><%= render partial: 'spree/admin/shared/address_form', locals: { f: sa_form, type: "shipping" } %><% end %></div>diff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rbindex 827d7f5afc..cd42739c6e 100644--- a/core/app/models/spree/address.rb+++ b/core/app/models/spree/address.rb@@ -59,10 +59,17 @@ module Spreeself.whitelisted_ransackable_associations = %w[country state user]def self.build_default+ ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)+ `Address#build_default` is deprecated and will be removed in Spree 5.0.+ Please use standard rails `Address.new(country: current_store.default_country)`+ DEPRECATIONnew(country: Spree::Country.default)enddef self.default(user = nil, kind = 'bill')+ ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)+ `Address#default` is deprecated and will be removed in Spree 5.0.+ DEPRECATIONif user && user_address = user.public_send(:"#{kind}_address")user_address.cloneelsediff --git a/frontend/app/controllers/spree/addresses_controller.rb b/frontend/app/controllers/spree/addresses_controller.rbindex 1001ed9864..e9c276f358 100644--- a/frontend/app/controllers/spree/addresses_controller.rb+++ b/frontend/app/controllers/spree/addresses_controller.rb@@ -23,7 +23,7 @@ module Spreeenddef new- @address = Spree::Address.default+ @address = try_spree_current_user.addresses.new(country: current_store.default_country)enddef updatediff --git a/frontend/app/views/spree/checkout/_address.html.erb b/frontend/app/views/spree/checkout/_address.html.erbindex d2634b6ff8..fb364337b8 100644--- a/frontend/app/views/spree/checkout/_address.html.erb+++ b/frontend/app/views/spree/checkout/_address.html.erb@@ -54,7 +54,7 @@address_name: address_name,address_form: address_form,address_type: address_type,- address: Spree::Address.default,+ address: Spree::Address.new(country: current_store.default_country),form: form} %></div>