adjust send email job
This commit is contained in:
@@ -8,6 +8,12 @@ class SendSubmitterInvitationEmailJob
|
|||||||
|
|
||||||
return if submitter.submission.source == 'invite' && !Accounts.can_send_emails?(submitter.account, on_events: true)
|
return if submitter.submission.source == 'invite' && !Accounts.can_send_emails?(submitter.account, on_events: true)
|
||||||
|
|
||||||
|
unless Accounts.can_send_invitation_emails?(submitter.account)
|
||||||
|
Rollbar.warning("Skip email: #{submitter.account.id}") if defined?(Rollbar)
|
||||||
|
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
mail = SubmitterMailer.invitation_email(submitter)
|
mail = SubmitterMailer.invitation_email(submitter)
|
||||||
|
|
||||||
Submitters::ValidateSending.call(submitter, mail)
|
Submitters::ValidateSending.call(submitter, mail)
|
||||||
@@ -17,6 +23,6 @@ class SendSubmitterInvitationEmailJob
|
|||||||
SubmissionEvent.create!(submitter:, event_type: 'send_email')
|
SubmissionEvent.create!(submitter:, event_type: 'send_email')
|
||||||
|
|
||||||
submitter.sent_at ||= Time.current
|
submitter.sent_at ||= Time.current
|
||||||
submitter.save
|
submitter.save!
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -153,6 +153,10 @@ module Accounts
|
|||||||
EncryptedConfig.exists?(key: EncryptedConfig::EMAIL_SMTP_KEY)
|
EncryptedConfig.exists?(key: EncryptedConfig::EMAIL_SMTP_KEY)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def can_send_invitation_emails?(_account)
|
||||||
|
true
|
||||||
|
end
|
||||||
|
|
||||||
def normalize_timezone(timezone)
|
def normalize_timezone(timezone)
|
||||||
tzinfo = TZInfo::Timezone.get(ActiveSupport::TimeZone::MAPPING[timezone] || timezone)
|
tzinfo = TZInfo::Timezone.get(ActiveSupport::TimeZone::MAPPING[timezone] || timezone)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user