Merge branch 'master' into credit-and-debit-card-payments

config/application.rb

@@ -15,7 +15,13 @@ require 'rails/all'
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
-module Registry
+# Add "db" to the list hosts on which you can run `rake db:setup:all`
+# Only allow that in test and development.
+if ['development', 'test'].include?(Rails.env)
+  ActiveRecord::Tasks::DatabaseTasks::LOCAL_HOSTS << "db"
+end
+
+module DomainNameRegistry
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers

config/database-example.yml

@@ -4,14 +4,14 @@
 # Registrant example is at database-example-registrant.yml file
 
 default: &default
-  host: localhost
   adapter: postgresql
   encoding: unicode
-  pool: 5
-  username: registry
-  password: registry_pwd
+  pool: <%= ENV.fetch("APP_DB_MAX_THREADS") { 5 } %>
+  host: <%= ENV.fetch("APP_DBHOST") { "localhost" } %>
+  username: <%= ENV.fetch("APP_DBUSER") { "postgres" } %>
+  password:
 
-#    
+#
 # Staging config For EPP, REPP, Admin, Registrar
 #
 
@@ -27,7 +27,7 @@ api_log_staging:
   <<: *default
   database: registry_api_log_staging
 
-#    
+#
 # Production config For EPP, REPP, Admin, Registrar
 #
 production:

config/environments/test.rb

@@ -43,6 +43,7 @@ Rails.application.configure do
   config.log_level = :debug
   config.active_job.queue_adapter = :test
   config.logger = ActiveSupport::Logger.new(nil)
+  config.active_support.test_order = :random # :random is the default in Rails 5
 end
 
 # In this mode, any jobs you queue will be run in the same thread, synchronously

config/initializers/eis_custom_active_record.rb

@@ -1,8 +0,0 @@
-# Log all user issues raised by active record
-# rubocop: disable Metrics/LineLength
-class ActiveRecord::Base
-  after_validation do |m|
-    Rails.logger.info "USER MSG: ACTIVERECORD: #{m.class} ##{m.id} #{m.errors.full_messages} #{m.errors['epp_errors']}" if m.errors.present?
-    true
-  end
-end

config/locales/admin/domains.en.yml

@@ -5,6 +5,10 @@ en:
         header: Domains
         registrant: Registrant
 
+      show:
+        edit_btn: Edit statuses
+        history_btn: History
+
       search_form:
         reset_btn: Reset
 

config/locales/admin/mail_templates.en.yml

@@ -0,0 +1,5 @@
+en:
+  admin:
+    mail_templates:
+      html_body: HTML body
+      new_mail_template: New mail template

config/locales/admin/registrars.en.yml

@@ -19,6 +19,12 @@ en:
       billing:
         header: Billing
 
+      edit:
+        header: Edit registrar
+
+      billing:
+        header: Billing
+
       create:
         created: Registrar has been successfully created
 

config/locales/en.yml

@@ -337,7 +337,6 @@ en:
 
   transfer_requested: 'Transfer requested.'
   message_was_not_found: 'Message was not found'
-  zonefile: 'Zonefile'
   only_one_parameter_allowed: 'Only one parameter allowed: %{param_1} or %{param_2}'
   exactly_one_parameter_required: 'Exactly one parameter required: %{params}'
   ds_data_with_key_allowed: 'Allow DS data with key'
@@ -538,7 +537,6 @@ en:
   invoice_number: Invoice no.
   seller: 'Seller'
   prepayment: 'Prepayment'
-  vat: 'VAT (%{vat_prc}%)'
   unpaid: 'Unpaid'
   your_current_account_balance_is: 'Your current account balance is %{balance} %{currency}'
   billing: 'Billing'
@@ -555,7 +553,6 @@ en:
   unit: 'Unit'
   price: 'Price'
   total: 'Total'
-  total_without_vat: 'Total without VAT'
   paid_at: 'Paid at'
   invoice: 'Invoice'
   bank_statements: 'Bank statements'
@@ -730,7 +727,6 @@ en:
   is_registrant: 'Is registrant'
   force_delete_set_on_domain: 'Force delete set on domain %{domain_name}'
   mail_templates: Mail Templates
-  new_mail_template: New mail template
   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'
@@ -762,5 +758,6 @@ en:
 
   attributes:
     vat_no: VAT number
+    vat_rate: VAT rate
     ipv4: IPv4
     ipv6: IPv6

config/schedule.rb

@@ -46,10 +46,6 @@ if @cron_group == 'registry'
     runner 'DomainCron.start_expire_period'
   end
 
-  every 50.minutes do
-    runner 'DomainCron.start_delete_period'
-  end
-
   every 52.minutes do
     runner 'DomainCron.start_redemption_grace_period'
   end