Merge remote-tracking branch 'origin/registry-660' into registry-661

# Conflicts:
#	db/structure.sql
#	doc/repp-doc.md

config/locales/admin/domains.en.yml

@@ -2,9 +2,12 @@ en:
   admin:
     domains:
       index:
-        reset_btn: Reset
+        header: Domains
         registrant: Registrant
 
+      search_form:
+        reset_btn: Reset
+
       edit:
         add_new_status_btn: Add new status
         back_btn: Back to domain

config/locales/en.yml

@@ -26,6 +26,7 @@ en:
       date: "%Y-%m-%d"
       date_long: "%d. %B %Y"
       ydate: "%Y.%m.%d"
+      filename: "%Y-%m-%d_%H.%M"
   date:
     formats:
       default: "%Y-%m-%d"
@@ -79,7 +80,7 @@ en:
             period:
               not_a_number: 'Period is not a number'
               not_an_integer: 'Period must be an integer'
-            auth_info:
+            transfer_code:
               wrong_pw: 'Authorization error'
             domain_statuses:
               invalid: 'Statuses are invalid'
@@ -97,11 +98,6 @@ en:
         domain:
           <<: *epp_domain_ar_attributes
 
-        domain_transfer:
-          attributes:
-            base:
-              transfer_can_be_approved_only_by_current_registrar: 'Transfer can be approved only by current domain registrar'
-
         nameserver:
           attributes:
             hostname:
@@ -326,32 +322,13 @@ en:
   starting_balance: 'Starting balance'
   destroyed: 'Destroyed'
 
-  domain_transfer_requested: 'Domain transfer requested!'
-  domain_transfer_approved: 'Domain transfer approved!'
-  failed_to_approve_domain_transfer: 'Failed to approve domain transfer'
   approve: 'Approve'
   domain_already_belongs_to_the_querying_registrar: 'Domain already belongs to the querying registrar'
-  other_registrar_has_already_requested_to_transfer_this_domain: 'Other registrar has already requested to transfer this domain.'
-  transfer_domain: 'Transfer domain'
-  failed_to_request_domain_transfer: 'Failed to request domain transfer' #not used atm
-  domain_transfer: 'Domain transfer'
-  request_domain_transfer: 'Request domain transfer'
-  domain_valid_to: 'Domain valid to'
-  accept_time: 'Accept time'
-  transfer_from: 'Transfer from'
-  transferred_at: 'Transferred at'
-  domain_transfers_list: 'Domain transfers list'
-  domain_transfers: 'Domain transfers'
 
-  password_invalid: 'Password invalid!'
-  domain_was_not_found: 'Domain was not found!'
-  domain_list: 'Domain list'
-  create_new_domain: 'Create new domain'
   welcome: 'Welcome!'
   edit_statuses: 'Edit statuses'
   contact_list: 'Contact list'
   create_new_contact: 'Create new contact'
-  domain_pw: 'Domain password'
   history: 'History'
 
   new_registrar: 'New registrar'
@@ -421,7 +398,6 @@ en:
   tech_contacts_min_count: 'Tech contacts minimum count'
   tech_contacts_max_count: 'Tech contacts maximum count'
   action_failed_due_to_server_error: 'Action failed due to server error'
-  pending_transfer_was_not_found: 'Pending transfer was not found'
   transfer_can_be_rejected_only_by_current_registrar: 'Transfer can be rejected only by current registrar'
   request_command: 'Request command'
   request_object: 'Request object'
@@ -441,7 +417,6 @@ en:
   attribute_is_invalid: 'Attribute is invalid: %{attribute}'
   request_successful: 'Request successful'
   choose: 'Choose...'
-  clear_fields: 'Clear fields'
   created_before: 'Created before'
   created_after: 'Created after'
   billing_address: 'Billing address'
@@ -500,12 +475,9 @@ en:
               blank: "Password can't be blank"
 
   username: 'Username'
-  password: 'Password'
-  authinfo_pw: 'AuthInfo pw'
   log_in: 'Log in'
   domains: 'Domains'
   register: 'Register'
-  check: 'Check'
   contacts: 'Contacts'
   domain_info: 'Domain info'
   domain_details: 'Domain details'
@@ -547,9 +519,7 @@ en:
   new: New
   renew_domain: 'Renew domain'
   cur_exp_date: 'curExpDate'
