raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make Order #deliver_order_confirmation_email method private

Browse Source
This commit is contained in:
Matt-Yorkley
2023-06-05 19:51:49 +01:00
parent 10dbeb32b2
commit 17b10d10c0
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/spree/order.rb
View File

@@ -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

4
spec/models/spree/order_spec.rb
View File

@@ -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