Skip to content

Commit c0b4211

Browse files
awwaiidawwaiid
authored
Merge pull request #5351 from MSaami/5329-fixes-to-bank-partner-user-experience
5329 fixes to bank partner user experience
2 parents b5b634d + b04dfb6 commit c0b4211

15 files changed

+63
-75
lines changed

‎app/models/partner.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ class Partner < ApplicationRecord
4444
has_many :families, dependent: :destroy, class_name: 'Partners::Family'
4545
has_many :children, through: :families, class_name: 'Partners::Child'
4646
has_many :authorized_family_members, through: :families, class_name: 'Partners::AuthorizedFamilyMember'
47+
has_one :default_storage_location, class_name: 'StorageLocation', dependent: :nullify, foreign_key: 'id', primary_key: 'default_storage_location_id', inverse_of: false
4748

4849
has_many_attached :documents
4950

‎app/views/partners/_partner_details.html.erb‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<div>
2+
<label>Email: </label> <%= @partner.email %>
3+
</div>
4+
<div>
5+
<label>Default Storage Location: </label> <%= @partner.default_storage_location&.name || 'None' %>
6+
</div>
7+
<div>
8+
<label>Partner Group: </label> <%= @partner.partner_group&.name || 'None' %>
9+
</div>
10+
<div>
11+
<label>Do you want this partner to receive emails for distributions and reminders from the system? </label> <%= @partner.send_reminders ? 'Yes' : 'No' %>
12+
</div>
13+
<div>
14+
<label>Notes: </label> <%= @partner.notes %>
15+
</div>
16+
<div>
17+
<label> Documents: </label>
18+
<% if @partner.documents.present? %>
19+
<% @partner.documents.each do |doc| %>
20+
<li><%= link_to doc.blob.filename.to_s, rails_blob_path(doc) %></li>
21+
<% end %>
22+
</ul>
23+
<% else %>
24+
<span>None</span>
25+
<% end %>
26+
</div>
27+
<div>
28+
<label>Requestable Item Categories: </label>
29+
<% if @partner.item_categories.present? %>
30+
<ul class='list-disc ml-3'>
31+
<% @partner.item_categories.each do |ic| %>
32+
<li>
33+
<span><%= ic.name %></span>
34+
</li>
35+
<% end %>
36+
</ul>
37+
<% elsif @partner.partner_group.present? %>
38+
<span class='text-red-600 text-bold font-italic'>No Items Requestable</span>
39+
<% else %>
40+
<span class='text-blue-600 text-bold font-italic'>All Items Requestable</span>
41+
<% end %>
42+
</div>
43+
44+
<%= edit_button_to edit_partner_path(@partner), { text: "Edit details", icon: "pencil-square-o", type: "primary", size: "m" } %>

‎app/views/partners/_uninvited_header.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</div>
77
<!-- /.card-body -->
88
<div class="card-footer">
9-
<%= edit_button_to edit_partner_path(partner) %>
9+
<%= render "partner_details", partner: partner %>
1010
<% if partner.deletable? %>
1111
<%= delete_button_to partner_path(partner), {confirm: confirm_delete_msg(partner.name)} %>
1212
<% end %>

‎app/views/partners/show.html.erb‎

Lines changed: 10 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="col-sm-6">
55
<% content_for :title, "Partners - #{@partner.name} - Agencies - #{current_organization.name}" %>
66
<h1>
7-
Partner info
7+
Partner Administration
88
<small>for <%= @partner.name %></small>
99
</h1>
1010
</div>
@@ -30,32 +30,27 @@
3030
<% unless @partner.uninvited? %>
3131

