Merge remote-tracking branch 'origin/master' into 111396946-blocked_and_reserved_view2

# Conflicts:
#	app/controllers/admin/blocked_domains_controller.rb
#	app/models/blocked_domain.rb

app/views/admin/contacts/index.haml

@@ -29,15 +29,10 @@
           .form-group
             = label_tag t(:country)
             = select_tag '[q][country_code_eq]', SortedCountry.all_options(params[:q][:country_code_eq]), { include_blank: true, placeholder: t(:choose), class: 'form-control selectize' }
-        .col-md-3
-          .form-group
-            = f.label t(:is_registrant)
-            %div
-              = f.check_box :registrant_domains_id_not_null
-        .col-md-3
+        .col-md-6
           .form-group
             = label_tag t(:contact_type)
-            = select_tag '[q][domain_contacts_type_in]', options_for_select([['admin', 'AdminDomainContact'], ['tech', 'TechDomainContact']], params[:q][:domain_contacts_type_in]), { multiple: true, placeholder: t(:choose), class: 'form-control js-combobox' }
+            = select_tag '[q][domain_contacts_type_in]', options_for_select([['admin', 'AdminDomainContact'], ['tech', 'TechDomainContact'], ['registrant', 'registrant']], params[:q][:domain_contacts_type_in]), { multiple: true, placeholder: t(:choose), class: 'form-control js-combobox' }
       .row
         .col-md-3
           .form-group

app/views/admin/domain_versions/_version.haml

@@ -55,43 +55,47 @@
       = "#{l(domain.valid_to, format: :date)}"
 
   %td
-    - registrant.each do |r|
-      %p
-        = r[:name]
-        = r[:phone]
-        = r[:email]
-      %p
-        = r[:code]
+    - if registrant
+      - registrant.each do |r|
+        %p
+          = r[:name]
+          = r[:phone]
+          = r[:email]
+        %p
+          = r[:code]
 
   %td
-    - admin_contacts.each do |ac|
-      %p
-        = ac[:name]
-        = ac[:phone]
-        = ac[:email]
-      %p
-        = ac[:code]
+    - if admin_contacts
+      - admin_contacts.each do |ac|
+        %p
+          = ac[:name]
+          = ac[:phone]
+          = ac[:email]
+        %p
+          = ac[:code]
 
   %td
-    - tech_contacts.each do |tc|
-      %p
-        = tc[:name]
-        = tc[:phone]
-        = tc[:email]
-      %p
-        = tc[:code]
+    - if tech_contacts
+      - tech_contacts.each do |tc|
+        %p
+          = tc[:name]
+          = tc[:phone]
+          = tc[:email]
+        %p
+          = tc[:code]
 
   %td
     %p
-      - nameservers.each do |ns|
-        = ns[:hostname]
-        %br
-        = ns[:ipv4]
-        = ns[:ipv6]
+      - if nameservers
+        - nameservers.each do |ns|
+          = ns[:hostname]
+          %br
+          = ns[:ipv4]
+          = ns[:ipv6]
 
   %td
     %p
-      = domain.registrar.name
+      = domain.registrar.name if domain.registrar
 
   - if domain.pending_json.present?
     %tr.js-pending{ style: 'display: none;' }

app/views/admin/settings/index.haml

@@ -71,6 +71,9 @@
           = render 'setting_row', var: :days_to_keep_invoices_active
           = render 'setting_row', var: :days_to_keep_overdue_invoices_active
           = render 'setting_row', var: :minimum_deposit
+          = render 'setting_row', var: :directo_receipt_payment_term
+          = render 'setting_row', var: :directo_receipt_product_name
+          = render 'setting_row', var: :directo_sales_agent
           = render 'setting_row', var: :registry_billing_email
           = render 'setting_row', var: :registry_invoice_contact
           = render 'setting_row', var: :registry_vat_no