Merge branch 'postalinfo'

Conflicts:
	app/helpers/epp/contacts_helper.rb
	app/models/address.rb
	app/models/contact.rb
	db/schema.rb
	spec/epp/contact_spec.rb
	spec/fabricators/contact_fabricator.rb
	spec/fabricators/international_address_fabricator.rb
	spec/models/address_spec.rb
	spec/models/contact_spec.rb
This commit is contained in:
Andres Keskküla 2014-08-26 10:09:52 +03:00
commit 8d5152d400
17 changed files with 343 additions and 195 deletions

View file

@ -0,0 +1,10 @@
class AddPostalInfoToAddress < ActiveRecord::Migration
def change
add_column :addresses, :name, :string
add_column :addresses, :org_name, :string
add_column :addresses, :type, :string
remove_column :contacts, :name, :string
remove_column :contacts, :org_name, :string
end
end