diff --git a/app/views/reimbursement/reports/_actions.html.erb b/app/views/reimbursement/reports/_actions.html.erb index c1b01e6e56..f328fda4e7 100644 --- a/app/views/reimbursement/reports/_actions.html.erb +++ b/app/views/reimbursement/reports/_actions.html.erb @@ -36,7 +36,7 @@ <% elsif current_user == report.user && !admin_signed_in? %>
<%= inline_icon "plus" %> - Add <%= report.expenses.count > 0 ? "Another" : "An" %> Expense + Add <%= report.expenses.count > 0 ? "another" : "an" %> expense
<% elsif !report.closed? %> <%= link_to reimbursement_report_reject_path(report_id: report.id), class: "btn bg-error", data: { turbo: true, turbo_method: :post } do %> @@ -51,7 +51,7 @@ <% if report.reimbursement_requested? && !admin_signed_in? %> <%= link_to reimbursement_report_draft_path(report_id: report.id), class: "btn bg-muted", method: :post do %> <%= inline_icon "reply" %> - Mark As Draft + Mark as draft <% button_hint = capture do %> Status: the HCB team is reviewing this report. To make further changes, mark it as a draft. <% end %> @@ -59,7 +59,7 @@ <% elsif current_user == report.user && report.submitted? %> <%= link_to reimbursement_report_draft_path(report_id: report.id), class: "btn bg-muted", method: :post do %> <%= inline_icon "reply" %> - Mark As Draft + Mark as draft <% button_hint = capture do %> Status: your report is currently under review by the <%= report.event.name %> team. To make further changes, mark it as a draft. <% end %> @@ -196,7 +196,7 @@ <% admin_tool("overflow-visible") do %> <%= link_to reimbursement_report_admin_approve_path(report_id: report.id), class: "btn bg-info", method: :post do %> <%= inline_icon "thumbsup" %> - Approve <%= report.user.payout_method.title_kind %> Reimbursement + Approve <%= report.user.payout_method.title_kind.downcase %> reimbursement <% end %> <% unless ::Shared::AmpleBalance.ample_balance?(report.amount_to_reimburse_cents, report.event) %> <% button_hint = capture do %> diff --git a/app/views/reimbursement/reports/_edit_form.html.erb b/app/views/reimbursement/reports/_edit_form.html.erb index cefe4172ca..4af441acf0 100644 --- a/app/views/reimbursement/reports/_edit_form.html.erb +++ b/app/views/reimbursement/reports/_edit_form.html.erb @@ -29,9 +29,15 @@ <%= form.collection_select :reviewer_id, @report.event.users, :id, :name, include_blank: "Anyone" %> <% end %> - <%= form.submit "Update report", class: "left mt2" %> -<% end %> +
+ <%= form.submit "Update report", class: "left mt2" %> -<% admin_tool_if !@report.draft? do %> - <%= button_to "Delete report", reimbursement_report_path(@report), class: "right mt2 bg-error btn", method: :delete, type: "button" %> + <% if current_user.admin? && !@report.draft? %> + <% admin_tool("right mt2") do %> + <%= button_to "Delete report", reimbursement_report_path(@report), class: "bg-error btn", method: :delete, type: "button" %> + <% end %> + <% else %> + <%= button_to "Delete report", reimbursement_report_path(@report), class: "right mt2 bg-error btn", method: :delete, type: "button" %> + <% end %> +
<% end %> diff --git a/app/views/reimbursement/reports/show.html.erb b/app/views/reimbursement/reports/show.html.erb index e82e2e9a5c..ccee8be861 100644 --- a/app/views/reimbursement/reports/show.html.erb +++ b/app/views/reimbursement/reports/show.html.erb @@ -66,7 +66,7 @@