#5085 - Donations should have paginated totals for in-kind value (#5121)

* Added paginated in kind value

* Added feature test for pagination values

Author: neenu-chacko

app/controllers/donations_controller.rb

@@ -33,6 +33,7 @@ def index
     @donations_quantity = @donations.collect(&:total_quantity).sum
     @paginated_donations_quantity = @paginated_donations.collect(&:total_quantity).sum
     @total_value_all_donations = total_value(@donations)
+    @paginated_in_kind_value = total_value(@paginated_donations)
     @total_money_raised = total_money_raised(@donations)
     @storage_locations = @donations.filter_map { |donation| donation.storage_location if !donation.storage_location.discarded_at }.compact.uniq.sort
     @selected_storage_location = filter_params[:at_storage_location]

app/views/donations/index.html.erb

@@ -111,7 +111,7 @@
                   <th>Money Raised</th>
                   <th>In Kind Value</th>
                   <th>Comments</th>
-                  <th>Actions</th>
+                  <th class="text-right">Actions</th>
                 </tr>
               </thead>
               <tbody>
@@ -125,14 +125,25 @@
                 <td></td>
                 <td class="text-left numeric">
                   <strong id="donation_quantity">
-                    <%= @donations_quantity %> (Total)
+                    <%= @donations_quantity %>
+                    <br>
+                    (Total)
                   </strong>
                   <br>
-                  <%= @paginated_donations_quantity %> (This page)
+                  <%= @paginated_donations_quantity %>
+                  <br>
+                  (This page)
                 </td>
                 <td class="text-left numeric"><strong><%= dollar_value(@total_money_raised) %></strong></td>
-                <td class="text-left numeric"><strong><%= dollar_value(@total_value_all_donations) %></strong></td>
-                <td></td>
+                <td class="text-left numeric in-kind">
+                  <strong>
+                    <%= dollar_value(@total_value_all_donations) %> (Total)
+                  </strong>
+                  <br>
+                  <%= dollar_value(@paginated_in_kind_value) %>
+                  <br>
+                   (This page)
+                </td>
               </tr>
               </tfoot>
             </table>

spec/system/donation_system_spec.rb

@@ -13,7 +13,8 @@
 
       before do
         create(:donation)
-        create(:donation)
+        donation = create(:donation)
+        create(:line_item, itemizable: donation, item: create(:item, value_in_cents: 300))
         visit subject
       end
 
@@ -28,6 +29,11 @@
         expect(page.find(:css, "table", visible: true)).to have_content("20")
       end
 
+      it "displays total in kind value on the index page" do
+        expect(page).to have_css("table td.in-kind", text: "$3.00")
+        expect(page).to have_css("table td.in-kind", text: "(This page)")
+      end
+
       it "doesn't die when an inactive item is in a donation" do
         item = create(:item, :active, name: "INACTIVE ITEM")
         create(:donation, :with_items, item: item)
@@ -570,7 +576,7 @@
 
       it "Allows the user to edit a donation" do
         total_quantity = find("#donation_quantity").text
-        expect(total_quantity).to eq "100 (Total)"
+        expect(total_quantity).to eq "100\n(Total)"
         click_on "View"
         expect(page).to have_content "Rare Candy"
 
@@ -585,7 +591,7 @@
         click_on "Save"
 
         total_quantity = find("#donation_quantity").text
-        expect(total_quantity).to eq "200 (Total)"
+        expect(total_quantity).to eq "200\n(Total)"
 
         expect(Donation.count).to eq(1)
         donation = Donation.last
@@ -621,7 +627,7 @@
         # removing the line item is a lot more benign than randomly
         # switching the item on it to a different item
         total_quantity = find("#donation_quantity").text
-        expect(total_quantity).to eq "0 (Total)"
+        expect(total_quantity).to eq "0\n(Total)"
       end
     end
 
@@ -679,7 +685,7 @@
 
         expect(page).to have_content "Donation #{@donation.id} has been removed!"
         # deleted the only donation, ensure total now reads 0
-        expect(page).to have_content "0 (Total)"
+        expect(page).to have_content "0\n(Total)"
       end
     end
   end