| <%= t("admin.shared.title") %> | +<%= t("admin.shared.description") %> | +<%= t("admin.shared.actions") %> | +
|---|---|---|
| + <%= t("admin.system_emails.#{system_email_title}.title") %> + | ++ <%= t("admin.system_emails.#{system_email_title}.description") %> + | ++ <% if system_email_actions.include?('view') %> + <%= link_to t("admin.shared.view"), admin_system_email_view_path(system_email_title), + class: "button hollow" %> + <% end %> + <% if system_email_actions.include?('preview_pending') %> + <%= link_to t("admin.system_emails.preview_pending.action"), + admin_system_email_preview_pending_path(system_email_title), + class: "button" %> + <% end %> + | +
<%= t("admin.system_emails.#{@system_email}.preview_detail") %>
+ + <% @previews.each do |preview| %> + <%= render partial: "admin/system_emails/preview_pending/#{@system_email}", + locals: { preview: preview } %> + <% end %> ++ <%= preview.body %> +
++ <%= t("admin.newsletters.show.body_help_text") %> +
+- <%= link_to notification.notifiable.title, notification_url(notification), style: "color: #2895F1; text-decoration: none;" %> + <%= link_to notification.notifiable.title, proposal_url(notification.notifiable.proposal, anchor: "tab-notifications"), style: "color: #2895F1; text-decoration: none;" %>
<%= notification.notifiable.proposal.title %> • diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 54bb5adc6..a2194110b 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -518,9 +518,10 @@ en: administrators: Administrators managers: Managers moderators: Moderators - newsletters_and_notifications: Newsletters & Notifications + messaging_users: Messages to users newsletters: Newsletters admin_notifications: Notifications + system_emails: System Emails emails_download: Emails download valuators: Valuators poll_officers: Poll officers @@ -649,6 +650,15 @@ en: preview_guide: "This is how the users will see the notification:" sent_guide: "This is how the users see the notification:" send_alert: Are you sure you want to send this notification to %{n} users? + system_emails: + preview_pending: + action: Preview Pending + preview_of: Preview of %{name} + pending_to_be_sent: This is the content pending to be sent + proposal_notification_digest: + title: Proposal Notification Digest + description: Gathers all proposal notifications for an user in a single message, to avoid too much emails. + preview_detail: Users will only recieve notifications from the proposals they are following emails_download: index: title: Emails download @@ -1045,6 +1055,11 @@ en: image: Image show_image: Show image moderated_content: "Check the content moderated by the moderators, and confirm if the moderation has been done correctly." + view: View + proposal: Proposal + author: Author + content: Content + created_at: Created at spending_proposals: index: geozone_filter_all: All zones diff --git a/config/locales/en/seeds.yml b/config/locales/en/seeds.yml index a3587c9e3..4e40cfd63 100644 --- a/config/locales/en/seeds.yml +++ b/config/locales/en/seeds.yml @@ -53,18 +53,3 @@ en: recounting_poll: "Recounting Poll" expired_poll_without_stats: "Expired Poll without Stats & Results" expired_poll_with_stats: "Expired Poll with Stats & Results" - admin_notifications: - internal_link: - title: 'Do you have a proposal?' - body: 'Remember you can create a proposal with your ideas and people will discuss & support it.' - link: '/proposals' - external_link: - title: Help us translate consul - body: 'If you are proficient in a language, please help us translate consul!.' - link: 'https://crwd.in/consul' - without_link: - title: 'You can now geolocate proposals & investments' - body: 'When you create a proposal or investment you now can specify a point on a map' - not_sent: - title: 'We are closing the Participatory Budget!!' - body: 'Hurry up and create a last proposal before it ends next in few days!' diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index c57b42197..2d652e8e2 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -519,9 +519,10 @@ es: administrators: Administradores managers: Gestores moderators: Moderadores - newsletters_and_notifications: Newsletters & Notificaciones + messaging_users: Mensajes a usuarios newsletters: Newsletters admin_notifications: Notificaciones + system_emails: Emails del sistema emails_download: Descarga de emails valuators: Evaluadores poll_officers: Presidentes de mesa @@ -650,6 +651,15 @@ es: preview_guide: "Así es como los usuarios verán la notificación:" sent_guide: "Así es como los usuarios ven la notificación:" send_alert: ¿Estás seguro/a de que quieres enviar esta notificación a %{n} usuarios? + system_emails: + preview_pending: + action: Previsualizar Pendientes + preview_of: Vista previa de %{name} + pending_to_be_sent: Este es todo el contenido pendiente de enviar + proposal_notification_digest: + title: Resumen de Notificationes de Propuestas + description: Reune todas las notificaciones de propuestas en un único mensaje, para evitar demasiados emails. + preview_detail: Los usuarios sólo recibirán las notificaciones de aquellas propuestas que siguen. emails_download: index: title: Descarga de emails @@ -1046,6 +1056,11 @@ es: image: Imagen show_image: Mostrar imagen moderated_content: "Revisa el contenido moderado por los moderadores, y confirma si la moderación se ha realizado correctamente." + view: Ver + proposal: Propuesta + author: Autor + content: Contenido + created_at: Fecha de creación spending_proposals: index: geozone_filter_all: Todos los ámbitos de actuación diff --git a/config/locales/es/seeds.yml b/config/locales/es/seeds.yml index d8a40471b..1d6563bef 100644 --- a/config/locales/es/seeds.yml +++ b/config/locales/es/seeds.yml @@ -53,18 +53,3 @@ es: recounting_poll: "Votación en Recuento" expired_poll_without_stats: "Votación Finalizada (sin Estadísticas o Resultados)" expired_poll_with_stats: "Votación Finalizada (con Estadísticas y Resultado)" - admin_notifications: - internal_link: - title: 'Tienes una propuesta?' - body: 'Recuerda que puedes crear propuestas y los ciudadanos las debatirán y apoyarán.' - link: '/proposals' - external_link: - title: 'Ayúdanos a traducir CONSUL' - body: 'Si dominas un idioma, ayúdanos a completar su traducción en CONSUL.' - link: 'https://crwd.in/consul' - without_link: - title: 'Ahora puedes geolocalizar propuestas y proyectos de inversión' - body: 'Cuando crees una propuesta o proyecto de inversión podrás especificar su localización en el mapa' - not_sent: - title: 'Últimos días para crear proyectos de Presupuestos Participativos' - body: 'Quedan pocos dias para que se cierre el plazo de presentación de proyectos de inversión para los presupuestos participativos!' diff --git a/config/routes/admin.rb b/config/routes/admin.rb index ec7e4bb5f..150d1b28a 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -165,6 +165,11 @@ namespace :admin do end end + resources :system_emails, only: [:index] do + get :view + get :preview_pending + end + resources :emails_download, only: :index do get :generate_csv, on: :collection end diff --git a/spec/features/admin/system_emails_spec.rb b/spec/features/admin/system_emails_spec.rb new file mode 100644 index 000000000..dd14e87bc --- /dev/null +++ b/spec/features/admin/system_emails_spec.rb @@ -0,0 +1,70 @@ +require 'rails_helper' + +feature "System Emails" do + + background do + admin = create(:administrator) + login_as(admin.user) + end + + context "Index" do + scenario "Lists all system emails with correct actions" do + visit admin_system_emails_path + + within('#proposal_notification_digest') do + expect(page).to have_link('View') + end + end + end + + context "View" do + scenario "#proposal_notification_digest" do + proposal_a = create(:proposal, title: 'Proposal A') + proposal_b = create(:proposal, title: 'Proposal B') + proposal_notification_a = create(:proposal_notification, proposal: proposal_a, + title: 'Proposal A Title', + body: 'Proposal A Notification Body') + proposal_notification_b = create(:proposal_notification, proposal: proposal_b, + title: 'Proposal B Title', + body: 'Proposal B Notification Body') + create(:notification, notifiable: proposal_notification_a) + create(:notification, notifiable: proposal_notification_b) + + visit admin_system_email_view_path('proposal_notification_digest') + + expect(page).to have_content('Proposal notifications in') + expect(page).to have_link('Proposal A Title', href: proposal_url(proposal_a, + anchor: 'tab-notifications')) + expect(page).to have_link('Proposal B Title', href: proposal_url(proposal_b, + anchor: 'tab-notifications')) + expect(page).to have_content('Proposal A Notification Body') + expect(page).to have_content('Proposal B Notification Body') + end + end + + context "Preview Pending" do + scenario "#proposal_notification_digest" do + proposal_a = create(:proposal, title: 'Proposal A') + proposal_b = create(:proposal, title: 'Proposal B') + proposal_notification_a = create(:proposal_notification, proposal: proposal_a, + title: 'Proposal A Title', + body: 'Proposal A Notification Body') + proposal_notification_b = create(:proposal_notification, proposal: proposal_b, + title: 'Proposal B Title', + body: 'Proposal B Notification Body') + create(:notification, notifiable: proposal_notification_a, emailed_at: nil) + create(:notification, notifiable: proposal_notification_b, emailed_at: nil) + + visit admin_system_email_preview_pending_path('proposal_notification_digest') + + expect(page).to have_content('This is the content pending to be sent') + expect(page).to have_link('Proposal A', href: proposal_url(proposal_a)) + expect(page).to have_link('Proposal B', href: proposal_url(proposal_b)) + expect(page).to have_link('Proposal A Title', href: proposal_url(proposal_a, + anchor: 'tab-notifications')) + expect(page).to have_link('Proposal B Title', href: proposal_url(proposal_b, + anchor: 'tab-notifications')) + end + end + +end diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index 4d009bfbc..91f8b31b6 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -306,14 +306,14 @@ feature 'Emails' do expect(email).to have_body_text(notification1.notifiable.body) expect(email).to have_body_text(proposal1.author.name) - expect(email).to have_body_text(/#{notification_path(notification1)}/) + expect(email).to have_body_text(/#{proposal_path(proposal1, anchor: 'tab-notifications')}/) expect(email).to have_body_text(/#{proposal_path(proposal1, anchor: 'comments')}/) expect(email).to have_body_text(/#{proposal_path(proposal1, anchor: 'social-share')}/) expect(email).to have_body_text(proposal2.title) expect(email).to have_body_text(notification2.notifiable.title) expect(email).to have_body_text(notification2.notifiable.body) - expect(email).to have_body_text(/#{notification_path(notification2)}/) + expect(email).to have_body_text(/#{proposal_path(proposal2, anchor: 'tab-notifications')}/) expect(email).to have_body_text(/#{proposal_path(proposal2, anchor: 'comments')}/) expect(email).to have_body_text(/#{proposal_path(proposal2, anchor: 'social-share')}/) expect(email).to have_body_text(proposal2.author.name)