Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fixed setting proper from/reply-to headers for the invitation mailer (#12668)

Damian Legawiec4ac6d1388651
diff --git a/core/app/mailers/spree/invitation_mailer.rb b/core/app/mailers/spree/invitation_mailer.rb
index 64122d2c2f..4caf0ebf18 100644
--- a/core/app/mailers/spree/invitation_mailer.rb
+++ b/core/app/mailers/spree/invitation_mailer.rb
@@ -4,6 +4,8 @@ module Spree
def invitation_email(invitation)
@invitation = invitation
mail(to: invitation.email,
+ from: from_address,
+ reply_to: reply_to_address,
subject: Spree.t('invitation_mailer.invitation_email.subject',
resource_name: invitation.resource&.name))
end
@@ -12,6 +14,8 @@ module Spree
def invitation_accepted(invitation)
@invitation = invitation
mail(to: invitation.inviter.email,
+ from: from_address,
+ reply_to: reply_to_address,
subject: Spree.t('invitation_mailer.invitation_accepted.subject',
invitee_name: invitation.invitee&.name,
resource_name: invitation.resource&.name))
diff --git a/core/app/views/spree/invitation_mailer/invitation_email.html.erb b/core/app/views/spree/invitation_mailer/invitation_email.html.erb
index 187ffce6a4..212275e069 100644
--- a/core/app/views/spree/invitation_mailer/invitation_email.html.erb
+++ b/core/app/views/spree/invitation_mailer/invitation_email.html.erb
@@ -10,7 +10,7 @@
<% if spree.respond_to?(:admin_invitation_url) %>
<p>
- <%= link_to Spree.t('invitation_mailer.invitation_email.link_text'), spree.admin_invitation_url(@invitation, token: @invitation.token, host: @current_store.formatted_url) %>
+ <%= link_to Spree.t('invitation_mailer.invitation_email.link_text'), spree.admin_invitation_url(@invitation, token: @invitation.token, host: @invitation.store.formatted_url) %>
</p>
<% end %>
diff --git a/core/spec/mailers/spree/invitation_mailer_spec.rb b/core/spec/mailers/spree/invitation_mailer_spec.rb
index 78a870387a..8e7f0e6c32 100644
--- a/core/spec/mailers/spree/invitation_mailer_spec.rb
+++ b/core/spec/mailers/spree/invitation_mailer_spec.rb
@@ -23,6 +23,14 @@ RSpec.describe Spree::InvitationMailer, type: :mailer do
expect(mail.to).to eq([invitation.email])
end
+ it 'sends from the store mail from address' do
+ expect(mail.from).to eq([store.mail_from_address])
+ end
+
+ it 'sets reply-to as the store mail from address' do
+ expect(mail.reply_to).to eq([store.mail_from_address])
+ end
+
it 'includes the invitation link in the body' do
expect(mail.body.encoded).to include("http://test.com/admin/invitations/#{invitation.id}?token=#{invitation.token}")
end
@@ -50,5 +58,13 @@ RSpec.describe Spree::InvitationMailer, type: :mailer do
it 'sends to the correct recipient' do
expect(mail.to).to eq([inviter.email])
end
+
+ it 'sends from the store mail from address' do
+ expect(mail.from).to eq([store.mail_from_address])
+ end
+
+ it 'sets reply-to as the store mail from address' do
+ expect(mail.reply_to).to eq([store.mail_from_address])
+ end
end
end