Merge pull request #1850 from datadryad/show-payment

Display payment section after payment is recorded
datadryad · Sep 24, 2024 · 46d7201 · 46d7201
2 parents c958863 + f8b2127
commit 46d7201
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/app/views/stash_datacite/resources/_payment.html.erb b/app/views/stash_datacite/resources/_payment.html.erb
@@ -1,7 +1,6 @@
 <script type="text/javascript">
   ReactRailsUJS.mountComponents();
 </script>
-<% if @resource.identifier.payment_type.blank? || @resource.identifier.payment_type == 'unknown' %>
 <div>
   <h3>Payment</h3>
   <% submitter_affiliation = @resource.identifier.submitter_affiliation %>
@@ -32,7 +31,7 @@
   <% else %>
     <p>This submission does not require a payment.</p>
   <% end %>
-  <% if @resource.identifier.user_must_pay? || @resource.identifier.institution_will_pay? %>
+  <% if (@resource.identifier.payment_type.blank? || @resource.identifier.payment_type == 'unknown') && (@resource.identifier.user_must_pay? || @resource.identifier.institution_will_pay?) %>
     <% if @resource.identifier.user_must_pay? %>
       <h4 style="color:#cf4817">Are you affiliated with a Dryad member institution that could sponsor this fee?</h4>
       <% if @aff_tenant.present? %>
@@ -49,5 +48,4 @@
       <p><b>Is this correct?</b> Your author list affiliation <b><%= @aff_tenant.long_name %></b> is also a Dryad member.</p>
     <% end %>
   <% end %>
-</div>
-<% end %>
+</div>