Add extended registrar's info to "pending_update_request_for_old_registrant" mailer

#180

app/mailers/domain_mailer.rb

@@ -1,8 +1,14 @@
 class DomainMailer < ApplicationMailer
   include Que::Mailer
 
-  def pending_update_request_for_old_registrant(params)
-    compose_from(params)
+  def pending_update_request_for_old_registrant(domain:, registrant:)
+    @domain = DomainPresenter.new(domain: domain, view: view_context)
+    @registrar = RegistrarPresenter.new(registrar: domain.registrar, view: view_context)
+    @registrant = RegistrantPresenter.new(registrant: registrant, view: view_context)
+    @verification_url = registrant_domain_update_confirm_url(domain, token: domain.registrant_verification_token)
+
+    subject = default_i18n_subject(domain_name: domain.name)
+    mail(to: registrant.email, subject: subject)
   end
 
   def pending_update_notification_for_new_registrant(params)

app/presenters/registrant_presenter.rb

@@ -1,17 +1,11 @@
 class RegistrantPresenter
+  delegate :name, :ident, :email, to: :registrant
+
   def initialize(registrant:, view:)
     @registrant = registrant
     @view = view
   end
 
-  def name
-    registrant.name
-  end
-
-  def ident
-    registrant.ident
-  end
-
   private
 
   attr_reader :registrant

app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb

@@ -1,13 +1,21 @@
 Tere
 <br><br>
-Registrisse laekus taotlus domeeni <%= @params[:name] %> registreerija vahetuseks. Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja <%= @params[:registrar_name] %> poole.
+Registrisse laekus taotlus domeeni <%= @domain.name %> registreerija vahetuseks. Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole:
+
+<p>
+  <%= @registrar.name %><br>
+  Email: <%= @registrar.email %><br>
+  Telefon: <%= @registrar.phone %><br>
+  Veebileht: <%= @registrar.url %>
+</p>
+
 <br><br>
 Uue registreerija andmed:<br>
-Nimi: <%= @params[:registrant_name] %><br>
+Nimi: <%= @registrant.name %><br>
 <% if @params[:registrant_priv] %>
-Isikukood: <%= @params[:registrant_ident] %><br>
+Isikukood: <%= @registrant.ident %><br>
 <% else %>
-Äriregistrikood: <%= @params[:registrant_ident] %><br>
+Äriregistrikood: <%= @registrant.ident %><br>
 <% end %>
 Tänav: <%= @params[:registrant_street] %><br>
 Linn: <%= @params[:registrant_city] %><br>
@@ -17,7 +25,7 @@ Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatak
 <br><br>
 Muudatuse kinnitamiseks külastage palun allolevat lehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan:<br>
 
-<%= link_to @params[:verification_url], @params[:verification_url] %>
+<%= link_to @verification_url, @verification_url %>
 <br><br>
 Lugupidamisega<br>
 Eesti Interneti Sihtasutus
@@ -26,14 +34,22 @@ Eesti Interneti Sihtasutus
 <br><br>
 Hi,
 <br><br>
-Application for changing registrant of your domain <%= @params[:name] %> has been filed. Please make sure that the update and information are correct. Incase of problems please turn to your registrar. Your registrar is <%= @params[:registrar_name] %>
+Application for changing registrant of your domain <%= @domain.name %> has been filed. Please make sure that the update and information are correct. Incase of problems please turn to your registrar:
+
+<p>
+  <%= @registrar.name %><br>
+  Email: <%= @registrar.email %><br>
+  Phone: <%= @registrar.phone %><br>
+  Website: <%= @registrar.url %>
+</p>
+
 <br><br>
 New registrant:<br>
-Name: <%= @params[:registrant_name] %><br>
+Name: <%= @registrant.name %><br>
 <% if @params[:registrant_priv] %>
-Personal code: <%= @params[:registrant_ident] %><br>
+Personal code: <%= @registrant.ident %><br>
 <% else %>
