Merge pull request #4720 from pulibrary/i4718_recap_delivery

Move on_shelf.email_conf_msg to on_shelf_confirmation partial

Author: christinach

app/views/requests/request_mailer/_in_library_confirmation.html.erb

@@ -4,7 +4,7 @@
   </td>
 </tr>
 
-<tr class="pikcup-info">
+<tr class="pickup-info">
   <td colspan="2" style="padding: 18px;">
   <div style="text-align:center;margin:18px 0;">
     <p class="body-content"><%= I18n.t("requests.#{type}.email_conf_msg")%></p>

app/views/requests/request_mailer/_pick_up_info.html.erb

@@ -1,7 +1,6 @@
-<p class="body-content"><%= I18n.t('requests.on_shelf.email_conf_msg') %></p>
 <div style="text-align:center;margin:18px 0;">
   <div style="font-size:12px;font-weight:normal;padding-top:18px;line-height:125%;">Pick-up Location</div>
   <span
     style="font-size:20px;font-weight:bold;"><%= @submission.pick_up_location['label'].html_safe %>
   <p/>
-</div>
+</div>

app/views/requests/request_mailer/on_shelf_confirmation.html.erb

@@ -6,7 +6,9 @@
   </td>
 </tr>
 
-<tr class="pikcup-info">
+<p class="body-content"><%= I18n.t('requests.on_shelf.email_conf_msg') %></p>
+
+<tr class="pickup-info">
   <td colspan="2" style="padding: 18px;">
     <%= render 'pick_up_info' %>
   </td>

app/views/requests/request_mailer/recap_confirmation.html.erb

@@ -12,7 +12,7 @@
   </td>
 </tr>
 
-<tr class="pikcup-info">
+<tr class="pickup-info">
   <td colspan="2" style="padding: 18px;">
     <%= render 'pick_up_info' %>
   </td>

spec/mailers/requests/request_mailer_spec.rb

@@ -643,6 +643,7 @@
       expect(confirmation_mail.from).to eq([I18n.t('requests.default.email_from')])
       expect(confirmation_mail.html_part.body.to_s).to have_content I18n.t('requests.recap.email_conf_msg')
       expect(confirmation_mail.text_part.body.to_s).to have_content I18n.t('requests.recap.email_conf_msg')
+      expect(confirmation_mail.html_part.body.to_s).not_to have_content(I18n.t('requests.on_shelf.email_conf_msg'))
     end
   end