Fix invitation status

ecosyste-ms · Feb 27, 2025 · 850e476 · 850e476
1 parent 683d205
commit 850e476
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -175,6 +175,7 @@
             <tbody>
               <% @project_allocations.each_with_index do |project_allocation, i| %>
                 <% next if project_allocation.project_url.nil? %>
+                <% next if @allocation.completed? && !project_allocation.paid? %>
 
                 <!-- Main Row -->
                 <tr class="clickable-row <%= 'row-rejected' if project_allocation.project_funding_rejected %>" data-bs-toggle="collapse" data-bs-target="#details-<%= i %>" role="button" aria-controls="#details-<%= i %>">