Merge branch 'master' into remove-spring-gem

config/application-example.yml

@@ -106,10 +106,13 @@ sk_digi_doc_service_name: 'Testimine'
 secret_key_base: 'please-change-it-you-can-generate-it-with-rake-secret'
 devise_secret: 'please-change-it-you-can-generate-it-with-rake-secret'
 
+# You should list only payment methods that
+# conform with the Estonian BankLink standard
 payments_banks: >
   seb,
   swed,
   lhv
+
 payments_seb_url: 'https://www.seb.ee/cgi-bin/dv.sh/ipank.r'
 payments_seb_bank_certificate: 'eyp_pub.pem'
 payments_seb_seller_private: 'kaupmees_priv.pem'
@@ -123,6 +126,26 @@ payments_lhv_bank_certificate: 'eyp_pub.pem'
 payments_lhv_seller_private: 'kaupmees_priv.pem'
 payments_lhv_seller_account: 'testvpos'
 
+# You should list other payment intermediaries here. Each one of them needs their own class in /app/models/payments/
+payments_intermediaries: >
+  every_pay
+
+# Other intermediaries should follow this naming convention:
+# payments_intermediary_url - URL to intiate payments
+# payments_intermediary_seller_account - your username in the bank system
+# payments_intermediary_api_user - API username, in case it's different than the seller account
+# payments_intermediary_api_key - API key given to you by intermediary
+payments_every_pay_url: 'https://igw-demo.every-pay.com/transactions/'
+payments_every_pay_seller_account: 'EUR3D1'
+payments_every_pay_api_user: 'api_user'
+payments_every_pay_api_key: 'api_key'
+
 user_session_timeout: '3600' # 1 hour
 secure_session_cookies: 'false' # true|false
 same_site_session_cookies: 'false' # false|strict|lax
+
+
+# Since the keys for staging are absent from the repo, we need to supply them separate for testing.
+test:
+  payments_seb_bank_certificate: 'test/fixtures/files/seb_bank_cert.pem'
+  payments_seb_seller_private: 'test/fixtures/files/seb_seller_key.pem'

config/locales/en.yml

@@ -541,7 +541,6 @@ en:
   your_current_account_balance_is: 'Your current account balance is %{balance} %{currency}'
   billing: 'Billing'
   your_account: 'Your account'
-  pay_by_bank_link: 'Pay by bank link'
   issue_date: 'Issue date'
   due_date: 'Due date'
   payment_term: 'Payment term'

config/locales/registrar/bulk_change.en.yml

@@ -0,0 +1,31 @@
+en:
+  registrar:
+    bulk_change:
+      new:
+        header: Bulk change
+        technical_contact: Technical contact
+        nameserver: Nameserver
+        bulk_transfer: Bulk transfer
+
+      tech_contact_form:
+        current_contact_id: Current contact ID
+        new_contact_id: New contact ID
+        submit_btn: Replace technical contacts
+        help_btn: Toggle help
+        help: >-
+          Replace technical contact specified in "current contact ID" with the one in "new
+          contact ID" on any domain registered under this registrar
+
+      nameserver_form:
+        ip_hint: One IP per line
+        replace_btn: Replace nameserver
+        help_btn: Toggle help
+        help: >-
+          Replace nameserver specified in the "old hostname" with the one in "new hostname" with
+          optional IPv4 and IPv6 addresses on any domain registered under this registrar
+
+      bulk_transfer_form:
+        file_field_hint: CSV file with domain list provided by another registrar
+        submit_btn: Transfer
+        help_btn: Toggle help
+        help: Transfer domains in the csv file with correct transfer code to this registrar

config/locales/registrar/domain_transfers.en.yml

@@ -3,17 +3,10 @@ en:
     domain_transfers:
       new:
         header: Domain transfer
-        single: One by one
-        batch: Batch
 
       create:
         header: Domain transfer
         transferred: "%{count} 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
+        submit_btn: Transfer

config/locales/registrar/domains.en.yml

@@ -5,7 +5,7 @@ en:
         header: Domains
         new_btn: New domain
         transfer_btn: Transfer
-        replace_nameserver_btn: Replace nameserver
+        bulk_change_btn: Bulk change
         csv:
           domain_name: Domain
           transfer_code: Transfer code

config/locales/registrar/invoices.en.yml

@@ -1,5 +1,11 @@
 en:
   registrar:
     invoices:
+      pay_invoice: 'Pay invoice'
+      redirected_to_intermediary: 'Click the button below to redirect to payment intermediary'
+      to_card_payment: Open card payment
+      go_to_intermediary: 'Go to intermediary'
+      pay_by_credit_card: Pay by credit card
+      payment_complete: Credit Card payment Complete
       index:
         reset_btn: Reset

config/locales/registrar/nameservers.en.yml

@@ -0,0 +1,5 @@
+en:
+  registrar:
+    nameservers:
+      update:
+        replaced: Nameserver have been successfully replaced

config/locales/registrar/registrar_nameservers.en.yml

@@ -1,13 +0,0 @@
-en:
-  registrar:
-    registrar_nameservers:
-      edit:
-        header: Replace nameserver
-        replace_btn: Replace
-
-      form:
-        ip_hint: One IP per line
-        replace_btn: Replace nameserver
-
-      update:
-        replaced: Nameserver have been successfully replaced

config/locales/registrar/tech_contacts.en.yml

@@ -0,0 +1,7 @@
+en:
+  registrar:
+    tech_contacts:
+      update:
+        replaced: Technical contacts have been successfully replaced.
+        affected_domains: Affected domains
+        skipped_domains: Skipped domains

config/routes.rb

@@ -62,9 +62,9 @@ Rails.application.routes.draw do
       end
     end
     resources :domain_transfers, only: %i[new create]
-    get 'registrar/nameservers', to: 'registrar_nameservers#edit', as: :edit_registrar_nameserver
-    put 'registrar/nameservers', to: 'registrar_nameservers#update', as: :update_registrar_nameserver
-
+    resource :bulk_change, controller: :bulk_change, only: :new
+    resource :tech_contacts, only: :update
+    resource :nameservers, only: :update
     resources :contacts, constraints: {:id => /[^\/]+(?=#{ ActionController::Renderers::RENDERERS.map{|e| "\\.#{e}\\z"}.join("|") })|[^\/]+/} do
       member do
         get 'delete'
@@ -91,10 +91,11 @@ Rails.application.routes.draw do
       end
     end
 
-
-    get  'pay/return/:bank' => 'payments#back',  as: 'return_payment_with'
-    post 'pay/return/:bank' => 'payments#back'
-    get  'pay/go/:bank'     => 'payments#pay',   as: 'payment_with'
+    get  'pay/return/:bank'       => 'payments#back',  as: 'return_payment_with'
+    post 'pay/return/:bank'       => 'payments#back'
+    put  'pay/return/:bank'       => 'payments#back'
+    post 'pay/callback/:bank'     => 'payments#callback', as: 'response_payment_with'
+    get  'pay/go/:bank'           => 'payments#pay',   as: 'payment_with'
   end
 
   namespace :registrant do