From 0e1bf2188cebf63ba654bdb57f8b716e340ae1a2 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Tue, 5 Mar 2019 00:02:10 +0100
Subject: [PATCH] Remove unused verification offices url setting

---
 app/views/verification/letter/new.html.erb        |  4 +---
 app/views/verification/letter/show.html.erb       |  7 +------
 app/views/verification/residence/_errors.html.erb |  4 +---
 config/locales/en/settings.yml                    |  1 -
 config/locales/en/verification.yml                |  9 +++------
 config/locales/es/settings.yml                    |  1 -
 config/locales/es/verification.yml                |  9 +++------
 db/dev_seeds/settings.rb                          |  1 -
 db/seeds.rb                                       |  1 -
 spec/features/verification/letter_spec.rb         | 11 -----------
 10 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/app/views/verification/letter/new.html.erb b/app/views/verification/letter/new.html.erb
index 0909ebf46..1aa0654f2 100644
--- a/app/views/verification/letter/new.html.erb
+++ b/app/views/verification/letter/new.html.erb
@@ -46,9 +46,7 @@
 
       <ul>
         <li>
-          <%= t("verification.letter.new.office",
-          office: link_to(t("verification.letter.new.offices"), setting['verification_offices_url'],
-          target: "blank")).html_safe %>
+          <%= t("verification.letter.new.office") %>
         </li>
         <li>
           <%= link_to t("verification.letter.new.send_letter"), letter_path, method: :post %>
diff --git a/app/views/verification/letter/show.html.erb b/app/views/verification/letter/show.html.erb
index acc764646..27462dc2e 100644
--- a/app/views/verification/letter/show.html.erb
+++ b/app/views/verification/letter/show.html.erb
@@ -7,12 +7,7 @@
     <h1><%= t("verification.letter.edit.title") %></h1>
 
     <div data-alert class="callout success">
-      <%= t("verification.letter.create.flash.success_html",
-          offices: link_to(t("verification.letter.create.flash.offices"),
-                           setting['verification_offices_url'],
-                           title: t('shared.target_blank_html'),
-                           target: "_blank")).html_safe
-      %>
+      <%= t("verification.letter.create.flash.success_html") %>
     </div>
 
     <%= link_to t("verification.letter.edit.see_all"), proposals_path, class: "button warning" %>
diff --git a/app/views/verification/residence/_errors.html.erb b/app/views/verification/residence/_errors.html.erb
index 7b97e6085..bde26bae7 100644
--- a/app/views/verification/residence/_errors.html.erb
+++ b/app/views/verification/residence/_errors.html.erb
@@ -4,9 +4,7 @@
     <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
       <span aria-hidden="true">&times;</span>
     </button>
-    <%= t("verification.residence.new.error_verifying_census",
-    offices: link_to( t("verification.residence.new.error_verifying_census_offices"),
-    setting['verification_offices_url'], title: t('shared.target_blank_html'), target: "_blank")).html_safe %>
+    <%= t("verification.residence.new.error_verifying_census") %>
   </div>
 
 <% else %>
diff --git a/config/locales/en/settings.yml b/config/locales/en/settings.yml
index 551461a68..f57b01533 100644
--- a/config/locales/en/settings.yml
+++ b/config/locales/en/settings.yml
@@ -71,7 +71,6 @@ en:
     min_age_to_participate: Minimum age needed to participate
     min_age_to_participate_description: "Users over this age can participate in all processes where a user verified account is needed"
     analytics_url: "Analytics URL"
-    verification_offices_url: Verification offices URL
     proposal_notification_minimum_interval_in_days: "Minimum interval (in days) for authors of proposals to send new proposal notifications"
     proposal_notification_minimum_interval_in_days_description: "The number of days user can send a notification for all supporters of their proposal"
     direct_message_max_per_day: "Direct Message max number per day"
diff --git a/config/locales/en/verification.yml b/config/locales/en/verification.yml
index 0ba13f8dd..8172acb76 100644
--- a/config/locales/en/verification.yml
+++ b/config/locales/en/verification.yml
@@ -19,8 +19,7 @@ en:
         unconfirmed_code: You have not yet entered the confirmation code
       create:
         flash:
-          offices: Citizen Support Offices
-          success_html: Thank you for requesting your <b>maximum security code (only required for the final votes)</b>. In a few days we will send it to the address featuring in the data we have on file. Please remember that, if you prefer, you can collect your code from any of the %{offices}.
+          success_html: Thank you for requesting your <b>maximum security code (only required for the final votes)</b>. In a few days we will send it to the address featuring in the data we have on file. Please remember that, if you prefer, you can collect your code from any of the Citizen Support Offices.
       edit:
         see_all: See proposals
         title: Letter requested
@@ -29,8 +28,7 @@ en:
       new:
         explanation: 'For participate on final voting you can:'
         go_to_index: See proposals
-        office: Verify in any %{office}
-        offices: Citizen Support Offices
+        office: Verify in any Citizen Support Offices
         send_letter: Send me a letter with the code
         title: Congratulations!
         user_permission_info: With your account you can...
@@ -60,8 +58,7 @@ en:
         document_type_label: Document type
         error_not_allowed_age: You don't have the required age to participate
         error_not_allowed_postal_code: In order to be verified, you must be registered.
-        error_verifying_census: The Census was unable to verify your information. Please confirm that your census details are correct by calling to City Council or visit one %{offices}.
-        error_verifying_census_offices: Citizen Support Office
+        error_verifying_census: The Census was unable to verify your information. Please confirm that your census details are correct by calling to City Council or visit one Citizen Support Office.
         form_errors: prevented the verification of your residence
         postal_code: Postcode
         postal_code_note: To verify your account you must be registered
