diff --git a/app/models/invitation.rb b/app/models/invitation.rb index a701aec..3ffbc38 100644 --- a/app/models/invitation.rb +++ b/app/models/invitation.rb @@ -227,7 +227,7 @@ def approve_expense end def status - 'DELETED' if deleted_at.present? + return 'DELETED' if deleted_at.present? data['status'] end diff --git a/app/views/funds/show.html.erb b/app/views/funds/show.html.erb index 9f66db5..5d88c05 100644 --- a/app/views/funds/show.html.erb +++ b/app/views/funds/show.html.erb @@ -175,6 +175,7 @@
<% @project_allocations.each_with_index do |project_allocation, i| %> <% next if project_allocation.project_url.nil? %> + <% next if @allocation.completed? && !project_allocation.paid? %>