Merge branch 'master' of github.com:internetee/registry

Conflicts:
	app/views/layouts/application.haml
	config/locales/en.yml

app/models/contact.rb

@@ -1,7 +1,6 @@
 class Contact < ActiveRecord::Base
   # TODO: Foreign contact will get email with activation link/username/temp password
   # TODO: Phone number validation, in first phase very minimam in order to support current registries
-  # TODO: Validate presence of name
 
   include EppErrors
 
@@ -18,7 +17,7 @@ class Contact < ActiveRecord::Base
 
   accepts_nested_attributes_for :address, :disclosure
 
-  validates :phone, :email, :ident, :address, :registrar, presence: true
+  validates :name, :phone, :email, :ident, :address, :registrar, presence: true
 
   validate :ident_must_be_valid
 

app/models/domain.rb

@@ -99,7 +99,12 @@ class Domain < ActiveRecord::Base
   def make_snapshot
     {
       name: name,
-      status: status
+      status: status,
+      period: period,
+      period_unit: period_unit,
+      registrar_id: registrar.try(:id),
+      valid_to: valid_to,
+      valid_from: valid_from
     }
   end