Calculates SP.total_votes using physical_votes

app/models/spending_proposal.rb

@@ -100,7 +100,7 @@ class SpendingProposal < ActiveRecord::Base
   end
 
   def total_votes
-    cached_votes_up
+    cached_votes_up + physical_votes
   end
 
   def code

spec/models/spending_proposal_spec.rb

@@ -277,4 +277,15 @@ describe SpendingProposal do
     end
   end
 
+  describe "total votes" do
+    it "takes into account physical votes in addition to web votes" do
+      sp = create(:spending_proposal)
+      sp.register_vote(create(:user, :level_two), true)
+      expect(sp.total_votes).to eq(1)
+      sp.physical_votes = 10
+      expect(sp.total_votes).to eq(11)
+    end
+  end
+
+
 end