diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb index 70604b5690..cd3179e5e3 100644 --- a/app/models/spree/order.rb +++ b/app/models/spree/order.rb @@ -365,13 +365,6 @@ module Spree ) end - def deliver_order_confirmation_email - return if subscription.present? - - Spree::OrderMailer.confirm_email_for_customer(id).deliver_later(wait: 10.seconds) - Spree::OrderMailer.confirm_email_for_shop(id).deliver_later(wait: 10.seconds) - end - # Helper methods for checkout steps def paid? payment_state == 'paid' || payment_state == 'credit_owed' @@ -618,6 +611,13 @@ module Spree private + def deliver_order_confirmation_email + return if subscription.present? + + Spree::OrderMailer.confirm_email_for_customer(id).deliver_later(wait: 10.seconds) + Spree::OrderMailer.confirm_email_for_shop(id).deliver_later(wait: 10.seconds) + end + def fee_handler @fee_handler ||= OrderFeesHandler.new(self) end diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb index 5c250f970e..3b24adf1cc 100644 --- a/spec/models/spree/order_spec.rb +++ b/spec/models/spree/order_spec.rb @@ -935,7 +935,7 @@ describe Spree::Order do expect(Spree::OrderMailer).to receive(:confirm_email_for_customer).and_return(mailer) expect(Spree::OrderMailer).to receive(:confirm_email_for_shop).and_return(mailer) - order.deliver_order_confirmation_email + order.__send__(:deliver_order_confirmation_email) end it "does not send confirmation emails when the order belongs to a subscription" do @@ -944,7 +944,7 @@ describe Spree::Order do expect(Spree::OrderMailer).not_to receive(:confirm_email_for_customer) expect(Spree::OrderMailer).not_to receive(:confirm_email_for_shop) - order.deliver_order_confirmation_email + order.__send__(:deliver_order_confirmation_email) end end