From 7c469923a7cce318410ad7f916193d7ab63ff7cb Mon Sep 17 00:00:00 2001
From: Stas <stanislav@perfectline.co>
Date: Wed, 2 Dec 2015 17:37:38 +0200
Subject: [PATCH 01/35] 109190528-condition_added

---
 app/views/epp/domains/info.xml.builder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/epp/domains/info.xml.builder b/app/views/epp/domains/info.xml.builder
index 9e1779921..d3ffd22d5 100644
--- a/app/views/epp/domains/info.xml.builder
+++ b/app/views/epp/domains/info.xml.builder
@@ -38,7 +38,7 @@ xml.epp_head do
 
         xml.tag!('domain:clID', @domain.registrar_name)
 
-        xml.tag!('domain:crID', @domain.creator.try(:registrar)) if @domain.creator
+        xml.tag!('domain:crID', @domain.creator.try(:registrar) || @domain.creator) if @domain.creator
 
         xml.tag!('domain:crDate', @domain.created_at.try(:iso8601))
 

From 8944ec5bf0034f44b635b5178a6f320b31f1b2d5 Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Thu, 3 Dec 2015 16:53:05 +0200
Subject: [PATCH 02/35] Story #109367018 - send mail about with old registrant
 name when pending update

---
 app/models/domain.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/models/domain.rb b/app/models/domain.rb
index cc35807d5..b05a4327a 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -438,7 +438,6 @@ class Domain < ActiveRecord::Base
   end
 
   def pending_update!
-    old_registrant_id = registrant_id
     return true if pending_update?
     self.epp_pending_update = true # for epp
 
@@ -450,8 +449,8 @@ class Domain < ActiveRecord::Base
     new_registrant_email = registrant.email
     new_registrant_name  = registrant.name
 
-    DomainMailer.pending_update_request_for_old_registrant(id, old_registrant_id, deliver_emails).deliver
-    DomainMailer.pending_update_notification_for_new_registrant(id, old_registrant_id, deliver_emails).deliver
+    DomainMailer.pending_update_request_for_old_registrant(id, registrant_id_was, deliver_emails).deliver
+    DomainMailer.pending_update_notification_for_new_registrant(id, registrant_id_was, deliver_emails).deliver
 
     reload # revert back to original
 

From 4980bc591db45ff80e07a245a44fe73c0c9d1e9e Mon Sep 17 00:00:00 2001
From: Vladimir Krylov <vladimir.krylov@perfectline.co>
Date: Mon, 7 Dec 2015 17:15:23 +0200
Subject: [PATCH 03/35] Story#109623634 - No after-validate contacts callback
 for transfer

---
 app/models/epp/domain.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index 739c55bec..0ec24c60b 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -3,7 +3,7 @@ class Epp::Domain < Domain
   include EppErrors
 
   # TODO: remove this spagetti once data in production is correct.
-  attr_accessor :is_renewal
+  attr_accessor :is_renewal, :is_transfer
 
   before_validation :manage_permissions
   def manage_permissions
@@ -14,7 +14,7 @@ class Epp::Domain < Domain
 
   after_validation :validate_contacts
   def validate_contacts
-    return true if is_renewal
+    return true if is_renewal || is_transfer
 
     ok = true
     active_admins = admin_domain_contacts.select { |x| !x.marked_for_destruction? }
@@ -592,6 +592,8 @@ class Epp::Domain < Domain
 
   # rubocop: disable Metrics/CyclomaticComplexity
   def transfer(frame, action, current_user)
+    @is_transfer = true
+
     case action
     when 'query'
       return domain_transfers.last if domain_transfers.any?

From 668cbdac06d6fcdf549dd05191eb5fb2df27c515 Mon Sep 17 00:00:00 2001
From: Vladimir Krylov <vladimir.krylov@perfectline.co>
Date: Mon, 7 Dec 2015 17:25:24 +0200
Subject: [PATCH 04/35] Story#109623634 - No after-validate contacts callback
 for transfer

---
 app/models/epp/domain.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index 0ec24c60b..7ab57781e 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -7,6 +7,7 @@ class Epp::Domain < Domain
 
   before_validation :manage_permissions
   def manage_permissions
+    return true if is_transfer
     return unless update_prohibited? || delete_prohibited?
     add_epp_error('2304', nil, nil, I18n.t(:object_status_prohibits_operation))
     false

From bbd90127af0ee33fdd2c2e072fc8ff4a2b605b8a Mon Sep 17 00:00:00 2001
From: Stas <stanislav@perfectline.co>
Date: Fri, 11 Dec 2015 12:07:46 +0200
Subject: [PATCH 05/35] 109809872-template_changes

---
 app/views/admin/contacts/partials/_general.haml    | 2 +-
 app/views/admin/domains/partials/_general.haml     | 2 +-
 app/views/admin/keyrelays/show.haml                | 2 +-
 app/views/registrar/domains/partials/_general.haml | 2 +-
 app/views/registrar/polls/show.haml                | 2 +-
 config/locales/en.yml                              | 2 ++
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/admin/contacts/partials/_general.haml b/app/views/admin/contacts/partials/_general.haml
index 194c5feb5..64f17612e 100644
--- a/app/views/admin/contacts/partials/_general.haml
+++ b/app/views/admin/contacts/partials/_general.haml
@@ -6,7 +6,7 @@
       %dt= t(:id)
       %dd= @contact.code
 
-      %dt= t(:password)
+      %dt= t(:authinfo_pw)
       %dd
         = text_field_tag :auth_info, @contact.auth_info, readonly: true, class: 'partially-hidden'
 
diff --git a/app/views/admin/domains/partials/_general.haml b/app/views/admin/domains/partials/_general.haml
index d433a1302..d1a17c1cc 100644
--- a/app/views/admin/domains/partials/_general.haml
+++ b/app/views/admin/domains/partials/_general.haml
@@ -12,7 +12,7 @@
       %dt= t(:registrar)
       %dd= link_to(@domain.registrar, admin_registrar_path(@domain.registrar))
 
-      %dt= t(:password)
+      %dt= t(:authinfo_pw)
       %dd
         = text_field_tag :password, @domain.auth_info, readonly: true, class: 'partially-hidden'
 
diff --git a/app/views/admin/keyrelays/show.haml b/app/views/admin/keyrelays/show.haml
index 067cd4439..08f8b6f33 100644
--- a/app/views/admin/keyrelays/show.haml
+++ b/app/views/admin/keyrelays/show.haml
@@ -28,7 +28,7 @@
           %dt= t(:public_key)
           %dd= @keyrelay.key_data_public_key
 
-          %dt= t(:password)
+          %dt= t(:authinfo_pw)
           %dd= @keyrelay.auth_info_pw
 
           %dt= t(:expiry_relative)
diff --git a/app/views/registrar/domains/partials/_general.haml b/app/views/registrar/domains/partials/_general.haml
index cd16079dd..4eb5285e7 100644
--- a/app/views/registrar/domains/partials/_general.haml
+++ b/app/views/registrar/domains/partials/_general.haml
@@ -3,7 +3,7 @@
     %h3.panel-title= t(:general)
   .panel-body
     %dl.dl-horizontal
-      %dt= t(:password)
+      %dt= t(:authinfo_pw)
       %dd= @data.css('pw').text.present? ? @data.css('pw').text : t('hidden')
 
       - if @data.css('pw').text.blank?
diff --git a/app/views/registrar/polls/show.haml b/app/views/registrar/polls/show.haml
index 90a5bb02a..e013bad7b 100644
--- a/app/views/registrar/polls/show.haml
+++ b/app/views/registrar/polls/show.haml
@@ -30,7 +30,7 @@
                 %dt= t(:domain_name)
                 %dd= @data.css('name').text
 
-                %dt= t(:password)
+                %dt= t(:authinfo_pw)
                 %dd= @data.css('pw').text
 
                 - if @data.css('relative').text.present?
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 16e643b16..83f9ce16a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -280,6 +280,7 @@ en:
   domain_details: 'Domain details'
   registered_at: 'Registered at'
   password: 'Password'
+  authinfo_pw: 'AuthInfo pw'
   valid_from: 'Valid from'
   general: 'General'
   contacts: 'Contacts'
@@ -554,6 +555,7 @@ en:
 
   username: 'Username'
   password: 'Password'
+  authinfo_pw: 'AuthInfo pw'
   log_in: 'Log in'
   domains: 'Domains'
   register: 'Register'

From 95454229ca0feb9783deaf8ee62bef7d49d744c2 Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Mon, 14 Dec 2015 17:43:24 +0200
Subject: [PATCH 06/35] Story #105745608 - handle missing price list with error
 2104

---
 app/controllers/epp/domains_controller.rb | 24 +++++++++++------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/controllers/epp/domains_controller.rb b/app/controllers/epp/domains_controller.rb
index f8cb2b752..91ddeb93d 100644
--- a/app/controllers/epp/domains_controller.rb
+++ b/app/controllers/epp/domains_controller.rb
@@ -29,11 +29,6 @@ class Epp::DomainsController < EppController
     handle_errors(@domain) and return if @domain.errors.any?
     handle_errors and return unless balance_ok?('create') # loads pricelist in this method
 