-Business Registry code: <%= @params[:registrant_ident] %><br>
+Business Registry code: <%= @registrant.ident %><br>
 <% end %>
 Street: <%= @params[:registrant_street] %><br>
 City: <%= @params[:registrant_city] %><br>
@@ -42,7 +58,7 @@ Country: <%= @params[:registrant_country] %>
 The application will remain in pending status for <%= Setting.expire_pending_confirmation %> hrs and will be automaticcally rejected if it is not approved nor rejected before.
 <br><br>
 To confirm the update please visit this website, once again review the data and press approve:<br>
-<%= link_to @params[:verification_url], @params[:verification_url] %>
+<%= link_to @verification_url, @verification_url %>
 <br><br>
 Best Regards,<br>
 Estonian Internet Foundation

app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb

@@ -1,13 +1,18 @@
 Tere
 
-Registrisse laekus taotlus domeeni <%= @params[:name] %> registreerija vahetuseks. Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja <%= @params[:registrar_name] %> poole.
+Registrisse laekus taotlus domeeni <%= @domain.name %> registreerija vahetuseks. Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole:
+
+<%= @registrar.name %>
+Email: <%= @registrar.email %>
+Telefon: <%= @registrar.phone %>
+Veebileht: <%= @registrar.url %>
 
 Uue registreerija andmed:
-Nimi: <%= @params[:registrant_name] %>
+Nimi: <%= @registrant.name %>
 <% if @params[:registrant_priv] %>
-Isikukood: <%= @params[:registrant_ident] %>
+  Isikukood: <%= @registrant.ident %>
 <% else %>
-Äriregistrikood: <%= @params[:registrant_ident] %>
+  Äriregistrikood: <%= @registrant.ident %>
 <% end %>
 Tänav: <%= @params[:registrant_street] %>
 Linn: <%= @params[:registrant_city] %>
@@ -15,7 +20,7 @@ Riik: <%= @params[:registrant_country] %>
 
 Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatakse automaatselt tagasi kui te seda enne ei kinnita või tagasi lükka.
 Muudatuse kinnitamiseks külastage palun allolevat lehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan:
-<%= @params[:verification_url] %>
+<%= @verification_url %>
 
 Lugupidamisega
 Eesti Interneti Sihtasutus
@@ -24,14 +29,19 @@ Eesti Interneti Sihtasutus
 
 Hi,
 
-Application for changing registrant of your domain <%= @params[:name] %> has been filed. Please make sure that the update and information are correct. Incase of problems please turn to your registrar. Your registrar is <%= @params[:registrar_name] %>
+Application for changing registrant of your domain <%= @domain.name %> has been filed. Please make sure that the update and information are correct. In case of problems please turn to your registrar:
+
+<%= @registrar.name %>
+Email: <%= @registrar.email %>
+Phone: <%= @registrar.phone %>
+Website: <%= @registrar.url %>
 
 New registrant:
-Name: <%= @params[:registrant_name] %>
+Name: <%= @registrant.name %>
 <% if @params[:registrant_priv] %>
-Personal code: <%= @params[:registrant_ident] %>
+  Personal code: <%= @registrant.ident %>
 <% else %>
-Business Registry code: <%= @params[:registrant_ident] %>
+  Business Registry code: <%= @registrant.ident %>
 <% end %>
 Street: <%= @params[:registrant_street] %>
 City: <%= @params[:registrant_city] %>
@@ -39,7 +49,7 @@ Country: <%= @params[:registrant_country] %>
 
 The application will remain in pending status for <%= Setting.expire_pending_confirmation %> hrs and will be automaticcally rejected if it is not approved nor rejected before.
 To confirm the update please visit this website, once again review the data and press approve:
-<%= @params[:verification_url] %>
+<%= @verification_url %>
 
 Best Regards,
 Estonian Internet Foundation