Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

accept changesfrom upstream and resolve merge conflict ~ automatic go invoices

Browse source
This commit is contained in:
viehlieb 2022-02-03 12:15:21 +01:00
commit bb3e049630
27 changed files with 263 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/mailers/mailer.rb
View file

@ -115,7 +115,7 @@ class Mailer < ActionMailer::Base
@user = user
@feedback = feedback
mail to: FoodsoftConfig[:notification][:error_recipients],
mail to: feedback_recipients,
from: user,
subject: I18n.t('mailer.feedback.subject')
end
@ -196,4 +196,9 @@ class Mailer < ActionMailer::Base
address.display_name = name
address.format
end
# use the (new) feedback_recipients option, but fallback to error_recipients for backwards compatibility
def feedback_recipients
FoodsoftConfig[:notification][:feedback_recipients] || FoodsoftConfig[:notification][:error_recipients]
end
end