diff --git a/app/jobs/domain_delete_confirm_email_job.rb b/app/jobs/domain_delete_confirm_email_job.rb index d2f2911e3..fafe143e1 100644 --- a/app/jobs/domain_delete_confirm_email_job.rb +++ b/app/jobs/domain_delete_confirm_email_job.rb @@ -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 diff --git a/app/mailers/domain_delete_mailer.rb b/app/mailers/domain_delete_mailer.rb index aa4d38533..46ad963fb 100644 --- a/app/mailers/domain_delete_mailer.rb +++ b/app/mailers/domain_delete_mailer.rb @@ -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 diff --git a/app/views/mailers/domain_delete_mailer/confirm.html.erb b/app/views/mailers/domain_delete_mailer/confirmation.html.erb similarity index 83% rename from app/views/mailers/domain_delete_mailer/confirm.html.erb rename to app/views/mailers/domain_delete_mailer/confirmation.html.erb index e62890ed1..f1d3e0c70 100644 --- a/app/views/mailers/domain_delete_mailer/confirm.html.erb +++ b/app/views/mailers/domain_delete_mailer/confirmation.html.erb @@ -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.

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.
-<%= link_to @confirm_url, @confirm_url %> -

-Lugupidamisega
-Eesti Interneti Sihtasutus -

+<%= link_to @confirmation_url, @confirmation_url %> +<%= render 'mailers/shared/signatures/signature.et.html' %>


Hi, @@ -23,9 +20,7 @@ Application for deletion of your domain <%= @domain.name %> has been filed. Plea

To confirm the update please visit this website, once again review the data and press approve:
-<%= link_to @confirm_url, @confirm_url %> +<%= link_to @confirmation_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.html' %> diff --git a/app/views/mailers/domain_delete_mailer/confirm.text.erb b/app/views/mailers/domain_delete_mailer/confirmation.text.erb similarity index 87% rename from app/views/mailers/domain_delete_mailer/confirm.text.erb rename to app/views/mailers/domain_delete_mailer/confirmation.text.erb index 7d2e1cb05..0632a7f99 100644 --- a/app/views/mailers/domain_delete_mailer/confirm.text.erb +++ b/app/views/mailers/domain_delete_mailer/confirmation.text.erb @@ -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' %> \ No newline at end of file diff --git a/config/locales/mailers/domain_delete.en.yml b/config/locales/mailers/domain_delete.en.yml index 57bf126bf..9d709f3bb 100644 --- a/config/locales/mailers/domain_delete.en.yml +++ b/config/locales/mailers/domain_delete.en.yml @@ -1,9 +1,11 @@ en: domain_delete_mailer: - confirm: - subject: Kinnitustaotlus domeeni %{domain_name} kustutamiseks .ee registrist / Application for approval for deletion of %{domain_name} + confirmation: + subject: >- + Kinnitustaotlus domeeni %{domain_name} kustutamiseks .ee registrist + / Application for approval for deletion of %{domain_name} forced: subject: >- Domeen %{domain_name} on kustutusmenetluses / Domain %{domain_name} is in deletion process - / Домен %{domain_name} в процессе удаления + / Домен %{domain_name} в процессе удаления \ No newline at end of file diff --git a/test/mailers/domain_delete_mailer_test.rb b/test/mailers/domain_delete_mailer_test.rb index a7a134fed..0efbea486 100644 --- a/test/mailers/domain_delete_mailer_test.rb +++ b/test/mailers/domain_delete_mailer_test.rb @@ -14,18 +14,22 @@ class DomainDeleteMailerTest < ActiveSupport::TestCase def test_delivers_domain_delete_confirmation_email assert_equal 'shop.test', @domain.name + assert_equal 'john@inbox.test', @domain.registrant.email - email = DomainDeleteMailer.confirm(domain: @domain, - registrar: @domain.registrar, - registrant: @domain.registrant).deliver_now + email = DomainDeleteMailer.confirmation(domain: @domain, + registrar: @domain.registrar, + registrant: @domain.registrant).deliver_now assert_emails 1 + assert_equal ['john@inbox.test'], email.to assert_equal 'Kinnitustaotlus domeeni shop.test kustutamiseks .ee registrist' \ ' / Application for approval for deletion of shop.test', email.subject end def test_delivers_domain_force_delete_email assert_equal 'shop.test', @domain.name + assert_equal 'john@inbox.test', @domain.registrant.email + assert_equal 'jane@mail.test', @domain.admin_contacts.first.email email = DomainDeleteMailer.forced(domain: @domain, registrar: @domain.registrar, @@ -34,6 +38,7 @@ class DomainDeleteMailerTest < ActiveSupport::TestCase .first).deliver_now assert_emails 1 + assert_equal %w[jane@mail.test john@inbox.test], email.to assert_equal 'Domeen shop.test on kustutusmenetluses' \ ' / Domain shop.test is in deletion process' \ ' / Домен shop.test в процессе удаления', email.subject diff --git a/test/mailers/previews/domain_delete_mailer_preview.rb b/test/mailers/previews/domain_delete_mailer_preview.rb index 12dbbad69..f8dc0e9ee 100644 --- a/test/mailers/previews/domain_delete_mailer_preview.rb +++ b/test/mailers/previews/domain_delete_mailer_preview.rb @@ -12,4 +12,11 @@ class DomainDeleteMailerPreview < ActionMailer::Preview end define_forced_templates + + def confirmation + domain = Domain.first + DomainDeleteMailer.confirmation(domain: domain, + registrar: domain.registrar, + registrant: domain.registrant) + end end \ No newline at end of file