+ def format(email)
+ return warn_no_email if email.nil?
+ 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)}, [#{@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
+
+ 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
+ ].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
+ end
+
+ def warn_no_email(item = 'email')
+ warn_missing item
+ 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/contact.rb b/app/models/epp/contact.rb
index ec5673b06..54806b88d 100644
--- a/app/models/epp/contact.rb
+++ b/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],
@@ -160,20 +161,20 @@ class Epp::Contact < Contact
self.ident_updated_at ||= Time.zone.now # not in use
ident_frame = frame.css('ident').first
- if ident_frame && ident_attr_valid?(ident_frame) && ident_country_code.blank? && ident_type.in?(%w(org priv).freeze)
- at.merge!(ident_country_code: ident_frame.attr('cc'))
+ if ident_frame && ident_attr_valid?(ident_frame)
+ 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[/\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?
+ at.merge!(ident_type: ident_frame.attr('type'))
+ at.merge!(ident_country_code: ident_frame.attr('cc')) if ident_frame.attr('cc').present?
+ else
+ throw :epp_error, {code: '2306', msg: I18n.t(:ident_update_error)}
+ end
end
-
- # Deprecated
- # if ident_updated_at.present?
- # throw :epp_error, {
- # code: '2306',
- # msg: I18n.t(:ident_update_error)
- # }
- # else
- # at.merge!(self.class.ident_attrs(frame.css('ident').first))
- # self.ident_updated_at = Time.zone.now
- # end
end
super(at)
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index 12eeaf70d..c7b5cf8ed 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -3,10 +3,12 @@ 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
+ return if is_admin # this bad hack for 109086524, refactor later
+ 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
@@ -14,7 +16,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? }
@@ -486,6 +488,15 @@ class Epp::Domain < Domain
# at[:statuses] += at_add[:domain_statuses_attributes]
+ if registrant_id && registrant.code == frame.css('registrant')
+
+ throw :epp_error, {
+ code: '2305',
+ msg: I18n.t(:contact_already_associated_with_the_domain)
+ }
+
+ end
+
if errors.empty? && verify &&
Setting.request_confrimation_on_registrant_change_enabled &&
frame.css('registrant').present? &&
@@ -500,20 +511,22 @@ 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'])
- statuses.delete(DomainStatus::PENDING_UPDATE)
- yield(self) if block_given? # need to skip statuses check here
- self.save
+ self.deliver_emails = true # turn on email delivery
+ self.statuses.delete(DomainStatus::PENDING_UPDATE)
::PaperTrail.whodunnit = user.id_role_username # updator str should be the request originator not the approval user
+
+ send_mail :registrant_updated_notification_for_old_registrant
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_new_registrant
+ WhoisRecord.find_by(domain_id: id).save # need to reload model
+
+ save! # for notification if everything fails
true
end
@@ -586,6 +599,7 @@ class Epp::Domain < Domain
statuses.delete(DomainStatus::SERVER_HOLD)
statuses.delete(DomainStatus::EXPIRED)
+ statuses.delete(DomainStatus::SERVER_UPDATE_PROHIBITED)
save
end
@@ -594,6 +608,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?
@@ -621,6 +637,7 @@ class Epp::Domain < Domain
oc.registrar_id = registrar_id
oc.copy_from_id = c.id
oc.prefix_code
+ oc.domain_transfer = true
oc.save!(validate: false)
oc
end
diff --git a/app/models/invoice.rb b/app/models/invoice.rb
index 8bc5137d5..425202a4c 100644
--- a/app/models/invoice.rb
+++ b/app/models/invoice.rb
@@ -2,14 +2,27 @@ 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
scope :unbinded, lambda {
where('id NOT IN (SELECT invoice_id FROM account_activities where invoice_id IS NOT NULL)')
}
+ scope :all_columns, ->{select("invoices.*")}
+ scope :sort_due_date_column, ->{all_columns.select("CASE WHEN invoices.cancelled_at is not null THEN
+ (invoices.cancelled_at + interval '100 year') ELSE
+ invoices.due_date END AS sort_due_date")}
+ scope :sort_by_sort_due_date_asc, ->{sort_due_date_column.order("sort_due_date ASC")}
+ scope :sort_by_sort_due_date_desc, ->{sort_due_date_column.order("sort_due_date DESC")}
+ scope :sort_receipt_date_column, ->{all_columns.includes(:account_activity).references(:account_activity).select(%Q{
+ CASE WHEN account_activities.created_at is not null THEN account_activities.created_at
+ WHEN invoices.cancelled_at is not null THEN invoices.cancelled_at + interval '100 year'
+ ELSE NULL END AS sort_receipt_date })}
+ scope :sort_by_sort_receipt_date_asc, ->{sort_receipt_date_column.order("sort_receipt_date ASC")}
+ scope :sort_by_sort_receipt_date_desc, ->{sort_receipt_date_column.order("sort_receipt_date DESC")}
attr_accessor :billing_email
validates :billing_email, email_format: { message: :invalid }, allow_blank: true
@@ -17,7 +30,10 @@ class Invoice < ActiveRecord::Base
validates :invoice_type, :due_date, :currency, :seller_name,
:seller_iban, :buyer_name, :invoice_items, :vat_prc, presence: true
- before_create :set_invoice_number
+ before_create :set_invoice_number, :check_vat
+
+ before_save :check_vat
+
def set_invoice_number
last_no = Invoice.order(number: :desc).where('number IS NOT NULL').limit(1).pluck(:number).first
@@ -34,6 +50,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
@@ -90,6 +112,10 @@ class Invoice < ActiveRecord::Base
kit.to_pdf
end
+ def description
+ "Order nr. #{number}"
+ end
+
def pdf_name
"invoice-#{number}.pdf"
end
diff --git a/app/models/pricelist.rb b/app/models/pricelist.rb
index 42cca0126..17420dfa1 100644
--- a/app/models/pricelist.rb
+++ b/app/models/pricelist.rb
@@ -31,7 +31,7 @@ class Pricelist < ActiveRecord::Base
def pricelist_for(zone, operation, period)
lists = valid.where(category: zone, operation_category: operation, duration: period)
return lists.first if lists.count == 1
- lists.where('valid_to IS NOT NULL').order(valid_from: :desc).first
+ lists.order(valid_from: :desc).first
end
end
end
diff --git a/app/models/registrant_user.rb b/app/models/registrant_user.rb
index 9a69e8acb..413ff1202 100644
--- a/app/models/registrant_user.rb
+++ b/app/models/registrant_user.rb
@@ -1,4 +1,5 @@
class RegistrantUser < User
+ ACCEPTED_ISSUER = 'AS Sertifitseerimiskeskus'
attr_accessor :idc_data
def ability
@@ -6,6 +7,19 @@ class RegistrantUser < User
end
delegate :can?, :cannot?, to: :ability
+ def ident
+ registrant_ident.to_s.split("-").last
+ end
+
+ def domains
+ ident_cc, ident = registrant_ident.to_s.split '-'
+ Domain.includes(:registrar, :registrant).where(contacts: {
+ ident_type: 'priv',
+ ident: ident, #identity_code,
+ ident_country_code: ident_cc #country_code
+ })
+ end
+
def to_s
username
end
@@ -13,11 +27,9 @@ class RegistrantUser < User
class << self
def find_or_create_by_idc_data(idc_data, issuer_organization)
return false if idc_data.blank?
- return false if issuer_organization != 'AS Sertifitseerimiskeskus'
+ return false if issuer_organization != ACCEPTED_ISSUER
idc_data.force_encoding('UTF-8')
- logger.error(idc_data)
- logger.error(idc_data.encoding)
identity_code = idc_data.scan(/serialNumber=(\d+)/).flatten.first
country = idc_data.scan(/^\/C=(.{2})/).flatten.first
first_name = idc_data.scan(%r{/GN=(.+)/serialNumber}).flatten.first
diff --git a/app/models/registrant_verification.rb b/app/models/registrant_verification.rb
index d0c015ecb..253bac630 100644
--- a/app/models/registrant_verification.rb
+++ b/app/models/registrant_verification.rb
@@ -12,7 +12,6 @@ class RegistrantVerification < ActiveRecord::Base
belongs_to :domain
validates :verification_token, :domain_name, :domain, :action, :action_type, presence: true
- validates :domain, uniqueness: { scope: [:domain_id, :verification_token] }
def domain_registrant_change_confirm!
self.action_type = DOMAIN_REGISTRANT_CHANGE
@@ -23,7 +22,7 @@ class RegistrantVerification < ActiveRecord::Base
def domain_registrant_change_reject!
self.action_type = DOMAIN_REGISTRANT_CHANGE
self.action = REJECTED
- DomainUpdateConfirmJob.enqueue domain.id, REJECTED if save
+ DomainUpdateConfirmJob.run domain.id, REJECTED if save
end
def domain_registrant_delete_confirm!
diff --git a/app/models/reserved_domain.rb b/app/models/reserved_domain.rb
index 09d72ec17..8b2cb49e6 100644
--- a/app/models/reserved_domain.rb
+++ b/app/models/reserved_domain.rb
@@ -1,25 +1,75 @@
class ReservedDomain < ActiveRecord::Base
include Versions # version/reserved_domain_version.rb
before_save :fill_empty_passwords
+ before_save :generate_data
+ before_destroy :remove_data
+ validates :name, domain_name: true, uniqueness: true
+
+
- def fill_empty_passwords
- return unless names
- names.each { |k, v| names[k] = SecureRandom.hex if v.blank? }
- end
class << self
def pw_for(domain_name)
- name_in_unicode = SimpleIDN.to_ascii(domain_name)
- by_domain(domain_name).select("names -> '#{domain_name}' AS pw").first.try(:pw) ||
- by_domain(name_in_unicode).select("names -> '#{name_in_unicode}' AS pw").first.try(:pw)
+ name_in_ascii = SimpleIDN.to_ascii(domain_name)
+ by_domain(domain_name).first.try(:password) || by_domain(name_in_ascii).first.try(:password)
end
def by_domain name
- where("names ? '#{name}'")
+ where(name: name)
end
def any_of_domains names
- where("names ?| ARRAY['#{names.join("','")}']")
+ where(name: names)
end
end
+
+
+ def fill_empty_passwords
+
+ if self.password.empty?
+
+ self.password = SecureRandom.hex
+
+ 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] = 'Reserved'
+ h
+ end
+
+ def remove_data
+ return if Domain.where(name: name).any?
+
+ Whois::Record.where(name: name).delete_all
+ end
+
end
diff --git a/app/models/soap/arireg.rb b/app/models/soap/arireg.rb
new file mode 100644
index 000000000..422a72dd9
--- /dev/null
+++ b/app/models/soap/arireg.rb
@@ -0,0 +1,219 @@
+# coding: utf-8
+require 'savon'
+=begin
+
+Estonian Business registry provides information about registered companies via xml (SOAP over HTTPS).
+
+Note:
+ The SSL endpoint certificate is self signed.
+
+Documentation:
+ http://www.rik.ee/et/e-ariregister/xml-teenus
+ Specifications are in Eng and Est
+ User contract required
+
+Testing:
+ https://demo-ariregxml.rik.ee:447/testariport/?wsdl
+ http://demo-ariregxml.rik.ee:81
+ https://demo-ariregxml.rik.ee:447
+
+Live service:
+ https://ariregxml.rik.ee/ariport/?wsdl
+ https://ariregxml.rik.ee/
+
+Implements Soap::Arireg # associated_businesses
+ 8. arireg.paringesindus_v4
+ Rights of representation of all persons related to the company (newer)
+ http://www2.rik.ee/schemas/xtee/arireg/live/paringesindus_v4.xsd
+ expects personal id code, to fetch list of registered business id codes
+ returning {ident: person, ident_country_code: ... associated_businesses: [...id_codes...]}
+
+=end
+
+# do some SSL set up?
+# ssl_version
+# ssl_verify_mode
+# ssl_cert_key_file
+# ssl_cert_key
+# ssl_cert_key_password
+# ssl_cert_file
+# ssl_cert
+# ssl_ca_cert_file
+# ssl_ca_cert
+
+module Soap
+
+ class Arireg
+
+ class NotAvailableError < StandardError
+ attr_accessor :json
+ def initialize(params)
+ params[:message] = "#{I18n.t(:business_registry_service_not_available)}" unless params.key? :message
+ @json = params
+
+ super(params)
+ end
+ end
+
+ class << self
+ attr_accessor :wsdl, :host, :username, :password
+ end
+
+ def initialize
+ if self.class.username.nil?
+ if Rails.application.secrets.key?(:arireg)
+ arireg = Rails.application.secrets[:arireg].with_indifferent_access
+ self.class.username = arireg[:username]
+ self.class.password = arireg[:password]
+ if self.class.wsdl.nil? # no override of config/environments/* ?
+ self.class.wsdl = arireg[:wsdl]
+ self.class.host = arireg[:host]
+ end
+ else
+ self.class.username = ENV['arireg_username']
+ self.class.password = ENV['arireg_password']
+ end
+ end
+ if self.class.wsdl.nil?
+ self.class.wsdl = ENV['arireg_wsdl']
+ self.class.host = ENV['arireg_host']
+ end
+
+ # note Savon has error if https w/non-standard port,
+ # use non-standard force to pre-set endpoint
+ @client = Savon.client(wsdl: self.class.wsdl,
+ host: self.class.host,
+ endpoint: "#{self.class.host}/cgi-bin/consumer_proxy")
+ @session = nil
+ end
+
+ # retrieve business id codes for business that a person has a legal role
+ def associated_businesses(ident, ident_cc = 'EST')
+ begin
+ msg = {
+ 'fyysilise_isiku_kood' => ident,
+ 'fyysilise_isiku_koodi_riik' => country_code_3(ident_cc)
+ }
+ Rails.logger.info "[Ariregister] Request sent with data: #{msg.inspect}"
+
+ response = @client.call :paringesindus_v4, message: body(msg)
+ content = extract response, :paringesindus_v4_response
+ Rails.logger.info "[Ariregister] Got response with data: #{content.inspect}"
+
+ if content.present? && content[:ettevotjad].key?(:item)
+ business_ident = items(content, :ettevotjad).map{|item| item[:ariregistri_kood]}
+ else
+ business_ident = []
+ end
+
+ {
+ ident: ident,
+ ident_country_code: ident_cc,
+ # ident_type: 'priv',
+ retrieved_on: Time.now,
+ associated_businesses: business_ident
+ }
+ rescue Savon::SOAPFault => fault
+ Rails.logger.error "[Ariregister] #{fault} Äriregister arireg #{self.class.username} at #{self.class.host }"
+ raise NotAvailableError.new(exception: fault)
+ rescue HTTPI::SSLError => ssl_error
+ Rails.logger.error "[Ariregister] #{ssl_error} at #{self.class.host}"
+ raise NotAvailableError.new(exception: ssl_error)
+ rescue SocketError => sock
+ Rails.logger.error "[Ariregister] #{sock}"
+ raise NotAvailableError.new(exception: sock)
+ end
+ end
+
+ def debug
+ @client.globals.log_level :debug
+ @client.globals.log true
+ @client.globals.pretty_print_xml true
+ @debug = true
+ @client
+ end
+
+ private
+
+ # add required elements to request
+ def body(args)
+ if @session.nil?
+ args['ariregister_kasutajanimi'] = self.class.username
+ args['ariregister_parool'] = self.class.password
+ else
+ args['ariregister_sessioon'] = @session
+ end
+ {keha: args}
+ end
+
+ # TLA --- three letter acronym required not two letter acronym, transform
+ def country_code_3(code)
+ if code.length == 2
+ code = CC2X3[code]
+ raise NotAvailableError.new(message: 'Unrecognized Country') if code.nil?
+ end
+ code
+ end
+
+ def extract(response, element)
+ # response envelope body has again header/body under element; header is user and password returned
+ response.hash[:envelope][:body][element][:keha]
+ end
+
+ def items(content, parent)
+ items = content[parent][:item]
+ items.is_a?(Array) ? items : [items]
+ end
+
+ CC2X3 = {"AF"=>"AFG", "AX"=>"ALA", "AL"=>"ALB", "DZ"=>"DZA", "AS"=>"ASM",
+ "AD"=>"AND", "AO"=>"AGO", "AI"=>"AIA", "AQ"=>"ATA", "AG"=>"ATG",
+ "AR"=>"ARG", "AM"=>"ARM", "AW"=>"ABW", "AU"=>"AUS", "AT"=>"AUT",
+ "AZ"=>"AZE", "BS"=>"BHS", "BH"=>"BHR", "BD"=>"BGD", "BB"=>"BRB",
+ "BY"=>"BLR", "BE"=>"BEL", "BZ"=>"BLZ", "BJ"=>"BEN", "BM"=>"BMU",
+ "BT"=>"BTN", "BO"=>"BOL", "BQ"=>"BES", "BA"=>"BIH", "BW"=>"BWA",
+ "BV"=>"BVT", "BR"=>"BRA", "IO"=>"IOT", "BN"=>"BRN", "BG"=>"BGR",
+ "BF"=>"BFA", "BI"=>"BDI", "CV"=>"CPV", "KH"=>"KHM", "CM"=>"CMR",
+ "CA"=>"CAN", "KY"=>"CYM", "CF"=>"CAF", "TD"=>"TCD", "CL"=>"CHL",
+ "CN"=>"CHN", "CX"=>"CXR", "CC"=>"CCK", "CO"=>"COL", "KM"=>"COM",
+ "CD"=>"COD", "CG"=>"COG", "CK"=>"COK", "CR"=>"CRI", "CI"=>"CIV",
+ "HR"=>"HRV", "CU"=>"CUB", "CW"=>"CUW", "CY"=>"CYP", "CZ"=>"CZE",
+ "DK"=>"DNK", "DJ"=>"DJI", "DM"=>"DMA", "DO"=>"DOM", "EC"=>"ECU",
+ "EG"=>"EGY", "SV"=>"SLV", "GQ"=>"GNQ", "ER"=>"ERI", "EE"=>"EST",
+ "ET"=>"ETH", "FK"=>"FLK", "FO"=>"FRO", "FJ"=>"FJI", "FI"=>"FIN",
+ "FR"=>"FRA", "GF"=>"GUF", "PF"=>"PYF", "TF"=>"ATF", "GA"=>"GAB",
+ "GM"=>"GMB", "GE"=>"GEO", "DE"=>"DEU", "GH"=>"GHA", "GI"=>"GIB",
+ "GR"=>"GRC", "GL"=>"GRL", "GD"=>"GRD", "GP"=>"GLP", "GU"=>"GUM",
+ "GT"=>"GTM", "GG"=>"GGY", "GN"=>"GIN", "GW"=>"GNB", "GY"=>"GUY",
+ "HT"=>"HTI", "HM"=>"HMD", "VA"=>"VAT", "HN"=>"HND", "HK"=>"HKG",
+ "HU"=>"HUN", "IS"=>"ISL", "IN"=>"IND", "ID"=>"IDN", "IR"=>"IRN",
+ "IQ"=>"IRQ", "IE"=>"IRL", "IM"=>"IMN", "IL"=>"ISR", "IT"=>"ITA",
+ "JM"=>"JAM", "JP"=>"JPN", "JE"=>"JEY", "JO"=>"JOR", "KZ"=>"KAZ",
+ "KE"=>"KEN", "KI"=>"KIR", "KP"=>"PRK", "KR"=>"KOR", "KW"=>"KWT",
+ "KG"=>"KGZ", "LA"=>"LAO", "LV"=>"LVA", "LB"=>"LBN", "LS"=>"LSO",
+ "LR"=>"LBR", "LY"=>"LBY", "LI"=>"LIE", "LT"=>"LTU", "LU"=>"LUX",
+ "MO"=>"MAC", "MK"=>"MKD", "MG"=>"MDG", "MW"=>"MWI", "MY"=>"MYS",
+ "MV"=>"MDV", "ML"=>"MLI", "MT"=>"MLT", "MH"=>"MHL", "MQ"=>"MTQ",
+ "MR"=>"MRT", "MU"=>"MUS", "YT"=>"MYT", "MX"=>"MEX", "FM"=>"FSM",
+ "MD"=>"MDA", "MC"=>"MCO", "MN"=>"MNG", "ME"=>"MNE", "MS"=>"MSR",
+ "MA"=>"MAR", "MZ"=>"MOZ", "MM"=>"MMR", "NA"=>"NAM", "NR"=>"NRU",
+ "NP"=>"NPL", "NL"=>"NLD", "NC"=>"NCL", "NZ"=>"NZL", "NI"=>"NIC",
+ "NE"=>"NER", "NG"=>"NGA", "NU"=>"NIU", "NF"=>"NFK", "MP"=>"MNP",
+ "NO"=>"NOR", "OM"=>"OMN", "PK"=>"PAK", "PW"=>"PLW", "PS"=>"PSE",
+ "PA"=>"PAN", "PG"=>"PNG", "PY"=>"PRY", "PE"=>"PER", "PH"=>"PHL",
+ "PN"=>"PCN", "PL"=>"POL", "PT"=>"PRT", "PR"=>"PRI", "QA"=>"QAT",
+ "RE"=>"REU", "RO"=>"ROU", "RU"=>"RUS", "RW"=>"RWA", "BL"=>"BLM",
+ "SH"=>"SHN", "KN"=>"KNA", "LC"=>"LCA", "MF"=>"MAF", "PM"=>"SPM",
+ "VC"=>"VCT", "WS"=>"WSM", "SM"=>"SMR", "ST"=>"STP", "SA"=>"SAU",
+ "SN"=>"SEN", "RS"=>"SRB", "SC"=>"SYC", "SL"=>"SLE", "SG"=>"SGP",
+ "SX"=>"SXM", "SK"=>"SVK", "SI"=>"SVN", "SB"=>"SLB", "SO"=>"SOM",
+ "ZA"=>"ZAF", "GS"=>"SGS", "SS"=>"SSD", "ES"=>"ESP", "LK"=>"LKA",
+ "SD"=>"SDN", "SR"=>"SUR", "SJ"=>"SJM", "SZ"=>"SWZ", "SE"=>"SWE",
+ "CH"=>"CHE", "SY"=>"SYR", "TW"=>"TWN", "TJ"=>"TJK", "TZ"=>"TZA",
+ "TH"=>"THA", "TL"=>"TLS", "TG"=>"TGO", "TK"=>"TKL", "TO"=>"TON",
+ "TT"=>"TTO", "TN"=>"TUN", "TR"=>"TUR", "TM"=>"TKM", "TC"=>"TCA",
+ "TV"=>"TUV", "UG"=>"UGA", "UA"=>"UKR", "AE"=>"ARE", "GB"=>"GBR",
+ "UM"=>"UMI", "US"=>"USA", "UY"=>"URY", "UZ"=>"UZB", "VU"=>"VUT",
+ "VE"=>"VEN", "VN"=>"VNM", "VG"=>"VGB", "VI"=>"VIR", "WF"=>"WLF",
+ "EH"=>"ESH", "YE"=>"YEM", "ZM"=>"ZMB", "ZW"=>"ZWE"}
+ end
+end
diff --git a/app/models/whois_record.rb b/app/models/whois_record.rb
index 21db2bdc0..c16e5ce73 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
@@ -44,11 +48,11 @@ class WhoisRecord < ActiveRecord::Base
h[:changed] = domain.updated_at.try(:to_s, :iso8601)
h[:expire] = domain.valid_to.try(:to_date).try(:to_s)
h[:outzone] = domain.outzone_at.try(:to_date).try(:to_s)
- h[:delete] = domain.delete_at.try(:to_date).try(:to_s)
+ h[:delete] = [domain.delete_at, domain.force_delete_at].compact.min.try(:to_date).try(:to_s)
h[:registrant] = domain.registrant.name
- h[:registrant_email] = domain.registrant.email
+ h[:email] = domain.registrant.email
@disclosed << [:email, domain.registrant.email]
h[:registrant_changed] = domain.registrant.updated_at.try(:to_s, :iso8601)
@@ -102,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
@@ -113,6 +117,6 @@ class WhoisRecord < ActiveRecord::Base
end
def destroy_whois_record
- Whois::Record.where(name: name).delete_all()
+ Whois::Record.where(name: name).delete_all
end
end
diff --git a/app/validators/domain_name_validator.rb b/app/validators/domain_name_validator.rb
index e39437f2b..be83f0835 100644
--- a/app/validators/domain_name_validator.rb
+++ b/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
diff --git a/app/views/admin/account_activities/index.haml b/app/views/admin/account_activities/index.haml
index 35e270dce..80ebba2f6 100644
--- a/app/views/admin/account_activities/index.haml
+++ b/app/views/admin/account_activities/index.haml
@@ -29,13 +29,24 @@
.form-group
= f.label t(:receipt_date_until)
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:receipt_date_until), autocomplete: 'off'
- .col-md-6{style: 'padding-top: 25px;'}
+ .col-md-3
+ .form-group
+ = label_tag t(:results_per_page)
+ = text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page)
+ .col-md-3{style: 'padding-top: 25px;'}
%button.btn.btn-default.search
%span.glyphicon.glyphicon-search
%button.btn.btn-default.js-reset-form
= t(:clear_fields)
+.row
+ .col-md-3
+ .col-md-3
+ .col-md-2
+ .col-md-4{class: 'text-right'}
+ = t(:starting_balance) + " #{@sum.to_a.map(&:sum).sum.to_f} EUR"
+
%hr
.row
@@ -55,6 +66,7 @@
%th{class: 'col-xs-2'}
= sort_link(@q, 'sum')
%tbody
+ -total = @sum.to_a.map(&:sum).sum.to_f
- @account_activities.each do |x|
%tr
%td= link_to(x.account.registrar.try(:code), admin_registrar_path(x.account.registrar))
@@ -63,7 +75,15 @@
%td= l(x.created_at)
- c = x.sum > 0.0 ? 'text-success' : 'text-danger'
- s = x.sum > 0.0 ? "+#{x.sum} #{x.currency}" : "#{x.sum} #{x.currency}"
+ -total += x.sum
%td{class: c}= s
+ - if @account_activities.count > 0
+ %tr
+ %td
+ %td
+ %td
+ %td{class: 'text-right'}= t(:total)
+ %td{class: total > 0 ? 'text-success' : 'text-danger'}= total > 0 ? "+#{total} EUR" : "#{total} EUR"
.row
.col-md-12
= paginate @account_activities
diff --git a/app/views/admin/blocked_domains/_form.haml b/app/views/admin/blocked_domains/_form.haml
new file mode 100644
index 000000000..996d52843
--- /dev/null
+++ b/app/views/admin/blocked_domains/_form.haml
@@ -0,0 +1,17 @@
+= form_for([:admin, @domain], html: {class: 'form-horizontal'}) do |f|
+ = render 'shared/full_errors', object: @domain
+
+ .row
+ .col-md-8
+ .panel.panel-default
+ .panel-heading.clearfix
+ .pull-left= t(:general)
+ .panel-body
+ .form-group
+ .col-md-4.control-label
+ = f.label :name
+ .col-md-7
+ = f.text_field(:name, class: 'form-control')
+ .row
+ .col-md-8.text-right
+ = button_tag(t(:save), class: 'btn btn-primary')
diff --git a/app/views/admin/blocked_domains/edit.haml b/app/views/admin/blocked_domains/edit.haml
new file mode 100644
index 000000000..51d77f0cc
--- /dev/null
+++ b/app/views/admin/blocked_domains/edit.haml
@@ -0,0 +1,3 @@
+= render 'shared/title', name: t(:edit_pw)
+
+= render 'form'
diff --git a/app/views/admin/blocked_domains/index.haml b/app/views/admin/blocked_domains/index.haml
index bd5660193..5f6ac69d0 100644
--- a/app/views/admin/blocked_domains/index.haml
+++ b/app/views/admin/blocked_domains/index.haml
@@ -1,10 +1,68 @@
+- content_for :actions do
+ = link_to(t(:new), new_admin_blocked_domain_path, class: 'btn btn-primary')
= render 'shared/title', name: t(:blocked_domains)
-= form_tag([:admin, :blocked_domains]) do |f|
- .row
- .col-md-12
- = text_area_tag :blocked_domains, @blocked_domains, class: 'form-control', rows: 30
- %hr
- .row
- .col-md-12.text-right
- %button.btn.btn-warning=t(:save)
+.row
+ .col-md-12
+ = search_form_for [:admin, @q], html: { style: 'margin-bottom: 0;', class: 'js-form', autocomplete: 'off' } do |f|
+ .row
+ .col-md-3
+ .form-group
+ = f.label :name
+ = f.search_field :name_matches, value: params[:q][:name_matches], class: 'form-control', placeholder: t(:name)
+ .col-md-3
+ .form-group
+ = f.label t(:created_at_from)
+ = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_at_from)
+ .col-md-3
+ .form-group
+ = f.label t(:created_at_until)
+ = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_at_until)
+ .row
+ .col-md-3
+ .form-group
+ = label_tag t(:results_per_page)
+ = text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page)
+ .col-md-3{style: 'padding-top: 25px;'}
+ %button.btn.btn-primary
+
+ %span.glyphicon.glyphicon-search
+
+ %button.btn.btn-default.js-reset-form
+ = t(:clear_fields)
+%hr
+.row
+ .col-md-12
+ .table-responsive
+ %table.table.table-hover.table-bordered.table-condensed
+ %thead
+ %tr
+ %th{class: 'col-xs-2'}
+ = sort_link(@q, 'name')
+ %th{class: 'col-xs-2'}
+ = sort_link(@q, 'created_at', t(:created_at))
+ %th{class: 'col-xs-2'}
+ = sort_link(@q, 'updated_at', t(:updated_at))
+ %th{class: 'col-xs-1'}
+ = t(:actions)
+ %tbody
+ - @domains.each do |x|
+ %tr
+ %td= x.name
+ %td= l(x.created_at, format: :short)
+ %td= l(x.updated_at, format: :short)
+ %td
+ %div{class: 'text-center'}
+ = link_to(t(:delete), delete_admin_blocked_domain_path(id: x.id),
+ data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger btn-xs')
+.row
+ .col-md-6
+ = paginate @domains
+ .col-md-6.text-right
+ .pagination
+ = t(:result_count, count: @domains.total_count)
+
+:coffee
+ $(".js-reset-form").on "click", (e) ->
+ e.preventDefault();
+ window.location = "#{admin_blocked_domains_path}"
diff --git a/app/views/admin/blocked_domains/new.haml b/app/views/admin/blocked_domains/new.haml
new file mode 100644
index 000000000..4461eea40
--- /dev/null
+++ b/app/views/admin/blocked_domains/new.haml
@@ -0,0 +1,3 @@
+= render 'shared/title', name: t(:add_blocked_domain)
+
+= render 'form'
diff --git a/app/views/admin/contacts/index.haml b/app/views/admin/contacts/index.haml
index b8e7850e6..715b87eb6 100644
--- a/app/views/admin/contacts/index.haml
+++ b/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
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/domain_versions/_version.haml b/app/views/admin/domain_versions/_version.haml
index fd449b4b0..321e9abda 100644
--- a/app/views/admin/domain_versions/_version.haml
+++ b/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;' }
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/invoices/index.haml b/app/views/admin/invoices/index.haml
index 75b6285a4..4b34dba94 100644
--- a/app/views/admin/invoices/index.haml
+++ b/app/views/admin/invoices/index.haml
@@ -8,13 +8,13 @@
%thead
%tr
%th{class: 'col-xs-3'}
- = sort_link(@q, 'invoice')
+ = sort_link(@q, :number)
%th{class: 'col-xs-3'}
- = sort_link(@q, 'buyer')
+ = sort_link(@q, :buyer_name, "Buyer")
%th{class: 'col-xs-3'}
- = sort_link(@q, 'due_date')
+ = sort_link(@q, :sort_due_date, "Due date")
%th{class: 'col-xs-3'}
- = sort_link(@q, 'receipt_date')
+ = sort_link(@q, :sort_receipt_date, "Receipt date")
%tbody
- @invoices.each do |x|
%tr
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/admin/registrars/index.haml b/app/views/admin/registrars/index.haml
index a2604dbec..8ba45d205 100644
--- a/app/views/admin/registrars/index.haml
+++ b/app/views/admin/registrars/index.haml
@@ -8,15 +8,18 @@
%table.table.table-hover.table-bordered.table-condensed
%thead
%tr
- %th{class: 'col-xs-6'}
+ %th{class: 'col-xs-4'}
= sort_link(@q, 'name')
- %th{class: 'col-xs-6'}
+ %th{class: 'col-xs-4'}
= sort_link(@q, 'reg_no', t(:reg_no))
+ %th{class: 'col-xs-4'}
+ = t(:credit_balance)
%tbody
- @registrars.each do |x|
%tr
%td= link_to(x, [:admin, x])
%td= x.reg_no
+ %td= "#{x.balance}"
.row
.col-md-12
= paginate @registrars
diff --git a/app/views/admin/registrars/show.haml b/app/views/admin/registrars/show.haml
index e3966583f..35938c0c6 100644
--- a/app/views/admin/registrars/show.haml
+++ b/app/views/admin/registrars/show.haml
@@ -32,6 +32,9 @@
%dt= t(:id)
%dd= @registrar.code
+ %dt= t(:credit_balance)
+ %dd= @registrar.balance
+
.col-md-6
.panel.panel-default
.panel-heading
diff --git a/app/views/admin/reserved_domains/_form.haml b/app/views/admin/reserved_domains/_form.haml
new file mode 100644
index 000000000..ec7492659
--- /dev/null
+++ b/app/views/admin/reserved_domains/_form.haml
@@ -0,0 +1,22 @@
+= form_for([:admin, @domain], html: {class: 'form-horizontal'}) do |f|
+ = render 'shared/full_errors', object: @domain
+
+ .row
+ .col-md-8
+ .panel.panel-default
+ .panel-heading.clearfix
+ .pull-left= t(:general)
+ .panel-body
+ .form-group
+ .col-md-4.control-label
+ = f.label :name
+ .col-md-7
+ = f.text_field(:name, class: 'form-control', disabled: !f.object.new_record?)
+ .form-group
+ .col-md-4.control-label
+ = f.label :password
+ .col-md-7
+ = f.text_field(:password, placeholder: t(:optional), class: 'form-control')
+ .row
+ .col-md-8.text-right
+ = button_tag(t(:save), class: 'btn btn-primary')
diff --git a/app/views/admin/reserved_domains/edit.haml b/app/views/admin/reserved_domains/edit.haml
new file mode 100644
index 000000000..51d77f0cc
--- /dev/null
+++ b/app/views/admin/reserved_domains/edit.haml
@@ -0,0 +1,3 @@
+= render 'shared/title', name: t(:edit_pw)
+
+= render 'form'
diff --git a/app/views/admin/reserved_domains/index.haml b/app/views/admin/reserved_domains/index.haml
index 15840ff93..06825b624 100644
--- a/app/views/admin/reserved_domains/index.haml
+++ b/app/views/admin/reserved_domains/index.haml
@@ -1,14 +1,72 @@
- content_for :actions do
- = link_to('#', class: 'btn btn-default', "data-container": "body", "data-title": t('list_format_is_in_yaml'), "data-content": "domain.ee: authinfopw<%= @domain.registrant.try(:ident) %>
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
<%= @domain.registrant.try(:ident) %>
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/
<%= @domain.registrant.try(:ident) %>
Согласно пункту 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/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Teenuste nimekiri
+
+
+
+
+ Adapteri test
+
+
+
+
+ Ettevõtjaga seotud dokumentide loetelu päring
+
+
+
+
+ Ettevõtja esmakannete päring
+
+
+
+
+ Ettevõtja muudatuste loetelu tasuline päring
+
+
+
+
+ Ettevotja rekvisiitide päring
+
+
+
+
+ Ettevotja rekvisiitide fail
+
+
+
+
+ Isikute otsing
+
+
+
+
+ Klassifikaatorite päring
+
+
+
+
+ Ettevõtja majandusaasta aruande päring
+
+
+
+
+ Ettevõtja majandusaasta aruande loetelu päring
+
+
+
+
+ Ettevõtja detailandmete päring v5
+
+
+
+
+ E-notar: toimiku dokumendi sisu
+
+
+
+
+ Ettevõtja lihtandmete päring v5
+
+
+
+
+ Ettevõtja lihtandmete päring tasuta
+
+
+
+
+ Esindusõiguste päring v3
+
+
+
+
+ Esindusõiguste päring v4
+
+
+
+
+ Visuaalse Äriregistri ettevõtete-isikute vaheliste seoste päring
+
+
+
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+
+
+
+ Äriregister_uus
+
+
+
diff --git a/lib/schemas/testariport.wsdl b/lib/schemas/testariport.wsdl
new file mode 100644
index 000000000..25e3818b2
--- /dev/null
+++ b/lib/schemas/testariport.wsdl
@@ -0,0 +1,510 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Teenuste nimekiri
+
+
+
+
+ Adapteri test
+
+
+
+
+ Ettevõtjaga seotud dokumentide loetelu päring
+
+
+
+
+ Ettevõtja esmakannete päring
+
+
+
+
+ Ettevõtja muudatuste loetelu tasuline päring
+
+
+
+
+ Ettevotja rekvisiitide päring
+
+
+
+
+ Ettevotja rekvisiitide fail
+
+
+
+
+ Isikute otsing
+
+
+
+
+ Klassifikaatorite päring
+
+
+
+
+ Ettevõtja majandusaasta aruande päring
+
+
+
+
+ Ettevõtja majandusaasta aruande loetelu päring
+
+
+
+
+ Ettevõtja detailandmete päring v5
+
+
+
+
+ E-notar: toimiku dokumendi sisu
+
+
+
+
+ Ettevõtja lihtandmete päring v5
+
+
+
+
+ Ettevõtja lihtandmete päring tasuta
+
+
+
+
+ Esindusõiguste päring v3
+
+
+
+
+ Esindusõiguste päring v4
+
+
+
+
+ Visuaalse Äriregistri ettevõtete-isikute vaheliste seoste päring
+
+
+
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+ v1
+
+
+
+
+
+
+
+ Äriregister_uus
+
+
+
diff --git a/lib/tasks/epp.rake b/lib/tasks/epp.rake
new file mode 100644
index 000000000..e03835dad
--- /dev/null
+++ b/lib/tasks/epp.rake
@@ -0,0 +1,19 @@
+namespace :epp do
+
+ desc 'EPP actions'
+ task all: :environment do
+ Rake::Task['epp:trim_documents'].invoke
+ end
+
+ desc 'Trim logs'
+ task trim_documents: :environment do
+ puts '-----> Running query'
+ sql = <<-SQL
+ UPDATE epp_logs SET request = regexp_replace(request, '', '[FILTERED]<\eis:legalDocument>');
+ SQL
+ ApiLog::EppLog.connection.execute(sql)
+
+ puts "-----> Query done"
+ end
+end
+
diff --git a/lib/tasks/whois.rake b/lib/tasks/whois.rake
index fd905e383..c8c3ba2a1 100644
--- a/lib/tasks/whois.rake
+++ b/lib/tasks/whois.rake
@@ -3,15 +3,24 @@ namespace :whois do
task regenerate: :environment do
start = Time.zone.now.to_f
- @i = 0
print "-----> Regenerate Registry whois_records table and sync with whois server..."
ActiveRecord::Base.uncached do
- puts "\n#{@i}"
- Domain.included.find_in_batches(batch_size: 10000) do |batch|
- batch.map(&:update_whois_record)
- puts(@i += 10000)
- GC.start
+
+ print "\n-----> Update domains whois_records"
+ Domain.find_in_batches.each do |group|
+ UpdateWhoisRecordJob.enqueue group.map(&:id), 'domain'
end
+
+ print "\n-----> Update blocked domains whois_records"
+ BlockedDomain.find_in_batches.each do |group|
+ UpdateWhoisRecordJob.enqueue group.map(&:id), 'blocked'
+ end
+
+ print "\n-----> Update reserved domains whois_records"
+ ReservedDomain.find_in_batches.each do |group|
+ UpdateWhoisRecordJob.enqueue group.map(&:id), 'reserved'
+ end
+
end
puts "\n-----> all done in #{(Time.zone.now.to_f - start).round(2)} seconds"
end
diff --git a/spec/models/directo_spec.rb b/spec/models/directo_spec.rb
new file mode 100644
index 000000000..bf187d2bf
--- /dev/null
+++ b/spec/models/directo_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Directo, type: :model do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb
index 9dd0f1a48..cddb9141b 100644
--- a/spec/models/domain_spec.rb
+++ b/spec/models/domain_spec.rb
@@ -140,20 +140,20 @@ describe Domain do
domain.registrant_verification_asked_at = 30.days.ago
domain.pending_delete!
- Domain.clean_expired_pendings.should == 1
+ DomainCron.clean_expired_pendings.should == 1
domain.reload.pending_delete?.should == false
domain.pending_json.should == {}
end
it 'should expire domains' do
- Domain.start_expire_period
+ DomainCron.start_expire_period
@domain.statuses.include?(DomainStatus::EXPIRED).should == false
old_valid_to = Time.zone.now - 10.days
@domain.valid_to = old_valid_to
@domain.save
- Domain.start_expire_period
+ DomainCron.start_expire_period
@domain.reload
@domain.statuses.include?(DomainStatus::EXPIRED).should == true
@domain.outzone_at.should be_within(5).of(old_valid_to + Setting.expire_warning_period.days)
@@ -161,7 +161,7 @@ describe Domain do
old_valid_to + Setting.expire_warning_period.days + Setting.redemption_grace_period.days
)
- Domain.start_expire_period
+ DomainCron.start_expire_period
@domain.reload
@domain.statuses.include?(DomainStatus::EXPIRED).should == true
end
@@ -173,7 +173,7 @@ describe Domain do
@domain.outzone_at, @domain.delete_at = nil, nil
@domain.save
- Domain.start_expire_period
+ DomainCron.start_expire_period
@domain.reload
@domain.statuses.include?(DomainStatus::EXPIRED).should == true
@domain.outzone_at.should be_within(5).of(old_valid_to + Setting.expire_warning_period.days)
@@ -183,7 +183,7 @@ describe Domain do
end
it 'should start redemption grace period' do
- Domain.start_redemption_grace_period
+ DomainCron.start_redemption_grace_period
@domain.reload
@domain.statuses.include?(DomainStatus::SERVER_HOLD).should == false
@@ -191,20 +191,20 @@ describe Domain do
@domain.statuses << DomainStatus::SERVER_MANUAL_INZONE # this prohibits server_hold
@domain.save
- Domain.start_redemption_grace_period
+ DomainCron.start_redemption_grace_period
@domain.reload
@domain.statuses.include?(DomainStatus::SERVER_HOLD).should == false
@domain.statuses = []
@domain.save
- Domain.start_redemption_grace_period
+ DomainCron.start_redemption_grace_period
@domain.reload
@domain.statuses.include?(DomainStatus::SERVER_HOLD).should == true
end
it 'should start delete period' do
- Domain.start_delete_period
+ DomainCron.start_delete_period
@domain.reload
@domain.statuses.include?(DomainStatus::DELETE_CANDIDATE).should == false
@@ -212,13 +212,13 @@ describe Domain do
@domain.statuses << DomainStatus::SERVER_DELETE_PROHIBITED # this prohibits delete_candidate
@domain.save
- Domain.start_delete_period
+ DomainCron.start_delete_period
@domain.reload
@domain.statuses.include?(DomainStatus::DELETE_CANDIDATE).should == false
@domain.statuses = []
@domain.save
- Domain.start_delete_period
+ DomainCron.start_delete_period
@domain.reload
@domain.statuses.include?(DomainStatus::DELETE_CANDIDATE).should == true
@@ -234,7 +234,7 @@ describe Domain do
Domain.count.should == 2
- Domain.start_delete_period
+ DomainCron.start_delete_period
Domain.destroy_delete_candidates
Domain.count.should == 0
@@ -391,7 +391,7 @@ describe Domain do
end
it 'should start redemption grace period' do
- Domain.start_redemption_grace_period
+ DomainCron.start_redemption_grace_period
@domain.reload
@domain.statuses.include?(DomainStatus::SERVER_HOLD).should == false
@@ -399,14 +399,14 @@ describe Domain do
@domain.statuses << DomainStatus::SERVER_MANUAL_INZONE # this prohibits server_hold
@domain.save
- Domain.start_redemption_grace_period
+ DomainCron.start_redemption_grace_period
@domain.reload
@domain.statuses.include?(DomainStatus::SERVER_HOLD).should == false
@domain.statuses = []
@domain.save
- Domain.start_redemption_grace_period
+ DomainCron.start_redemption_grace_period
@domain.reload
@domain.statuses.include?(DomainStatus::SERVER_HOLD).should == true
end