Only pass billing address details if they are present.

This commit is contained in:
Jeff Dutil 2012-11-19 07:56:15 -05:00
parent 6b82df21af
commit 63ff2c99bf
1 changed files with 13 additions and 12 deletions

View File

@ -390,18 +390,19 @@ module Spree
# suggest current user's email or any email stored in the order
opts[:email] = spree_current_user ? spree_current_user.email : order.email
opts[:address_override] = 1
opts[:address] = {
:name => order.bill_address.full_name,
:zip => order.bill_address.zipcode,
:address1 => order.bill_address.address1,
:address2 => order.bill_address.address2,
:city => order.bill_address.city,
:phone => order.bill_address.phone,
:state => order.bill_address.state_text,
:country => order.bill_address.country.iso
}
if order.bill_address.present?
opts[:address_override] = 1
opts[:address] = {
:name => order.bill_address.full_name,
:zip => order.bill_address.zipcode,
:address1 => order.bill_address.address1,
:address2 => order.bill_address.address2,
:city => order.bill_address.city,
:phone => order.bill_address.phone,
:state => order.bill_address.state_text,
:country => order.bill_address.country.iso
}
end
opts
end