diff --git a/app/models/concerns/domain/force_delete.rb b/app/models/concerns/domain/force_delete.rb index c8cbe6b0a..d09ea3704 100644 --- a/app/models/concerns/domain/force_delete.rb +++ b/app/models/concerns/domain/force_delete.rb @@ -57,6 +57,7 @@ module Concerns::Domain::ForceDelete self.force_delete_date = nil self.force_delete_start = nil save(validate: false) + registrar.notifications.create!(text: I18n.t('force_delete_cancelled', domain_name: name)) end private diff --git a/app/models/domain_cron.rb b/app/models/domain_cron.rb index e3edf9f4c..154c4ca19 100644 --- a/app/models/domain_cron.rb +++ b/app/models/domain_cron.rb @@ -94,7 +94,7 @@ class DomainCron domain.statuses << DomainStatus::CLIENT_HOLD log_start_client_hold(domain) - domain.save(validate: false) and marked += 1 + domain.save(validate: false) and marked += 1 and notify_client_hold(domain) end log_end_end_client_hold(marked: marked, real: real) @@ -120,4 +120,10 @@ class DomainCron STDOUT << "#{Time.zone.now.utc} - Successfully set client_hold to #{marked} of #{real} "\ "domains\n" end + + def self.notify_client_hold(domain) + domain.registrar.notifications.create!(text: I18n.t('soft_force_delete_set_on_domain', + domain_name: domain.name, + start_date: domain.force_delete_start)) + end end diff --git a/config/locales/en.yml b/config/locales/en.yml index 75f9a6542..b4a5d1c18 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -619,6 +619,8 @@ en: created_at_until: 'Created at until' is_registrant: 'Is registrant' force_delete_set_on_domain: 'Force delete set on domain %{domain_name}' + soft_force_delete_set_on_domain: 'clientHold status is set for domain %{domain_name}, ForceDelete is in effect from %{start_date}' + force_delete_cancelled: 'Force delete is cancelled on domain %{domain_name}' contact_is_not_valid: 'Contact %{value} is not valid, please fix the invalid contact' next: 'Next' previous: 'Previous' diff --git a/config/schedule.rb b/config/schedule.rb index fe920dc6d..07a04fa39 100644 --- a/config/schedule.rb +++ b/config/schedule.rb @@ -46,6 +46,10 @@ if @cron_group == 'registry' runner 'DomainCron.start_redemption_grace_period' end + every 1.hour do + runner 'DomainCron.start_client_hold' + end + every '0 0 1 * *' do runner 'Directo.send_monthly_invoices' end