Merge remote-tracking branch 'origin/master' into 105846070-merge-with-105842700-arireg-for-registrant-port

# Conflicts:
#	app/models/domain.rb

config/initializers/eis_ransack.rb

@@ -0,0 +1,40 @@
+# A custom initializer that enables sorting via custom scopes in Ransack (like the same feature in MetaSearch)
+
+module Ransack
+  module Adapters
+    module ActiveRecord
+      class Context < ::Ransack::Context
+
+        # Allows for sorting by custom scopes
+        #
+        #
+        # Define your custom scopes in your model, e. g. sort_by_title_asc and sort_by_title_desc
+        # (The scopes would sort by some calculated column or a column added via some crazy join, etc.)
+        #
+        # In your sort links refer to the scopes like to standard fields, e. g.
+        #   <%= sort_link(@q, :title, 'Crazy calculated title') %>
+        def evaluate(search, opts = {})
+          viz = Visitor.new
+          relation = @object.where(viz.accept(search.base))
+          if search.sorts.any?
+            custom_scopes = search.sorts.select do |s|
+              custom_scope_name = :"sort_by_#{s.name}_#{s.dir}"
+              relation.respond_to?(custom_scope_name)
+            end
+            attribute_scopes = search.sorts - custom_scopes
+
+            relation = relation.except(:order)
+
+            custom_scopes.each do |s|
+              custom_scope_name = :"sort_by_#{s.name}_#{s.dir}"
+              relation = relation.public_send(custom_scope_name)
+            end
+
+            relation = relation.reorder(viz.accept(attribute_scopes)) if attribute_scopes.any?
+          end
+          opts[:distinct] ? relation.distinct : relation
+        end
+      end
+    end
+  end
+end

config/initializers/initial_settings.rb

@@ -35,10 +35,14 @@ if con.present? && con.table_exists?('settings')
   Setting.save_default(:days_to_keep_invoices_active, 30)
   Setting.save_default(:days_to_keep_overdue_invoices_active, 30)
   Setting.save_default(:minimum_deposit, 0.0)
+  Setting.save_default(:directo_receipt_payment_term, "R")
+  Setting.save_default(:directo_receipt_product_name, "ETTEM06")
+  Setting.save_default(:directo_sales_agent, "JAANA")
 
   Setting.save_default(:days_to_renew_domain_before_expire, 90)
   Setting.save_default(:expire_warning_period, 15)
   Setting.save_default(:redemption_grace_period, 30)
+  Setting.save_default(:expiration_reminder_mail, 2)
 
   Setting.save_default(:registrar_ip_whitelist_enabled, true)
   Setting.save_default(:api_ip_whitelist_enabled, true)