merges master and fixes conflicts

app/models/verification/letter.rb

@@ -18,13 +18,17 @@ class Verification::Letter
   end
 
   def letter_requested!
-    user.update(letter_requested_at: Time.now, letter_verification_code: four_digit_code)
+    user.update(letter_requested_at: Time.now, letter_verification_code: generate_verification_code)
   end
 
   def verify?
     user.letter_verification_code == verification_code
   end
 
+  def increase_letter_verification_tries
+    user.update(letter_verification_tries: user.letter_verification_tries += 1)
+  end
+
   def update_user_address
     user.address = Address.new(parsed_address)
     user.save
@@ -50,8 +54,10 @@ class Verification::Letter
       district:      address[:nombre_distrito] }
   end
 
-  def four_digit_code
-    rand.to_s[2..5]
-  end
+  private
+
+    def generate_verification_code
+      rand.to_s[2..7]
+    end
 
 end

app/models/verification/sms.rb

@@ -24,7 +24,7 @@ class Verification::Sms
   end
 
   def update_user_phone_information
-    user.update(unconfirmed_phone: phone, sms_confirmation_code: four_digit_code)
+    user.update(unconfirmed_phone: phone, sms_confirmation_code: generate_confirmation_code)
   end
 
   def send_sms
@@ -41,7 +41,7 @@ class Verification::Sms
 
   private
 
-    def four_digit_code
+    def generate_confirmation_code
       rand.to_s[2..5]
     end
 end