Merge branch 'master' into 1725-census_local_copy_user_verification

This commit is contained in:
María Checa
2017-07-14 15:50:26 +02:00
269 changed files with 2580 additions and 1000 deletions

View File

@@ -23,12 +23,12 @@ class Officing::Residence
if user_exists?
self.user = find_user_by_document
self.user.update(verified_at: Time.current)
user.update(verified_at: Time.current)
else
user_params = {
document_number: document_number,
document_type: document_type,
geozone: self.geozone,
geozone: geozone,
date_of_birth: date_of_birth.to_datetime,
gender: gender,
residence_verified_at: Time.current,
@@ -115,7 +115,7 @@ class Officing::Residence
end
def clean_document_number
self.document_number = self.document_number.gsub(/[^a-z0-9]+/i, "").upcase if self.document_number.present?
self.document_number = document_number.gsub(/[^a-z0-9]+/i, "").upcase if document_number.present?
end
def random_password