Merge branch 'development' of git://github.com/cykod/Webiva into deve…

…lopment
cykod · Oct 12, 2010 · 3b90780 · 3b90780
2 parents a3fb7ce + 2a8a8c7
commit 3b90780
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/app/models/end_user.rb b/app/models/end_user.rb
@@ -669,6 +669,8 @@ def default_address
   def current_shipping_address
     if self.shipping_address && !self.shipping_address.address.blank?
      self.shipping_address
+    elsif self.billing_address && !self.billing_address.address.blank?
+      self.billing_address
     else
       self.default_address
     end