Merge pull request #244 from Crowdtilt/fix_reward_count_length

Fix length -> count for some reward + payment queries

app/controllers/admin/campaigns_controller.rb

@@ -285,17 +285,17 @@ def payments
       if payment
         @payments = [payment]
       else
-        @payments = @campaign.payments_completed.order("created_at ASC")
+        @payments = @campaign.payments.completed.order("created_at ASC")
         flash.now[:error] = "Contributor not found for " + params[:payment_id]
       end
     elsif params.has_key?(:email) && !params[:email].blank?
-      @payments = @campaign.payments_completed.where("lower(email) = ?", params[:email].downcase)
+      @payments = @campaign.payments.completed.where("lower(email) = ?", params[:email].downcase)
       if @payments.blank?
-        @payments = @campaign.payments_completed.order("created_at ASC")
+        @payments = @campaign.payments.completed.order("created_at ASC")
         flash.now[:error] = "Contributor not found for " + params[:email]
       end
     else
-      @payments = @campaign.payments_completed.order("created_at ASC")
+      @payments = @campaign.payments.completed.order("created_at ASC")
     end
 
     create_breadcrumb(['Payments', admin_campaigns_payments_path(@campaign)])

app/models/campaign.rb

@@ -65,32 +65,19 @@ def orders
   end
 
   def rewards?
-    (self.payment_type != 'fixed' && self.rewards.length > 0)
+    (self.payment_type != 'fixed' && self.rewards.count > 0)
   end
 
   def rewards_claimed
-    @sum = 0
-    self.rewards.each do |reward|
-      @sum += reward.payments.length 
-    end
-    return @sum
+    self.payments.joins(:reward).successful.count
   end 
-
-  def payments_completed
-    self.payments.where(:status => %w(authorized charged released rejected refunded offline))
-  end
-
-  def payments_successful
-    # 'rejected' is a post-tilt state, so they are included in successful payments.
-    self.payments.where(:status => %w(authorized charged released rejected offline))
-  end
 
   def raised_amount
-    self.payments_successful.sum(:amount)/100.0
+    self.payments.successful.sum(:amount)/100.0
   end
 
   def number_of_contributions
-    self.payments_successful.count
+    self.payments.successful.count
   end
 
   def tilt_percent

app/models/payment.rb

@@ -13,6 +13,9 @@ class Payment < ActiveRecord::Base
   belongs_to :campaign
   belongs_to :reward
 
+  scope :successful, where(status: %w(authorized charged released rejected offline))
+  scope :completed, where(status: %w(authorized charged released rejected refunded offline))
+
   def self.to_csv(options={})
     #db_columns = %w{fullname email quantity amount user_fee_amount created_at status ct_payment_id}
     csv_columns = ['Name', 'Email', 'Quantity', 'Amount', 'User Fee', 'Date', 'Reward',

app/models/reward.rb

@@ -9,13 +9,17 @@ class Reward < ActiveRecord::Base
   has_many :payments
 
   def sold_out?
-    !self.unlimited? && number_of_payments >= self.number
+    !self.unlimited? && self.number_of_successful_payments >= self.number
   end
 
   def number_of_payments
     self.payments.count
   end
 
+  def number_of_successful_payments
+    self.payments.successful.count
+  end
+
   def unlimited?
     self.number.nil? || self.number == 0
   end

app/serializers/reward_serializer.rb

@@ -1,3 +1,3 @@
 class RewardSerializer < ActiveModel::Serializer
-  attributes :id, :title, :description, :price, :delivery_date, :number, :campaign_id, :number_of_payments, :image_url, :collect_shipping_flag
-end
+  attributes :id, :title, :description, :price, :delivery_date, :number, :campaign_id, :number_of_successful_payments, :image_url, :collect_shipping_flag
+end

app/views/admin/campaigns/_form.html.erb

@@ -150,9 +150,9 @@
                       <% end %>
                       <input type="hidden" name="reward[][id]" value="<%= reward.id %>"/>
                     </td>
-                    <td><%= reward.payments.length %></td>
+                    <td><%= reward.payments.successful.count %></td>
                     <td>
-                      <% if reward.payments.length > 0 %>
+                      <% if reward.payments.successful.count > 0 %>
                         N/A<input type="hidden" name="reward[][delete]" value=""/>
                       <% else %>
                         <input type="checkbox" name="reward[][delete]" value="delete"/>

app/views/campaigns/checkout_amount.html.erb

@@ -67,7 +67,7 @@
                   <div class="reward_description">
                     <p class="title"><%= reward.title %></p>
                     <p class="claimed">
-                      <%= reward.payments.length %> <%= "of #{reward.number}" unless reward.unlimited? %> claimed
+                      <%= reward.payments.successful.count %> <%= "of #{reward.number}" unless reward.unlimited? %> claimed
                       <% if reward.sold_out? %> (All gone!) <% end %>
                     </p>
                     <p class="description"><%= reward.description %></p>

app/views/theme/views/campaign.html.erb

@@ -168,12 +168,12 @@
                   <% if @campaign.expired? %>
                     <% if reward.include_claimed? %>
                       <p class="claimed">
-                        <%= reward.payments.length %> <%= "of #{reward.number}" unless reward.unlimited? %> claimed <%= '(All gone!)' if reward.sold_out? %>
+                        <%= reward.payments.successful.count %> <%= "of #{reward.number}" unless reward.unlimited? %> claimed <%= '(All gone!)' if reward.sold_out? %>
                       </p>
                     <% end %>
                   <% else %>
                     <p class="claimed">
-                      <%= reward.payments.length %> <%= "of #{reward.number}" unless reward.unlimited? %> claimed <%= '(All gone!)' if reward.sold_out? %>
+                      <%= reward.payments.successful.count %> <%= "of #{reward.number}" unless reward.unlimited? %> claimed <%= '(All gone!)' if reward.sold_out? %>
                     </p>
                   <% end %>
                 </a>