add warning for user with no memberships

Author: markets

app/admin/user.rb

@@ -32,6 +32,7 @@
     column :posts do |u|
       u.posts.count
     end
+    column :created_at
     actions
   end
 

app/assets/stylesheets/application.scss

@@ -302,6 +302,10 @@ ul.statistics li{
   padding-left: 1.5rem;
 }
 
+.alert a {
+  text-decoration: underline;
+}
+
 // fields that contain an error
 .field_with_errors{
   color: red;

app/models/user.rb

@@ -94,6 +94,10 @@ def active?(organization)
     organization && !!(as_member_of(organization).try :active)
   end
 
+  def memberships?
+    members.any?
+  end
+
   def member(organization)
     members.where(organization_id: organization).first
   end

app/views/application/_no_membership_warning.html.erb

@@ -0,0 +1,3 @@
+<div class="alert alert-info">
+  <%= t('layouts.application.no_memberhsip_warning', link: organizations_path).html_safe %>
+</div>

app/views/layouts/application.html.erb

@@ -17,6 +17,7 @@
     <div class="container content">
       <%= render 'layouts/messages' unless devise_controller? %>
       <div class="container-fluid">
+        <%= render 'application/no_membership_warning' if current_user && !current_user.memberships? && !devise_controller? %>
         <%= yield %>
       </div>
       <%= organization_logo %>

config/locales/ca.yml

@@ -319,6 +319,7 @@ ca:
       help: Ajuda
       login: Entra
       manage_memberships: Gestiona membres
+      no_memberhsip_warning:
     report:
       report_title: INFORME
   locales:
@@ -393,8 +394,8 @@ ca:
       banner-title: Ets un Banc de Temps?
       empower-adbdt: ADBdT
       empower-adbdt-title: Associació pel Desenvolupament dels Bancs de Temps
-      empower-coopdevs: CoopDevs
-      empower-coopdevs-title: CoopDevs
+      empower-coopdevs: Coopdevs
+      empower-coopdevs-title: Coopdevs
       empower-github: Github
       empower-github-title: Github
       empower-showmap: veure mapa
@@ -417,7 +418,7 @@ ca:
       title2: als Bancs de Temps
   petitions:
     application_sent: Sol·licitud enviada correctament
-    application_sent_body: Hola! La teva sol·licitud a %{organization_name} s'ha enviat correctament.
+    application_sent_body: Hola! La teva sol·licitud a %{organization_name} s'ha enviat correctament. Algú de l'equip del banc de temps es posarà en contacte amb tu per finalitzar el procés dalta.
     application_status: Sol·licitud %{status}
     applications: Sol·licituds
     apply: Sol·licita unir-te

config/locales/en.yml

@@ -319,6 +319,7 @@ en:
       help: Help
       login: Login
       manage_memberships: Manage memberships
+      no_memberhsip_warning: Remember users without membership (15 days after register) they should ask for membership in <a href="%{link}">some Organization</a> or the user will be deleted when user have 1 month on the platform without any membership.
     report:
       report_title: REPORT
   locales:
@@ -393,8 +394,8 @@ en:
       banner-title: Are you a Time Bank?
       empower-adbdt: ADBdT
       empower-adbdt-title: Association for the Development of Time Banks
-      empower-coopdevs: CoopDevs
-      empower-coopdevs-title: CoopDevs
+      empower-coopdevs: Coopdevs
+      empower-coopdevs-title: Coopdevs
       empower-github: Github
       empower-github-title: Github
       empower-showmap: see map

config/locales/es.yml

@@ -319,6 +319,7 @@ es:
       help: Ayuda
       login: Entra
       manage_memberships: Gestionar membresia
+      no_memberhsip_warning:
     report:
       report_title: INFORME
   locales:
@@ -393,8 +394,8 @@ es:
       banner-title: "¿Eres un Banco de Tiempo?"
       empower-adbdt: ADBdT
       empower-adbdt-title: Asociación para el Desarrollo de los Bancos de Tiempo
-      empower-coopdevs: CoopDevs
-      empower-coopdevs-title: CoopDevs
+      empower-coopdevs: Coopdevs
+      empower-coopdevs-title: Coopdevs
       empower-github: Github
       empower-github-title: Github
       empower-showmap: ver mapa
@@ -417,7 +418,7 @@ es:
       title2: los Bancos de Tiempo
   petitions:
     application_sent: Solicitud enviada correctamente
-    application_sent_body: 'Hola! Tu solicitud a %{organization_name}  se ha enviado correctamente. '
+    application_sent_body: Hola! Tu solicitud a %{organization_name}  se ha enviado correctamente. Alguien del equipo del banco de tiempo se pondrá en contacto contigo para finalizar el proceso de alta.
     application_status: Solicitud %{status}
     applications: Solicitudes
     apply: Solicita unirte

config/locales/eu.yml

@@ -65,7 +65,7 @@ eu:
         notifications: Jaso eposta jakinarazpenak
         organization: Erakundea
         phone: Telefonoa
-        postcode: 
+        postcode:
         push_notifications: Jaso jakinarazpenak sakelakoan
         registration_date: Erregistratze-da
         registration_number: Erabiltzaile kodea
@@ -274,29 +274,29 @@ eu:
     contact_details: Kontaktuaren datuak
     create: Sortu
     date: Datuak
-    decline: 
+    decline:
     delete: Ezabatu
     demote: Ohiko erabiltzaile  bihurtu
     edit: Aldaketak egin
     enter_to_timebank: Denbora Bankuan sartu
     filter: Iragazkia
     from: tik
     give_time: Denbora eman
-    here: 
+    here:
     home: Hasiera
     information: Informazioa
     locales_header: Hizkuntza aldatu
     member_count: Erabiltzaile zenbakia
     more: 'Gehiago ikusi  '
     movements: Mugimenduak
     next: Hurrengoa
-    or: 
+    or:
     promote: Administratzaile bihurtu
     reason: Arrazoia
     required_field: Derrigorrez bete beharrekoa
     save: Gorde
     search: Bilatu
-    search_location: 
+    search_location:
     show: Erakutsi
     source_destination: Jatorria/ helmuga
     statistics: Estatistika
@@ -313,12 +313,13 @@ eu:
   layouts:
     application:
       about: TimeOverflowri buruz
-      bdtnear: 
+      bdtnear:
       edit_org: " %{organization} aldaketak egin"
       edit_profile: Nire profila aldatu
       help: Laguntza
       login: Sartu
-      manage_memberships: 
+      manage_memberships:
+      no_memberhsip_warning:
     report:
       report_title: TXOSTENA
   locales:
@@ -383,7 +384,7 @@ eu:
       new: Banku berria
     show:
       contact_information: kontaktuaren informazioa
-      join_timebank: 
+      join_timebank:
   pages:
     about:
       app-mobile: Mugikorrerako Appa
@@ -393,8 +394,8 @@ eu:
       banner-title: Denbora banku bat al zara?
       empower-adbdt: ADBdT
       empower-adbdt-title: Denbora Bankuen garapenerako elkartea
-      empower-coopdevs: CoopDevs
-      empower-coopdevs-title: CoopDevs
+      empower-coopdevs: Coopdevs
+      empower-coopdevs-title: Coopdevs
       empower-github: Github
       empower-github-title: Github
       empower-showmap: Mapa ikusi
@@ -416,25 +417,25 @@ eu:
       title: Denbora  bankuek  diseinaturiko softwarea,
       title2: Denbora bankuentzat
   petitions:
-    application_sent: 
-    application_sent_body: 
-    application_status: 
-    applications: 
-    apply: 
-    new: 
-    new_body: 
+    application_sent:
+    application_sent_body:
+    application_status:
+    applications:
+    apply:
+    new:
+    new_body:
     status:
-      accepted: 
-      declined: 
-      pending: 
-      sent: 
-    status_applications: 
+      accepted:
+      declined:
+      pending:
+      sent:
+    status_applications:
   posts:
     show:
       info: "%{type} hau %{organization}(e)ri dagokio."
   reports:
     download: Jaitsi
-    download_all: 
+    download_all:
   shared:
     movements:
       delete_reason: Zihur zaude azalpen hau ezabatu nahi duzula?
@@ -521,12 +522,12 @@ eu:
       error_amount: Denbora 0 baino handiagoa izan behar da
   users:
     avatar:
-      change_your_image: 
-      crop_the_image: 
-      max_size_warning: 
+      change_your_image:
+      crop_the_image:
+      max_size_warning:
     confirm_email:
-      email_sent: 
-      please: 
+      email_sent:
+      please:
     edit:
       edit_user: Erabiltzailea aldatu
     form:
@@ -563,7 +564,7 @@ eu:
       from_to: Jatorria/ Helmuga
       inactive: "( Ez erabilgarri)"
       inactive_user: Erabiltzailea ez dago erabilgarri
-      invalid_format: 
+      invalid_format:
       phone:
         one: Telefono zenbakia
         other: Telefono zenbakiak
@@ -576,9 +577,9 @@ eu:
       active_warning: " %{user} erabiltzailearen kontuaren egoera aldatuko duzu"
       cancel_warning: " %{user} erabiltzailea D bankutik ezabatuko duzu"
       deactivate: Desaktibatu
-      delete_membership: 
+      delete_membership:
       manage_warning: "%{user} erabiltzailearen onurak aldatuko dituzu"
-      sure_delete: 
+      sure_delete:
   views:
     pagination:
       first: Lehenengoa

config/locales/fr.yml

@@ -319,6 +319,7 @@ fr:
       help: Aide
       login: Connexion
       manage_memberships: Gérer les inscriptions
+      no_memberhsip_warning:
     report:
       report_title: RAPPORT
   locales:
@@ -393,8 +394,8 @@ fr:
       banner-title: Êtes-vous une Banque de temps ?
       empower-adbdt: ADBdT
       empower-adbdt-title: Association pour le développement des Banques de temps
-      empower-coopdevs: CoopDevs
-      empower-coopdevs-title: CoopDevs
+      empower-coopdevs: Coopdevs
+      empower-coopdevs-title: Coopdevs
       empower-github: Github
       empower-github-title: Github
       empower-showmap: Voir la map
@@ -416,19 +417,19 @@ fr:
       title: L'application conçue par et pour
       title2: Banques de temps
   petitions:
-    application_sent: Demande envoyée avec succès
-    application_sent_body: Bonjour! votre demande à %{organization_name} a bien été envoyée.
-    application_status: Demande %{status}
-    applications: Applications
-    apply: Demande à nous rejoindre
-    new: Nouvelle demande
-    new_body: Bonjour! Nouvelle demande de %{username}. Gérer vos demandes %{here_link}.
+    application_sent: Demande d'inscription envoyée avec succès
+    application_sent_body: Bonjour! votre demande d'inscription à %{organization_name} a bien été envoyée.
+    application_status: Demande d'inscription %{status}
+    applications: Demandes d'inscription
+    apply: Demander à nous rejoindre
+    new: Nouvelle demande d'inscription
+    new_body: Bonjour! Nouvelle demande d'inscription de %{username}. Gérer vos demandes %{here_link}.
     status:
       accepted: acceptée
       declined: déclinée
       pending: en attente
       sent: envoyée
-    status_applications: "%{status} demandes"
+    status_applications: Demandes d'inscription %{status}
   posts:
     show:
       info: Cette %{type} appartient à %{organization}.
@@ -505,9 +506,9 @@ fr:
     alpha_grouped_index:
       maintitle: Tags disponibles
   terms:
-    accept: Accept
+    accept: Accepter
     show:
-      accept: Accept
+      accept: Accepter
   transfers:
     computation:
       hour: