zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-30 09:30:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

Story#111065230 - send expiration_reminder Mail 2 days after

Browse source
This commit is contained in:
Vladimir Krylov 2016-01-06 17:30:05 +02:00
parent 097657accf
commit c0f9a0105e
4 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/mailers/domain_mailer.rb
View file

@ -97,8 +97,8 @@ class DomainMailer < ApplicationMailer
def expiration_reminder(domain_id) def expiration_reminder(domain_id)
@domain = Domain.find_by(id: domain_id) @domain = Domain.find_by(id: domain_id)
return unless @domain return if @domain.nil? || !@domain.statuses.include?(DomainStatus::EXPIRED) || whitelist_blocked?(@domain.registrant.email)
return if whitelist_blocked?(@domain.registrant.email)
mail(to: format(@domain.registrant.email), mail(to: format(@domain.registrant.email),
subject: "#{I18n.t(:expiration_remind_subject, subject: "#{I18n.t(:expiration_remind_subject,
name: @domain.name)} [#{@domain.name}]") name: @domain.name)} [#{@domain.name}]")

2
app/models/domain.rb
View file

@ -264,7 +264,7 @@ class Domain < ActiveRecord::Base
domains.each do |domain| domains.each do |domain|
next unless domain.expirable? next unless domain.expirable?
domain.set_graceful_expired domain.set_graceful_expired
DomainMailer.expiration_reminder(domain.id).deliver DomainMailer.expiration_reminder(domain.id).deliver_in(Setting.redemption_grace_period.days)
STDOUT << "#{Time.zone.now.utc} Domain.start_expire_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? STDOUT << "#{Time.zone.now.utc} Domain.start_expire_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test?
domain.save domain.save
end end

1
app/views/admin/settings/index.haml
View file

@ -36,6 +36,7 @@
= render 'setting_row', var: :days_to_renew_domain_before_expire = render 'setting_row', var: :days_to_renew_domain_before_expire
= render 'setting_row', var: :expire_warning_period = render 'setting_row', var: :expire_warning_period
= render 'setting_row', var: :redemption_grace_period = render 'setting_row', var: :redemption_grace_period
= render 'setting_row', var: :expiration_reminder_mail
.panel.panel-default .panel.panel-default
.panel-heading.clearfix .panel-heading.clearfix

1
config/initializers/initial_settings.rb
View file

@ -37,6 +37,7 @@ if con.present? && con.table_exists?('settings')
Setting.save_default(:days_to_renew_domain_before_expire, 90) Setting.save_default(:days_to_renew_domain_before_expire, 90)
Setting.save_default(:expire_warning_period, 15) Setting.save_default(:expire_warning_period, 15)
Setting.save_default(:redemption_grace_period, 30) Setting.save_default(:redemption_grace_period, 30)
Setting.save_default(:expiration_reminder_mail, 2)
Setting.save_default(:registrar_ip_whitelist_enabled, true) Setting.save_default(:registrar_ip_whitelist_enabled, true)
Setting.save_default(:api_ip_whitelist_enabled, true) Setting.save_default(:api_ip_whitelist_enabled, true)