diff --git a/config/locales/es/settings.yml b/config/locales/es/settings.yml
index b8e5b3e12..877fcda1f 100644
--- a/config/locales/es/settings.yml
+++ b/config/locales/es/settings.yml
@@ -71,7 +71,6 @@ es:
     min_age_to_participate: Edad mínima para participar
     min_age_to_participate_description: "Los usuarios mayores de esta edad podrán participar en todos los procesos donde se necesite una cueta verificada"
     analytics_url: "URL de estadísticas externas"
-    verification_offices_url: URL oficinas verificación
     proposal_notification_minimum_interval_in_days: "Intervalo mínimo (en días) para que los autores de propuestas puedan enviar nuevas notificaciones de propuesta"
     proposal_notification_minimum_interval_in_days_description: "El número de días en los que un usuario puede enviar una notificación a todos los que apoyan su propuesta"
     direct_message_max_per_day: "Mensajes directos máximos por día"
diff --git a/config/locales/es/verification.yml b/config/locales/es/verification.yml
index 66b54e494..19752ef1b 100644
--- a/config/locales/es/verification.yml
+++ b/config/locales/es/verification.yml
@@ -19,8 +19,7 @@ es:
         unconfirmed_code: Todavía no has introducido el código de confirmación
       create:
         flash:
-          offices: Oficinas de Atención al Ciudadano
-          success_html: Antes de las votaciones recibirás una carta con las instrucciones para verificar tu cuenta.<br> Recuerda que puedes ahorrar el envío verificándote presencialmente en cualquiera de las %{offices}.
+          success_html: Antes de las votaciones recibirás una carta con las instrucciones para verificar tu cuenta.<br> Recuerda que puedes ahorrar el envío verificándote presencialmente en cualquiera de las Oficinas de Atención al Ciudadano.
       edit:
         see_all: Ver propuestas
         title: Carta solicitada
@@ -29,8 +28,7 @@ es:
       new:
         explanation: 'Para participar en las votaciones finales puedes:'
         go_to_index: Ver propuestas
-        office: Verificarte presencialmente en cualquier %{office}
-        offices: Oficina de Atención al Ciudadano
+        office: Verificarte presencialmente en cualquier Oficina de Atención al Ciudadano
         send_letter: Solicitar una carta por correo postal
         title: '¡Felicidades!'
         user_permission_info: Con tu cuenta ya puedes...
@@ -60,8 +58,7 @@ es:
         document_type_label: Tipo de documento
         error_not_allowed_age: No tienes la edad mínima para participar
         error_not_allowed_postal_code: Para verificarte debes estar empadronado.
-        error_verifying_census: El Padrón no pudo verificar tu información. Por favor, confirma que tus datos de empadronamiento sean correctos llamando al Ayuntamiento o visitando una %{offices}.
-        error_verifying_census_offices: oficina de Atención al ciudadano
+        error_verifying_census: El Padrón no pudo verificar tu información. Por favor, confirma que tus datos de empadronamiento sean correctos llamando al Ayuntamiento o visitando una Oficina de Atención al Ciudadano.
         form_errors: evitaron verificar tu residencia
         postal_code: Código postal
         postal_code_note: Para verificar tus datos debes estar empadronado
diff --git a/db/dev_seeds/settings.rb b/db/dev_seeds/settings.rb
index 0b3fc5d58..b73bf02e5 100644
--- a/db/dev_seeds/settings.rb
+++ b/db/dev_seeds/settings.rb
@@ -58,7 +58,6 @@ section "Creating Settings" do
   Setting.create(key: "meta_description", value: "Citizen participation tool for an open, "\
                                                  "transparent and democratic government")
   Setting.create(key: "meta_keywords", value: "citizen participation, open government")
-  Setting.create(key: "verification_offices_url", value: "http://oficinas-atencion-ciudadano.url/")
   Setting.create(key: "min_age_to_participate", value: "16")
   Setting.create(key: "map_latitude", value: 40.41)
   Setting.create(key: "map_longitude", value: -3.7)
diff --git a/db/seeds.rb b/db/seeds.rb
index c406325f8..37a64c0ad 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -97,7 +97,6 @@ Setting['mailer_from_name'] = 'CONSUL'
 Setting['mailer_from_address'] = 'noreply@consul.dev'
 
 # Verification settings
-Setting['verification_offices_url'] = 'http://oficinas-atencion-ciudadano.url/'
 Setting['min_age_to_participate'] = 16
 
 # Featured proposals
diff --git a/spec/features/verification/letter_spec.rb b/spec/features/verification/letter_spec.rb
index b1dd74acf..74ab31ac7 100644
--- a/spec/features/verification/letter_spec.rb
+++ b/spec/features/verification/letter_spec.rb
@@ -20,17 +20,6 @@ feature "Verify Letter" do
     expect(user.letter_verification_code).to be
   end
 
-  scenario "Go to office instead of send letter" do
-    Setting["verification_offices_url"] = "http://offices.consul"
-    user = create(:user, residence_verified_at: Time.current,
-                         confirmed_phone:       "611111111")
-
-    login_as(user)
-    visit new_letter_path
-
-    expect(page).to have_link "Citizen Support Offices", href: "http://offices.consul"
-  end
-
   scenario "Deny access unless verified residence" do
     user = create(:user)