Remove extra condition from Address#editable?

fixes #37
spree-contrib · Jan 11, 2013 · 051b19c · 051b19c
1 parent b976d2d
commit 051b19c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/models/spree/address_decorator.rb b/app/models/spree/address_decorator.rb
@@ -15,9 +15,9 @@ def same_as?(other)
     attributes.except('id', 'updated_at', 'created_at', 'user_id') == other.attributes.except('id', 'updated_at', 'created_at', 'user_id')
   end
 
-  # can modify an address if it's not been used in an order
+  # can modify an address if it's not been used in an completed order
   def editable?
-    new_record? || (shipments.empty? && (Spree::Order.where("bill_address_id = ?", self.id).count + Spree::Order.where("bill_address_id = ?", self.id).count <= 1) && Spree::Order.complete.where("bill_address_id = ? OR ship_address_id = ?", self.id, self.id).count == 0)
+    new_record? || (shipments.empty? && Spree::Order.complete.where("bill_address_id = ? OR ship_address_id = ?", self.id, self.id).count == 0)
   end
 
   def can_be_deleted?