-    if !@domain_pricelist.try(:price)#checking if pricelist is not found
-        @domain.add_epp_error('2306', nil, nil, 'No price list for domain')
-        handle_errors(@domain) and return if @domain.errors.any?
-    end
-
     ActiveRecord::Base.transaction do
       if @domain.save # TODO: Maybe use validate: false here because we have already validated the domain?
         current_user.registrar.debit!({
@@ -107,10 +102,6 @@ class Epp::DomainsController < EppController
     period_unit = Epp::Domain.parse_period_unit_from_frame(params[:parsed_frame]) || 'y'
 
     balance_ok?('renew', period, period_unit) # loading pricelist
-    if !@domain_pricelist.try(:price)#checking if pricelist is not found
-      @domain.add_epp_error('2306', nil, nil, 'No price list for domain')
-      handle_errors(@domain) and return if @domain.errors.any?
-    end
 
     ActiveRecord::Base.transaction do
       success = @domain.renew(
@@ -258,12 +249,19 @@ class Epp::DomainsController < EppController
 
   def balance_ok?(operation, period = nil, unit = nil)
     @domain_pricelist = @domain.pricelist(operation, period.try(:to_i), unit)
-    if current_user.registrar.balance < @domain_pricelist.price.amount
+    if @domain_pricelist.try(:price) # checking if price list is not found
+      if current_user.registrar.balance < @domain_pricelist.price.amount
+        epp_errors << {
+            code: '2104',
+            msg: I18n.t('billing_failure_credit_balance_low')
+        }
+        return false
+      end
+    else
       epp_errors << {
-        code: '2104',
-        msg: I18n.t('billing_failure_credit_balance_low')
+          code: '2104',
+          msg: I18n.t(:active_price_missing_for_this_operation)
       }
-
       return false
     end
     true

From 369c0507ebae8f4ebf3e266e1b823c68b0e8d171 Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Thu, 3 Dec 2015 16:53:05 +0200
Subject: [PATCH 07/35] Story #109367018 - send mail about with old registrant
 name when pending update

---
 app/models/domain.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/models/domain.rb b/app/models/domain.rb
index 988cd43e3..842293842 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -440,7 +440,6 @@ class Domain < ActiveRecord::Base
   end
 
   def pending_update!
-    old_registrant_id = registrant_id
     return true if pending_update?
     self.epp_pending_update = true # for epp
 
@@ -452,8 +451,8 @@ class Domain < ActiveRecord::Base
     new_registrant_email = registrant.email
     new_registrant_name  = registrant.name
 
-    DomainMailer.pending_update_request_for_old_registrant(id, old_registrant_id, deliver_emails).deliver
-    DomainMailer.pending_update_notification_for_new_registrant(id, old_registrant_id, deliver_emails).deliver
+    DomainMailer.pending_update_request_for_old_registrant(id, registrant_id_was, deliver_emails).deliver
+    DomainMailer.pending_update_notification_for_new_registrant(id, registrant_id_was, deliver_emails).deliver
 
     reload # revert back to original
 

From 2c916001ad2cf1707078e69be85c8704458287b5 Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Tue, 15 Dec 2015 09:24:41 +0200
Subject: [PATCH 08/35] Story #109367018 -
 poll_pending_update_rejected_by_registrant typo

---
 config/locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 16e643b16..b441f8fd3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -904,7 +904,7 @@ en:
   edit_zone: 'Edit zone'
   there_are_count_domains_in_this_zone: 'There are %{count} domains in this zone'
   poll_pending_update_confirmed_by_registrant: 'Registrant confirmed domain update'
-  poll_pending_update_rejected_by_registranti: 'Registrant rejected domain update'
+  poll_pending_update_rejected_by_registrant: 'Registrant rejected domain update'
   poll_pending_delete_rejected_by_registrant: 'Registrant rejected domain deletion'
   poll_pending_delete_confirmed_by_registrant: 'Registrant confirmed domain deletion'
   manage: Manage

From 51a579891401964bf37f90d10f97deccda689566 Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Wed, 16 Dec 2015 16:14:05 +0200
Subject: [PATCH 09/35] Story #109367018 - add new model to handle domain
 values are changing, and need to be captured now, not later New model will
 provide data to DomainMailer customized as needed for the invocation reason
 as passed via symbol to send_mail(). The mail templetes then required
 modification to use the new data model. This should handle all the data
 errors in the update process, including pendingUpdate, confirmed, rejected or
 expired.

---
 app/jobs/domain_update_confirm_job.rb         |  24 +--
 app/mailers/domain_mailer.rb                  | 128 +++----------
 app/models/domain.rb                          |  11 +-
 app/models/domain_mail_model.rb               | 176 ++++++++++++++++++
 app/models/epp/domain.rb                      |   5 +-
 ...d_notification_for_new_registrant.html.erb |   8 +-
 ...d_notification_for_new_registrant.text.erb |   8 +-
 ...e_notification_for_new_registrant.html.erb |  42 ++---
 ...e_notification_for_new_registrant.text.erb |  42 ++---
 ...d_notification_for_new_registrant.html.erb |   8 +-
 ...d_notification_for_new_registrant.text.erb |   8 +-
 ...update_request_for_old_registrant.html.erb |  36 ++--
 ...update_request_for_old_registrant.text.erb |  36 ++--
 ...d_notification_for_new_registrant.html.erb |  36 ++--
 ...d_notification_for_new_registrant.text.erb |  36 ++--
 ...d_notification_for_old_registrant.html.erb |   8 +-
 ...d_notification_for_old_registrant.text.erb |   8 +-
 17 files changed, 366 insertions(+), 254 deletions(-)
 create mode 100644 app/models/domain_mail_model.rb

diff --git a/app/jobs/domain_update_confirm_job.rb b/app/jobs/domain_update_confirm_job.rb
index 28294ef25..4f2c1e9ad 100644
--- a/app/jobs/domain_update_confirm_job.rb
+++ b/app/jobs/domain_update_confirm_job.rb
@@ -4,18 +4,18 @@ class DomainUpdateConfirmJob < Que::Job
     ActiveRecord::Base.transaction do
       domain = Epp::Domain.find(domain_id)
       case action
-      when RegistrantVerification::CONFIRMED
-        domain.poll_message!(:poll_pending_update_confirmed_by_registrant)
-        domain.apply_pending_update! do |e|
-          e.instance_variable_set("@changed_attributes", e.changed_attributes.merge("statuses"=>[]))
-        end
-        domain.clean_pendings!
-      when RegistrantVerification::REJECTED
-        DomainMailer.pending_update_rejected_notification_for_new_registrant(domain_id).deliver
-        domain.poll_message!(:poll_pending_update_rejected_by_registrant)
-        domain.clean_pendings!
-        domain.instance_variable_set("@changed_attributes", domain.changed_attributes.merge("statuses"=>[]))
-        domain.save
+        when RegistrantVerification::CONFIRMED
+          domain.poll_message!(:poll_pending_update_confirmed_by_registrant)
+          domain.apply_pending_update! do |e|
+            e.instance_variable_set("@changed_attributes", e.changed_attributes.merge("statuses"=>[]))
+          end
+          domain.clean_pendings!
+        when RegistrantVerification::REJECTED
+          domain.send_mail :pending_update_rejected_notification_for_new_registrant
+          domain.poll_message!(:poll_pending_update_rejected_by_registrant)
+          domain.clean_pendings!
+          domain.instance_variable_set("@changed_attributes", domain.changed_attributes.merge("statuses"=>[]))
+          domain.save
       end
       destroy # it's best to destroy the job in the same transaction
     end
diff --git a/app/mailers/domain_mailer.rb b/app/mailers/domain_mailer.rb
index 3788dd510..4963cb02a 100644
--- a/app/mailers/domain_mailer.rb
+++ b/app/mailers/domain_mailer.rb
@@ -1,109 +1,41 @@
 class DomainMailer < ApplicationMailer
   include Que::Mailer
 
-  def pending_update_request_for_old_registrant(domain_id, old_registrant_id, should_deliver)
-    @domain = Domain.find_by(id: domain_id)
-    @old_registrant = Registrant.find(old_registrant_id)
-    return unless @domain
-    return if delivery_off?(@domain, should_deliver)
-
-    if @domain.registrant_verification_token.blank?
-      logger.warn "EMAIL NOT DELIVERED: registrant_verification_token is missing for #{@domain.name}"
-      return
-    end
-
-    if @domain.registrant_verification_asked_at.blank?
-      logger.warn "EMAIL NOT DELIVERED: registrant_verification_asked_at is missing for #{@domain.name}"
-      return
-    end
-
-    confirm_path = "#{ENV['registrant_url']}/registrant/domain_update_confirms"
-    @verification_url = "#{confirm_path}/#{@domain.id}?token=#{@domain.registrant_verification_token}"
-
-    return if whitelist_blocked?(@old_registrant.email)
-    mail(to: format(@old_registrant.email),
-         subject: "#{I18n.t(:pending_update_request_for_old_registrant_subject,
-         name: @domain.name)} [#{@domain.name}]")
+  def pending_update_request_for_old_registrant(params)
+    compose_from(params)
   end
 
-  def pending_update_notification_for_new_registrant(domain_id, old_registrant_id, should_deliver)
-    @domain = Domain.find_by(id: domain_id)
-    @old_registrant = Registrant.find(old_registrant_id)
-    return unless @domain
-    return if delivery_off?(@domain, should_deliver)
+  def pending_update_notification_for_new_registrant(params)
+    compose_from(params)
+  end
 
-    if @domain.registrant_verification_token.blank?
-      logger.warn "EMAIL NOT DELIVERED: registrant_verification_token is missing for #{@domain.name}"
+  def registrant_updated_notification_for_new_registrant(params)
+    compose_from(params)
+  end
+
+  def registrant_updated_notification_for_old_registrant(params)
+    compose_from(params)
+  end
+
+  def pending_update_rejected_notification_for_new_registrant(params)
+    compose_from(params)
+  end
+
+  def pending_update_expired_notification_for_new_registrant(params)
+    compose_from(params)
+  end
+
+  # app/models/DomainMailModel provides the data for mail that can be composed_from
+  # which ensures that values of objects are captured when they are valid, not later when this method is executed
+  def compose_from(params)
+    @params = params
+    return if delivery_off?(params, params[:deliver_emails])
+    return if whitelist_blocked?(params[:recipient])
+    params[:errors].map do |error|
+      logger.warn error
       return
     end
-
-    if @domain.registrant_verification_asked_at.blank?
-      logger.warn "EMAIL NOT DELIVERED: registrant_verification_asked_at is missing for #{@domain.name}"
-      return
-    end
-
-    @new_registrant = @domain.registrant # NB! new registrant at this point
-
-    return if whitelist_blocked?(@new_registrant.email)
-    mail(to: format(@new_registrant.email),
-         subject: "#{I18n.t(:pending_update_notification_for_new_registrant_subject,
-         name: @domain.name)} [#{@domain.name}]")
-  end
-
-  def registrant_updated_notification_for_new_registrant(domain_id, should_deliver)
-    @domain = Domain.find_by(id: domain_id)
-    return unless @domain
-    return if delivery_off?(@domain, should_deliver)
-
-    return if whitelist_blocked?(@domain.registrant_email)
-    mail(to: format(@domain.registrant_email),
-         subject: "#{I18n.t(:registrant_updated_notification_for_new_registrant_subject,
-         name: @domain.name)} [#{@domain.name}]")
-  end
-
-  def registrant_updated_notification_for_old_registrant(domain_id, should_deliver)
-    domain = Domain.find_by(id: domain_id)
-    return unless domain
-    return if delivery_off?(@domain, should_deliver)
-
-    @old_registrant_email = domain.registrant_email # Nb! before applying pending updates
-
-    return if whitelist_blocked?(@old_registrant_email)
-    mail(to: format(@old_registrant_email),
-         subject: "#{I18n.t(:registrant_updated_notification_for_old_registrant_subject,
-         name: @domain.name)} [#{@domain.name}]")
-  end
-
-  def pending_update_rejected_notification_for_new_registrant(domain_id)
-    @domain = Domain.find_by(id: domain_id)
-    return unless @domain
-    # no delivery off control, driggered by que, no epp request
-
-    @new_registrant_email = @domain.pending_json['new_registrant_email']
-    @new_registrant_name  = @domain.pending_json['new_registrant_name']
-
-    return if whitelist_blocked?(@new_registrant_email)
-    mail(to: format(@new_registrant_email),
-         subject: "#{I18n.t(:pending_update_rejected_notification_for_new_registrant_subject,
-         name: @domain.name)} [#{@domain.name}]")
-  end
-
-  def pending_update_expired_notification_for_new_registrant(domain_id)
-    @domain = Domain.find_by(id: domain_id)
-    return unless @domain
-    # no delivery off control, driggered by cron, no epp request
-
-    @new_registrant_email = @domain.pending_json['new_registrant_email']
-    @new_registrant_name  = @domain.pending_json['new_registrant_name']
-
-    return if whitelist_blocked?(@new_registrant_email)
-    if @new_registrant_email.blank?
-      logger.info "EMAIL NOT DELIVERED: no registrant email [pending_update_expired_notification_for_new_registrant]"
-      return
-    end
-    mail(to: format(@new_registrant_email),
-         subject: "#{I18n.t(:pending_update_expired_notification_for_new_registrant_subject,
-         name: @domain.name)} [#{@domain.name}]")
+    mail(to: params[:recipient], subject: params[:subject])
   end
 
   def pending_deleted(domain_id, old_registrant_id, should_deliver)
diff --git a/app/models/domain.rb b/app/models/domain.rb
index 842293842..d74eaf9a3 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -239,7 +239,7 @@ class Domain < ActiveRecord::Base
         end
         count += 1
         if domain.pending_update?
-          DomainMailer.pending_update_expired_notification_for_new_registrant(domain.id).deliver
+          send_mail :pending_update_expired_notification_for_new_registrant
         end
         if domain.pending_delete? || domain.pending_delete_confirmation?
           DomainMailer.pending_delete_expired_notification(domain.id, true).deliver
@@ -451,8 +451,8 @@ class Domain < ActiveRecord::Base
     new_registrant_email = registrant.email
     new_registrant_name  = registrant.name
 
-    DomainMailer.pending_update_request_for_old_registrant(id, registrant_id_was, deliver_emails).deliver
-    DomainMailer.pending_update_notification_for_new_registrant(id, registrant_id_was, deliver_emails).deliver
+    send_mail :pending_update_request_for_old_registrant
+    send_mail :pending_update_notification_for_new_registrant
 
     reload # revert back to original
 
@@ -818,5 +818,10 @@ class Domain < ActiveRecord::Base
       status_notes[status] = notes[i]
     end
   end
+
+  def send_mail(action)
+    DomainMailer.send(action, DomainMailModel.new(self).send(action)).deliver
+  end
+
 end
 # rubocop: enable Metrics/ClassLength
diff --git a/app/models/domain_mail_model.rb b/app/models/domain_mail_model.rb
new file mode 100644
index 000000000..045ba4b3e
--- /dev/null
+++ b/app/models/domain_mail_model.rb
@@ -0,0 +1,176 @@
+class DomainMailModel
+  # Capture current values used in app/views/mailers/domain_mailer/* and app/mailers/domain_mailer will send later
+  
+  def initialize(domain)
+    @domain = domain
+    @params = {errors: [], deliver_emails: domain.deliver_emails, id: domain.id}
+  end
+
+  def pending_update_request_for_old_registrant
+    registrant_old
+    subject(:pending_update_request_for_old_registrant_subject)
+    confirm_update
+    domain_info
+    compose
+  end
+
+  def pending_update_notification_for_new_registrant
+    # NB! new registrant at this point 
+    registrant
+    subject(:pending_update_notification_for_new_registrant_subject)
+    domain_info
+    compose
+  end
+      
+  def registrant_updated_notification_for_new_registrant
+    registrant
+    subject(:registrant_updated_notification_for_new_registrant_subject)
+    domain_info
+    compose
+  end
+
+  def registrant_updated_notification_for_old_registrant
+    registrant_old
+    subject(:registrant_updated_notification_for_old_registrant_subject)
+    registrant_name
+    compose
+  end
+  
+  def pending_update_rejected_notification_for_new_registrant
+    registrant_pending
+    subject(:pending_update_rejected_notification_for_new_registrant_subject)
+    @params[:deliver_emails] = true # trigger from que
+    @params[:registrar_name] = @domain.registrar.name
+    compose
+  end
+
+  def pending_update_expired_notification_for_new_registrant
+    registrant_pending
+    subject(:pending_update_expired_notification_for_new_registrant_subject)
+    compose
+  end
+
+  def pending_deleted
+    registrant
+    subject(:domain_pending_deleted_subject)
+    confirm_delete
+    compose
+  end
+
+  def pending_delete_rejected_notification
+    registrant
+    subject(:pending_delete_rejected_notification_subject)
+    compose
+  end
+
+  def pending_delete_expired_notification
+    registrant
+    subject(:pending_delete_expired_notification_subject)
+    compose
+  end
+
+  def delete_confirmation
+    registrant
+    subject(:delete_confirmation_subject)
+    compose
+  end
+
+  def force_delete
+    admins
+    subject(:force_delete_subject)
+    compose
+  end
+
+  private
+  
+  def registrant_old
+    @params[:recipient] = format Registrant.find(@domain.registrant_id_was).email
+  end
+      
+  def registrant
+    @params[:recipient] = format @domain.registrant.email
+  end
+
+  def registrant_name
+    @params[:registrant_name] = @domain.registrant.name
+  end
+
+  def registrant_pending
+    @params[:new_registrant_emai] = @domain.pending_json['new_registrant_email']
+    @params[:new_registrant_name] = @domain.pending_json['new_registrant_name']
+  end
+  
+  # registrant and domain admin contacts
+  def admins
+    emails = ([@domain.registrant.email] + @domain.admin_contacts.map { |x| format(x.email) })
+    @params[:recipient] = emails.uniq.map { |x| format(x) }
+  end
+
+  # puny internet domain name, TODO: username<email>
+  def format(email)
+    user, host = email.split('@')
+    host = SimpleIDN.to_ascii(host)
+    "#{user}@#{host}"
+  end
+
+  def subject(subject)
+    @params[:name] = @domain.name
+    @params[:subject] = I18n.t(subject, name: @domain.name)
+  end
+
+  def confirm_update
+    verification_url('domain_update_confirms')
+  end
+  
+  def confirm_delete
+    verification_url('domain_delete_confirms')
+  end
+
+  def compose
+    @params
+  end
+  
+  #private
+  
+  def verification_url(path)
+    token = verification_token or return
+    @params[:verification_url] = "#{ENV['registrant_url']}/registrant/#{path}/#{@domain.id}?token=#{token}"
+  end
+  
+  def verification_token
+    return warn_missing(:registrant_verification_token) if @domain.registrant_verification_token.blank?
+    return warn_missing(:registrant_verification_asked_at) if @domain.registrant_verification_asked_at.blank?
+    @domain.registrant_verification_token
+  end
+  
+  def domain_info
+    [:name, :registrar_name,
+     :registrant_name, :registrant_ident, :registrant_email,
+     :registrant_street,:registrant_city, :registrant_country
+    ].each do |attr|
+      @params.store attr, @domain.send(attr)
+    end
+    @params.store :registrant_priv, @domain.registrant.priv?
+    @params.store old_registrant_name, Registrant.find(@domain.registrant_id_was).name
+    @params
+  end
+
+  def warn_no_email(item)
+    #reason = "#{item.to_s} for #{@domain.name}"
+    warn_not_delivered item #reason
+    nil
+  end
+      
+  def warn_missing(item)
+    warn_not_delivered "#{item.to_s} is missing for #{@domain.name}"
+  end
+
+  def warn_not_delivered(reason)
+    message = "EMAIL NOT DELIVERED: #{reason}"
+    @params[:errors] << message
+#    Rails.logger.warn message
+    nil
+  end
+  
+end
+
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index 40b374003..189b5aa1c 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -500,7 +500,6 @@ class Epp::Domain < Domain
   # rubocop: enable Metrics/CyclomaticComplexity
 
   def apply_pending_update!
-    old_registrant_email = DomainMailer.registrant_updated_notification_for_old_registrant(id, deliver_emails)
     preclean_pendings
     user  = ApiUser.find(pending_json['current_user_id'])
     frame = Nokogiri::XML(pending_json['frame'])
@@ -512,8 +511,8 @@ class Epp::Domain < Domain
     return unless update(frame, user, false)
     clean_pendings!
     self.deliver_emails = true # turn on email delivery
-    DomainMailer.registrant_updated_notification_for_new_registrant(id, deliver_emails).deliver
-    old_registrant_email.deliver
+    send_mail :registrant_updated_notification_for_old_registrant
+    send_mail :registrant_updated_notification_for_new_registrant
     true
   end
 
diff --git a/app/views/mailers/domain_mailer/pending_update_expired_notification_for_new_registrant.html.erb b/app/views/mailers/domain_mailer/pending_update_expired_notification_for_new_registrant.html.erb
index a8bf8723d..cfa539736 100644
--- a/app/views/mailers/domain_mailer/pending_update_expired_notification_for_new_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/pending_update_expired_notification_for_new_registrant.html.erb
@@ -1,8 +1,8 @@
 Tere,
 <br><br>
-Domeeni <%= @domain.name %> registreerija <%= @domain.registrant_name %> ei kinnitanud tähtaegselt registreerija vahetuse taotlust. Domeeni <%= @domain.name %> registreerija vahetus on sellest tulenevalt tühistatud.
+Domeeni <%= @params[:name] %> registreerija <%= @params[:registrant_name] %> ei kinnitanud tähtaegselt registreerija vahetuse taotlust. Domeeni <%= @params[:name] %> registreerija vahetus on sellest tulenevalt tühistatud.
 <br><br>
-Küsimuste korral palun võtke ühendust registripidajaga <%= @domain.registrar_name %>, kelle kontaktid leiate http://internet.ee/registripidajad/akrediteeritud-registripidajad
+Küsimuste korral palun võtke ühendust registripidajaga <%= @params[:registrar_name] %>, kelle kontaktid leiate http://internet.ee/registripidajad/akrediteeritud-registripidajad
 <br><br>
 Lugupidamisega<br>
 Eesti Interneti SA
@@ -11,9 +11,9 @@ Eesti Interneti SA
 <br><br>
 Hi,
 <br><br>
-Domain registrant change has been expired for the domain <%= @domain.name %>.
+Domain registrant change has been expired for the domain <%= @params[:name] %>.
 <br><br>
-Please contact to your registrar <%= @domain.registrar_name %> if you have any questions.
+Please contact to your registrar <%= @params[:registrar_name] %> if you have any questions.
 <br><br>
 Best Regards,<br>
 Estonian Internet Foundation
diff --git a/app/views/mailers/domain_mailer/pending_update_expired_notification_for_new_registrant.text.erb b/app/views/mailers/domain_mailer/pending_update_expired_notification_for_new_registrant.text.erb
index 020a9da65..626583562 100644
--- a/app/views/mailers/domain_mailer/pending_update_expired_notification_for_new_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/pending_update_expired_notification_for_new_registrant.text.erb
@@ -1,8 +1,8 @@
 Tere,
 
-Domeeni <%= @domain.name %> registreerija <%= @domain.registrant_name %> ei kinnitanud tähtaegselt registreerija vahetuse taotlust. Domeeni <%= @domain.name %> registreerija vahetus on sellest tulenevalt tühistatud.
+Domeeni <%= @params[:name] %> registreerija <%= @params[:registrant_name] %> ei kinnitanud tähtaegselt registreerija vahetuse taotlust. Domeeni <%= @params[:name] %> registreerija vahetus on sellest tulenevalt tühistatud.
 
-Küsimuste korral palun võtke ühendust registripidajaga <%= @domain.registrar_name %>, kelle kontaktid leiate http://internet.ee/registripidajad/akrediteeritud-registripidajad
+Küsimuste korral palun võtke ühendust registripidajaga <%= @params[:registrar_name] %>, kelle kontaktid leiate http://internet.ee/registripidajad/akrediteeritud-registripidajad
 
 Lugupidamisega
 Eesti Interneti SA
@@ -11,9 +11,9 @@ Eesti Interneti SA
 
 Hi,
 
-Domain registrant change has been expired for the domain <%= @domain.name %>.
+Domain registrant change has been expired for the domain <%= @params[:name] %>.
 
-Please contact to your registrar <%= @domain.registrar_name %> if you have any questions.
+Please contact to your registrar <%= @params[:registrar_name] %> if you have any questions.
 
 Best Regards,
 Estonian Internet Foundation
diff --git a/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.html.erb b/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.html.erb
index df31c9139..9f33535ea 100644
--- a/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.html.erb
@@ -1,25 +1,25 @@
 Tere,
 <br><br>
-Registripidaja <%= @domain.registrar_name %> vahendusel on algatatud <%= @domain.name %> domeeni omanikuvahetuse protseduur.  
+Registripidaja <%= @params[:registrar_name] %> vahendusel on algatatud <%= @params[:name] %> domeeni omanikuvahetuse protseduur.  
 <br><br>
-Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole. Teie registripidaja on <%= @domain.registrar_name %>
+Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole. Teie registripidaja on <%= @params[:registrar_name] %>
 <br><br>
 Uued registreerija andmed:<br>
-Nimi: <%= @domain.registrant_name %><br>
-<% if @domain.registrant.priv? %>
-  Isikukood: <%= @domain.registrant_ident %><br>
+Nimi: <%= @params[:registrant_name] %><br>
+<% if @params[:registrant_priv] %>
+  Isikukood: <%= @params[:registrant_ident] %><br>
 <% else %>
-  Äriregistrikood: <%= @domain.registrant_ident %><br>
+  Äriregistrikood: <%= @params[:registrant_ident] %><br>
 <% end %>
-Tänav: <%= @domain.registrant_street %><br>
-Linn: <%= @domain.registrant_city %><br>
-Riik: <%= @domain.registrant_country %>
+Tänav: <%= @params[:registrant_street] %><br>
+Linn: <%= @params[:registrant_city] %><br>
+Riik: <%= @params[:registrant_country] %>
 <br><br>
-Juhime Teie tähelepanu asjaolule, et omanikuvahetuse protseduur viiaks lõpule vaid juhul, kui domeeni hetkel kehtiv registreerija <%= @old_registrant.name %> omanikuvahetuse tähtaegselt kinnitab.
+Juhime Teie tähelepanu asjaolule, et omanikuvahetuse protseduur viiaks lõpule vaid juhul, kui domeeni hetkel kehtiv registreerija <%= @params[:old_registrant_name] %> omanikuvahetuse tähtaegselt kinnitab.
 <br><br>
-Juhul kui <%= @old_registrant.name %> lükkab omanikuvahtuse taotluse tagasi või ei anna kinnitust enne <%= Setting.expire_pending_confirmation %> tundi, omanikuvahetuse protseduur tühistatakse.
+Juhul kui <%= @params[:old_registrant_name] %> lükkab omanikuvahtuse taotluse tagasi või ei anna kinnitust enne <%= Setting.expire_pending_confirmation %> tundi, omanikuvahetuse protseduur tühistatakse.
 <br><br>
-Küsimuste korral palun võtke ühendust registripidajaga <%= @domain.registrar_name %>, kelle kontaktid leiate http://internet.ee/registripidajad/akrediteeritud-registripidajad
+Küsimuste korral palun võtke ühendust registripidajaga <%= @params[:registrar_name] %>, kelle kontaktid leiate http://internet.ee/registripidajad/akrediteeritud-registripidajad
 <br><br>
 Lugupidamisega<br>
 Eesti Interneti SA
@@ -28,20 +28,20 @@ Eesti Interneti SA
 <br><br>
 Hi,
 <br><br>
-Registrant change process for the domain <%= @domain.name %> has been started.
+Registrant change process for the domain <%= @params[:name] %> has been started.
 <br><br>
 New registrant:<br>
-Name: <%= @domain.registrant_name %><br>
-<% if @domain.registrant.priv? %>
-Personal code: <%= @domain.registrant_ident %><br>
+Name: <%= @params[:registrant_name] %><br>
+<% if @params[:registrant_priv] %>
+Personal code: <%= @params[:registrant_ident] %><br>
 <% else %>
-Business Registry code: <%= @domain.registrant_ident %><br>
+Business Registry code: <%= @params[:registrant_ident] %><br>
 <% end %>
-Street: <%= @domain.registrant_street %><br>
-City: <%= @domain.registrant_city %><br>
-Country: <%= @domain.registrant_country %>
+Street: <%= @params[:registrant_street] %><br>
+City: <%= @params[:registrant_city] %><br>
+Country: <%= @params[:registrant_country] %>
 <br><br>
-Please contact to your registrar <%= @domain.registrar_name %> if you have any questions.
+Please contact to your registrar <%= @params[:registrar_name] %> if you have any questions.
 <br><br>
 Best Regards,<br>
 Estonian Internet Foundation
diff --git a/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.text.erb b/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.text.erb
index 80265c05f..1aa2d998d 100644
--- a/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.text.erb
@@ -1,25 +1,25 @@
 Tere,
 
-Registripidaja <%= @domain.registrar_name %> vahendusel on algatatud <%= @domain.name %> domeeni omanikuvahetuse protseduur.  
+Registripidaja <%= @params[:registrar_name] %> vahendusel on algatatud <%= @params[:name] %> domeeni omanikuvahetuse protseduur.  
 
-Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole. Teie registripidaja on <%= @domain.registrar_name %>
+Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole. Teie registripidaja on <%= @params[:registrar_name] %>
 
 Uued registreerija andmed:
-Nimi: <%= @domain.registrant_name %>
-<% if @domain.registrant.priv? %>
-Isikukood: <%= @domain.registrant_ident %>
+Nimi: <%= @params[:registrant_name] %>
+<% if @params[:registrant_priv] %>
+Isikukood: <%= @params[:registrant_ident] %>
 <% else %>
-Äriregistrikood: <%= @domain.registrant_ident %>
+Äriregistrikood: <%= @params[:registrant_ident] %>
 <% end %>
-Tänav: <%= @domain.registrant_street %>
-Linn: <%= @domain.registrant_city %>
-Riik: <%= @domain.registrant_country %>
+Tänav: <%= @params[:registrant_street] %>
+Linn: <%= @params[:registrant_city] %>
+Riik: <%= @params[:registrant_country] %>
 
-Juhime Teie tähelepanu asjaolule, et omanikuvahetuse protseduur viiaks lõpule vaid juhul, kui domeeni hetkel kehtiv registreerija <%= @old_registrant.name %> omanikuvahetuse tähtaegselt kinnitab.
+Juhime Teie tähelepanu asjaolule, et omanikuvahetuse protseduur viiaks lõpule vaid juhul, kui domeeni hetkel kehtiv registreerija <%= @params[:old_registrant_name] %> omanikuvahetuse tähtaegselt kinnitab.
 
-Juhul kui <%= @old_registrant.name %> lükkab omanikuvahtuse taotluse tagasi või ei anna kinnitust enne <%= Setting.expire_pending_confirmation %> tundi, omanikuvahetuse protseduur tühistatakse.
+Juhul kui <%= @params[:old_registrant_name] %> lükkab omanikuvahtuse taotluse tagasi või ei anna kinnitust enne <%= Setting.expire_pending_confirmation %> tundi, omanikuvahetuse protseduur tühistatakse.
 
-Küsimuste korral palun võtke ühendust registripidajaga <%= @domain.registrar_name %>, kelle kontaktid leiate http://internet.ee/registripidajad/akrediteeritud-registripidajad
+Küsimuste korral palun võtke ühendust registripidajaga <%= @params[:registrar_name] %>, kelle kontaktid leiate http://internet.ee/registripidajad/akrediteeritud-registripidajad
 
 Lugupidamisega
 Eesti Interneti SA
@@ -28,20 +28,20 @@ Eesti Interneti SA
 
 Hi,
 
-Registrant change process for the domain <%= @domain.name %> has been started.
+Registrant change process for the domain <%= @params[:name] %> has been started.
 
 New registrant:
-Name: <%= @domain.registrant_name %>
-<% if @domain.registrant.priv? %>
-Personal code: <%= @domain.registrant_ident %>
+Name: <%= @params[:registrant_name] %>
+<% if @params[:registrant.priv?] %>
+Personal code: <%= @params[:registrant_ident] %>
 <% else %>
-Business Registry code: <%= @domain.registrant_ident %>
+Business Registry code: <%= @params[:registrant_ident] %>
 <% end %>
-Street: <%= @domain.registrant_street %>
-City: <%= @domain.registrant_city %>
-Country: <%= @domain.registrant_country %>
+Street: <%= @params[:registrant_street] %>
+City: <%= @params[:registrant_city] %>
+Country: <%= @params[:registrant_country] %>
 
-Please contact to your registrar <%= @domain.registrar_name %> if you have any questions.
+Please contact to your registrar <%= @params[:registrar_name] %> if you have any questions.
 
 Best Regards,
 Estonian Internet Foundation
diff --git a/app/views/mailers/domain_mailer/pending_update_rejected_notification_for_new_registrant.html.erb b/app/views/mailers/domain_mailer/pending_update_rejected_notification_for_new_registrant.html.erb
index 94672f176..830b28b5b 100644
--- a/app/views/mailers/domain_mailer/pending_update_rejected_notification_for_new_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/pending_update_rejected_notification_for_new_registrant.html.erb
@@ -1,8 +1,8 @@
 Tere,
 <br><br>
-Domeeni <%= @domain.name %> registreerija <%= @new_registrant_name %> on domeeni registreerija vahetamise taotluse tagasi lükanud.
+Domeeni <%= @params[:name] %> registreerija <%= @params[:new_registrant_name] %> on domeeni registreerija vahetamise taotluse tagasi lükanud.
 <br><br>
-Küsimuste korral palun võtke ühendust registripidajaga <%= @domain.registrar_name %>, kelle kontaktid leiate http://internet.ee/registripidajad/akrediteeritud-registripidajad
+Küsimuste korral palun võtke ühendust registripidajaga <%= @params[:registrar_name] %>, kelle kontaktid leiate http://internet.ee/registripidajad/akrediteeritud-registripidajad
 <br><br>
 Lugupidamisega,<br>
 Eesti Interneti SA
@@ -11,9 +11,9 @@ Eesti Interneti SA
 <br><br>
 Hi,
 <br><br>
-Registrant change was declined for the domain <%= @domain.name %>.
+Registrant change was declined for the domain <%= @params[:name] %>.
 <br><br>
-Please contact to your registrar <%= @domain.registrar_name %> if you have any questions.
+Please contact to your registrar <%= @params[:registrar_name] %> if you have any questions.
 <br><br>
 Best Regards,<br>
 Estonian Internet Foundation
diff --git a/app/views/mailers/domain_mailer/pending_update_rejected_notification_for_new_registrant.text.erb b/app/views/mailers/domain_mailer/pending_update_rejected_notification_for_new_registrant.text.erb
index afdf06325..13cd089f2 100644
--- a/app/views/mailers/domain_mailer/pending_update_rejected_notification_for_new_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/pending_update_rejected_notification_for_new_registrant.text.erb
@@ -1,8 +1,8 @@
 Tere,
 
-Domeeni <%= @domain.name %> registreerija <%= @new_registrant_name %> on domeeni registreerija vahetamise taotluse tagasi lükanud.
+Domeeni <%= @params[:name] %> registreerija <%= @params[:new_registrant_name] %> on domeeni registreerija vahetamise taotluse tagasi lükanud.
 
-Küsimuste korral palun võtke ühendust registripidajaga <%= @domain.registrar_name %>, kelle kontaktid leiate http://internet.ee/registripidajad/akrediteeritud-registripidajad
+Küsimuste korral palun võtke ühendust registripidajaga <%= @params[:registrar_name] %>, kelle kontaktid leiate http://internet.ee/registripidajad/akrediteeritud-registripidajad
 
 Lugupidamisega
 Eesti Interneti SA
@@ -11,9 +11,9 @@ Eesti Interneti SA
 
 Hi,
 
-Registrant change was declined for the domain <%= @domain.name %>.
+Registrant change was declined for the domain <%= @params[:name] %>.
 
-Please contact to your registrar <%= @domain.registrar_name %> if you have any questions.
+Please contact to your registrar <%= @params[:registrar_name] %> if you have any questions.
 
 Best Regards,
 Estonian Internet Foundation
diff --git a/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb b/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb
index c62cb5561..5da14d96d 100644
--- a/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb
@@ -1,23 +1,23 @@
 Tere,
 <br><br>
-Registrisse laekus taotlus domeeni <%= @domain.name %> registreerija vahetuseks. Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole. Teie registripidaja on <%= @domain.registrar_name %>
+Registrisse laekus taotlus domeeni <%= @params[:name] %> registreerija vahetuseks. Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole. Teie registripidaja on <%= @params[:registrar_name] %>
 <br><br>
 Uued registreerija andmed:<br>
-Nimi: <%= @domain.registrant_name %><br>
-<% if @domain.registrant.priv? %>
-Isikukood: <%= @domain.registrant_ident %><br>
+Nimi: <%= @params[:registrant_name] %><br>
+<% if @params[:registrant_priv] %>
+Isikukood: <%= @params[:registrant_ident] %><br>
 <% else %>
-Äriregistrikood: <%= @domain.registrant_ident %><br>
+Äriregistrikood: <%= @params[:registrant_ident] %><br>
 <% end %>
-Tänav: <%= @domain.registrant_street %><br>
-Linn: <%= @domain.registrant_city %><br>
-Riik: <%= @domain.registrant_country %>
+Tänav: <%= @params[:registrant_street] %><br>
+Linn: <%= @params[:registrant_city] %><br>
+Riik: <%= @params[:registrant_country] %>
 <br><br>
 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.
 <br><br>
 Muudatuse kinnitamiseks külastage palun allolevat võrgulehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan:<br>
 
-<%= link_to @verification_url, @verification_url %>
+<%= link_to @params[:verification_url], @params[:verification_url] %>
 <br><br>
 Lugupidamisega<br>
 Eesti Interneti SA
@@ -26,23 +26,23 @@ Eesti Interneti SA
 <br><br>
 Hi,
 <br><br>
-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. Your registrar is <%= @domain.registrar_name %>
+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] %>
 <br><br>
 New registrant:<br>
-Name: <%= @domain.registrant_name %><br>
-<% if @domain.registrant.priv? %>
-Personal code: <%= @domain.registrant_ident %><br>
+Name: <%= @params[:registrant_name] %><br>
+<% if @params[:registrant_priv] %>
+Personal code: <%= @params[:registrant_ident] %><br>
 <% else %>
-Business Registry code: <%= @domain.registrant_ident %><br>
+Business Registry code: <%= @params[:registrant_ident] %><br>
 <% end %>
-Street: <%= @domain.registrant_street %><br>
-City: <%= @domain.registrant_city %><br>
-Country: <%= @domain.registrant_country %>
+Street: <%= @params[:registrant_street] %><br>
+City: <%= @params[:registrant_city] %><br>
+Country: <%= @params[:registrant_country] %>
 <br><br>
 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 @verification_url, @verification_url %>
+<%= link_to @params[:verification_url], @params[:verification_url] %>
 <br><br>
 Best Regards,<br>
 Estonian Internet Foundation
diff --git a/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb b/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb
index 04a85bf5e..27e394b87 100644
--- a/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb
@@ -1,21 +1,21 @@
 Tere,
 
-Registrisse laekus taotlus domeeni <%= @domain.name %> registreerija vahetuseks. Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole. Teie registripidaja on <%= @domain.registrar_name %>
+Registrisse laekus taotlus domeeni <%= @params[:name] %> registreerija vahetuseks. Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole. Teie registripidaja on <%= @params[:registrar_name] %>
 
 Uued registreerija andmed:
-Nimi: <%= @domain.registrant_name %>
-<% if @domain.registrant.priv? %>
-Isikukood: <%= @domain.registrant_ident %>
+Nimi: <%= @params[:registrant_name] %>
+<% if @params[:registrant_priv] %>
+Isikukood: <%= @params[:registrant_ident] %>
 <% else %>
-Äriregistrikood: <%= @domain.registrant_ident %>
+Äriregistrikood: <%= @params[:registrant_ident] %>
 <% end %>
-Tänav: <%= @domain.registrant_street %>
-Linn: <%= @domain.registrant_city %>
-Riik: <%= @domain.registrant_country %>
+Tänav: <%= @params[:registrant_street] %>
+Linn: <%= @params[:registrant_city] %>
+Riik: <%= @params[:registrant_country] %>
 
 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.
 Muudatuse kinnitamiseks külastage palun allolevat võrgulehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan:
-<%= @verification_url %>
+<%= @params[:verification_url] %>
 
 Lugupidamisega
 Eesti Interneti SA
@@ -24,22 +24,22 @@ Eesti Interneti SA
 
 Hi,
 
-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. Your registrar is <%= @domain.registrar_name %>
+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] %>
 
 New registrant:
-Name: <%= @domain.registrant_name %>
-<% if @domain.registrant.priv? %>
-Personal code: <%= @domain.registrant_ident %>
+Name: <%= @params[:registrant_name] %>
+<% if @params[:registrant_priv] %>
+Personal code: <%= @params[:registrant_ident] %>
 <% else %>
-Business Registry code: <%= @domain.registrant_ident %>
+Business Registry code: <%= @params[:registrant_ident] %>
 <% end %>
-Street: <%= @domain.registrant_street %>
-City: <%= @domain.registrant_city %>
-Country: <%= @domain.registrant_country %>
+Street: <%= @params[:registrant_street] %>
+City: <%= @params[:registrant_city] %>
+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:
-<%= @verification_url %>
+<%= @params[:verification_url] %>
 
 Best Regards,
 Estonian Internet Foundation
diff --git a/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.html.erb b/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.html.erb
index eb8352b8e..74021a489 100644
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.html.erb
@@ -1,18 +1,18 @@
 Tere,
 <br><br>
-Domeeni <%= @domain.name %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
+Domeeni <%= @params[:name] %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
 <br><br>
 Uued registreerija andmed:<br>
-Nimi: <%= @domain.registrant_name %><br>
-<% if @domain.registrant.priv? %>
-Isikukood: <%= @domain.registrant_ident %><br>
+Nimi: <%= @params[:registrant_name] %><br>
+<% if @params[:registrant_priv] %>
+Isikukood: <%= @params[:registrant_ident] %><br>
 <% else %>
-Äriregistrikood: <%= @domain.registrant_ident %><br>
+Äriregistrikood: <%= @params[:registrant_ident] %><br>
 <% end %>
-Epost: <%= @domain.registrant_email %><br>
-Tänav: <%= @domain.registrant_street %><br>
-Linn: <%= @domain.registrant_city %><br>
-Riik: <%= @domain.registrant_country %>
+Epost: <%= @params[:registrant_email] %><br>
+Tänav: <%= @params[:registrant_street] %><br>
+Linn: <%= @params[:registrant_city] %><br>
+Riik: <%= @params[:registrant_country] %>
 <br><br>
 Lugupidamisega<br>
 Eesti Interneti SA
@@ -21,19 +21,19 @@ Eesti Interneti SA
 <br><br>
 Hi,
 <br><br>
-Process for changing registrant of the domain <%= @domain.name %> has been approved and the data in the registry is updated.
+Process for changing registrant of the domain <%= @params[:name] %> has been approved and the data in the registry is updated.
 <br><br>
 New registrant:<br>
-Name: <%= @domain.registrant_name %><br>
-<% if @domain.registrant.priv? %>
-Personal code: <%= @domain.registrant_ident %><br>
+Name: <%= @params[:registrant_name] %><br>
+<% if @params[:registrant_priv] %>
+Personal code: <%= @params[:registrant_ident] %><br>
 <% else %>
-Business Registry code: <%= @domain.registrant_ident %><br>
+Business Registry code: <%= @params[:registrant_ident] %><br>
 <% end %>
-E-mail: <%= @domain.registrant_email %><br>
-Street: <%= @domain.registrant_street %><br>
-City: <%= @domain.registrant_city %><br>
-Country: <%= @domain.registrant_country %>
+E-mail: <%= @params[:registrant_email] %><br>
+Street: <%= @params[:registrant_street] %><br>
+City: <%= @params[:registrant_city] %><br>
+Country: <%= @params[:registrant_country] %>
 <br><br>
 Best Regards,<br>
 Estonian Internet Foundation
diff --git a/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.text.erb b/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.text.erb
index 503c111f6..279afa2b5 100644
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.text.erb
@@ -1,18 +1,18 @@
 Tere,
 
-Domeeni <%= @domain.name %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
+Domeeni <%= @params[:name] %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
 
 Uued registreerija andmed:
-Nimi: <%= @domain.registrant_name %>
-<% if @domain.registrant.priv? %>
-Isikukood: <%= @domain.registrant_ident %>
+Nimi: <%= @params[:registrant_name] %>
+<% if @params[:registrant_priv] %>
+Isikukood: <%= @params[:registrant_ident] %>
 <% else %>
-Äriregistrikood: <%= @domain.registrant_ident %>
+Äriregistrikood: <%= @params[:registrant_ident] %>
 <% end %>
-Epost: <%= @domain.registrant_email %>
-Tänav: <%= @domain.registrant_street %>
-Linn: <%= @domain.registrant_city %>
-Riik: <%= @domain.registrant_country %>
+Epost: <%= @params[:registrant_email] %>
+Tänav: <%= @params[:registrant_street] %>
+Linn: <%= @params[:registrant_city] %>
+Riik: <%= @params[:registrant_country] %>
 
 Lugupidamisega
 Eesti Interneti SA
@@ -21,19 +21,19 @@ Eesti Interneti SA
 
 Hi,
 
-Process for changing registrant of the domain <%= @domain.name %> has been approved and the data in the registry is updated.
+Process for changing registrant of the domain <%= @params[:name] %> has been approved and the data in the registry is updated.
 
 New registrant:
-Name: <%= @domain.registrant_name %>
-<% if @domain.registrant.priv? %>
-Personal code: <%= @domain.registrant_ident %>
+Name: <%= @params[:registrant_name] %>
+<% if @params[:registrant_priv] %>
+Personal code: <%= @params[:registrant_ident] %>
 <% else %>
-Business Registry code: <%= @domain.registrant_ident %>
+Business Registry code: <%= @params[:registrant_ident] %>
 <% end %>
-E-mail: <%= @domain.registrant_email %>
-Street: <%= @domain.registrant_street %>
-City: <%= @domain.registrant_city %>
-Country: <%= @domain.registrant_country %>
+E-mail: <%= @params[:registrant_email] %>
+Street: <%= @params[:registrant_street] %>
+City: <%= @params[:registrant_city] %>
+Country: <%= @params[:registrant_country] %>
 
 Best Regards,
 Estonian Internet Foundation
diff --git a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
index bdfda76dc..1ad338816 100644
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
@@ -1,9 +1,9 @@
 Tere,
 <br><br>
-Domeeni <%= @domain.name %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
+Domeeni <%= @params[:name] %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
 <br><br>
 Uued registreerija:<br>
-Nimi: <%= @domain.registrant_name %>
+Nimi: <%= @params[:registrant_name] %>
 <br><br>
 Lugupidamisega<br>
 Eesti Interneti SA
@@ -12,10 +12,10 @@ Eesti Interneti SA
 <br><br>
 Hi,
 <br><br>
-Process for changing registrant of the domain <%= @domain.name %> has been approved and the data in the registry is updated.
+Process for changing registrant of the domain <%= @params[:name] %> has been approved and the data in the registry is updated.
 <br><br>
 New registrant:<br>
-Name: <%= @domain.registrant_name %>
+Name: <%= @params[:registrant_name] %>
 <br><br>
 Best Regards,<br>
 Estonian Internet Foundation
diff --git a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb
index 08fb37fe0..beae5cfd8 100644
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb
@@ -1,9 +1,9 @@
 Tere,
 
-Domeeni <%= @domain.name %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
+Domeeni <%= @params[:name] %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
 
 Uued registreerija:
-Nimi: <%= @domain.registrant_name %>
+Nimi: <%= @params[:registrant_name] %>
 
 Lugupidamisega
 Eesti Interneti SA
@@ -12,10 +12,10 @@ Eesti Interneti SA
 
 Hi,
 
-Process for changing registrant of the domain <%= @domain.name %> has been approved and the data in the registry is updated.
+Process for changing registrant of the domain <%= @params[:name] %> has been approved and the data in the registry is updated.
 
 New registrant:
-Name: <%= @domain.registrant_name %>
+Name: <%= @params[:registrant_name] %>
 
 Best Regards,
 Estonian Internet Foundation

From 504c4454c5fd05fc772c63c0a4a727da76db55c7 Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Wed, 16 Dec 2015 17:53:08 +0200
Subject: [PATCH 10/35] Story #109367018 - minor bug fixes, missing
 punctuation, wrong symbol

---
 app/models/domain_mail_model.rb                            | 7 +++----
 ...pending_update_notification_for_new_registrant.text.erb | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/models/domain_mail_model.rb b/app/models/domain_mail_model.rb
index 045ba4b3e..01d01a6dc 100644
--- a/app/models/domain_mail_model.rb
+++ b/app/models/domain_mail_model.rb
@@ -47,6 +47,7 @@ class DomainMailModel
   def pending_update_expired_notification_for_new_registrant
     registrant_pending
     subject(:pending_update_expired_notification_for_new_registrant_subject)
+    domain_info
     compose
   end
 
@@ -96,7 +97,7 @@ class DomainMailModel
   end
 
   def registrant_pending
-    @params[:new_registrant_emai] = @domain.pending_json['new_registrant_email']
+    @params[:recipient] = @domain.pending_json['new_registrant_email']
     @params[:new_registrant_name] = @domain.pending_json['new_registrant_name']
   end
   
@@ -130,8 +131,6 @@ class DomainMailModel
     @params
   end
   
-  #private
-  
   def verification_url(path)
     token = verification_token or return
     @params[:verification_url] = "#{ENV['registrant_url']}/registrant/#{path}/#{@domain.id}?token=#{token}"
@@ -151,7 +150,7 @@ class DomainMailModel
       @params.store attr, @domain.send(attr)
     end
     @params.store :registrant_priv, @domain.registrant.priv?
-    @params.store old_registrant_name, Registrant.find(@domain.registrant_id_was).name
+    @params.store :old_registrant_name, Registrant.find(@domain.registrant_id_was).name
     @params
   end
 
diff --git a/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.text.erb b/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.text.erb
index 1aa2d998d..d7f2d7f9c 100644
--- a/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.text.erb
@@ -32,7 +32,7 @@ Registrant change process for the domain <%= @params[:name] %> has been started.
 
 New registrant:
 Name: <%= @params[:registrant_name] %>
-<% if @params[:registrant.priv?] %>
+<% if @params[:registrant_priv] %>
 Personal code: <%= @params[:registrant_ident] %>
 <% else %>
 Business Registry code: <%= @params[:registrant_ident] %>

From 496bb8738d059cbdd3fc697f772f92f3862cb9c3 Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Wed, 16 Dec 2015 18:15:14 +0200
Subject: [PATCH 11/35] Story #109367018 - warn if email missing, and format
 pending email

---
 app/models/domain_mail_model.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/domain_mail_model.rb b/app/models/domain_mail_model.rb
index 01d01a6dc..45c550f2d 100644
--- a/app/models/domain_mail_model.rb
+++ b/app/models/domain_mail_model.rb
@@ -97,7 +97,7 @@ class DomainMailModel
   end
 
   def registrant_pending
-    @params[:recipient] = @domain.pending_json['new_registrant_email']
+    @params[:recipient] = format @domain.pending_json['new_registrant_email']
     @params[:new_registrant_name] = @domain.pending_json['new_registrant_name']
   end
   
@@ -109,6 +109,7 @@ class DomainMailModel
 
   # puny internet domain name, TODO: username<email>
   def format(email)
+    return warn_no_email if email.nil?
     user, host = email.split('@')
     host = SimpleIDN.to_ascii(host)
     "#{user}@#{host}"
@@ -154,9 +155,8 @@ class DomainMailModel
     @params
   end
 
-  def warn_no_email(item)
-    #reason = "#{item.to_s} for #{@domain.name}"
-    warn_not_delivered item #reason
+  def warn_no_email(item = 'email')
+    warn_missing item
     nil
   end
       

From 515226042c82ae453aa13b579a9aa86982afe591 Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Wed, 16 Dec 2015 18:25:48 +0200
Subject: [PATCH 12/35] Story #109367018 - seems that
 pending_update_rejected_notification_for_new_registrant should name old
 registrant rejected change

---
 app/models/domain_mail_model.rb                                 | 1 +
 ...ing_update_rejected_notification_for_new_registrant.html.erb | 2 +-
 ...ing_update_rejected_notification_for_new_registrant.text.erb | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/domain_mail_model.rb b/app/models/domain_mail_model.rb
index 45c550f2d..fcb8ed6ca 100644
--- a/app/models/domain_mail_model.rb
+++ b/app/models/domain_mail_model.rb
@@ -99,6 +99,7 @@ class DomainMailModel
   def registrant_pending
     @params[:recipient] = format @domain.pending_json['new_registrant_email']
     @params[:new_registrant_name] = @domain.pending_json['new_registrant_name']
+    @params[:old_registrant_name] = @domain.registrant.name
   end
   
   # registrant and domain admin contacts
diff --git a/app/views/mailers/domain_mailer/pending_update_rejected_notification_for_new_registrant.html.erb b/app/views/mailers/domain_mailer/pending_update_rejected_notification_for_new_registrant.html.erb
index 830b28b5b..1f9acf666 100644
--- a/app/views/mailers/domain_mailer/pending_update_rejected_notification_for_new_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/pending_update_rejected_notification_for_new_registrant.html.erb
@@ -1,6 +1,6 @@
 Tere,
 <br><br>
-Domeeni <%= @params[:name] %> registreerija <%= @params[:new_registrant_name] %> on domeeni registreerija vahetamise taotluse tagasi lükanud.
+Domeeni <%= @params[:name] %> registreerija <%= @params[:old_registrant_name] %> on domeeni registreerija vahetamise taotluse tagasi lükanud.
 <br><br>
 Küsimuste korral palun võtke ühendust registripidajaga <%= @params[:registrar_name] %>, kelle kontaktid leiate http://internet.ee/registripidajad/akrediteeritud-registripidajad
 <br><br>
diff --git a/app/views/mailers/domain_mailer/pending_update_rejected_notification_for_new_registrant.text.erb b/app/views/mailers/domain_mailer/pending_update_rejected_notification_for_new_registrant.text.erb
index 13cd089f2..38a83e1b3 100644
--- a/app/views/mailers/domain_mailer/pending_update_rejected_notification_for_new_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/pending_update_rejected_notification_for_new_registrant.text.erb
@@ -1,6 +1,6 @@
 Tere,
 
-Domeeni <%= @params[:name] %> registreerija <%= @params[:new_registrant_name] %> on domeeni registreerija vahetamise taotluse tagasi lükanud.
+Domeeni <%= @params[:name] %> registreerija <%= @params[:old_registrant_name] %> on domeeni registreerija vahetamise taotluse tagasi lükanud.
 
 Küsimuste korral palun võtke ühendust registripidajaga <%= @params[:registrar_name] %>, kelle kontaktid leiate http://internet.ee/registripidajad/akrediteeritud-registripidajad
 

From 783b792acf6f6ec684aa9f846f534eebf607a911 Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Wed, 16 Dec 2015 20:20:32 +0200
Subject: [PATCH 13/35] Story #109367018 - ensure that updated notice goes to
 old registrant, but names new registrant

---
 app/models/domain_mail_model.rb                       | 11 +++--------
 app/models/epp/domain.rb                              |  7 +++++--
 ...t_updated_notification_for_old_registrant.html.erb |  4 ++--
 ...t_updated_notification_for_old_registrant.text.erb |  4 ++--
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/models/domain_mail_model.rb b/app/models/domain_mail_model.rb
index fcb8ed6ca..96a7e2350 100644
--- a/app/models/domain_mail_model.rb
+++ b/app/models/domain_mail_model.rb
@@ -15,8 +15,7 @@ class DomainMailModel
   end
 
   def pending_update_notification_for_new_registrant
-    # NB! new registrant at this point 
-    registrant
+    registrant     # new registrant at this point 
     subject(:pending_update_notification_for_new_registrant_subject)
     domain_info
     compose
@@ -30,16 +29,16 @@ class DomainMailModel
   end
 
   def registrant_updated_notification_for_old_registrant
+    registrant_pending
     registrant_old
     subject(:registrant_updated_notification_for_old_registrant_subject)
-    registrant_name
     compose
   end
   
   def pending_update_rejected_notification_for_new_registrant
     registrant_pending
     subject(:pending_update_rejected_notification_for_new_registrant_subject)
-    @params[:deliver_emails] = true # trigger from que
+    @params[:deliver_emails] = true # triggered from que
     @params[:registrar_name] = @domain.registrar.name
     compose
   end
@@ -92,10 +91,6 @@ class DomainMailModel
     @params[:recipient] = format @domain.registrant.email
   end
 
-  def registrant_name
-    @params[:registrant_name] = @domain.registrant.name
-  end
-
   def registrant_pending
     @params[:recipient] = format @domain.pending_json['new_registrant_email']
     @params[:new_registrant_name] = @domain.pending_json['new_registrant_name']
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index 189b5aa1c..c95e98e7e 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -503,6 +503,10 @@ class Epp::Domain < Domain
     preclean_pendings
     user  = ApiUser.find(pending_json['current_user_id'])
     frame = Nokogiri::XML(pending_json['frame'])
+
+    self.deliver_emails = true # turn on email delivery
+    send_mail :registrant_updated_notification_for_old_registrant
+
     statuses.delete(DomainStatus::PENDING_UPDATE)
     yield(self) if block_given? # need to skip statuses check here
     self.save
@@ -510,8 +514,7 @@ class Epp::Domain < Domain
     ::PaperTrail.whodunnit = user.id_role_username # updator str should be the request originator not the approval user
     return unless update(frame, user, false)
     clean_pendings!
-    self.deliver_emails = true # turn on email delivery
-    send_mail :registrant_updated_notification_for_old_registrant
+
     send_mail :registrant_updated_notification_for_new_registrant
     true
   end
diff --git a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
index 1ad338816..f4312da44 100644
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
@@ -3,7 +3,7 @@ Tere,
 Domeeni <%= @params[:name] %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
 <br><br>
 Uued registreerija:<br>
-Nimi: <%= @params[:registrant_name] %>
+Nimi: <%= @params[:new_registrant_name] %>
 <br><br>
 Lugupidamisega<br>
 Eesti Interneti SA
@@ -15,7 +15,7 @@ Hi,
 Process for changing registrant of the domain <%= @params[:name] %> has been approved and the data in the registry is updated.
 <br><br>
 New registrant:<br>
-Name: <%= @params[:registrant_name] %>
+Name: <%= @params[:new_registrant_name] %>
 <br><br>
 Best Regards,<br>
 Estonian Internet Foundation
diff --git a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb
index beae5cfd8..f17ba0bce 100644
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb
@@ -3,7 +3,7 @@ Tere,
 Domeeni <%= @params[:name] %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
 
 Uued registreerija:
-Nimi: <%= @params[:registrant_name] %>
+Nimi: <%= @params[:new_registrant_name] %>
 
 Lugupidamisega
 Eesti Interneti SA
@@ -15,7 +15,7 @@ Hi,
 Process for changing registrant of the domain <%= @params[:name] %> has been approved and the data in the registry is updated.
 
 New registrant:
-Name: <%= @params[:registrant_name] %>
+Name: <%= @params[:new_registrant_name] %>
 
 Best Regards,
 Estonian Internet Foundation

From ba659cd444d7f612208fc735765e586ae31fdf4b Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Thu, 17 Dec 2015 11:09:46 +0200
Subject: [PATCH 14/35] Story #109367018 - restore [domain] to subject line

---
 app/models/domain_mail_model.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/domain_mail_model.rb b/app/models/domain_mail_model.rb
index 96a7e2350..36154bc64 100644
--- a/app/models/domain_mail_model.rb
+++ b/app/models/domain_mail_model.rb
@@ -113,7 +113,7 @@ class DomainMailModel
 
   def subject(subject)
     @params[:name] = @domain.name
-    @params[:subject] = I18n.t(subject, name: @domain.name)
+    @params[:subject] = "#{I18n.t(subject, name: @domain.name)}, [#{@domain.name}]"
   end
 
   def confirm_update

From 702206b9c00c14a70e4cacc388080f14cc0d1e34 Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Thu, 17 Dec 2015 11:51:36 +0200
Subject: [PATCH 15/35] Story #109367018 - ensure that country is passed only
 as name

---
 app/models/domain_mail_model.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/domain_mail_model.rb b/app/models/domain_mail_model.rb
index 36154bc64..b0d81e410 100644
--- a/app/models/domain_mail_model.rb
+++ b/app/models/domain_mail_model.rb
@@ -142,10 +142,11 @@ class DomainMailModel
   def domain_info
     [:name, :registrar_name,
      :registrant_name, :registrant_ident, :registrant_email,
-     :registrant_street,:registrant_city, :registrant_country
+     :registrant_street,:registrant_city
     ].each do |attr|
       @params.store attr, @domain.send(attr)
     end
+    @params.store :registrant_country, @domain.registrant_country.name
     @params.store :registrant_priv, @domain.registrant.priv?
     @params.store :old_registrant_name, Registrant.find(@domain.registrant_id_was).name
     @params

From 057ec6a757ed78d5c7d71f4174fa3d4adb185eb6 Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Thu, 17 Dec 2015 14:39:12 +0200
Subject: [PATCH 16/35] Story #109367018 - privatize the work method

---
 app/mailers/domain_mailer.rb | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/mailers/domain_mailer.rb b/app/mailers/domain_mailer.rb
index 4963cb02a..66533e316 100644
--- a/app/mailers/domain_mailer.rb
+++ b/app/mailers/domain_mailer.rb
@@ -25,19 +25,6 @@ class DomainMailer < ApplicationMailer
     compose_from(params)
   end
 
-  # app/models/DomainMailModel provides the data for mail that can be composed_from
-  # which ensures that values of objects are captured when they are valid, not later when this method is executed
-  def compose_from(params)
-    @params = params
-    return if delivery_off?(params, params[:deliver_emails])
-    return if whitelist_blocked?(params[:recipient])
-    params[:errors].map do |error|
-      logger.warn error
-      return
-    end
-    mail(to: params[:recipient], subject: params[:subject])
-  end
-
   def pending_deleted(domain_id, old_registrant_id, should_deliver)
     @domain = Domain.find_by(id: domain_id)
     @old_registrant = Registrant.find(old_registrant_id)
@@ -129,4 +116,18 @@ class DomainMailer < ApplicationMailer
          subject: "#{I18n.t(:force_delete_subject)}"
         )
   end
+
+  private
+  # app/models/DomainMailModel provides the data for mail that can be composed_from
+  # which ensures that values of objects are captured when they are valid, not later when this method is executed
+  def compose_from(params)
+    @params = params
+    return if delivery_off?(params, params[:deliver_emails])
+    return if whitelist_blocked?(params[:recipient])
+    params[:errors].map do |error|
+      logger.warn error
+      return
+    end
+    mail(to: params[:recipient], subject: params[:subject])
+  end
 end

From 79dfb426c7827e881ee0e05c02365b5d63fa00fe Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Thu, 17 Dec 2015 15:28:33 +0200
Subject: [PATCH 17/35] Story #109367018 - add data for old registrant notice

---
 ...ed_notification_for_old_registrant.html.erb | 18 ++++++++++++++++++
 ...ed_notification_for_old_registrant.text.erb | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
index f4312da44..2c0693fa7 100644
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
@@ -4,6 +4,15 @@ Domeeni <%= @params[:name] %> registreerija vahetuse taotlus on kinnitatud ning
 <br><br>
 Uued registreerija:<br>
 Nimi: <%= @params[:new_registrant_name] %>
+<% if @params[:registrant_priv] %>
+Isikukood: <%= @params[:registrant_ident] %><br>
+<% else %>
+Äriregistrikood: <%= @params[:registrant_ident] %><br>
+<% end %>
+Epost: <%= @params[:registrant_email] %><br>
+Tänav: <%= @params[:registrant_street] %><br>
+Linn: <%= @params[:registrant_city] %><br>
+Riik: <%= @params[:registrant_country] %>
 <br><br>
 Lugupidamisega<br>
 Eesti Interneti SA
@@ -16,6 +25,15 @@ Process for changing registrant of the domain <%= @params[:name] %> has been app
 <br><br>
 New registrant:<br>
 Name: <%= @params[:new_registrant_name] %>
+<% if @params[:registrant_priv] %>
+Personal code: <%= @params[:registrant_ident] %><br>
+<% else %>
+Business Registry code: <%= @params[:registrant_ident] %><br>
+<% end %>
+E-mail: <%= @params[:registrant_email] %><br>
+Street: <%= @params[:registrant_street] %><br>
+City: <%= @params[:registrant_city] %><br>
+Country: <%= @params[:registrant_country] %>
 <br><br>
 Best Regards,<br>
 Estonian Internet Foundation
diff --git a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb
index f17ba0bce..37bfcade5 100644
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb
@@ -4,6 +4,15 @@ Domeeni <%= @params[:name] %> registreerija vahetuse taotlus on kinnitatud ning
 
 Uued registreerija:
 Nimi: <%= @params[:new_registrant_name] %>
+<% if @params[:registrant_priv] %>
+Isikukood: <%= @params[:registrant_ident] %>
+<% else %>
+Äriregistrikood: <%= @params[:registrant_ident] %>
+<% end %>
+Epost: <%= @params[:registrant_email] %>
+Tänav: <%= @params[:registrant_street] %>
+Linn: <%= @params[:registrant_city] %>
+Riik: <%= @params[:registrant_country] %>
 
 Lugupidamisega
 Eesti Interneti SA
@@ -16,6 +25,15 @@ Process for changing registrant of the domain <%= @params[:name] %> has been app
 
 New registrant:
 Name: <%= @params[:new_registrant_name] %>
+<% if @params[:registrant_priv] %>
+Personal code: <%= @params[:registrant_ident] %>
+<% else %>
+Business Registry code: <%= @params[:registrant_ident] %>
+<% end %>
+E-mail: <%= @params[:registrant_email] %>
+Street: <%= @params[:registrant_street] %>
+City: <%= @params[:registrant_city] %>
+Country: <%= @params[:registrant_country] %>
 
 Best Regards,
 Estonian Internet Foundation

From 086b82e5407bffd71af1fce792befd5bb908551e Mon Sep 17 00:00:00 2001
From: Stas <stanislav@perfectline.co>
Date: Thu, 17 Dec 2015 16:20:50 +0200
Subject: [PATCH 18/35] 109809872-term_change

---
 app/views/registrar/contacts/partials/_general.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/registrar/contacts/partials/_general.haml b/app/views/registrar/contacts/partials/_general.haml
index 37bd87555..462bf35a0 100644
--- a/app/views/registrar/contacts/partials/_general.haml
+++ b/app/views/registrar/contacts/partials/_general.haml
@@ -6,7 +6,7 @@
       %dt= t(:id)
       %dd= @contact.id
 
-      %dt= t(:password)
+      %dt= t(:authinfo_pw)
       %dd
         = text_field_tag :password, @contact.password, readonly: true, class: 'partially-hidden'
 

From eec8bd90ad7efbf686c9bb35be9081bff348c11e Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Thu, 17 Dec 2015 16:28:20 +0200
Subject: [PATCH 19/35] Story #109367018 - add data for template update

---
 app/models/domain_mail_model.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/domain_mail_model.rb b/app/models/domain_mail_model.rb
index b0d81e410..71cc2155d 100644
--- a/app/models/domain_mail_model.rb
+++ b/app/models/domain_mail_model.rb
@@ -32,6 +32,7 @@ class DomainMailModel
     registrant_pending
     registrant_old
     subject(:registrant_updated_notification_for_old_registrant_subject)
+    domain_info
     compose
   end
   

From 98f8a2b4404156867bad6c629e642d5a22bcd3fe Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Thu, 17 Dec 2015 18:08:10 +0200
Subject: [PATCH 20/35] Story #109367018 - add white space lines to email
 template

---
 ...egistrant_updated_notification_for_old_registrant.html.erb | 4 ++--
 ...egistrant_updated_notification_for_old_registrant.text.erb | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
index 2c0693fa7..390482155 100644
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
@@ -3,7 +3,7 @@ Tere,
 Domeeni <%= @params[:name] %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
 <br><br>
 Uued registreerija:<br>
-Nimi: <%= @params[:new_registrant_name] %>
+Nimi: <%= @params[:new_registrant_name] %><br>
 <% if @params[:registrant_priv] %>
 Isikukood: <%= @params[:registrant_ident] %><br>
 <% else %>
@@ -24,7 +24,7 @@ Hi,
 Process for changing registrant of the domain <%= @params[:name] %> has been approved and the data in the registry is updated.
 <br><br>
 New registrant:<br>
-Name: <%= @params[:new_registrant_name] %>
+Name: <%= @params[:new_registrant_name] %><br>
 <% if @params[:registrant_priv] %>
 Personal code: <%= @params[:registrant_ident] %><br>
 <% else %>
diff --git a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb
index 37bfcade5..5065d2d9f 100644
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb
@@ -4,6 +4,7 @@ Domeeni <%= @params[:name] %> registreerija vahetuse taotlus on kinnitatud ning
 
 Uued registreerija:
 Nimi: <%= @params[:new_registrant_name] %>
+
 <% if @params[:registrant_priv] %>
 Isikukood: <%= @params[:registrant_ident] %>
 <% else %>
@@ -25,6 +26,7 @@ Process for changing registrant of the domain <%= @params[:name] %> has been app
 
 New registrant:
 Name: <%= @params[:new_registrant_name] %>
+
 <% if @params[:registrant_priv] %>
 Personal code: <%= @params[:registrant_ident] %>
 <% else %>

From eb6c1d607ba1339ee77a3c26cd8a21a410d8770a Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Thu, 17 Dec 2015 18:08:52 +0200
Subject: [PATCH 21/35] Story #109367018 - add domain info for new registrant

---
 app/models/domain_mail_model.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/models/domain_mail_model.rb b/app/models/domain_mail_model.rb
index 71cc2155d..4ba55e117 100644
--- a/app/models/domain_mail_model.rb
+++ b/app/models/domain_mail_model.rb
@@ -32,7 +32,13 @@ class DomainMailModel
     registrant_pending
     registrant_old
     subject(:registrant_updated_notification_for_old_registrant_subject)
-    domain_info
+    new_registrant = Registrant.find @domain.pending_json['new_registrant_id']
+    @params[:registrant_name] = new_registrant.name
+    @params[:registrant_ident] = new_registrant.ident
+    @params[:registrant_priv] = new_registrant.priv?
+    @params[:registrant_email] = new_registrant.email
+    @params[:registrant_street] = new_registrant.street
+    @params[:registrant_city] = new_registrant.city
     compose
   end
   

From 688071bf46bdf3615cb48440f5a7c74d335be0b6 Mon Sep 17 00:00:00 2001
From: Georg Kahest <teadur@users.noreply.github.com>
Date: Thu, 17 Dec 2015 19:36:57 +0200
Subject: [PATCH 22/35] missing new registrant country name

---
 app/models/domain_mail_model.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/domain_mail_model.rb b/app/models/domain_mail_model.rb
index 4ba55e117..46309ad52 100644
--- a/app/models/domain_mail_model.rb
+++ b/app/models/domain_mail_model.rb
@@ -39,6 +39,7 @@ class DomainMailModel
     @params[:registrant_email] = new_registrant.email
     @params[:registrant_street] = new_registrant.street
     @params[:registrant_city] = new_registrant.city
+    @params[:registrant_country] = new_registrant.country.name
     compose
   end
   

From 39c4fafdd61fb96945d56ac14c01611694613aa4 Mon Sep 17 00:00:00 2001
From: Georg Kahest <teadur@users.noreply.github.com>
Date: Thu, 17 Dec 2015 19:42:42 +0200
Subject: [PATCH 23/35] standardise template

---
 .../registrant_updated_notification_for_old_registrant.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
index 390482155..a1820e7ad 100644
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
@@ -2,7 +2,7 @@ Tere,
 <br><br>
 Domeeni <%= @params[:name] %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
 <br><br>
-Uued registreerija:<br>
+Uued registreerija andmed:<br>
 Nimi: <%= @params[:new_registrant_name] %><br>
 <% if @params[:registrant_priv] %>
 Isikukood: <%= @params[:registrant_ident] %><br>

From a3b55543f2f7a2f806e9188da80066c0559efb93 Mon Sep 17 00:00:00 2001
From: Georg Kahest <teadur@users.noreply.github.com>
Date: Thu, 17 Dec 2015 19:47:38 +0200
Subject: [PATCH 24/35] Uued to Uue

---
 .../pending_update_notification_for_new_registrant.html.erb     | 2 +-
 .../pending_update_notification_for_new_registrant.text.erb     | 2 +-
 .../registrant_updated_notification_for_new_registrant.html.erb | 2 +-
 .../registrant_updated_notification_for_new_registrant.text.erb | 2 +-
 .../registrant_updated_notification_for_old_registrant.html.erb | 2 +-
 .../registrant_updated_notification_for_old_registrant.text.erb | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.html.erb b/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.html.erb
index 9f33535ea..07de23117 100644
--- a/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.html.erb
@@ -4,7 +4,7 @@ Registripidaja <%= @params[:registrar_name] %> vahendusel on algatatud <%= @para
 <br><br>
 Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole. Teie registripidaja on <%= @params[:registrar_name] %>
 <br><br>
-Uued registreerija andmed:<br>
+Uue registreerija andmed:<br>
 Nimi: <%= @params[:registrant_name] %><br>
 <% if @params[:registrant_priv] %>
   Isikukood: <%= @params[:registrant_ident] %><br>
diff --git a/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.text.erb b/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.text.erb
index d7f2d7f9c..24005a58a 100644
--- a/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/pending_update_notification_for_new_registrant.text.erb
@@ -4,7 +4,7 @@ Registripidaja <%= @params[:registrar_name] %> vahendusel on algatatud <%= @para
 
 Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole. Teie registripidaja on <%= @params[:registrar_name] %>
 
-Uued registreerija andmed:
+Uue registreerija andmed:
 Nimi: <%= @params[:registrant_name] %>
 <% if @params[:registrant_priv] %>
 Isikukood: <%= @params[:registrant_ident] %>
diff --git a/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.html.erb b/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.html.erb
index 74021a489..c7d464f43 100644
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.html.erb
@@ -2,7 +2,7 @@ Tere,
 <br><br>
 Domeeni <%= @params[:name] %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
 <br><br>
-Uued registreerija andmed:<br>
+Uue registreerija andmed:<br>
 Nimi: <%= @params[:registrant_name] %><br>
 <% if @params[:registrant_priv] %>
 Isikukood: <%= @params[:registrant_ident] %><br>
diff --git a/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.text.erb b/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.text.erb
index 279afa2b5..115655897 100644
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.text.erb
@@ -2,7 +2,7 @@ Tere,
 
 Domeeni <%= @params[:name] %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
 
-Uued registreerija andmed:
+Uue registreerija andmed:
 Nimi: <%= @params[:registrant_name] %>
 <% if @params[:registrant_priv] %>
 Isikukood: <%= @params[:registrant_ident] %>
diff --git a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
index a1820e7ad..b41e1f1eb 100644
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
@@ -2,7 +2,7 @@ Tere,
 <br><br>
 Domeeni <%= @params[:name] %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
 <br><br>
-Uued registreerija andmed:<br>
+Uue registreerija andmed:<br>
 Nimi: <%= @params[:new_registrant_name] %><br>
 <% if @params[:registrant_priv] %>
 Isikukood: <%= @params[:registrant_ident] %><br>
diff --git a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb
index 5065d2d9f..c2efa5af9 100644
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb
@@ -2,7 +2,7 @@ Tere,
 
 Domeeni <%= @params[:name] %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
 
-Uued registreerija:
+Uue registreerija andmed:
 Nimi: <%= @params[:new_registrant_name] %>
 
 <% if @params[:registrant_priv] %>

From b63884eac1288d99f5bc864132fa47ae03520d21 Mon Sep 17 00:00:00 2001
From: Georg Kahest <teadur@users.noreply.github.com>
Date: Thu, 17 Dec 2015 19:57:36 +0200
Subject: [PATCH 25/35] Missed one

---
 .../pending_update_request_for_old_registrant.html.erb          | 2 +-
 .../pending_update_request_for_old_registrant.text.erb          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb b/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb
index 5da14d96d..dc26a9c1c 100644
--- a/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb
@@ -2,7 +2,7 @@ Tere,
 <br><br>
 Registrisse laekus taotlus domeeni <%= @params[:name] %> registreerija vahetuseks. Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole. Teie registripidaja on <%= @params[:registrar_name] %>
 <br><br>
-Uued registreerija andmed:<br>
+Uue registreerija andmed:<br>
 Nimi: <%= @params[:registrant_name] %><br>
 <% if @params[:registrant_priv] %>
 Isikukood: <%= @params[:registrant_ident] %><br>
diff --git a/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb b/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb
index 27e394b87..142004bb6 100644
--- a/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb
@@ -2,7 +2,7 @@ Tere,
 
 Registrisse laekus taotlus domeeni <%= @params[:name] %> registreerija vahetuseks. Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole. Teie registripidaja on <%= @params[:registrar_name] %>
 
-Uued registreerija andmed:
+Uue registreerija andmed:
 Nimi: <%= @params[:registrant_name] %>
 <% if @params[:registrant_priv] %>
 Isikukood: <%= @params[:registrant_ident] %>

From b514b5c94d941af140fa88c2baf81dbb4982bade Mon Sep 17 00:00:00 2001
From: Vladimir Krylov <vladimir.krylov@perfectline.co>
Date: Thu, 17 Dec 2015 20:48:05 +0200
Subject: [PATCH 26/35] Story#109367018 Set hardcoded to reindex whois record

---
 app/models/epp/domain.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index c95e98e7e..656d5f645 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -516,6 +516,7 @@ class Epp::Domain < Domain
     clean_pendings!
 
     send_mail :registrant_updated_notification_for_new_registrant
+    update_whois_record
     true
   end
 

From 33d141e74b0820939d8898714470731830159de8 Mon Sep 17 00:00:00 2001
From: Vladimir Krylov <vladimir.krylov@perfectline.co>
Date: Thu, 17 Dec 2015 21:01:17 +0200
Subject: [PATCH 27/35] Story#109367018 Set hardcoded to reindex whois record

---
 app/jobs/domain_update_confirm_job.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/jobs/domain_update_confirm_job.rb b/app/jobs/domain_update_confirm_job.rb
index 4f2c1e9ad..8e9fd4708 100644
--- a/app/jobs/domain_update_confirm_job.rb
+++ b/app/jobs/domain_update_confirm_job.rb
@@ -10,6 +10,7 @@ class DomainUpdateConfirmJob < Que::Job
             e.instance_variable_set("@changed_attributes", e.changed_attributes.merge("statuses"=>[]))
           end
           domain.clean_pendings!
+          domain.update_whois_record
         when RegistrantVerification::REJECTED
           domain.send_mail :pending_update_rejected_notification_for_new_registrant
           domain.poll_message!(:poll_pending_update_rejected_by_registrant)

From eff9a076ae2a6c571fd8c9c9d2d928df73f27fef Mon Sep 17 00:00:00 2001
From: Vladimir Krylov <vladimir.krylov@perfectline.co>
Date: Thu, 17 Dec 2015 21:17:11 +0200
Subject: [PATCH 28/35] Story#109367018 reset all domains data

---
 app/jobs/domain_update_confirm_job.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/jobs/domain_update_confirm_job.rb b/app/jobs/domain_update_confirm_job.rb
index 8e9fd4708..42209d205 100644
--- a/app/jobs/domain_update_confirm_job.rb
+++ b/app/jobs/domain_update_confirm_job.rb
@@ -10,7 +10,7 @@ class DomainUpdateConfirmJob < Que::Job
             e.instance_variable_set("@changed_attributes", e.changed_attributes.merge("statuses"=>[]))
           end
           domain.clean_pendings!
-          domain.update_whois_record
+          WhoisRecord.find_by(domain_id: domain.id).save!
         when RegistrantVerification::REJECTED
           domain.send_mail :pending_update_rejected_notification_for_new_registrant
           domain.poll_message!(:poll_pending_update_rejected_by_registrant)

From e7eb45c3249f6b960f505fd31c2bc0f67f9e4df7 Mon Sep 17 00:00:00 2001
From: Vladimir Krylov <vladimir.krylov@perfectline.co>
Date: Fri, 18 Dec 2015 10:54:36 +0200
Subject: [PATCH 29/35] Story#110391728 - Asking instance, not class to send
 email

---
 app/models/domain.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/domain.rb b/app/models/domain.rb
index 7a4aae870..05ffafc4d 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -239,7 +239,7 @@ class Domain < ActiveRecord::Base
         end
         count += 1
         if domain.pending_update?
-          send_mail :pending_update_expired_notification_for_new_registrant
+          domain.send_mail :pending_update_expired_notification_for_new_registrant
         end
         if domain.pending_delete? || domain.pending_delete_confirmation?
           DomainMailer.pending_delete_expired_notification(domain.id, true).deliver

From 6ed9a290e18ef4110267c7873e5e4b00309a02cc Mon Sep 17 00:00:00 2001
From: Vladimir Krylov <vladimir.krylov@perfectline.co>
Date: Fri, 18 Dec 2015 11:11:50 +0200
Subject: [PATCH 30/35] Story#110391728 - do not update domain whois record if
 only relation left

---
 app/models/contact.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/contact.rb b/app/models/contact.rb
index 96365d056..ecf399731 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -488,7 +488,7 @@ class Contact < ActiveRecord::Base
   end
 
  def update_related_whois_records
-   related_domain_descriptions.each{ |x, y| WhoisRecord.find_by(name: x).save}
+   related_domain_descriptions.each{ |x, y| WhoisRecord.find_by(name: x).try(:save) }
  end	 
 
 end

From 9027f5007c14134067dad7ffe61a74498138851a Mon Sep 17 00:00:00 2001
From: Vladimir Krylov <vladimir.krylov@perfectline.co>
Date: Fri, 18 Dec 2015 14:00:41 +0200
Subject: [PATCH 31/35] Story#109623634 - after contact transferring new one
 should have state linked

---
 app/models/epp/domain.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index 7ab57781e..26f0c3153 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -622,6 +622,7 @@ class Epp::Domain < Domain
     oc.registrar_id = registrar_id
     oc.copy_from_id = c.id
     oc.prefix_code
+    oc.domains_present = true
     oc.save!(validate: false)
     oc
   end

From a790693f3e615197713c13186802898ce67fca89 Mon Sep 17 00:00:00 2001
From: Stas <stanislav@perfectline.co>
Date: Fri, 18 Dec 2015 14:46:38 +0200
Subject: [PATCH 32/35] 110245112-find_by_overwrite

---
 app/models/whois_record.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/models/whois_record.rb b/app/models/whois_record.rb
index 55cc997da..528f84816 100644
--- a/app/models/whois_record.rb
+++ b/app/models/whois_record.rb
@@ -23,6 +23,10 @@ class WhoisRecord < ActiveRecord::Base
     end
   end
 
+  def self.find_by_name(name)
+    WhoisRecord.where("lower(name) = ?", name.downcase)
+  end
+
   def generated_json
     @generated_json ||= generate_json
   end

From e4c00e6bcee25144c726ea3fe3ce7fdbb1245da5 Mon Sep 17 00:00:00 2001
From: Vladimir Krylov <vladimir.krylov@perfectline.co>
Date: Fri, 18 Dec 2015 15:48:00 +0200
Subject: [PATCH 33/35] Story#109623634 - after contact transferring it should
 be linked and ok

---
 app/models/contact.rb    | 6 ++++++
 app/models/epp/domain.rb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/models/contact.rb b/app/models/contact.rb
index fcebe8632..bcd359ca9 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -57,6 +57,11 @@ class Contact < ActiveRecord::Base
 
   before_save :manage_statuses
   def manage_statuses
+    if domain_transfer # very ugly but need better workflow
+      self.statuses = [OK, LINKED]
+      return
+    end
+
     manage_linked
     manage_ok
   end
@@ -78,6 +83,7 @@ class Contact < ActiveRecord::Base
   ]
 
   attr_accessor :deliver_emails
+  attr_accessor :domain_transfer # hack but solves problem faster
 
   #
   # STATUSES
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index 26f0c3153..fac09705d 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -622,7 +622,7 @@ class Epp::Domain < Domain
     oc.registrar_id = registrar_id
     oc.copy_from_id = c.id
     oc.prefix_code
-    oc.domains_present = true
+    oc.domain_transfer = true
     oc.save!(validate: false)
     oc
   end

From fd186901a483dd659e92f9a2dd60277146889082 Mon Sep 17 00:00:00 2001
From: Vladimir Krylov <vladimir.krylov@perfectline.co>
Date: Fri, 18 Dec 2015 16:45:13 +0200
Subject: [PATCH 34/35] Story#109623634 - save  old states.

---
 app/models/contact.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/contact.rb b/app/models/contact.rb
index bcd359ca9..2375090da 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -58,7 +58,7 @@ class Contact < ActiveRecord::Base
   before_save :manage_statuses
   def manage_statuses
     if domain_transfer # very ugly but need better workflow
-      self.statuses = [OK, LINKED]
+      self.statuses = statuses | [OK, LINKED]
       return
     end
 

From 52d1f79df045d63f96f4ed994336e5473c687af8 Mon Sep 17 00:00:00 2001
From: Stas <stanislav@perfectline.co>
Date: Fri, 18 Dec 2015 17:39:41 +0200
Subject: [PATCH 35/35] 110245542-callback_for_vat_percent

---
 app/models/invoice.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/models/invoice.rb b/app/models/invoice.rb
index 8bc5137d5..aaddbd77b 100644
--- a/app/models/invoice.rb
+++ b/app/models/invoice.rb
@@ -18,6 +18,8 @@ class Invoice < ActiveRecord::Base
             :seller_iban, :buyer_name, :invoice_items, :vat_prc, presence: true
 
   before_create :set_invoice_number
+  before_create :check_vat
+
   def set_invoice_number
     last_no = Invoice.order(number: :desc).where('number IS NOT NULL').limit(1).pluck(:number).first
 
@@ -34,6 +36,12 @@ class Invoice < ActiveRecord::Base
     false
   end
 
+  def check_vat
+    if buyer.country_code = 'EE' && buyer.vat_no.present?
+      self.vat_prc = 0
+    end
+  end
+
   before_save -> { self.sum_cache = sum }
 
   class << self