zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-03 09:43:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Take "address_processing" setting into account in ContactMailer

Browse source 
#480
This commit is contained in:
Artur Beljajev 2017-05-22 01:27:17 +03:00
parent 332ef9b04b
commit 490ebf969c
3 changed files with 17 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/mailers/contact_mailer.rb
View file

@ -1,5 +1,6 @@
class ContactMailer < ApplicationMailer class ContactMailer < ApplicationMailer
include Que::Mailer include Que::Mailer
helper_method :address_processing
def email_updated(old_email, email, contact_id, should_deliver) def email_updated(old_email, email, contact_id, should_deliver)
@contact = Contact.find_by(id: contact_id) @contact = Contact.find_by(id: contact_id)
@ -32,4 +33,10 @@ class ContactMailer < ApplicationMailer
logger.info "EMAIL SENDING FAILED: #{email}: #{e}" logger.info "EMAIL SENDING FAILED: #{email}: #{e}"
end end
end end
private
def address_processing
Contact.address_processing?
end
end end

19
app/views/mailers/contact_mailer/email_updated.html.erb
View file

@ -1,3 +1,6 @@
<%
contact = RegistrantPresenter.new(registrant: @contact, view: self)
%>
Tere <%= @contact.name %> Tere <%= @contact.name %>
<br><br> <br><br>
Kontakti <%= @contact.name %> e-posti aadress on muudetud<br> Kontakti <%= @contact.name %> e-posti aadress on muudetud<br>
@ -14,13 +17,7 @@ Muudatusega seotud domeenid:<br>
<% end %> <% end %>
<br> <br>
Kontaktandmed:<br> Kontaktandmed:<br>
Nimi: <%= @contact.name %><br> <%= render 'mailers/shared/registrant/registrant.et.html', registrant: contact %>
Isikukood: <%= @contact.ident %><br>
E-post: <%= @contact.email %><br>
Tel: <%= @contact.phone %><br>
Tänav: <%= @contact.street %><br>
Linn: <%= @contact.city %><br>
Riik: <%= @contact.country %>
<br><br> <br><br>
Lugupidamisega<br> Lugupidamisega<br>
Eesti Interneti Sihtasutus Eesti Interneti Sihtasutus
@ -43,13 +40,7 @@ Domains affected by this update:<br>
<% end %> <% end %>
<br> <br>
Contact information:<br> Contact information:<br>
Name: <%= @contact.name %><br> <%= render 'mailers/shared/registrant/registrant.en.html', registrant: contact %>
Identity Code: <%= @contact.ident %><br>
E-mail: <%= @contact.email %><br>
Tel: <%= @contact.phone %><br>
Street: <%= @contact.street %><br>
City: <%= @contact.city %><br>
Country: <%= @contact.country %>
<br><br> <br><br>
Best Regards,<br> Best Regards,<br>
Estonian Internet Foundation Estonian Internet Foundation

19
app/views/mailers/contact_mailer/email_updated.text.erb
View file

@ -1,3 +1,6 @@
<%
contact = RegistrantPresenter.new(registrant: @contact, view: self)
%>
Tere <%= @contact.name %> Tere <%= @contact.name %>
Kontakti <%= @contact.name %> e-posti aadress on muudetud Kontakti <%= @contact.name %> e-posti aadress on muudetud
@ -14,13 +17,7 @@ Muudatusega seotud domeenid:
<% end %> <% end %>
Kontaktandmed: Kontaktandmed:
Nimi: <%= @contact.name %> <%= render 'mailers/shared/registrant/registrant.et.text', registrant: contact %>
Isikukood: <%= @contact.ident %>
E-post: <%= @contact.email %>
Tel: <%= @contact.phone %>
Tänav: <%= @contact.street %>
Linn: <%= @contact.city %>
Riik: <%= @contact.country %>
Lugupidamisega Lugupidamisega
Eesti Interneti Sihtasutus Eesti Interneti Sihtasutus
@ -43,13 +40,7 @@ Domains affected by this update:
<% end %> <% end %>
Contact information: Contact information:
Name: <%= @contact.name %> <%= render 'mailers/shared/registrant/registrant.en.text', registrant: contact %>
Identity Code: <%= @contact.ident %>
E-mail: <%= @contact.email %>
Tel: <%= @contact.phone %>
Street: <%= @contact.street %>
City: <%= @contact.city %>
Country: <%= @contact.country %>
Best Regards, Best Regards,
Estonian Internet Foundation Estonian Internet Foundation