Skip to content

Commit 54f49ba

Browse files
authored
Merge branch 'main' into 5059-non-negative-purchase_value
2 parents b10d9d5 + 07e1643 commit 54f49ba

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

app/views/partners/_show_header.html.erb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@
4242
</div>
4343
</div>
4444
<!-- /.card-body -->
45-
<div class="card-footer">
46-
<span class="float-right">
47-
<%= download_button_to(partner_path(partner, format: :csv, filters: filter_params.merge(date_range: date_range_params)), {text: "Export Partner Distributions", size: "md"}) if partner_distributions.any? %>
48-
</span>
49-
</div>
5045
</div>
5146
<div id="seeZipcodes" class="modal fade">
5247
<div class="modal-dialog">

app/views/partners/show.html.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,9 @@
222222
<!-- Default box -->
223223
<div class="card card-primary card-outline">
224224
<div class="card-header">
225+
<span class="float-right">
226+
<%= download_button_to(partner_path(@partner, format: :csv, filters: filter_params.merge(date_range: date_range_params)), {text: "Export Partner Distributions", size: "md"}) if @partner_distributions.any? %>
227+
</span>
225228
<h2 class="card-title fs-3">Prior Distributions</h2>
226229
</div>
227230
<div class="card-body p-0">

app/views/product_drives/show.html.erb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@
6161
<div class="row">
6262
<div class="col-12">
6363
<!-- Default box -->
64+
<div class="card-footer clearfix">
65+
<%= edit_button_to edit_product_drive_path(@product_drive), { text: "Make a correction", size: "md" } %>
66+
<%= delete_button_to product_drive_path(@product_drive), { confirm: "Are you sure you want to permanently remove this product drive?", size: "md" } if current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %>
67+
</div>
6468
<div class="card">
6569
<div class="card-body p-0">
6670
<table class="table">
@@ -90,10 +94,6 @@
9094
<p style="text-align: center">
9195
To add additional donations to this product drive, please edit that donation and select this product drive from the appropriate dropdown.
9296
</p>
93-
<div class="card-footer clearfix">
94-
<%= edit_button_to edit_product_drive_path(@product_drive), { text: "Make a correction", size: "md" } %>
95-
<%= delete_button_to product_drive_path(@product_drive), { confirm: "Are you sure you want to permanently remove this product drive?", size: "md" } if current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %>
96-
</div>
9797
<!-- /.card-footer-->
9898
</div>
9999
<!-- /.card -->

0 commit comments

Comments
 (0)