app/models/valuation/lifetime_value.rb in artfully_ose-1.2.0 vs app/models/valuation/lifetime_value.rb in artfully_ose-1.3.0.pre1

@@ -20,10 +20,14 @@
     # Calculate the lifetime value of this model by summing the price of all items 
     # attached to orders attached to this person.  Save the value in lifetime_value.
     # Return the value
     #
     def calculate_lifetime_value
-      self.lifetime_value = Item.where(:order_id => self.lifetime_orders).sum(Item.total_price_sql_sum).to_i
+      self.lifetime_value = Item.
+              joins('LEFT JOIN donations ON donations.id = items.product_id').
+              where('(donations.pledge = ? OR items.product_type != ?)',  false, 'Donation').
+              where(:order_id => self.lifetime_orders).sum(Item.total_price_sql_sum).to_i
+      self.lifetime_value = self.lifetime_value + soft_credits.sum('amount').to_i * 100
       self.save(:validate => false)
       self.lifetime_value
     end
   end
 end
\ No newline at end of file