Skip to content

Commit

Permalink
Move on_shelf.email_conf_msg to on_shelf_confirmation partial
Browse files Browse the repository at this point in the history
  • Loading branch information
maxkadel committed Jan 24, 2025
1 parent 691e587 commit 6197e68
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions app/views/requests/request_mailer/_pick_up_info.html.erb
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions spec/mailers/requests/request_mailer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 6197e68

Please sign in to comment.