diff --git a/app/mailers/domain_mailer.rb b/app/mailers/domain_mailer.rb index 979da1d52..3788dd510 100644 --- a/app/mailers/domain_mailer.rb +++ b/app/mailers/domain_mailer.rb @@ -176,11 +176,9 @@ class DomainMailer < ApplicationMailer name: @domain.name)} [#{@domain.name}]") end - def expiration_reminder(domain_id, should_deliver) + def expiration_reminder(domain_id) @domain = Domain.find_by(id: domain_id) return unless @domain - return if delivery_off?(@domain, should_deliver) - return if whitelist_blocked?(@domain.registrant.email) mail(to: format(@domain.registrant.email), subject: "#{I18n.t(:expiration_remind_subject, diff --git a/app/models/domain.rb b/app/models/domain.rb index 9664e4f26..06a108f72 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -263,7 +263,7 @@ class Domain < ActiveRecord::Base domains.each do |domain| next unless domain.expirable? domain.set_graceful_expired - DomainMailer.expiration_reminder(domain.id, deliver_emails).deliver + DomainMailer.expiration_reminder(domain.id).deliver STDOUT << "#{Time.zone.now.utc} Domain.start_expire_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? domain.save end