Merge remote-tracking branch 'origin/master' into 1739-ns-bulk-change-test-and-whois-update

config/application.rb

@@ -36,6 +36,7 @@ module DomainNameRegistry
 
     # Autoload all model subdirs
     config.autoload_paths += Dir[Rails.root.join('app', 'models', '**/')]
+    config.autoload_paths += Dir[Rails.root.join('app', 'interactions', '**/')]
     config.eager_load_paths << config.root.join('lib', 'validators')
     config.watchable_dirs['lib'] = %i[rb]
 

config/application.yml.sample

@@ -87,6 +87,12 @@ sk_digi_doc_service_name: 'Testimine'
 registrant_api_base_url:
 registrant_api_auth_allowed_ips: '127.0.0.1, 0.0.0.0' #ips, separated with commas
 
+# Bounces API
+api_shared_key: testkey
+
+# Base URL (inc. https://) of REST registrant portal
+# Leave blank to use internal registrant portal
+registrant_portal_verifications_base_url: ''
 #
 # MISC
 

config/database_travis.yml

@@ -4,7 +4,7 @@ default: &default
   encoding: unicode
   pool: 5
   username: postgres
-  password:
+  password: password
 
 test:
   <<: *default

config/locales/admin/menu.en.yml

@@ -14,6 +14,7 @@ en:
         blocked_domains: Blocked domains
         reserved_domains: Reserved domains
         disputed_domains: Disputed domains
+        bounced_email_addresses: Bounced emails
         epp_log: EPP log
         repp_log: REPP log
         que: Que

config/locales/en.yml

@@ -588,6 +588,9 @@ en:
   create_bank_transaction: 'Create bank transaction'
   create_new_invoice: 'Create new invoice'
   billing_failure_credit_balance_low: 'Billing failure - credit balance low'
+  billing_failure_credit_balance_low_for_domain: 'Billing failure - credit balance low for %{domain}'
+  domain_renew_error_for_domain: 'Domain renew error for %{domain}'
+  not_enough_funds: 'Not enough funds for renew domains'
   create: 'Create'
   activity_type: 'Activity type'
   receipt_date_from: 'Receipt date from'
@@ -602,6 +605,7 @@ en:
   notes: Notes
   active_price_for_this_operation_is: 'Active price for this operation is %{price}'
   active_price_missing_for_this_operation: 'Active price missing for this operation!'
+  active_price_missing_for_operation_with_domain: 'Active price missing for operation with %{domain}'
   valid_to_from: 'Valid to from'
   valid_to_until: 'Valid to until'
   registrant_ident: 'Registrant ident'
@@ -662,3 +666,4 @@ en:
     iban: IBAN
   sign_in: "Sign in"
   signed_in_successfully: "Signed in successfully"
+  bulk_renew_completed: "Bulk renew for domains completed"

config/locales/registrar/bulk_change.en.yml

@@ -6,6 +6,7 @@ en:
         technical_contact: Technical contact
         nameserver: Nameserver
         bulk_transfer: Bulk transfer
+        bulk_renew: Bulk renew
 
       tech_contact_form:
         current_contact_id: Current contact ID
@@ -29,3 +30,11 @@ en:
         submit_btn: Transfer
         help_btn: Toggle help
         help: Transfer domains in the csv file with correct transfer code to this registrar
+
+      bulk_renew_form:
+        filter_btn: Filter
+        renew_btn: Renew
+        expire_date: Expire date until
+        domain_ids: Domains for bulk renewal
+        current_balance: Current balance
+        period: Period

config/locales/registrar/domain_transfers.en.yml

@@ -6,7 +6,7 @@ en:
 
       create:
         header: Domain transfer
-        transferred: "%{count} domains have been successfully transferred"
+        transferred: "%{count} domains have been successfully transferred. Failed domains: %{failed}"
 
       form:
         submit_btn: Transfer

config/routes.rb

@@ -37,12 +37,36 @@ Rails.application.routes.draw do
     get 'error/:command', to: 'errors#error'
   end
 
-  mount Repp::API => '/'
-
   namespace :repp do
     namespace :v1 do
+      resources :contacts do
+        collection do
+          get 'check/:id', to: 'contacts#check'
+        end
+      end
+
+      resources :accounts do
+        collection do
+          get 'balance'
+        end
+      end
       resources :auctions, only: %i[index]
       resources :retained_domains, only: %i[index]
+      namespace :registrar do
+        resources :nameservers do
+          collection do
+            put '/', to: 'nameservers#update'
+          end
+        end
+      end
+      resources :domains do
+        collection do
+          get ':id/transfer_info', to: 'domains#transfer_info', constraints: { id: /.*/ }
+          post 'transfer', to: 'domains#transfer'
+          patch 'contacts', to: 'domains/contacts#update'
+          post 'renew/bulk', to: 'domains/renews#bulk_renew'
+        end
+      end
     end
   end
 
@@ -56,6 +80,8 @@ Rails.application.routes.draw do
     namespace :v1 do
       namespace :registrant do
         post 'auth/eid', to: 'auth#eid'
+        get 'confirms/:name/:template/:token', to: 'confirms#index', constraints: { name: /[^\/]+/ }
+        post 'confirms/:name/:template/:token/:decision', to: 'confirms#update', constraints: { name: /[^\/]+/ }
 
         resources :domains, only: %i[index show], param: :uuid do
           resource :registry_lock, only: %i[create destroy]
@@ -65,7 +91,7 @@ Rails.application.routes.draw do
       end
 
       resources :auctions, only: %i[index show update], param: :uuid
-
+      resources :bounces, only: %i[create]
     end
 
     match '*all', controller: 'cors', action: 'cors_preflight_check', via: [:options],
@@ -108,6 +134,7 @@ Rails.application.routes.draw do
     end
     resources :domain_transfers, only: %i[new create]
     resource :bulk_change, controller: :bulk_change, only: :new
+    post '/bulk_renew/new', to: 'bulk_change#bulk_renew', as: :bulk_renew
     resource :tech_contacts, only: :update
     resource :nameservers, only: :update
     resources :contacts, constraints: {:id => /[^\/]+(?=#{ ActionController::Renderers::RENDERERS.map{|e| "\\.#{e}\\z"}.join("|") })|[^\/]+/} do
@@ -295,6 +322,7 @@ Rails.application.routes.draw do
     resources :delayed_jobs
     resources :epp_logs
     resources :repp_logs
+    resources :bounced_mail_addresses, only: %i[index show destroy]
 
     authenticate :admin_user do
       mount Que::Web, at: 'que'