Refactor invitation email subjects for partner users and simplify invitation due date check

Author: rrg1459

app/mailers/custom_devise_mailer.rb

@@ -7,10 +7,7 @@ def subject_for(key)
     # Replace the invitation instruction subject for partner users
     # that were invited by other partner users.
 
-    if resource.invitation_sent_at.present?
-      highlighted_role = resource.roles.order(:name).distinct.map(&:itself).first
-      "You've been re-invited to be a #{highlighted_role.name} in your Human Essentials App Account"
-    elsif resource.has_role?(Role::PARTNER, :any) && resource.id == resource.partner.primary_user&.id
+    if resource.has_role?(Role::PARTNER, :any) && resource.id == resource.partner.primary_user&.id && resource.roles.size == 1
       "You've been invited to be a partner with #{resource.partner.organization.name}"
     elsif resource.has_role?(Role::PARTNER, :any) && resource.id != resource.partner.primary_user&.id
       "You've been invited to #{resource.partner.name}'s Human Essentials account"

app/views/users/mailer/invitation_instructions.html.erb

@@ -344,12 +344,7 @@
                     <% organization = @resource.partner&.organization %>
                     <% is_primary_partner = @resource.id == @resource.partner&.primary_user&.id %>
                     <p>Hello <%= @resource.email %></p>
-                    <% if @resource.invitation_sent_at.present? %>
-                      <% highlighted_role = @resource.roles.order(:name).distinct.map(&:itself).first %>
-                      <% email = highlighted_role&.resource&.email.nil? ? @resource.email : highlighted_role.resource.email %>
-                      <p>You've been re-invited to become a <strong><%= highlighted_role.name %></strong> in your Human Essentials App Account</p>
-                      <p><strong> Please contact <%= email %> if you are encountering any issues. </strong></p>
-                    <% elsif @resource.partner.present? && is_primary_partner %>
+                    <% if @resource.partner.present? && is_primary_partner && @resource.roles.size == 1 %>
                       <p>You've been invited to become a partner with <strong><%= organization.name %>!</strong></p>
                       <p><%= organization.invitation_text %></p>
                       <p>Please click the link below to accept your invitation and create an account and you'll be able to begin requesting distributions.</p>

app/views/users/mailer/invitation_instructions.text.erb

@@ -4,7 +4,7 @@
 
 <%= accept_invitation_url(@resource, :invitation_token => @token) %>
 
-<% if @resource.invitation_sent_at.present? && @resource.invitation_due_at %>
+<% if @resource.invitation_due_at %>
   <%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format')) %>
 <% end %>