mirror of
https://github.com/internetee/registry.git
synced 2025-08-04 08:52:04 +02:00
Merge pull request #1156 from internetee/refactor-domain-delete-mailer
Refactor domain delete mailer
This commit is contained in:
commit
7e0fd30125
7 changed files with 34 additions and 27 deletions
|
@ -3,9 +3,9 @@ class DomainDeleteConfirmEmailJob < Que::Job
|
|||
domain = Domain.find(domain_id)
|
||||
|
||||
log(domain)
|
||||
DomainDeleteMailer.confirm(domain: domain,
|
||||
registrar: domain.registrar,
|
||||
registrant: domain.registrant).deliver_now
|
||||
DomainDeleteMailer.confirmation(domain: domain,
|
||||
registrar: domain.registrar,
|
||||
registrant: domain.registrant).deliver_now
|
||||
end
|
||||
|
||||
private
|
||||
|
|
|
@ -3,10 +3,10 @@ class DomainDeleteMailer < ApplicationMailer
|
|||
%w[private_person legal_person]
|
||||
end
|
||||
|
||||
def confirm(domain:, registrar:, registrant:)
|
||||
def confirmation(domain:, registrar:, registrant:)
|
||||
@domain = DomainPresenter.new(domain: domain, view: view_context)
|
||||
@registrar = RegistrarPresenter.new(registrar: registrar, view: view_context)
|
||||
@confirm_url = confirm_url(domain)
|
||||
@confirmation_url = confirmation_url(domain)
|
||||
|
||||
subject = default_i18n_subject(domain_name: domain.name)
|
||||
mail(to: registrant.email, subject: subject)
|
||||
|
@ -28,7 +28,7 @@ class DomainDeleteMailer < ApplicationMailer
|
|||
|
||||
private
|
||||
|
||||
def confirm_url(domain)
|
||||
def confirmation_url(domain)
|
||||
registrant_domain_delete_confirm_url(domain, token: domain.registrant_verification_token)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -8,11 +8,8 @@ Registrisse laekus taotlus domeeni <%= @domain.name %> kustutamiseks. Palun veen
|
|||
Muudatuse kinnitamiseks külastage palun allolevat lehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan.
|
||||
<br><br>
|
||||
Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatakse automaatselt tagasi kui te seda enne ise ei kinnita või tagasi lükka.<br>
|
||||
<%= link_to @confirm_url, @confirm_url %>
|
||||
<br><br>
|
||||
Lugupidamisega<br>
|
||||
Eesti Interneti Sihtasutus
|
||||
<br><br>
|
||||
<%= link_to @confirmation_url, @confirmation_url %>
|
||||
<%= render 'mailers/shared/signatures/signature.et.html' %>
|
||||
<hr>
|
||||
<br><br>
|
||||
Hi,
|
||||
|
@ -23,9 +20,7 @@ Application for deletion of your domain <%= @domain.name %> has been filed. Plea
|
|||
|
||||
<br><br>
|
||||
To confirm the update please visit this website, once again review the data and press approve:<br>
|
||||
<%= link_to @confirm_url, @confirm_url %>
|
||||
<%= link_to @confirmation_url, @confirmation_url %>
|
||||
<br><br>
|
||||
The application will remain in pending status for <%= Setting.expire_pending_confirmation %> hrs and will be automatically rejected if it is not approved nor rejected before.
|
||||
<br><br>
|
||||
Best Regards,<br>
|
||||
Estonian Internet Foundation
|
||||
<%= render 'mailers/shared/signatures/signature.en.html' %>
|
|
@ -7,10 +7,9 @@ Registrisse laekus taotlus domeeni <%= @domain.name %> kustutamiseks. Palun veen
|
|||
Muudatuse kinnitamiseks külastage palun allolevat lehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan.
|
||||
|
||||
Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatakse automaatselt tagasi kui te seda enne ise ei kinnita või tagasi lükka.
|
||||
<%= @confirm_url %>
|
||||
<%= @confirmation_url %>
|
||||
|
||||
Lugupidamisega
|
||||
Eesti Interneti Sihtasutus
|
||||
<%= render 'mailers/shared/signatures/signature.et.text' %>
|
||||
|
||||
--------------------------------------
|
||||
|
||||
|
@ -21,9 +20,8 @@ Application for deletion of your domain <%= @domain.name %> has been filed. Plea
|
|||
<%= render 'mailers/shared/registrar/registrar.en.text', registrar: @registrar %>
|
||||
|
||||
To confirm the update please visit this website, once again review the data and press approve:
|
||||
<%= @confirm_url %>
|
||||
<%= @confirmation_url %>
|
||||
|
||||
The application will remain in pending status for <%= Setting.expire_pending_confirmation %> hrs and will be automatically rejected if it is not approved nor rejected before.
|
||||
|
||||
Best Regards,
|
||||
Estonian Internet Foundation
|
||||
<%= render 'mailers/shared/signatures/signature.en.text' %>
|
Loading…
Add table
Add a link
Reference in a new issue