Merge pull request #1197 from YaleSTC/1121_returned_overdue

[1121] view returned overdue

app/controllers/reservations_controller.rb

@@ -34,9 +34,9 @@ def set_filter
 
     f = (can? :manage, Reservation) ? :upcoming : :reserved
 
-    @filters = [:reserved, :checked_out, :overdue, :returned, :upcoming,
-                :requested, :approved_requests, :denied]
-    @filters << :missed unless AppConfig.check(:res_exp_time)
+    @filters = [:reserved, :checked_out, :overdue, :returned, :returned_overdue,
+                :upcoming, :requested, :approved_requests, :denied]
+    @filters << :missed unless AppConfig.first.res_exp_time
 
     # if filter in session set it
     if session[:filter]

app/models/reservation.rb

@@ -131,7 +131,14 @@ def time_checked_out
   end
 
   def late_fee
-    equipment_model.late_fee.to_f
+    if checked_in
+      end_date = checked_in.to_date
+    else
+      end_date = Time.zone.today
+    end
+    fee = equipment_model.late_fee * (end_date - due_date)
+    fee = 0 if fee < 0
+    fee
   end
 
   def reserver

app/views/admin_mailer/overdue_checked_in_fine_admin.html.erb

@@ -11,7 +11,7 @@
   Notes: <%= markdown(@overdue_checked_in.notes) %>
 <% end %>
 
-<p>The late fee is <%= number_to_currency(@overdue_checked_in.equipment_model.late_fee) %> per day, for a total of <%= number_to_currency(((@overdue_checked_in.checked_in.to_date - @overdue_checked_in.due_date )).to_i*(@overdue_checked_in.equipment_model.late_fee))%>
+<p>The late fee is <%= number_to_currency(@overdue_checked_in.equipment_model.late_fee) %> per day, for a total of <%= number_to_currency(@overdue_checked_in.late_fee) %>
 </p>
 
 <br />

app/views/reservations/_check_in_form.html.erb

@@ -70,7 +70,7 @@
         <footer>
           <p>
             This equipment is <strong class="error">overdue.</strong><br />
-            At a fee of <%= number_to_currency(reservation.late_fee) %> / day, the renter owes <strong><%= number_to_currency(reservation.late_fee * (Time.zone.today - reservation.due_date).to_i)  %></strong> total.
+            At a fee of <%= number_to_currency(reservation.equipment_model.late_fee) %> / day, the renter owes <strong><%= number_to_currency(reservation.late_fee) %></strong> total.
           </p>
         </footer>
 

app/views/reservations/_check_out_form.html.erb

@@ -53,7 +53,7 @@
     <footer>
       <p>
           This equipment is <strong>due back on <%= reservation.due_date.to_s(:long) %>.</strong><br />
-          An overdue return will incur a combined late fee of <strong><%= number_to_currency(reservation.late_fee) %> / day.</strong>
+          An overdue return will incur a combined late fee of <strong><%= number_to_currency(reservation.equipment_model.late_fee) %> / day.</strong>
       </p>
     </footer>
   </div>

app/views/reservations/_index_nav.html.erb

@@ -11,6 +11,7 @@
       <%= render partial: 'index_nav_tab', locals: {filter: :missed, text: 'Missed'} %>
     <% end %>
     <%= render partial: 'index_nav_tab', locals: {filter: :returned, text: 'Returned'} %>
+    <%= render partial: 'index_nav_tab', locals: {filter: :returned_overdue, text: 'Returned Overdue'} %>
     <%= render partial: 'index_nav_tab', locals: {filter: :approved_requests, text: 'Approved'} %>
     <%= render partial: 'index_nav_tab', locals: {filter: :denied, text: 'Denied'} %>
   </ul>

app/views/reservations/_reservations_list.html.erb

@@ -9,6 +9,9 @@
     <th>Item</th>
     <th>Start Date</th>
     <th>Due Date</th>
+    <% if @filter == :overdue || @filter == :returned_overdue %>
+      <th>Late Fee</th>
+    <% end %>
   </tr>
   </thead>
   <tbody>
@@ -38,6 +41,9 @@
       </td>
       <td><%= reservation.start_date.to_s(:long) %></td>
       <td><%= reservation.due_date.to_s(:long) %></td>
+      <% if @filter == :overdue || @filter == :returned_overdue %>
+        <td><%= number_to_currency reservation.late_fee %></td>
+      <% end %>
     </tr>
   <% end %>
   </tbody>

app/views/user_mailer/_returned_overdue.html.erb

@@ -1,6 +1,6 @@
 <p>This is a receipt for your late equipment return. </p>
 
 <% if @reservation.equipment_model.late_fee > 0 %>
-  <p>Your late fee is <%= number_to_currency(@reservation.equipment_model.late_fee) %> per day, for a total of <%= number_to_currency(((@reservation.checked_in.to_date - @reservation.due_date)).to_i*(@reservation.equipment_model.late_fee))%>
+  <p>Your late fee is <%= number_to_currency(@reservation.equipment_model.late_fee) %> per day, for a total of <%= number_to_currency(@reservation.late_fee) %>
   </p>
 <% end %>