diff --git a/app/presenters/registrant_presenter.rb b/app/presenters/registrant_presenter.rb
index 6ea64d7e4..fe532b44d 100644
--- a/app/presenters/registrant_presenter.rb
+++ b/app/presenters/registrant_presenter.rb
@@ -1,5 +1,11 @@
class RegistrantPresenter
- delegate :name, :ident, :email, :priv?, :id_code, :reg_no,
+ delegate :name,
+ :ident,
+ :phone,
+ :email,
+ :priv?,
+ :id_code,
+ :reg_no,
:street, :city, :state, :zip, :country,
:ident_country,
to: :registrant
diff --git a/app/views/mailers/contact_mailer/email_updated.html.erb b/app/views/mailers/contact_mailer/email_updated.html.erb
index cde26e0c8..681643fad 100644
--- a/app/views/mailers/contact_mailer/email_updated.html.erb
+++ b/app/views/mailers/contact_mailer/email_updated.html.erb
@@ -17,7 +17,7 @@ Muudatusega seotud domeenid:
<% end %>
Kontaktandmed:
-<%= render 'mailers/shared/registrant/registrant.et.html', registrant: contact %>
+<%= render 'mailers/shared/registrant/registrant.et.html', registrant: contact, with_phone: true %>
Lugupidamisega
Eesti Interneti Sihtasutus
@@ -40,7 +40,7 @@ Domains affected by this update:
<% end %>
Contact information:
-<%= render 'mailers/shared/registrant/registrant.en.html', registrant: contact %>
+<%= render 'mailers/shared/registrant/registrant.en.html', registrant: contact, with_phone: true %>
Best Regards,
Estonian Internet Foundation
diff --git a/app/views/mailers/contact_mailer/email_updated.text.erb b/app/views/mailers/contact_mailer/email_updated.text.erb
index a8f02b669..58c21f5a3 100644
--- a/app/views/mailers/contact_mailer/email_updated.text.erb
+++ b/app/views/mailers/contact_mailer/email_updated.text.erb
@@ -17,7 +17,7 @@ Muudatusega seotud domeenid:
<% end %>
Kontaktandmed:
-<%= render 'mailers/shared/registrant/registrant.et.text', registrant: contact %>
+<%= render 'mailers/shared/registrant/registrant.et.text', registrant: contact, with_phone: true %>
Lugupidamisega
Eesti Interneti Sihtasutus
@@ -40,7 +40,7 @@ Domains affected by this update:
<% end %>
Contact information:
-<%= render 'mailers/shared/registrant/registrant.en.text', registrant: contact %>
+<%= render 'mailers/shared/registrant/registrant.en.text', registrant: contact, with_phone: true %>
Best Regards,
Estonian Internet Foundation
diff --git a/app/views/mailers/shared/registrant/_registrant.en.html.erb b/app/views/mailers/shared/registrant/_registrant.en.html.erb
index 83d2a3b10..1626b12ff 100644
--- a/app/views/mailers/shared/registrant/_registrant.en.html.erb
+++ b/app/views/mailers/shared/registrant/_registrant.en.html.erb
@@ -4,7 +4,10 @@ Name: <%= registrant.name %>
<% else %>
Business Registry code: <%= registrant.ident %>
<% end %>
-<% if address_processing %>
+<% if local_assigns[:with_phone] -%>
+ Phone: <%= registrant.phone %>
+<% end -%>
+<% if address_processing -%>
Street: <%= registrant.street %>
City: <%= registrant.city %>
State: <%= registrant.state %>
@@ -12,4 +15,4 @@ Name: <%= registrant.name %>
Country: <%= registrant.country %>
<% else %>
Country: <%= registrant.ident_country %>
-<% end %>
+<% end -%>
diff --git a/app/views/mailers/shared/registrant/_registrant.en.text.erb b/app/views/mailers/shared/registrant/_registrant.en.text.erb
index 72cc91446..4f6482be7 100644
--- a/app/views/mailers/shared/registrant/_registrant.en.text.erb
+++ b/app/views/mailers/shared/registrant/_registrant.en.text.erb
@@ -4,7 +4,10 @@ Name: <%= registrant.name %>
<% else %>
Business Registry code: <%= registrant.ident %>
<% end %>
-<% if address_processing %>
+<% if local_assigns[:with_phone] -%>
+ Phone: <%= registrant.phone %>
+<% end -%>
+<% if address_processing -%>
Street: <%= registrant.street %>
City: <%= registrant.city %>
State: <%= registrant.state %>
@@ -12,4 +15,4 @@ Name: <%= registrant.name %>
Country: <%= registrant.country %>
<% else %>
Country: <%= registrant.ident_country %>
-<% end %>
+<% end -%>
diff --git a/app/views/mailers/shared/registrant/_registrant.et.html.erb b/app/views/mailers/shared/registrant/_registrant.et.html.erb
index 8857afd74..b396c3428 100644
--- a/app/views/mailers/shared/registrant/_registrant.et.html.erb
+++ b/app/views/mailers/shared/registrant/_registrant.et.html.erb
@@ -4,7 +4,10 @@ Nimi: <%= registrant.name %>
<% else %>
Äriregistrikood: <%= registrant.ident %>
<% end %>
-<% if address_processing %>
+<% if local_assigns[:with_phone] -%>
+ Telefon: <%= registrant.phone %>
+<% end -%>
+<% if address_processing -%>
Tänav: <%= registrant.street %>
Linn: <%= registrant.city %>
Maakond: <%= registrant.state %>
@@ -12,4 +15,4 @@ Nimi: <%= registrant.name %>
Riik: <%= registrant.country(locale: :et) %>
<% else %>
Riik: <%= registrant.ident_country(locale: :et) %>
-<% end %>
+<% end -%>
diff --git a/app/views/mailers/shared/registrant/_registrant.et.text.erb b/app/views/mailers/shared/registrant/_registrant.et.text.erb
index 9a4601f4a..0ff02d51d 100644
--- a/app/views/mailers/shared/registrant/_registrant.et.text.erb
+++ b/app/views/mailers/shared/registrant/_registrant.et.text.erb
@@ -4,7 +4,10 @@ Nimi: <%= registrant.name %>
<% else %>
Äriregistrikood: <%= registrant.ident %>
<% end %>
-<% if address_processing %>
+<% if local_assigns[:with_phone] -%>
+ Telefon: <%= registrant.phone %>
+<% end -%>
+<% if address_processing -%>
Tänav: <%= registrant.street %>
Linn: <%= registrant.city %>
Maakond: <%= registrant.state %>
@@ -12,4 +15,4 @@ Nimi: <%= registrant.name %>
Riik: <%= registrant.country(locale: :et) %>
<% else %>
Riik: <%= registrant.ident_country(locale: :et) %>
-<% end %>
+<% end -%>
diff --git a/spec/presenters/registrant_presenter_spec.rb b/spec/presenters/registrant_presenter_spec.rb
index f787fc2d3..e0c453540 100644
--- a/spec/presenters/registrant_presenter_spec.rb
+++ b/spec/presenters/registrant_presenter_spec.rb
@@ -43,6 +43,7 @@ RSpec.describe RegistrantPresenter do
registrant_delegatable_attributes = %i(
name
ident
+ phone
email
priv?
street
diff --git a/spec/views/mailers/shared/registrant/registrant_shared.rb b/spec/views/mailers/shared/registrant/registrant_shared.rb
index fb42b2a2e..5537680f1 100644
--- a/spec/views/mailers/shared/registrant/registrant_shared.rb
+++ b/spec/views/mailers/shared/registrant/registrant_shared.rb
@@ -21,6 +21,22 @@ RSpec.shared_examples 'domain mailer registrant info' do |template_path|
expect(rendered).to have_text('test ident')
end
+ context 'when :with_phone is true' do
+ it 'has phone' do
+ allow(registrant).to receive(:phone).and_return('test phone')
+ render template: template_path, locals: { with_phone: true }
+ expect(rendered).to have_text('test phone')
+ end
+ end
+
+ context 'when :with_phone is false' do
+ it 'has no phone' do
+ allow(registrant).to receive(:phone).and_return('test phone')
+ render template: template_path, locals: { with_phone: false }
+ expect(rendered).to_not have_text('test phone')
+ end
+ end
+
address_attributes = %i[street city state zip country]
context 'when address processing is enabled' do