mirror of
https://github.com/internetee/registry.git
synced 2025-07-24 19:48:28 +02:00
parent
eada1a66dd
commit
8a831ee92c
30 changed files with 205 additions and 201 deletions
|
@ -379,11 +379,8 @@ class Domain < ActiveRecord::Base
|
|||
new_registrant_email = registrant.email
|
||||
new_registrant_name = registrant.name
|
||||
|
||||
current_registrant = Registrant.find(registrant_id_was)
|
||||
RegistrantChangeMailer.confirm(domain: self, registrar: registrar, current_registrant: current_registrant,
|
||||
new_registrant: registrant).deliver
|
||||
RegistrantChangeMailer.notice(domain: self, registrar: registrar, current_registrant: current_registrant,
|
||||
new_registrant: registrant).deliver
|
||||
RegistrantChangeConfirmEmailJob.enqueue(id, new_registrant_id)
|
||||
RegistrantChangeNoticeEmailJob.enqueue(id, new_registrant_id)
|
||||
|
||||
reload
|
||||
|
||||
|
@ -444,8 +441,7 @@ class Domain < ActiveRecord::Base
|
|||
pending_delete_confirmation!
|
||||
save(validate: false) # should check if this did succeed
|
||||
|
||||
old_registrant = Registrant.find(registrant_id_was)
|
||||
DeleteDomainMailer.pending(domain: self, old_registrant: old_registrant).deliver
|
||||
DomainDeleteConfirmEmailJob.enqueue(id)
|
||||
end
|
||||
|
||||
def cancel_pending_delete
|
||||
|
@ -566,12 +562,15 @@ class Domain < ActiveRecord::Base
|
|||
end
|
||||
|
||||
self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).utc.beginning_of_day unless force_delete_at
|
||||
|
||||
transaction do
|
||||
save!(validate: false)
|
||||
registrar.messages.create!(
|
||||
body: I18n.t('force_delete_set_on_domain', domain: name)
|
||||
)
|
||||
DomainMailer.force_delete(domain: self).deliver
|
||||
|
||||
DomainDeleteForcedEmailJob.enqueue(id)
|
||||
|
||||
return true
|
||||
end
|
||||
false
|
||||
|
@ -745,6 +744,10 @@ class Domain < ActiveRecord::Base
|
|||
pending_json['new_registrant_email']
|
||||
end
|
||||
|
||||
def new_registrant_id
|
||||
pending_json['new_registrant_id']
|
||||
end
|
||||
|
||||
def self.to_csv
|
||||
CSV.generate do |csv|
|
||||
csv << column_names
|
||||
|
|
|
@ -16,8 +16,7 @@ class DomainCron
|
|||
end
|
||||
count += 1
|
||||
if domain.pending_update?
|
||||
RegistrantChangeMailer.expired(domain: domain, registrar: domain.registrar, registrant: domain.registrant)
|
||||
.deliver
|
||||
RegistrantChangeExpiredEmailJob.enqueue(domain.id)
|
||||
end
|
||||
if domain.pending_delete? || domain.pending_delete_confirmation?
|
||||
DomainMailer.pending_delete_expired_notification(domain.id, true).deliver
|
||||
|
@ -49,7 +48,7 @@ class DomainCron
|
|||
saved = domain.save(validate: false)
|
||||
|
||||
if saved
|
||||
DomainExpirationEmailJob.enqueue(domain.id, run_at: send_time)
|
||||
DomainExpireEmailJob.enqueue(domain.id, run_at: send_time)
|
||||
marked += 1
|
||||
end
|
||||
end
|
||||
|
|
|
@ -571,7 +571,6 @@ class Epp::Domain < Domain
|
|||
frame.css('delete').children.css('delete').attr('verified').to_s.downcase != 'yes'
|
||||
|
||||
registrant_verification_asked!(frame.to_s, user_id)
|
||||
self.deliver_emails = true # turn on email delivery for epp
|
||||
pending_delete!
|
||||
manage_automatic_statuses
|
||||
true # aka 1001 pending_delete
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue