Merge remote-tracking branch 'origin/master' into 111396946-blocked_and_reserved_view2

# Conflicts:
#	app/controllers/admin/blocked_domains_controller.rb
#	app/models/blocked_domain.rb

app/controllers/admin/contacts_controller.rb

@@ -4,8 +4,14 @@ class Admin::ContactsController < AdminController
 
   def index
     params[:q] ||= {}
-    @q = Contact.includes(:registrar).search(params[:q])
-    @contacts = @q.result.page(params[:page])
+    search_params = params[:q].deep_dup
+
+    if search_params[:domain_contacts_type_in].is_a?(Array) && search_params[:domain_contacts_type_in].delete('registrant')
+      search_params[:registrant_domains_id_not_null] = 1
+    end
+
+    @q = Contact.includes(:registrar).search(search_params)
+    @contacts = @q.result(distinct: :true).page(params[:page])
 
     if params[:statuses_contains]
       contacts = Contact.includes(:registrar).where(
@@ -16,8 +22,8 @@ class Admin::ContactsController < AdminController
     end
 
     normalize_search_parameters do
-      @q = contacts.search(params[:q])
-      @contacts = @q.result.page(params[:page])
+      @q = contacts.search(search_params)
+      @contacts = @q.result(distinct: :true).page(params[:page])
     end
 
     @contacts = @contacts.per(params[:results_per_page]) if params[:results_per_page].to_i > 0

app/controllers/registrar/contacts_controller.rb

@@ -6,8 +6,15 @@ class Registrar::ContactsController < Registrar::DeppController # EPP controller
 
     params[:q] ||= {}
     params[:q].delete_if { |_k, v| v.blank? }
-    if params[:q].length == 1 && params[:q][:name_matches].present?
-      @contacts = Contact.find_by(name: params[:q][:name_matches])
+
+    search_params = params[:q].deep_dup
+
+    if search_params[:domain_contacts_type_in].is_a?(Array) && search_params[:domain_contacts_type_in].delete('registrant')
+      search_params[:registrant_domains_id_not_null] = 1
+    end
+
+    if search_params.length == 1 && search_params[:name_matches].present?
+      @contacts = Contact.find_by(name: search_params[:name_matches])
     end
 
     if params[:statuses_contains]
@@ -19,8 +26,8 @@ class Registrar::ContactsController < Registrar::DeppController # EPP controller
     end
 
     normalize_search_parameters do
-      @q = contacts.search(params[:q])
-      @contacts = @q.result.page(params[:page])
+      @q = contacts.search(search_params)
+      @contacts = @q.result(distinct: :true).page(params[:page])
     end
 
     @contacts = @contacts.per(params[:results_per_page]) if params[:results_per_page].to_i > 0

app/jobs/update_whois_record_job.rb

@@ -0,0 +1,16 @@
+class UpdateWhoisRecordJob < Que::Job
+
+  def run(ids, type)
+    klass = case type
+      when 'reserved'then ReservedDomain
+      when 'blocked' then BlockedDomain
+      else Domain
+    end
+
+    ids.each do |id|
+      record = klass.find_by(id: id)
+      next unless record
+      record.update_whois_record
+    end
+  end
+end

app/models/bank_link.rb

@@ -32,7 +32,7 @@ class BankLink
       hash["VK_AMOUNT"]   = number_with_precision(invoice.sum_cache, :precision => 2, :separator => ".")
       hash["VK_CURR"]     = invoice.currency
       hash["VK_REF"]      = ""
-      hash["VK_MSG"]      = "Order nr. #{invoice.number}"
+      hash["VK_MSG"]      = invoice.description
       hash["VK_RETURN"]   = controller.registrar_return_payment_with_url(type)
       hash["VK_CANCEL"]   = controller.registrar_return_payment_with_url(type)
       hash["VK_DATETIME"] = Time.now.strftime("%Y-%m-%dT%H:%M:%S%z")
@@ -101,6 +101,7 @@ class BankLink
         transaction.buyer_iban = params["VK_SND_ACC"]
         transaction.buyer_name = params["VK_SND_NAME"]
         transaction.paid_at    = Time.parse(params["VK_T_DATETIME"])
+        transaction.save!
 
         transaction.autobind_invoice
       end

app/models/bank_transaction.rb

@@ -2,6 +2,7 @@ class BankTransaction < ActiveRecord::Base
   include Versions
   belongs_to :bank_statement
   has_one :account_activity
+  has_many :directo_records, as: :item, class_name: 'Directo'# Deprecated
 
   scope :unbinded, lambda {
     where('id NOT IN (SELECT bank_transaction_id FROM account_activities where bank_transaction_id IS NOT NULL)')
@@ -16,21 +17,32 @@ class BankTransaction < ActiveRecord::Base
     account_activity.invoice
   end
 
+
+  def invoice_num
+    return @invoice_no if defined?(@invoice_no)
+
+    match = description.match(/^[^\d]*(\d+)/)
+    return unless match
+
+    @invoice_no = match[1].try(:to_i)
+  end
+
+  def invoice
+    @invoice ||= registrar.invoices.find_by(number: invoice_num) if registrar
+  end
+
+  def registrar
+    @registrar ||= Registrar.find_by(reference_no: reference_no)
+  end
+
+
   # For successful binding, reference number, invoice id and sum must match with the invoice
   # rubocop: disable Metrics/PerceivedComplexity
   # rubocop: disable Metrics/CyclomaticComplexity
   def autobind_invoice
     return if binded?
-    registrar = Registrar.find_by(reference_no: reference_no)
     return unless registrar
-
-    match = description.match(/^[^\d]*(\d+)/)
-    return unless match
-
-    invoice_no = match[1].to_i
-    return unless invoice_no
-
-    invoice = registrar.invoices.find_by(number: invoice_no)
+    return unless invoice_num
     return unless invoice
 
     return if invoice.binded?

app/models/blocked_domain.rb

@@ -1,6 +1,56 @@
 class BlockedDomain < ActiveRecord::Base
   include Versions
+  before_save :generate_data
+  before_destroy :remove_data
 validates :name, domain_name: true, uniqueness: true
 
-  after_initialize -> { self.names = [] if names.nil? }
+
+  class << self
+    def by_domain name
+      where(name: name)
+    end
+
+    def any_of_domains names
+      where(name: names)
+    end
+  end
+
+  def name= val
+    super SimpleIDN.to_unicode(val)
+  end
+
+  def generate_data
+    return if Domain.where(name: name).any?
+
+    @json = generate_json
+    @body = generate_body
+    update_whois_server
+  end
+
+  alias_method :update_whois_record, :generate_data
+
+  def update_whois_server
+    wr = Whois::Record.find_or_initialize_by(name: name)
+    wr.body = @body
+    wr.json = @json
+    wr.save
+  end
+
+  def generate_body
+    template = Rails.root.join("app/views/for_models/whois_other.erb".freeze)
+    ERB.new(template.read, nil, "-").result(binding)
+  end
+
+  def generate_json
+    h = HashWithIndifferentAccess.new
+    h[:name]       = self.name
+    h[:status]     = 'Blocked'
+    h
+  end
+
+  def remove_data
+    return if Domain.where(name: name).any?
+
+    Whois::Record.where(name: name).delete_all
+  end
 end

app/models/contact.rb

@@ -29,7 +29,7 @@ class Contact < ActiveRecord::Base
     uniqueness: { message: :epp_id_taken },
     format: { with: /\A[\w\-\:\.\_]*\z/i, message: :invalid },
     length: { maximum: 100, message: :too_long_contact_code }
-  validate :ident_valid_format?
+  validate :val_ident_valid_format?
   validate :uniq_statuses?
   validate :validate_html
 
@@ -235,16 +235,17 @@ class Contact < ActiveRecord::Base
     name || '[no name]'
   end
 
-  def ident_valid_format?
+  def val_ident_valid_format?
     case ident_country_code
     when 'EE'.freeze
+      err_msg = "invalid_EE_identity_format#{"_update" if id}".to_sym
       case ident_type
         when 'priv'.freeze
-          errors.add(:ident, :invalid_EE_identity_format) unless Isikukood.new(ident).valid?
+          errors.add(:ident, err_msg) unless Isikukood.new(ident).valid?
         when 'org'.freeze
           # !%w(1 7 8 9).freeze.include?(ident.first) ||
           if ident.size != 8 || !(ident =~/\A[0-9]{8}\z/)
-            errors.add(:ident, :invalid_EE_identity_format)
+            errors.add(:ident, err_msg)
           end
       end
     end

app/models/directo.rb

@@ -0,0 +1,49 @@
+class Directo < ActiveRecord::Base
+  belongs_to :item, polymorphic: true
+
+  def self.send_receipts
+    new_trans = Invoice.where(invoice_type: "DEB", in_directo: false).where.not(cancelled_at: nil)
+    new_trans.find_in_batches(batch_size: 10).each do |group|
+      mappers = {} # need them as no direct connection between invoice
+      builder = Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml|
+        xml.invoices {
+          group.each do |invoice|
+            next if invoice.account_activity.nil? || invoice.account_activity.bank_transaction.nil?
+            # next if invoice.account_activity.bank_transaction.sum.nil? || invoice.account_activity.bank_transaction.sum != invoice.sum_cache
+
+            num     = invoice.number
+            mappers[num] = invoice
+            xml.invoice(
+                "SalesAgent"  => Setting.directo_sales_agent,
+                "Number"      => num,
+                "InvoiceDate" => invoice.created_at.strftime("%Y-%m-%dT%H:%M:%S"),
+                "PaymentTerm" => Setting.directo_receipt_payment_term,
+                "Currency"    => invoice.currency,
+                "CustomerCode"=> invoice.buyer.try(:directo_handle)
+            ){
+              xml.line(
+                  "ProductID"      => Setting.directo_receipt_product_name,
+                  "Quantity"       => 1,
+                  "UnitPriceWoVAT" => ActionController::Base.helpers.number_with_precision(invoice.sum_cache/(1+invoice.vat_prc), precision: 2, separator: "."),
+                  "ProductName"    => invoice.description
+              )
+            }
+          end
+        }
+      end
+
+      data = builder.to_xml.gsub("\n",'')
+      response = RestClient::Request.execute(url: ENV['directo_invoice_url'], method: :post, payload: {put: "1", what: "invoice", xmldata: data}, verify_ssl: false).to_s
+      dump_result_to_db(mappers, response)
+    end
+  end
+
+  def self.dump_result_to_db mappers, xml
+    Nokogiri::XML(xml).css("Result").each do |res|
+      obj = mappers[res.attributes["docid"].value.to_i]
+      obj.directo_records.create!(response: res.as_json.to_h)
+      obj.update_columns(in_directo: true)
+      Rails.logger.info("[DIRECTO] Invoice #{res.attributes["docid"].value} was pushed and return is #{res.as_json.to_h.inspect}")
+    end
+  end
+end

app/models/domain.rb

@@ -93,7 +93,7 @@ class Domain < ActiveRecord::Base
   def update_reserved_domains
     return unless in_reserved_list?
     rd = ReservedDomain.by_domain(name).first
-    rd.names[name] = SecureRandom.hex
+    rd.password = SecureRandom.hex
     rd.save
   end
 
@@ -264,9 +264,9 @@ class Domain < ActiveRecord::Base
       domains.each do |domain|
         next unless domain.expirable?
         domain.set_graceful_expired
-        DomainMailer.expiration_reminder(domain.id).deliver_in(Setting.expiration_reminder_mail.days)
+        DomainMailer.expiration_reminder(domain.id).deliver_in(Setting.expiration_reminder_mail.to_i.days)
         STDOUT << "#{Time.zone.now.utc} Domain.start_expire_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test?
-        domain.save
+        domain.save(validate: false)
       end
 
       STDOUT << "#{Time.zone.now.utc} - Successfully expired #{domains.count} domains\n" unless Rails.env.test?
@@ -280,7 +280,7 @@ class Domain < ActiveRecord::Base
         next unless domain.server_holdable?
         domain.statuses << DomainStatus::SERVER_HOLD
         STDOUT << "#{Time.zone.now.utc} Domain.start_redemption_grace_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test?
-        domain.save
+        domain.save(validate: false)
       end
 
       STDOUT << "#{Time.zone.now.utc} - Successfully set server_hold to #{d.count} domains\n" unless Rails.env.test?
@@ -294,7 +294,7 @@ class Domain < ActiveRecord::Base
         next unless domain.delete_candidateable?
         domain.statuses << DomainStatus::DELETE_CANDIDATE
         STDOUT << "#{Time.zone.now.utc} Domain.start_delete_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test?
-        domain.save
+        domain.save(validate: false)
       end
 
       return if Rails.env.test?
@@ -408,8 +408,7 @@ class Domain < ActiveRecord::Base
       end
     end
 
-    return false if statuses.include_any?(DomainStatus::DELETE_CANDIDATE, DomainStatus::SERVER_RENEW_PROHIBITED,
-                                          DomainStatus::CLIENT_RENEW_PROHIBITED, DomainStatus::PENDING_RENEW,
+    return false if statuses.include_any?(DomainStatus::DELETE_CANDIDATE, DomainStatus::PENDING_RENEW,
                                           DomainStatus::PENDING_TRANSFER, DomainStatus::PENDING_DELETE,
                                           DomainStatus::PENDING_UPDATE, DomainStatus::PENDING_DELETE_CONFIRMATION)
     true

app/models/epp/contact.rb

@@ -123,6 +123,7 @@ class Epp::Contact < Contact
         [:email, :invalid],
         [:ident, :invalid],
         [:ident, :invalid_EE_identity_format],
+        [:ident, :invalid_EE_identity_format_update],
         [:ident, :invalid_birthday_format],
         [:ident, :invalid_country_code],
         [:ident_type, :missing],
@@ -164,7 +165,7 @@ class Epp::Contact < Contact
         org_priv = %w(org priv).freeze
         if ident_country_code.blank? && org_priv.include?(ident_type) && org_priv.include?(ident_frame.attr('type'))
           at.merge!(ident_country_code: ident_frame.attr('cc'), ident_type: ident_frame.attr('type'))
-        elsif ident_type == "birthday" && ident !=~ /\d{4}-\d{2}-\d{2}/ && (Date.parse(ident) rescue false)
+        elsif ident_type == "birthday" && !ident[/\A\d{4}-\d{2}-\d{2}\z/] && (Date.parse(ident) rescue false)
           at.merge!(ident: ident_frame.text)
           at.merge!(ident_country_code: ident_frame.attr('cc')) if ident_frame.attr('cc').present?
         elsif ident_type.blank? && ident_country_code.blank?

app/models/epp/domain.rb

@@ -8,7 +8,7 @@ class Epp::Domain < Domain
   before_validation :manage_permissions
   def manage_permissions
     return if is_admin # this bad hack for 109086524, refactor later
-    return true if is_transfer
+    return true if is_transfer || is_renewal
     return unless update_prohibited? || delete_prohibited?
     add_epp_error('2304', nil, nil, I18n.t(:object_status_prohibits_operation))
     false
@@ -590,6 +590,7 @@ class Epp::Domain < Domain
 
     statuses.delete(DomainStatus::SERVER_HOLD)
     statuses.delete(DomainStatus::EXPIRED)
+    statuses.delete(DomainStatus::SERVER_UPDATE_PROHIBITED)
 
     save
   end

app/models/invoice.rb

@@ -2,8 +2,9 @@ class Invoice < ActiveRecord::Base
   include Versions
   belongs_to :seller, class_name: 'Registrar'
   belongs_to :buyer, class_name: 'Registrar'
+  has_one  :account_activity
   has_many :invoice_items
-  has_one :account_activity
+  has_many :directo_records, as: :item, class_name: 'Directo'
 
   accepts_nested_attributes_for :invoice_items
 
@@ -99,6 +100,10 @@ class Invoice < ActiveRecord::Base
     kit.to_pdf
   end
 
+  def description
+    "Order nr. #{number}"
+  end
+
   def pdf_name
     "invoice-#{number}.pdf"
   end

app/models/reserved_domain.rb

@@ -38,11 +38,15 @@ class ReservedDomain < ActiveRecord::Base
   end
 
   def generate_data
+    return if Domain.where(name: name).any?
+
     @json = generate_json
     @body = generate_body
     update_whois_server
   end
 
+  alias_method :update_whois_record, :generate_data
+
   def update_whois_server
     wr = Whois::Record.find_or_initialize_by(name: name)
     wr.body = @body
@@ -63,6 +67,8 @@ class ReservedDomain < ActiveRecord::Base
   end
 
   def remove_data
+    return if Domain.where(name: name).any?
+
     Whois::Record.where(name: name).delete_all
   end
 

app/models/whois_record.rb

@@ -106,7 +106,7 @@ class WhoisRecord < ActiveRecord::Base
     self.json = generated_json
     self.body = generated_body
     self.name = json['name']
-    self.registrar_id = domain.registrar_id # for faster registrar updates
+    self.registrar_id = domain.registrar_id if domain # for faster registrar updates
   end
 
   def update_whois_server

app/validators/domain_name_validator.rb

@@ -38,7 +38,7 @@ class DomainNameValidator < ActiveModel::EachValidator
 
     def validate_blocked(value)
       return true unless value
-      return false if BlockedDomain.where("names @> ?::varchar[]", "{#{value}}").count > 0
+      return false if BlockedDomain.where(name: value).count > 0
       ZonefileSetting.where(origin: value).count == 0
     end
   end

app/views/admin/contacts/index.haml

@@ -29,15 +29,10 @@
           .form-group
             = label_tag t(:country)
             = select_tag '[q][country_code_eq]', SortedCountry.all_options(params[:q][:country_code_eq]), { include_blank: true, placeholder: t(:choose), class: 'form-control selectize' }
-        .col-md-3
-          .form-group
-            = f.label t(:is_registrant)
-            %div
-              = f.check_box :registrant_domains_id_not_null
-        .col-md-3
+        .col-md-6
           .form-group
             = label_tag t(:contact_type)
-            = select_tag '[q][domain_contacts_type_in]', options_for_select([['admin', 'AdminDomainContact'], ['tech', 'TechDomainContact']], params[:q][:domain_contacts_type_in]), { multiple: true, placeholder: t(:choose), class: 'form-control js-combobox' }
+            = select_tag '[q][domain_contacts_type_in]', options_for_select([['admin', 'AdminDomainContact'], ['tech', 'TechDomainContact'], ['registrant', 'registrant']], params[:q][:domain_contacts_type_in]), { multiple: true, placeholder: t(:choose), class: 'form-control js-combobox' }
       .row
         .col-md-3
           .form-group

app/views/admin/domain_versions/_version.haml

@@ -55,43 +55,47 @@
       = "#{l(domain.valid_to, format: :date)}"
 
   %td
-    - registrant.each do |r|
-      %p
-        = r[:name]
-        = r[:phone]
-        = r[:email]
-      %p
-        = r[:code]
+    - if registrant
+      - registrant.each do |r|
+        %p
+          = r[:name]
+          = r[:phone]
+          = r[:email]
+        %p
+          = r[:code]
 
   %td
-    - admin_contacts.each do |ac|
-      %p
-        = ac[:name]
-        = ac[:phone]
-        = ac[:email]
-      %p
-        = ac[:code]
+    - if admin_contacts
+      - admin_contacts.each do |ac|
+        %p
+          = ac[:name]
+          = ac[:phone]
+          = ac[:email]
+        %p
+          = ac[:code]
 
   %td
-    - tech_contacts.each do |tc|
-      %p
-        = tc[:name]
-        = tc[:phone]
-        = tc[:email]
-      %p
-        = tc[:code]
+    - if tech_contacts
+      - tech_contacts.each do |tc|
+        %p
+          = tc[:name]
+          = tc[:phone]
+          = tc[:email]
+        %p
+          = tc[:code]
 
   %td
     %p
-      - nameservers.each do |ns|
-        = ns[:hostname]
-        %br
-        = ns[:ipv4]
-        = ns[:ipv6]
+      - if nameservers
+        - nameservers.each do |ns|
+          = ns[:hostname]
+          %br
+          = ns[:ipv4]
+          = ns[:ipv6]
 
   %td
     %p
-      = domain.registrar.name
+      = domain.registrar.name if domain.registrar
 
   - if domain.pending_json.present?
     %tr.js-pending{ style: 'display: none;' }

app/views/admin/settings/index.haml

@@ -71,6 +71,9 @@
           = render 'setting_row', var: :days_to_keep_invoices_active
           = render 'setting_row', var: :days_to_keep_overdue_invoices_active
           = render 'setting_row', var: :minimum_deposit
+          = render 'setting_row', var: :directo_receipt_payment_term
+          = render 'setting_row', var: :directo_receipt_product_name
+          = render 'setting_row', var: :directo_sales_agent
           = render 'setting_row', var: :registry_billing_email
           = render 'setting_row', var: :registry_invoice_contact
           = render 'setting_row', var: :registry_vat_no

app/views/epp/contacts/info.xml.builder

@@ -51,7 +51,7 @@ xml.epp_head do
         xml.tag!('contact:crID', @contact.cr_id)
         xml.tag!('contact:crDate', @contact.created_at.try(:iso8601))
 
-        if @contact.updated_at != @contact.created_at
+        if @contact.updated_at > @contact.created_at
           upID =  @contact.updator.try(:registrar)
           upID =  upID.code if upID.present?             # Did updator return a kind of User that has a registrar?
           xml.tag!('contact:upID', upID) if upID.present? # optional upID

app/views/epp/domains/info.xml.builder

@@ -41,7 +41,7 @@ xml.epp_head do
         xml.tag!('domain:crID', @domain.cr_id)
         xml.tag!('domain:crDate', @domain.created_at.try(:iso8601))
 
-        if @domain.updated_at != @domain.created_at
+        if @domain.updated_at > @domain.created_at
           upID =  @domain.updator.try(:registrar)
           upID =  upID.code if upID.present?             # Did updator return a kind of User that has a registrar?
           xml.tag!('domain:upID', upID) if upID.present? # optional upID

app/views/for_models/whois_other.erb

@@ -2,7 +2,7 @@ Estonia .ee Top Level Domain WHOIS server
 
 Domain:
 name:       <%= @json['name'] %>
-status: <%= @json['status'] %>
+status:     <%= @json['status'] %>
 
 Estonia .ee Top Level Domain WHOIS server
 More information at http://internet.ee

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

@@ -1,7 +1,7 @@
 Domeen <%= @domain.name %> on aegunud<br>
 Lugupeetud .ee domeeni kasutaja<br>
 <br>
-Domeeninimi <%= @domain.name %>  on aegunud ja ei ole alates <%= l(@domain.outzone_at, format: :short) %> internetis kättesaadav. Alates <%= l(@domain.delete_at, format: :short) %> on domeen <%= @domain.name %> avatud registreerimiseks kõigile huvilistele.
+Domeeninimi <%= @domain.name %>  on aegunud ja ei ole alates <%= l(@domain.outzone_at, format: :date) %> internetis kättesaadav. Alates <%= l(@domain.delete_at, format: :date) %> on domeen <%= @domain.name %> avatud registreerimiseks kõigile huvilistele.
 <br><br>
 Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja <%= @domain.registrar.name %> poole. Registripidajate kontaktid leiate aadressilt www.internet.ee/registripidajad.
 <br><br>
@@ -27,7 +27,7 @@ Tel: +372 727 1000<br>
 The <%= @domain.name %> domain has expired<br>
 Dear user of .ee domain,<br>
 <br>
-The domain name <%= @domain.name %> has expired and will not be available on the Internet from <%= l(@domain.outzone_at, format: :short) %>. From <%= l(@domain.delete_at, format: :short) %>, the <%= @domain.name %> domain will be available for registration on a first come first served basis.
+The domain name <%= @domain.name %> has expired and will not be available on the Internet from <%= l(@domain.outzone_at, format: :date) %>. From <%= l(@domain.delete_at, format: :date) %>, the <%= @domain.name %> domain will be available for registration on a first come first served basis.
 <br><br>
 To renew the domain registration, please contact your registrar <%= @domain.registrar.name %>. You can find the registrar's contacts at http://www.internet.ee/en/registripidajad/.
 <br><br>
@@ -53,7 +53,7 @@ Phone: +372 727 1000<br>
 Домен <%= @domain.name %> устарел<br>
 Уважаемый пользователь домена .ee<br>
 <br>
-Доменное имя <%= @domain.name %> устарело и с <%= l(@domain.outzone_at, format: :short) %> недоступно в Интернете. С <%= l(@domain.delete_at, format: :short) %> домен <%= @domain.name %> доступен для регистрации всем желающим по принципу "first come, first served".
+Доменное имя <%= @domain.name %> устарело и с <%= l(@domain.outzone_at, format: :date) %> недоступно в Интернете. С <%= l(@domain.delete_at, format: :date) %> домен <%= @domain.name %> доступен для регистрации всем желающим по принципу "first come, first served".
 <br><br>
 Для продления регистрации домена просим обратиться к своему регистратору <%= @domain.registrar.name %>. Контактные данные регистраторов можно найти по адресу http://www.internet.ee/ru/p/.
 <br><br>

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

@@ -1,7 +1,7 @@
 Domeen <%= @domain.name %> on aegunud
 Lugupeetud .ee domeeni kasutaja
 
-Domeeninimi <%= @domain.name %>  on aegunud ja ei ole alates <%= l(@domain.outzone_at, format: :short) %> internetis kättesaadav. Alates <%= l(@domain.delete_at, format: :short) %> on domeen <%= @domain.name %> avatud registreerimiseks kõigile huvilistele.
+Domeeninimi <%= @domain.name %>  on aegunud ja ei ole alates <%= l(@domain.outzone_at, format: :date) %> internetis kättesaadav. Alates <%= l(@domain.delete_at, format: :date) %> on domeen <%= @domain.name %> avatud registreerimiseks kõigile huvilistele.
 
 Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja <%= @domain.registrar.name %> poole. Registripidajate kontaktid leiate aadressilt www.internet.ee/registripidajad.
 
@@ -27,7 +27,7 @@ Tel: +372 727 1000
 The <%= @domain.name %> domain has expired
 Dear user of .ee domain,
 
-The domain name <%= @domain.name %> has expired and will not be available on the Internet from <%= l(@domain.outzone_at, format: :short) %>. From <%= l(@domain.delete_at, format: :short) %>, the <%= @domain.name %> domain will be available for registration on a first come first served basis.
+The domain name <%= @domain.name %> has expired and will not be available on the Internet from <%= l(@domain.outzone_at, format: :date) %>. From <%= l(@domain.delete_at, format: :date) %>, the <%= @domain.name %> domain will be available for registration on a first come first served basis.
 
 To renew the domain registration, please contact your registrar <%= @domain.registrar.name %>. You can find the registrar's contacts at http://www.internet.ee/en/registripidajad/.
 
@@ -53,7 +53,7 @@ Phone: +372 727 1000
 Домен <%= @domain.name %> устарел
 Уважаемый пользователь домена .ee
 
-Доменное имя <%= @domain.name %> устарело и с <%= l(@domain.outzone_at, format: :short) %> недоступно в Интернете. С <%= l(@domain.delete_at, format: :short) %> домен <%= @domain.name %> доступен для регистрации всем желающим по принципу "first come, first served".
+Доменное имя <%= @domain.name %> устарело и с <%= l(@domain.outzone_at, format: :date) %> недоступно в Интернете. С <%= l(@domain.delete_at, format: :date) %> домен <%= @domain.name %> доступен для регистрации всем желающим по принципу "first come, first served".
 
 Для продления регистрации домена просим обратиться к своему регистратору <%= @domain.registrar.name %>. Контактные данные регистраторов можно найти по адресу http://www.internet.ee/ru/p/.
 

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

@@ -20,7 +20,7 @@ Registrikood: <b><%= @domain.registrant.try(:ident) %></b></p>
 
 <p>Domeenireeglite punktist 6.4 tulenevalt on domeeni suhtes &otilde;igust omaval registreerijal v&otilde;imalus esitada domeeni <b><%= @domain.name %></b> registripidajale <b><%= @domain.registrar %></b> domeeni &uuml;leandmise taotlus Domeenireeglite p 5.3.6.2 kohaselt. Taotlusele tuleb lisada domeeni omandamist t&otilde;endavad dokumendid, mis asendavad Domeenireeglite punktis 5.3.6.3 s&auml;testatud &uuml;leandva registreerija n&otilde;usolekut. Vastav dokumentatsioon tuleks esitada Registripidajale esimesel v&otilde;imalusel.</p>
 
-<p>Kui &uuml;leandmine ei ole 30 p&auml;eva jooksul toimunud, kustub domeen <b><%= @domain.name %></b> 24 tunni jooksul <b><%= l(@domain.force_delete_at, format: :short) %></b> m&ouml;&ouml;dumisest juhuslikult valitud ajahetkel. Soovi korral on v&otilde;imalik domeen p&auml;rast selle kustumist registrist “kes ees, see mees” p&otilde;him&otilde;ttel uuesti registreerida.</p>
+<p>Kui &uuml;leandmine ei ole 30 p&auml;eva jooksul toimunud, kustub domeen <b><%= @domain.name %></b> 24 tunni jooksul <b><%= l(@domain.force_delete_at, format: :date) %></b> m&ouml;&ouml;dumisest juhuslikult valitud ajahetkel. Soovi korral on v&otilde;imalik domeen p&auml;rast selle kustumist registrist “kes ees, see mees” p&otilde;him&otilde;ttel uuesti registreerida.</p>
 
 <p>Lisak&uuml;simuste korral v&otilde;tke palun &uuml;hendust oma registripidajaga <%= @domain.registrar %>, kelle kontaktandmed leiate lingilt <a href="http://www.internet.ee/registripidajad" target="_blank">http://www.internet.ee/registripidajad</a></p><br /><br />
 
@@ -39,7 +39,7 @@ Registry code: <b><%= @domain.registrant.try(:ident) %></b></p>
 
 <p>According to paragraph 6.4 of the Domain Regulation, the registrant holding a right to the domain name <b><%= @domain.name %></b> can submit a domain name transfer application to the registrar <b><%= @domain.registrar %></b> in accordance with paragraph 5.3.6.2 of the Domain Regulation. The application must be submitted together with documents certifying the acquisition of the domain that will replace the consent of the surrendering registrant as laid down in paragraph 5.3.6.3 of the Domain Regulation. The relevant documents should be submitted to the registrar as soon as possible.</p>
 
-<p>If the transfer has not been made in 30 days, the domain <b><%= @domain.name %></b> will be deleted at a randomly chosen moment within 24 hours after <b><%= l(@domain.force_delete_at, format: :short) %></b>. After deletion it is possible to reregister the domain on a "first come, first served" basis.</p>
+<p>If the transfer has not been made in 30 days, the domain <b><%= @domain.name %></b> will be deleted at a randomly chosen moment within 24 hours after <b><%= l(@domain.force_delete_at, format: :date) %></b>. After deletion it is possible to reregister the domain on a "first come, first served" basis.</p>
 
 <p>Should you have additional questions, please contact your registrar <%= @domain.registrar %>, whose contact information can be found at <a href="http://www.internet.ee/registrars/" target="_blank">http://www.internet.ee/registrars/</a></p><br /><br />
 
@@ -58,7 +58,7 @@ Registry code: <b><%= @domain.registrant.try(:ident) %></b></p>
 
 <p>Согласно пункту 6.4 Правил домена регистрант, имеющий право на домен, может подать регистратору <b><%= @domain.registrar %></b> домена <b><%= @domain.name %></b> ходатайство о передаче домена в соответствии с п. 5.3.6.2 Правил домена. К ходатайству следует приложить подтверждающие приобретение домена документы, заменяющие в соответствии с пунктом 5.3.6.3 Правил домена согласие передающего доменное имя регистранта. EIS предлагает представить соответствующую документацию  Регистратору при первой возможности, начиная с инициирования процедуры удаления.</p>
 
-<p>Если в течение 30 дней передача не произошла, домен <b><%= @domain.name %></b> удаляется по истечении 24 часов <b><%= l(@domain.force_delete_at, format: :short) %></b> в случайный момент времени. По желанию после удаления из регистра домен можно снова зарегистрировать по принципу "кто успел, тот и съел".</p>
+<p>Если в течение 30 дней передача не произошла, домен <b><%= @domain.name %></b> удаляется по истечении 24 часов <b><%= l(@domain.force_delete_at, format: :date) %></b> в случайный момент времени. По желанию после удаления из регистра домен можно снова зарегистрировать по принципу "кто успел, тот и съел".</p>
 
 <p>Просим обратиться к своему регистратору <%= @domain.registrar %>. Контактные данные регистраторов можно найти по адресу <a href="http://www.internet.ee/registratory/" target="_blank">http://www.internet.ee/registratory/</a></p><br /><br />
 

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

@@ -11,7 +11,7 @@ Kuivõrd äriregistrist kustutatud juriidiline isik ei saa olla domeeni registre
 
 Domeenireeglite punktist 6.4 tulenevalt on domeeni suhtes õigust omaval registreerijal võimalus esitada domeeni <%= @domain.name %> registripidajale <%= @domain.registrar %> domeeni üleandmise taotlus Domeenireeglite p 5.3.6.2 kohaselt. Taotlusele tuleb lisada domeeni omandamist tõendavad dokumendid, mis asendavad Domeenireeglite punktis 5.3.6.3 sätestatud üleandva registreerija nõusolekut. Vastav dokumentatsioon tuleks esitada Registripidajale esimesel võimalusel.
 
-Kui üleandmine ei ole 30 päeva jooksul toimunud, kustub domeen <%= @domain.name %> 24 tunni jooksul <%= l(@domain.force_delete_at, format: :short) %> möödumisest juhuslikult valitud ajahetkel. Soovi korral on võimalik domeen pärast selle kustumist registrist "kes ees, see mees" põhimõttel uuesti registreerida.
+Kui üleandmine ei ole 30 päeva jooksul toimunud, kustub domeen <%= @domain.name %> 24 tunni jooksul <%= l(@domain.force_delete_at, format: :date) %> möödumisest juhuslikult valitud ajahetkel. Soovi korral on võimalik domeen pärast selle kustumist registrist "kes ees, see mees" põhimõttel uuesti registreerida.
 
 Lisaküsimuste korral võtke palun ühendust oma registripidajaga <%= @domain.registrar %>, kelle kontaktandmed leiate lingilt http://www.internet.ee/registripidajad/
 
@@ -30,7 +30,7 @@ As a terminated legal person cannot be the registrant of a domain, the EIF start
 
 According to paragraph 6.4 of the Domain Regulation, the registrant holding a right to the domain name <%= @domain.name %> can submit a domain name transfer application to the registrar <%= @domain.registrar %> in accordance with paragraph 5.3.6.2 of the Domain Regulation. The application must be submitted together with documents certifying the acquisition of the domain that will replace the consent of the surrendering registrant as laid down in paragraph 5.3.6.3 of the Domain Regulation. The relevant documents should be submitted to the registrar as soon as possible.
 
-If the transfer has not been made in 30 days, the domain <%= @domain.name %> will be deleted at a randomly chosen moment within 24 hours after <%= l(@domain.force_delete_at, format: :short) %>. After deletion it is possible to reregister the domain on a "first come, first served" basis.
+If the transfer has not been made in 30 days, the domain <%= @domain.name %> will be deleted at a randomly chosen moment within 24 hours after <%= l(@domain.force_delete_at, format: :date) %>. After deletion it is possible to reregister the domain on a "first come, first served" basis.
 
 Should you have additional questions, please contact your registrar <%= @domain.registrar %>, whose contact information can be found at http://www.internet.ee/registrars/
 
@@ -49,7 +49,7 @@ EIS стало известно, что юридическое лицо с ре
 
 Согласно пункту 6.4 Правил домена регистрант, имеющий право на домен, может подать регистратору <%= @domain.registrar %> домена <%= @domain.name %> ходатайство о передаче домена в соответствии с п. 5.3.6.2 Правил домена. К ходатайству следует приложить подтверждающие приобретение домена документы, заменяющие в соответствии с пунктом 5.3.6.3 Правил домена согласие передающего доменное имя регистранта. EIS предлагает представить соответствующую документацию  Регистратору при первой возможности, начиная с инициирования процедуры удаления.
 
-Если в течение 30 дней передача не произошла, домен <%= @domain.name %> удаляется по истечении 24 часов <%= l(@domain.force_delete_at, format: :short) %> в случайный момент времени. По желанию после удаления из регистра домен можно снова зарегистрировать по принципу "кто успел, тот и съел".
+Если в течение 30 дней передача не произошла, домен <%= @domain.name %> удаляется по истечении 24 часов <%= l(@domain.force_delete_at, format: :date) %> в случайный момент времени. По желанию после удаления из регистра домен можно снова зарегистрировать по принципу "кто успел, тот и съел".
 
 Просим обратиться к своему регистратору <%= @domain.registrar %>. Контактные данные регистраторов можно найти по адресу http://www.internet.ee/registratory
 

app/views/registrar/contacts/index.haml

@@ -31,15 +31,10 @@
           .form-group
             = label_tag t(:country)
             = select_tag '[q][country_code_eq]', SortedCountry.all_options(params[:q][:country_code_eq]), { include_blank: true, placeholder: t(:choose), class: 'form-control selectize' }
-        .col-md-3
-          .form-group
-            = f.label t(:is_registrant)
-            %div
-              = f.check_box :registrant_domains_id_not_null
-        .col-md-3
+        .col-md-6
           .form-group
             = label_tag t(:contact_type)
-            = select_tag '[q][domain_contacts_type_in]', options_for_select([['admin', 'AdminDomainContact'], ['tech', 'TechDomainContact']], params[:q][:domain_contacts_type_in]), { multiple: true, placeholder: t(:choose), class: 'form-control js-combobox' }
+            = select_tag '[q][domain_contacts_type_in]', options_for_select([['admin', 'AdminDomainContact'], ['tech', 'TechDomainContact'], ['registrant', 'registrant']], params[:q][:domain_contacts_type_in]), { multiple: true, placeholder: t(:choose), class: 'form-control js-combobox' }
       .row
         .col-md-3
           .form-group