Merge pull request #324 from sparc-request/jl-add-status-to-consolidated

Jl add status to consolidated
sparc-request · Mar 23, 2016 · 3edd31a · 3edd31a
2 parents af1a408 + 677437a
commit 3edd31a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/helpers/service_calendar_helper.rb b/app/helpers/service_calendar_helper.rb
@@ -230,7 +230,7 @@ def move_to_position arm
   end
 
   def display_line_items_status(line_item)
-    line_item.service_request.status.capitalize
+    AVAILABLE_STATUSES[line_item.sub_service_request.status]
   end
 
   def display_per_patient_calendar?(service_request, sub_service_request, merged)

diff --git a/app/models/protocol.rb b/app/models/protocol.rb
@@ -420,7 +420,7 @@ def has_per_patient_per_visit? current_request, portal
   def has_one_time_fees? current_request, portal
     return self.service_requests.detect do |sr|
       if sr.has_one_time_fee_services?
-        if ['first_draft', 'draft'].include?(sr.status)
+        if ['first_draft'].include?(sr.status)
           if portal
             false
           elsif current_request == sr
@@ -436,7 +436,7 @@ def has_one_time_fees? current_request, portal
   def direct_cost_total service_request
     total = 0
     self.service_requests.each do |sr|
-      next if ['first_draft', 'draft'].include?(sr.status) && sr != service_request
+      next if ['first_draft'].include?(sr.status) && sr != service_request
       total += sr.direct_cost_total
     end
     return total