From 7b02f98af8d08e0c9757b3925c0f16ebfc01e179 Mon Sep 17 00:00:00 2001
From: Vladimir Krylov <vladimir.krylov@perfectline.co>
Date: Mon, 30 Nov 2015 15:43:02 +0200
Subject: [PATCH] Story#107821878 - ContactsMailer#email_updated gets new
 attribute old_email

---
 app/mailers/contact_mailer.rb                           | 6 ++++--
 app/models/contact.rb                                   | 2 +-
 app/views/mailers/contact_mailer/email_updated.html.erb | 4 ++--
 app/views/mailers/contact_mailer/email_updated.text.erb | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/mailers/contact_mailer.rb b/app/mailers/contact_mailer.rb
index 110ce6a71..08beae05d 100644
--- a/app/mailers/contact_mailer.rb
+++ b/app/mailers/contact_mailer.rb
@@ -1,8 +1,10 @@
 class ContactMailer < ApplicationMailer
   include Que::Mailer
 
-  def email_updated(email, contact_id, should_deliver)
-    @contact = Contact.find_by(id: contact_id)
+  def email_updated(old_email, email, contact_id, should_deliver)
+    @contact   = Contact.find_by(id: contact_id)
+    @old_email = old_email
+
     return unless email || @contact
     return if delivery_off?(@contact, should_deliver)
     return if whitelist_blocked?(email)
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 20c11ae80..154a2e636 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -50,7 +50,7 @@ class Contact < ActiveRecord::Base
     emails << domains.map(&:registrant_email) if domains.present?
     emails = emails.flatten.uniq
     emails.each do |e|
-      ContactMailer.email_updated(e, id, deliver_emails).deliver
+      ContactMailer.email_updated(email_was, e, id, deliver_emails).deliver
     end
   end
 
diff --git a/app/views/mailers/contact_mailer/email_updated.html.erb b/app/views/mailers/contact_mailer/email_updated.html.erb
index 552e97cdf..cd5a75682 100644
--- a/app/views/mailers/contact_mailer/email_updated.html.erb
+++ b/app/views/mailers/contact_mailer/email_updated.html.erb
@@ -1,7 +1,7 @@
 Tere <%= @contact.name %>
 <br><br>
 Kontakti <%= @contact.name %> eposti aadress on muudetud<br>
-endine aadress: <%= @contact.email_was %><br>
+endine aadress: <%= @old_email %><br>
 uus aadress: <%= @contact.email %>
 <br><br>
 Eposti aadressile saadetakse domeenidega seotud infot seal hulgas kinnitustaotluseid omaniku vahetuse ja domeeni kustutamise korral. Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduga oma registripidaja poole. Teie registripidaja on <%= @contact.registrar.name %>
@@ -30,7 +30,7 @@ Eesti Interneti SA
 Hi <%= @contact.name %>
 <br><br>
 E-mail address of <%= @contact.name %> has been changed<br>
-previous address: <%= @contact.email_was %><br>
+previous address: <%= @old_email %><br>
 new address: <%= @contact.email %>
 <br><br>
 E-mail addresses are used to send important information regarding your registered domains including applications for approval of registrant change and domain deletion. Please make sure that the update and contact information are correct. Incase of problems please turn to your registrar. Your registrar is <%= @contact.registrar.name %>
diff --git a/app/views/mailers/contact_mailer/email_updated.text.erb b/app/views/mailers/contact_mailer/email_updated.text.erb
index ce43b5401..a899c04c2 100644
--- a/app/views/mailers/contact_mailer/email_updated.text.erb
+++ b/app/views/mailers/contact_mailer/email_updated.text.erb
@@ -1,7 +1,7 @@
 Tere <%= @contact.name %>
 
 Kontakti <%= @contact.name %> eposti aadress on muudetud
-endine aadress: <%= @contact.email_was %>
+endine aadress: <%= @old_email %>
 uus aadress: <%= @contact.email %>
 
 Eposti aadressile saadetakse domeenidega seotud infot seal hulgas kinnitustaotluseid omaniku vahetuse ja domeeni kustutamise korral. Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduga oma registripidaja poole. Teie registripidaja on <%= @contact.registrar.name %>
@@ -30,7 +30,7 @@ Eesti Interneti SA
 Hi <%= @contact.name %>
 
 E-mail address of <%= @contact.name %> has been changed
-previous address: <%= @contact.email_was %>
+previous address: <%= @old_email %>
 new address: <%= @contact.email %>
 
 E-mail addresses are used to send important information regarding your registered domains including applications for approval of registrant change and domain deletion. Please make sure that the update and contact information are correct. Incase of problems please turn to your registrar. Your registrar is <%= @contact.registrar.name %>