From 134a51ab1d9d60201ea9e328ba0095c2d695c4dc Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Tue, 8 Jan 2019 15:31:28 +0000 Subject: [PATCH] Fix merge typo in the cancel email method of the order mailer decorator --- app/mailers/spree/order_mailer_decorator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mailers/spree/order_mailer_decorator.rb b/app/mailers/spree/order_mailer_decorator.rb index b0d4deef89..9d3688388f 100644 --- a/app/mailers/spree/order_mailer_decorator.rb +++ b/app/mailers/spree/order_mailer_decorator.rb @@ -7,7 +7,7 @@ Spree::OrderMailer.class_eval do def cancel_email(order_or_order_id, resend = false) @order = find_order(order_or_order_id) I18n.with_locale valid_locale(@order.user) do - mail(to: order.email, + mail(to: @order.email, from: from_address, subject: mail_subject(t('order_mailer.cancel_email.subject'), resend)) end