From c367bc264cf3c2bcb62051a62299628e6ae2ca92 Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Thu, 24 Sep 2015 15:27:39 +0200
Subject: [PATCH] refactors pending verification step view [#500]

---
 app/models/concerns/verification.rb                  | 11 +++++++++++
 app/views/admin/verifications/_pending_step.html.erb |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/models/concerns/verification.rb b/app/models/concerns/verification.rb
index 1227791dc..da484bff0 100644
--- a/app/models/concerns/verification.rb
+++ b/app/models/concerns/verification.rb
@@ -45,4 +45,15 @@ module Verification
     !level_two_or_three_verified?
   end
 
+  def failed_residence_verification?
+    !residence_verified? && failed_census_calls.size > 0
+  end
+
+  def no_phone_available?
+    !verification_sms_sent?
+  end
+
+  def sms_code_not_confirmed?
+    !sms_verified?
+  end
 end
diff --git a/app/views/admin/verifications/_pending_step.html.erb b/app/views/admin/verifications/_pending_step.html.erb
index 952574616..2f54067a3 100644
--- a/app/views/admin/verifications/_pending_step.html.erb
+++ b/app/views/admin/verifications/_pending_step.html.erb
@@ -1,7 +1,7 @@
-<% if !user.residence_verified? %>
+<% if user.failed_residence_verification? %>
   <%= render partial: 'failed_census_call', collection: user.failed_census_calls %>
-<% elsif !user.verification_sms_sent? %>
+<% elsif user.no_phone_available? %>
   <p><%= t("admin.verifications.index.phone_not_given") %></p>
-<% elsif !user.sms_verified? %>
+<% elsif user.sms_code_not_confirmed? %>
   <p><%= t("admin.verifications.index.sms_code_not_confirmed") %></p>
 <% end %>
\ No newline at end of file