Skip to content
This repository was archived by the owner on Aug 13, 2021. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/mailers/spree/order_mailer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class OrderMailer < BaseMailer
def confirm_email(order, resend = false)
@order = order.respond_to?(:id) ? order : Spree::Order.find(order)
subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
subject += "#{Spree::Config[:site_name]} #{Spree.t('order_mailer.confirm_email.subject')} ##{@order.number}"
subject += "#{Spree::Store.current.name} #{Spree.t('order_mailer.confirm_email.subject')} ##{@order.number}"
mail_params = {:to => @order.email, :subject => subject}
if @order.store.present? && @order.store.mail_from_address.present?
mail_params[:from] = @order.store.mail_from_address
Expand All @@ -16,7 +16,7 @@ def confirm_email(order, resend = false)
def cancel_email(order, resend = false)
@order = order.respond_to?(:id) ? order : Spree::Order.find(order)
subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
subject += "#{Spree::Config[:site_name]} #{Spree.t('order_mailer.cancel_email.subject')} ##{@order.number}"
subject += "#{Spree::Store.current.name} #{Spree.t('order_mailer.cancel_email.subject')} ##{@order.number}"
mail_params = {:to => @order.email, :subject => subject}
if @order.store.present? && @order.store.mail_from_address.present?
mail_params[:from] = @order.store.mail_from_address
Expand Down
2 changes: 1 addition & 1 deletion app/mailers/spree/shipment_mailer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class ShipmentMailer < BaseMailer
def shipped_email(shipment, resend = false)
@shipment = shipment.respond_to?(:id) ? shipment : Spree::Shipment.find(shipment)
subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
subject += "#{Spree::Config[:site_name]} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@shipment.order.number}"
subject += "#{Spree::Store.current.name} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@shipment.order.number}"

mail_params = {:to => @shipment.order.email, :subject => subject}
if @shipment.order.store && @shipment.order.store.mail_from_address.present?
Expand Down
2 changes: 1 addition & 1 deletion app/views/spree/admin/stores/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<div class="four columns">
<%= f.field_container :mail_from_address do %>
<%= f.label :mail_from_address, Spree.t(:send_mails_as) %><br />
<%= f.text_field :mail_from_address, :class => 'fullwidth' %>
<%= f.text_field :mail_from_address, :class => 'fullwidth', :placeholder => 'support@example.com' %>
<%= error_message_on :store, :mail_from_address %>
<% end %>
</div>
Expand Down