From ca2370eb7c10cda90754760b63bd7e5ef54a565e Mon Sep 17 00:00:00 2001
From: Fernando Blat <ferblape@gmail.com>
Date: Thu, 29 Dec 2016 10:20:52 +0100
Subject: [PATCH 1/3] Manage offices url as a setting

---
 app/views/verification/letter/new.html.erb        | 2 +-
 app/views/verification/letter/show.html.erb       | 2 +-
 app/views/verification/residence/_errors.html.erb | 2 +-
 config/locales/fr.yml                             | 2 --
 config/locales/pt-BR.yml                          | 2 --
 config/locales/settings.en.yml                    | 1 +
 config/locales/settings.es.yml                    | 1 +
 config/locales/verification.en.yml                | 3 ---
 config/locales/verification.es.yml                | 3 ---
 db/dev_seeds.rb                                   | 2 +-
 db/seeds.rb                                       | 3 +++
 spec/features/verification/letter_spec.rb         | 1 +
 12 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/app/views/verification/letter/new.html.erb b/app/views/verification/letter/new.html.erb
index 01d0f0e01..52a4a4992 100644
--- a/app/views/verification/letter/new.html.erb
+++ b/app/views/verification/letter/new.html.erb
@@ -50,7 +50,7 @@
       <ul>
         <li>
           <%= t("verification.letter.new.office",
-          office: link_to(t("verification.letter.new.offices"), t("verification.letter.new.offices_url"),
+          office: link_to(t("verification.letter.new.offices"), Setting['verification_offices_url'],
           target: "blank")).html_safe %>
         </li>
         <li>
diff --git a/app/views/verification/letter/show.html.erb b/app/views/verification/letter/show.html.erb
index e5189a476..13acb9985 100644
--- a/app/views/verification/letter/show.html.erb
+++ b/app/views/verification/letter/show.html.erb
@@ -12,7 +12,7 @@
     <div data-alert class="callout success">
       <%= t("verification.letter.create.flash.success_html",
           offices: link_to(t("verification.letter.create.flash.offices"),
-                           t("verification.letter.create.flash.offices_url"),
+                           Setting['verification_offices_url'],
                            title: t('shared.target_blank_html'),
                            target: "_blank")).html_safe
       %>
diff --git a/app/views/verification/residence/_errors.html.erb b/app/views/verification/residence/_errors.html.erb
index dd4112d7c..28f2c28b6 100644
--- a/app/views/verification/residence/_errors.html.erb
+++ b/app/views/verification/residence/_errors.html.erb
@@ -6,7 +6,7 @@
     </button>
     <%= t("verification.residence.new.error_verifying_census",
     offices: link_to( t("verification.residence.new.error_verifying_census_offices"),
-    t("verification.residence.new.error_verifying_census_offices_url"), title: t('shared.target_blank_html'), target: "_blank")).html_safe %>
+    Setting['verification_offices_url'], title: t('shared.target_blank_html'), target: "_blank")).html_safe %>
   </div>
 
 <% else %>
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index b70c4648d..ef0f5a419 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1497,7 +1497,6 @@ fr:
       create:
         flash:
           offices: Bureaux de soutien aux citoyens
-          offices_url: http://offices.consul
           success_html: Merci d'avoir demandé votre <b>code de sécurité maximum (uniquement
             requis pour le vote final)</b>.  Dans quelques jours, nous vous enverrons
             un courrier vers votre adresse postale. Vous pouvez le réclamer dans n'importe
@@ -1512,7 +1511,6 @@ fr:
         go_to_index: Voir les propositions
         office: Vérifier dans n'importe quel %{office}
         offices: Bureaux de soutien aux citoyens
-        offices_url: http://offices.consul
         send_letter: Envoyer une lettre avec le code
         title: Félicitations
         user_permission_info: Avec votre compte, vous pouvez
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 831c9a556..2254e6e94 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1518,7 +1518,6 @@ pt-BR:
       create:
         flash:
           offices: Escritórios de Apoio ao Cidadão
-          offices_url: http://offices.consul
           success_html: Obrigado por solicitar seu <b>código de segurança máxima (somente
             solicitado em votações finais)</b>. Em poucos dias nós lhe enviaremos
             para seu endereço relacionado nos dados que temos em arquivo. Por favor
@@ -1534,7 +1533,6 @@ pt-BR:
         go_to_index: Ver propostas
         office: Verificar em qualquer %{office}
         offices: Escritórios de Apoio ao Cidadão
-        offices_url: http://offices.consul
         send_letter: Envie-me uma carta com o código
         title: Parabéns!
         user_permission_info: Com a sua conta você pode...
diff --git a/config/locales/settings.en.yml b/config/locales/settings.en.yml
index 20aa31c3d..57d633fb7 100755
--- a/config/locales/settings.en.yml
+++ b/config/locales/settings.en.yml
@@ -33,3 +33,4 @@ en:
         voting_allowed: Voting on investment projects
     mailer_from_name: Origin email name
     mailer_from_address: Origin email address
+    verification_offices_url: Verification offices URL
diff --git a/config/locales/settings.es.yml b/config/locales/settings.es.yml
index f01235528..ccaab0404 100644
--- a/config/locales/settings.es.yml
+++ b/config/locales/settings.es.yml
@@ -33,3 +33,4 @@ es:
         voting_allowed: Votaciones sobre propuestas de inversión.
     mailer_from_name: Nombre email remitente
     mailer_from_address: Dirección email remitente
+    verification_offices_url: URL oficinas verificación
diff --git a/config/locales/verification.en.yml b/config/locales/verification.en.yml
index e47e5a6b3..b6a89f939 100755
--- a/config/locales/verification.en.yml
+++ b/config/locales/verification.en.yml
@@ -21,7 +21,6 @@ en:
       create:
         flash:
           offices: Citizen Support Offices
