Merge branch 'master' into registry-765

# Conflicts:
#	app/views/admin/registrars/show.html.erb
#	db/structure.sql
This commit is contained in:
Artur Beljajev 2018-03-10 13:22:34 +02:00
commit 1b87c0bbc6
8 changed files with 11 additions and 11 deletions

View file

@ -77,7 +77,6 @@ namespace :import do
name: x.organization.try(:strip).presence || x.name.try(:strip).presence || x.handle.try(:strip).presence,
reg_no: x.ico.try(:strip),
vat_no: x.dic.try(:strip),
billing_address: nil,
phone: x.telephone.try(:strip),
email: x.email.try(:strip),
billing_email: x.billing_address.try(:strip),