Merge branch 'master' into registry-623

# Conflicts:
#	app/controllers/admin/registrars_controller.rb
#	app/models/registrar.rb
#	app/views/admin/registrars/_billing.html.erb
#	app/views/admin/registrars/show.html.erb
#	config/locales/admin/registrars.en.yml
#	config/locales/en.yml
#	db/migrate/20180309053424_add_registrars_unique_constraints.rb
#	db/structure.sql
#	test/fixtures/registrars.yml
#	test/integration/admin/registrars/delete_test.rb
#	test/integration/admin/registrars/new_test.rb
#	test/models/registrar_test.rb

config/locales/admin/registrars.en.yml

@@ -12,12 +12,12 @@ en:
         edit_btn: Edit
         delete_btn: Delete
         delete_btn_confirm: Are you sure you want delete registrar?
-        new_api_use_btn: New API user
-        active: Active
-        api_users: API users
 
-        preferences:
-          header: Preferences
+      edit:
+        header: Edit registrar
+
+      billing:
+        header: Billing
 
       edit:
         header: Edit registrar
@@ -44,3 +44,20 @@ en:
 
         preferences:
           header: Preferences
+
+      details:
+        header: Details
+
+      contacts:
+        header: Contacts
+
+      preferences:
+        header: Preferences
+
+      users:
+        header: API Users
+        new_btn: New API user
+
+      white_ips:
+        header: Whitelisted IPs
+        new_btn: New whitelisted IP

config/locales/admin/white_ips.en.yml

@@ -0,0 +1,5 @@
+en:
+  admin:
+    white_ips:
+      new:
+        header: New whitelisted IP

config/locales/en.yml

@@ -202,9 +202,6 @@ en:
         state: 'State / Province'
       deposit:
         amount: 'Amount'
-      white_ip:
-        ipv4: 'IPv4'
-        ipv6: 'IPv6'
 
   errors:
     messages:
@@ -301,7 +298,6 @@ en:
   reg_no: 'Reg. no'
   status: 'Status'
   contact: 'Contact'
-  credit_balance: 'Credit balance'
   starting_balance: 'Starting balance'
   destroyed: 'Destroyed'
 
@@ -386,7 +382,6 @@ en:
   choose: 'Choose...'
   created_before: 'Created before'
   created_after: 'Created after'
-  billing_email: 'Billing e-mail'
   contact_phone: 'Contact phone'
   contact_email: 'Contact e-mail'
   address_help: 'Street name, house no - apartment no, city, county, country, zip'
@@ -575,7 +570,6 @@ en:
   queried_at: 'Queried at'
   import_file_path: 'Import file path'
   bank_code: 'Bank code'
-  reference_no: 'Reference no'
   currency: 'Currency'
   buyer_name: 'Buyer name'
   buyer_iban: 'Buyer IBAN'
@@ -652,8 +646,6 @@ en:
   not_valid_domain_verification_body: This could mean your verification has been expired or done already.<br><br>Please contact us if you think something is wrong.
   upload_crt: 'Upload CRT'
   crt_or_csr_must_be_present: 'CRT or CSR must be present'
-  white_ips: 'White IP-s'
-  create_new_white_ip: 'Create new white IP'
   ipv4_or_ipv6_must_be_present: 'IPv4 or IPv6 must be present'
   white_ip: 'White IP'
   edit_white_ip: 'Edit white IP'
@@ -741,7 +733,6 @@ en:
   failure: "It was not saved"
   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'
   next: 'Next'
   previous: 'Previous'
   personal_domain_verification_url: 'Personal domain verification url'
@@ -771,3 +762,5 @@ en:
   attributes:
     vat_no: VAT number
     vat_rate: VAT rate
+    ipv4: IPv4
+    ipv6: IPv6

config/routes.rb

@@ -97,7 +97,6 @@ Rails.application.routes.draw do
     get  'pay/go/:bank'     => 'payments#pay',   as: 'payment_with'
   end
 
-  # REGISTRANT ROUTES
   namespace :registrant do
     root 'domains#index'
 
@@ -111,17 +110,6 @@ Rails.application.routes.draw do
       end
     end
 
-    # resources :invoices do
-      # member do
-        # get 'download_pdf'
-        # match 'forward', via: [:post, :get]
-        # patch 'cancel'
-      # end
-    # end
-
-    # resources :deposits
-    # resources :account_activities
-
     resources :domain_update_confirms
     resources :domain_delete_confirms
 
@@ -150,8 +138,6 @@ Rails.application.routes.draw do
     end
 
     resources :registrars do
-      resources :api_users
-      resources :white_ips
       collection do
         get :search
       end