-  transfer: 'Transfer'
   query: 'Query'
-  transfer_domain: 'Transfer domain'
   reject: 'Reject'
   approve: 'Approve'
   contact_info: 'Contact info'
@@ -805,7 +775,6 @@ en:
   manage: Manage
   pending_epp: Pending epp
   id: ID
-  hidden: '[hidden]'
   created_at_from: 'Created at from'
   created_at_until: 'Created at until'
   is_registrant: 'Is registrant'
@@ -816,9 +785,6 @@ en:
   contact_is_not_valid: 'Contact %{value} is not valid, please fix the invalid contact'
   welcome_to_eis_registrar_portal: 'Welcome to EIS Registrar portal'
   interfaces: 'Interfaces'
-  list_format_is_in_yaml: 'List format is in YAML'
-  if_auth_info_is_left_empty_it_will_be_auto_generated: 'If auth info is left empty, it will be auto generated.'
-  each_domain_name_must_end_with_colon_sign: 'Each domain name must end with colon (:) sign.'
   next: 'Next'
   previous: 'Previous'
   personal_domain_verification_url: 'Personal domain verification url'

config/locales/registrant/domains.en.yml

@@ -2,7 +2,9 @@ en:
   registrant:
     domains:
       index:
+        header: Domains
         registrant: Registrant
+        reset_btn: Reset
 
       download_list:
         registrant: Registrant

config/locales/registrar/account_activities.en.yml

@@ -0,0 +1,5 @@
+en:
+  registrar:
+    account_activities:
+      index:
+        reset_btn: Reset

config/locales/registrar/contacts.en.yml

@@ -1,6 +1,9 @@
 en:
   registrar:
     contacts:
+      index:
+        reset_btn: Reset
+
       partials:
         domains:
           roles: Roles

config/locales/registrar/domain_transfers.en.yml

@@ -0,0 +1,19 @@
+en:
+  registrar:
+    domain_transfers:
+      new:
+        header: Domain transfer
+        single: One by one
+        batch: Batch
+
+      create:
+        header: Domain transfer
+        transferred: Domains have been successfully transferred
+
+      form:
+        single:
+          transfer_btn: Transfer
+
+        batch:
+          batch_file_help: CSV file with domain list provided by another registrar
+          transfer_btn: Transfer batch

config/locales/registrar/domains.en.yml

@@ -2,14 +2,28 @@ en:
   registrar:
     domains:
       index:
-        registrant: Registrant
-        download_btn: Download
+        header: Domains
+        new_btn: New domain
+        transfer_btn: Transfer
         csv:
           domain_name: Domain
+          transfer_code: Transfer code
           registrant_name: Registrant name
           registrant_code: Registrant code
           expire_time: Date of expiry
 
+      info:
+        transfer_btn: Transfer
+
+      search_form:
+        download_btn: Download as CSV
+        reset_btn: Reset
+
+      domain:
+        edit_btn: Edit
+        renew_btn: Renew
+        delete_btn: Delete
+
       form:
         save_btn: Save
         dnskeys:

config/locales/registrar/invoices.en.yml

@@ -0,0 +1,5 @@
+en:
+  registrar:
+    invoices:
+      index:
+        reset_btn: Reset

config/routes.rb

@@ -54,7 +54,6 @@ Rails.application.routes.draw do
         post 'update', as: 'update'
         post 'destroy', as: 'destroy'
         get 'renew'
-        match 'transfer', via: [:post, :get]
         get 'edit'
         get 'info'
         get 'check'
@@ -62,6 +61,7 @@ Rails.application.routes.draw do
         get 'search_contacts'
       end
     end
+    resources :domain_transfers, only: %i[new create]
 
     resources :contacts, constraints: {:id => /[^\/]+(?=#{ ActionController::Renderers::RENDERERS.map{|e| "\\.#{e}\\z"}.join("|") })|[^\/]+/} do
       member do
@@ -99,7 +99,7 @@ Rails.application.routes.draw do
   namespace :registrant do
     root 'domains#index'
 
-    resources :domains do
+    resources :domains, only: %i[index show] do
       collection do
         get :download_list
       end
@@ -107,7 +107,6 @@ Rails.application.routes.draw do
       member do
         get 'domain_verification_url'
       end
-
     end
 
     # resources :invoices do