From 27f5e6db8a123b2a4c5777859d95f8daca4430fd Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sat, 25 Aug 2018 12:50:36 +0100 Subject: [PATCH] Fixed bug on order_mailer_decorator. When cancel_email is called with order id in paramater order, order.number will fail. This is only seen in spree 2 because only spree 2 calls this method with order id. Bug introduced here: https://github.com/openfoodfoundation/openfoodnetwork/commit/32d2adc8a24f4352e8c6a0b179fe9ef351295f6d#diff-aa82d768109073ea8ad7858146630be4R9. Spree change introduced here: https://github.com/spree/spree/commit/8d90ae15f807467ffbcc20e779c9ffead577df2a#diff-1e2ba31309f1f1abd2a4b626036d316fR94 --- app/mailers/spree/order_mailer_decorator.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/mailers/spree/order_mailer_decorator.rb b/app/mailers/spree/order_mailer_decorator.rb index a4b2db8b70..d284a704aa 100644 --- a/app/mailers/spree/order_mailer_decorator.rb +++ b/app/mailers/spree/order_mailer_decorator.rb @@ -6,8 +6,8 @@ Spree::OrderMailer.class_eval do def cancel_email(order, resend = false) @order = find_order(order) subject = (resend ? "[#{t(:resend).upcase}] " : '') - subject += "#{Spree::Config[:site_name]} #{t('order_mailer.cancel_email.subject')} ##{order.number}" - mail(to: order.email, from: from_address, subject: subject) + subject += "#{Spree::Config[:site_name]} #{t('order_mailer.cancel_email.subject')} ##{@order.number}" + mail(to: @order.email, from: from_address, subject: subject) end def confirm_email_for_customer(order, resend = false)