-          offices_url: http://offices.consul
           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}.
       edit:
         see_all: See proposals
@@ -33,7 +32,6 @@ en:
         go_to_index: See proposals
         office: Verify in any %{office}
         offices: Citizen Support Offices
-        offices_url: http://offices.consul
         send_letter: Send me a letter with the code
         title: Congratulations!
         user_permission_info: With your account you can...
@@ -65,7 +63,6 @@ en:
         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_offices_url: http://offices.consul
         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/verification.es.yml b/config/locales/verification.es.yml
index a8e41ea09..65cfead6b 100644
--- a/config/locales/verification.es.yml
+++ b/config/locales/verification.es.yml
@@ -21,7 +21,6 @@ es:
       create:
         flash:
           offices: Oficinas de Atención al Ciudadano
-          offices_url: http://offices.consul
           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}.
       edit:
         see_all: Ver propuestas
@@ -33,7 +32,6 @@ es:
         go_to_index: Ver propuestas
         office: Verificarte presencialmente en cualquier %{office}
         offices: Oficina de Atención al Ciudadano
-        offices_url: http://offices.consul
         send_letter: Solicitar una carta por correo postal
         title: "¡Felicidades!"
         user_permission_info: Con tu cuenta ya puedes...
@@ -65,7 +63,6 @@ es:
         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_offices_url: http://offices.consul
         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.rb b/db/dev_seeds.rb
index dfdd42731..24f4e5b9c 100644
--- a/db/dev_seeds.rb
+++ b/db/dev_seeds.rb
@@ -35,7 +35,7 @@ Setting.create(key: 'per_page_code', value: "")
 Setting.create(key: 'comments_body_max_length', value: '1000')
 Setting.create(key: 'mailer_from_name', value: 'Consul')
 Setting.create(key: 'mailer_from_address', value: 'noreply@consul.dev')
-
+Setting.create(key: 'verification_offices_url', value: 'http://oficinas-atencion-ciudadano.url/')
 
 puts "Creating Geozones"
 ('A'..'Z').each { |i| Geozone.create(name: "District #{i}", external_code: i.ord, census_code: i.ord) }
diff --git a/db/seeds.rb b/db/seeds.rb
index d8be294c7..3000597b5 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -86,3 +86,6 @@ Setting['direct_message_max_per_day'] = 3
 # Email settings
 Setting['mailer_from_name'] = 'Consul'
 Setting['mailer_from_address'] = 'noreply@consul.dev'
+
+# Verification settings
+Setting['verification_offices_url'] = 'http://oficinas-atencion-ciudadano.url/'
diff --git a/spec/features/verification/letter_spec.rb b/spec/features/verification/letter_spec.rb
index 3d5d14fd3..828dde908 100644
--- a/spec/features/verification/letter_spec.rb
+++ b/spec/features/verification/letter_spec.rb
@@ -20,6 +20,7 @@ feature 'Verify Letter' do
   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")
 

From 76bc1a7934de14286046f1d0cc35b47c854945dc Mon Sep 17 00:00:00 2001
From: Fernando Blat <ferblape@gmail.com>
Date: Tue, 3 Jan 2017 08:55:17 +0100
Subject: [PATCH 2/3] Use settings helper

---
 app/views/verification/letter/new.html.erb        | 2 +-
 app/views/verification/letter/show.html.erb       | 2 +-
 app/views/verification/residence/_errors.html.erb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/verification/letter/new.html.erb b/app/views/verification/letter/new.html.erb
index 52a4a4992..648de7478 100644
--- a/app/views/verification/letter/new.html.erb
+++ b/app/views/verification/letter/new.html.erb
@@ -50,7 +50,7 @@
       <ul>
         <li>
           <%= t("verification.letter.new.office",
-          office: link_to(t("verification.letter.new.offices"), Setting['verification_offices_url'],
+          office: link_to(t("verification.letter.new.offices"), setting['verification_offices_url'],
           target: "blank")).html_safe %>
         </li>
         <li>
diff --git a/app/views/verification/letter/show.html.erb b/app/views/verification/letter/show.html.erb
index 13acb9985..372e1a8d1 100644
--- a/app/views/verification/letter/show.html.erb
+++ b/app/views/verification/letter/show.html.erb
@@ -12,7 +12,7 @@
     <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'],
+                           setting['verification_offices_url'],
                            title: t('shared.target_blank_html'),
                            target: "_blank")).html_safe
       %>
diff --git a/app/views/verification/residence/_errors.html.erb b/app/views/verification/residence/_errors.html.erb
index 28f2c28b6..7b97e6085 100644
--- a/app/views/verification/residence/_errors.html.erb
+++ b/app/views/verification/residence/_errors.html.erb
@@ -6,7 +6,7 @@
     </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 %>
+    setting['verification_offices_url'], title: t('shared.target_blank_html'), target: "_blank")).html_safe %>
   </div>
 
 <% else %>

From 8350143496d027f9b08d88b59d874556fd88349a Mon Sep 17 00:00:00 2001
From: Fernando Blat <ferblape@gmail.com>
Date: Wed, 4 Jan 2017 11:11:38 +0100
Subject: [PATCH 3/3] Don't fetch setting if table doesn't exist

---
 config/initializers/devise.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 32f387ba9..2cc09084f 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -12,8 +12,8 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  if Rails.env.test?
-    config.mailer_sender = "noreply@example.org"
+  if Rails.env.test? || !ActiveRecord::Base.connection.table_exists?('settings')
+    config.mailer_sender = "noreply@consul.dev"
   else
     config.mailer_sender = "#{Setting['mailer_from_name']} <#{Setting['mailer_from_address']}>"
   end