Add success? method to ProjectAllocation and update view logic for al…

…location status
ecosyste-ms · Feb 27, 2025 · 6a70af9 · 6a70af9
1 parent 35f1430
commit 6a70af9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/models/project_allocation.rb b/app/models/project_allocation.rb
@@ -582,7 +582,12 @@ def find_transaction
   end
 
   def status
+    return 'REJECTED' if funding_rejected?
     return invitation.status if invitation.present?
     return 'PAID' if find_transaction.present?
   end
+
+  def success?
+    ['APPROVED', 'PAID'].include?(status)
+  end
 end
diff --git a/app/views/funds/show.html.erb b/app/views/funds/show.html.erb
@@ -175,7 +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? %>
+                <% next if @allocation.completed? && !project_allocation.success? %>
 
                 <!-- 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 %>">