Merge pull request #3548 from nebulab/kennyadsl/build-default-address

Build default address with an existing method in checkout address
solidusio · Mar 26, 2020 · c44e877 · c44e877
2 parents 16dc131 + 110641e
commit c44e877
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/frontend/app/controllers/spree/checkout_controller.rb b/frontend/app/controllers/spree/checkout_controller.rb
@@ -203,9 +203,8 @@ def before_address
       @order.assign_default_user_addresses
       # If the user has a default address, the previous method call takes care
       # of setting that; but if he doesn't, we need to build an empty one here
-      default = { country_id: Spree::Country.default.id }
-      @order.build_bill_address(default) unless @order.bill_address
-      @order.build_ship_address(default) if @order.checkout_steps.include?('delivery') && !@order.ship_address
+      @order.bill_address ||= Spree::Address.build_default
+      @order.ship_address ||= Spree::Address.build_default if @order.checkout_steps.include?('delivery')
     end
 
     def before_delivery