3232
<section class="card card-info card-outline">
33-
<div class="card-header">
34-
<h2 class="card-title fs-3">Partner Actions</h2>
35-
</div>
3633
<div class="card-body p-3">
37-
<% if current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %>
38-
<%= link_to partner_users_path(@partner) do %>
39-
<div class="btn btn-app bg-success">
40-
<i class="fas fa-users"></i> Manage Users
41-
</div>
42-
<% end %>
43-
<% end %>
44-
<hr>
4534
<div class="row px-2">
4635
<div class="col-lg-4 col-sm-12">
4736
<div>
4837
<h4 class='text-2xl underline'> Partner Details </h4>
4938
</div>
50-
<%= edit_button_to edit_partner_path(@partner), { text: "Edit Partner Information", icon: "pencil-square-o", type: "primary", size: "m" } %>
39+
<%= render "partner_details", partner: @partner %>
5140
<br>
5241
<br>
53-
<%= view_button_to '#partner-information', { text: "View Partner Information", type: "secondary", size: "m" } %>
42+
<% if current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %>
43+
<%= edit_button_to partner_users_path(@partner), { text: "Manage Users", icon: "pencil-square-o", type: "primary", size: "m" } %>
44+
<% end %>
5445
</div>
5546
<div class="col-lg-4 col-sm-12">
5647
<div>
5748
<h4 class='text-2xl underline'> Partner Status </h4>
5849
</div>
50+
<div>
51+
<label>Status:</label> <%= @partner.display_status %>
52+
</div>
53+
5954
<% if @partner.deactivated? %>
6055
<%= reactivate_button_to reactivate_partner_path(@partner), { confirm: confirm_reactivate_msg(@partner.name), size: 'm' } %>
6156
<% else %>
@@ -64,7 +59,7 @@
6459
<br>
6560
<br>
6661
<% unless @partner.approved? %>
67-
<%= print_button_to approve_application_partner_path(@partner), { text: "Activate Partner Now", icon: "thumbs-o-up", type: "success", size: "m" } if can_administrate? %>
62+
<%= print_button_to approve_application_partner_path(@partner), { text: "Approve Partner", icon: "thumbs-o-up", type: "success", size: "m", enabled: @partner.approvable? } if can_administrate? %>
6863
<% end %>
6964
</div>
7065
</div>
@@ -134,57 +129,6 @@
134129
</div>
135130
</div>
136131
</section>
137-
<section class="card card-info card-outline">
138-
<div class="card-header">
139-
<h2 class="card-title fs-3">Settings</h2>
140-
</div>
141-
<div class="card-body p-2">
142-
<div class="row">
143-
<div class="col-xs-12 col-sm-12" id="partner-notes">
144-
<div>
145-
<h4 class='text-2xl underline'> Partner Group: </h4>
146-
<div>
147-
<label><%= @partner.partner_group&.name || "None" %></label>
148-
</div>
149-
</div>
150-
151-
<h4 class='text-2xl underline'> Requestable Item Categories: </h4>
152-
<p class='text-sm font-light mb-1'> You can change this through their partner group.</p>
153-
154-
<% if @partner.item_categories.present? %>
155-
<ul class='list-disc ml-3'>
156-
<% @partner.item_categories.each do |ic| %>
157-
<li>
158-
<span class='text-lg'><%= ic.name %></span>
159-
</li>
160-
<% end %>
161-
</ul>
162-
<% elsif @partner.partner_group.present? %>
163-
<span class='text-red-600 text-bold font-italic'>No Items Requestable</span>
164-
<% else %>
165-
<span class='text-blue-600 text-bold font-italic'>All Items Requestable</span>
166-
<% end %>
167-
</div>
168-
</div>
169-
</div>
170-
</section>
171-
172-
<section class="card card-info card-outline">
173-
<div class="card-header">
174-
<h2 class="card-title fs-3">Notes</h2>
175-
</div>
176-
<div class="card-body p-2">
177-
<div class="row">
178-
<div class="col-xs-12 col-sm-12" id="partner-notes">
179-
<% if @partner.notes %>
180-
<p><%= simple_format(@partner.notes) %></p>
181-
<% else %>
182-
<p> None provided </p>
183-
<% end %>
184-
</div>
185-
</div>
186-
</div>
187-
</section>
188132

189133
<section class="card card-info card-outline">
190134
<div class="card-header">

‎docs/user_guide/bank/images/partners/partners_deactivate_2.png‎

143 KB
Loading

‎docs/user_guide/bank/images/partners/partners_edit_navigation.png‎

188 KB
Loading

‎docs/user_guide/bank/images/partners/partners_profile_edit_navigation_1.png‎

137 KB
Loading

‎docs/user_guide/bank/images/partners/partners_profile_edit_navigation_2.png‎

497 KB
Loading

‎docs/user_guide/bank/images/partners/partners_profile_view_navigation_1.png‎

137 KB
Loading

‎docs/user_guide/bank/images/partners/partners_profile_view_navigation_2.png‎

284 KB
Loading

0 commit comments

Comments
 (0)