README.md

 # Re2o
 
-Gnu public license v2.0
+GNU public license v2.0
 
 ## Avant propos 
 
-Re2o est un logiciel d'administration développé initiallement au rezometz. Il
+Re2o est un logiciel d'administration développé initialement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en 
 quelques clics.
 
@@ -31,15 +31,15 @@ Pour cela :
 
 ## Fonctionnement général
 
-Re2o est séparé entre les models, qui sont visible sur le schéma des 
-dépendances. Il s'agit en réalité des tables sql, et les fields etant les 
+Re2o est séparé entre les models, qui sont visibles sur le schéma des
+dépendances. Il s'agit en réalité des tables sql, et les fields étant les
 colonnes.
 Ceci dit il n'est jamais nécessaire de toucher directement au sql, django 
 procédant automatiquement à tout cela. 
 On crée donc différents models (user, right pour les droits des users, 
 interfaces, IpList pour l'ensemble des adresses ip, etc)
 
-Du coté des forms, il s'agit des formulaire d'édition des models. Il 
+Du coté des forms, il s'agit des formulaires d'édition des models. Il
 s'agit de ModelForms django, qui héritent des models très simplement, voir la 
 documentation django models forms.
 
@@ -56,12 +56,20 @@ d'accéder à ces vues, utilisé par re2o-tools.
 
 # Requète en base de donnée
 
-Pour avoir un shell, il suffit de lancer '''python3 manage.py shell'''
-Pour charger des objets, example avec User, faire : 
-''' from users.models import User'''
-Pour charger les objets django, il suffit de faire User.objects.all() 
-pour tous les users par exemple. 
-Il est ensuite aisé de faire des requètes, par exemple 
-User.objects.filter(pseudo='test')
-Des exemples et la documentation complète sur les requètes django sont 
+Pour avoir un shell, lancer :
+```.bash
+python3 manage.py shell
+```
+
+Pour charger des objets (exemple avec User), faire :
+```.python
+from users.models import User
+```
+
+Pour charger les objets django, il suffit de faire `User.objects.all()`
+pour tous les users par exemple.
+Il est ensuite aisé de faire des requêtes, par exemple
+`User.objects.filter(pseudo='test')`
+
+Des exemples et la documentation complète sur les requêtes django sont
 disponible sur le site officiel.

api/views.py

@@ -29,6 +29,7 @@ the response (JSON or other), the CSRF exempting, ...
 import datetime
 
 from django.conf import settings
+from django.db.models import Q
 from rest_framework.authtoken.views import ObtainAuthToken
 from rest_framework.authtoken.models import Token
 from rest_framework.response import Response
@@ -421,7 +422,7 @@ class UserViewSet(viewsets.ReadOnlyModelViewSet):
 class HomeCreationViewSet(viewsets.ReadOnlyModelViewSet):
     """Exposes infos of `users.models.Users` objects to create homes.
     """
-    queryset = users.User.objects.all()
+    queryset = users.User.objects.exclude(Q(state=users.User.STATE_DISABLED) | Q(state=users.User.STATE_NOT_YET_ACTIVE))
     serializer_class = serializers.HomeCreationSerializer
 
 class ClubViewSet(viewsets.ReadOnlyModelViewSet):

cotisations/forms.py

@@ -102,7 +102,7 @@ class SelectArticleForm(FormRevMixin, Form):
 
     def __init__(self, *args, **kwargs):
         user = kwargs.pop('user')
-        target_user = kwargs.pop('target_user')
+        target_user = kwargs.pop('target_user', None)
         super(SelectArticleForm, self).__init__(*args, **kwargs)
         self.fields['article'].queryset = Article.find_allowed_articles(user, target_user)
 

cotisations/locale/fr/LC_MESSAGES/django.po

@@ -681,8 +681,9 @@ msgstr ""
 
 #: templates/cotisations/delete.html:38
 #: templates/cotisations/edit_facture.html:60
+#: views.py:181 views.py:235
 msgid "Confirm"
-msgstr "Confirmer"
+msgstr "Valider"
 
 #: templates/cotisations/edit_facture.html:31
 #: templates/cotisations/facture.html:30
@@ -695,12 +696,13 @@ msgstr "Modifier la facture"
 
 #: templates/cotisations/edit_facture.html:41
 #: templates/cotisations/facture.html:56
-msgid "Invoice's articles"
-msgstr "Articles de la facture"
+#: templates/cotisations/index_article.html:30
+msgid "Articles"
+msgstr "Articles"
 
 #: templates/cotisations/facture.html:37
-msgid "New invoice"
-msgstr "Nouvelle facture"
+msgid "Buy"
+msgstr "Acheter une cotisation"
 
 #: templates/cotisations/facture.html:40
 #, python-format
@@ -713,8 +715,8 @@ msgid "Current balance: %(balance)s €"
 msgstr "Solde actuel : %(balance)s €"
 
 #: templates/cotisations/facture.html:70
-msgid "Add an article"
-msgstr "Ajouter un article"
+msgid "Add an extra article"
+msgstr "Ajouter un article supplémentaire"
 
 #: templates/cotisations/facture.html:72
 msgid "Total price: <span id=\"total_price\">0,00</span> €"
@@ -728,9 +730,6 @@ msgstr "Factures"
 msgid "Subscriptions"
 msgstr "Cotisations"
 
-#: templates/cotisations/index_article.html:30
-msgid "Articles"
-msgstr "Articles"
 
 #: templates/cotisations/index_article.html:33
 msgid "Article types list"
@@ -812,9 +811,6 @@ msgstr "Contrôler les factures"
 msgid "You need to choose at least one article."
 msgstr "Vous devez choisir au moins un article."
 
-#: views.py:181 views.py:235
-msgid "Create"
-msgstr "Créer"
 
 #: views.py:228
 msgid "The custom invoice was created."

cotisations/migrations/0034_auto_20180831_1532.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-08-31 13:32
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cotisations', '0033_auto_20180818_1319'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='facture',
+            name='valid',
+            field=models.BooleanField(default=False, verbose_name='validated'),
+        ),
+    ]

cotisations/migrations/0035_notepayment.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-09-01 11:27
+from __future__ import unicode_literals
+
+import cotisations.payment_methods.mixins
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cotisations', '0034_auto_20180831_1532'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='NotePayment',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('server', models.CharField(max_length=255, verbose_name='server')),
+                ('port', models.PositiveIntegerField(blank=True, null=True)),
+                ('id_note', models.PositiveIntegerField(blank=True, null=True)),
+                ('payment', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, related_name='payment_method', to='cotisations.Paiement')),
+            ],
+            options={
+                'verbose_name': 'NoteKfet',
+            },
+            bases=(cotisations.payment_methods.mixins.PaymentMethodMixin, models.Model),
+        ),
+    ]

cotisations/models.py

@@ -50,7 +50,7 @@ from machines.models import regen
 from re2o.field_permissions import FieldPermissionModelMixin
 from re2o.mixins import AclMixin, RevMixin
 
-from cotisations.utils import find_payment_method
+from cotisations.utils import find_payment_method, send_mail_invoice
 from cotisations.validators import check_no_balance
 
 
@@ -137,7 +137,7 @@ class Facture(BaseInvoice):
     )
     # TODO : change name to validity for clarity
     valid = models.BooleanField(
-        default=True,
+        default=False,
         verbose_name=_("validated")
     )
     # TODO : changed name to controlled for clarity
@@ -231,19 +231,26 @@ class Facture(BaseInvoice):
         self.field_permissions = {
             'control': self.can_change_control,
         }
+        self.__original_valid = self.valid
+
+    def save(self, *args, **kwargs):
+        super(Facture, self).save(*args, **kwargs)
+        if not self.__original_valid and self.valid:
+            send_mail_invoice(self)
 
     def __str__(self):
         return str(self.user) + ' ' + str(self.date)
 
-
 @receiver(post_save, sender=Facture)
 def facture_post_save(**kwargs):
     """
     Synchronise the LDAP user after an invoice has been saved.
     """
     facture = kwargs['instance']
-    user = facture.user
-    user.ldap_sync(base=False, access_refresh=True, mac_refresh=False)
+    if facture.valid:
+        user = facture.user
+        user.set_active()
+        user.ldap_sync(base=False, access_refresh=True, mac_refresh=False)
 
 
 @receiver(post_delete, sender=Facture)
@@ -472,7 +479,8 @@ def vente_post_save(**kwargs):
         purchase.create_cotis()
         purchase.cotisation.save()
         user = purchase.facture.user
-        user.ldap_sync(base=False, access_refresh=True, mac_refresh=False)
+        user.set_active()
+        user.ldap_sync(base=True, access_refresh=True, mac_refresh=False)
 
 
 # TODO : change vente to purchase
@@ -602,7 +610,9 @@ class Article(RevMixin, AclMixin, models.Model):
             user: The user requesting articles.
             target_user: The user to sell articles
         """
-        if target_user.is_class_club:
+        if target_user is None:
+            objects_pool = cls.objects.filter(Q(type_user='All'))
+        elif target_user.is_class_club:
             objects_pool = cls.objects.filter(
                 Q(type_user='All') | Q(type_user='Club')
             )
@@ -700,6 +710,10 @@ class Paiement(RevMixin, AclMixin, models.Model):
         if payment_method is not None and use_payment_method:
             return payment_method.end_payment(invoice, request)
 
+        ## So make this invoice valid, trigger send mail
+        invoice.valid = True
+        invoice.save()
+
         # In case a cotisation was bought, inform the user, the
         # cotisation time has been extended too
         if any(sell.type_cotisation for sell in invoice.vente_set.all()):

cotisations/payment_methods/__init__.py

@@ -127,10 +127,11 @@ method to your model, where `form` is an instance of
 """
 
 
-from . import comnpay, cheque, balance, urls
+from . import comnpay, cheque, balance, note_kfet, urls
 
 PAYMENT_METHODS = [
     comnpay,
     cheque,
     balance,
+    note_kfet
 ]

cotisations/payment_methods/balance/models.py

@@ -74,8 +74,6 @@ class BalancePayment(PaymentMethodMixin, models.Model):
         user = invoice.user
         total_price = invoice.prix_total()
         if float(user.solde) - float(total_price) < self.minimum_balance:
-            invoice.valid = False
-            invoice.save()
             messages.error(
                 request,
                 _("Your balance is too low for this operation.")

cotisations/payment_methods/cheque/models.py

@@ -46,8 +46,6 @@ class ChequePayment(PaymentMethodMixin, models.Model):
         """Invalidates the invoice then redirect the user towards a view asking
         for informations to add to the invoice before validating it.
         """
-        invoice.valid = False
-        invoice.save()
         return redirect(reverse(
             'cotisations:cheque:validate',
             kwargs={'invoice_pk': invoice.pk}

cotisations/payment_methods/comnpay/models.py

@@ -81,8 +81,6 @@ class ComnpayPayment(PaymentMethodMixin, models.Model):
         a facture id, the price and the secret transaction data stored in
         the preferences.
         """
-        invoice.valid = False
-        invoice.save()
         host = request.get_host()
         p = Transaction(
             str(self.payment_credential),

cotisations/payment_methods/comnpay/views.py

@@ -68,7 +68,7 @@ def accept_payment(request, factureid):
             )
     return redirect(reverse(
         'users:profil',
-        kwargs={'userid': request.user.id}
+        kwargs={'userid': invoice.user.id}
     ))
 
 

cotisations/payment_methods/note_kfet/__init__.py

+# -*- mode: python; coding: utf-8 -*-
+# Re2o est un logiciel d'administration développé initiallement au rezometz. Il
+# se veut agnostique au réseau considéré, de manière à être installable en
+# quelques clics.
+#
+# Copyright © 2018  Gabriel Detraz, Pierre-Antoine Comby
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+"""
+This module contains a method to pay online using comnpay.
+"""
+from . import models, urls
+NAME = "NOTE"
+PaymentMethod = models.NotePayment

cotisations/payment_methods/note_kfet/forms.py

+# -*- mode: python; coding: utf-8 -*-
+# Re2o est un logiciel d'administration développé initiallement au rezometz. Il
+# se veut agnostique au réseau considéré, de manière à être installable en
+# quelques clics.
+#
+# Copyright © 2018  Pierre-Antoine Comby
+# Copyright © 2018  Gabriel Detraz
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+from django import forms
+from django.utils.translation import ugettext_lazy as _
+
+from cotisations.utils import find_payment_method
+
+class NoteCredentialForm(forms.Form):
+    """A special form to get credential to connect to a NoteKfet2015 server throught his API
+    object.
+    """
+    login = forms.CharField(
+            label=_("pseudo note")
+        )
+    password = forms.CharField(
+            label=_("Password"),
+            widget=forms.PasswordInput
+        )
+   

cotisations/payment_methods/note_kfet/models.py

+# -*- mode: python; coding: utf-8 -*-
+# Re2o est un logiciel d'administration développé initiallement au rezometz. Il
+# se veut agnostique au réseau considéré, de manière à être installable en
+# quelques clics.
+#
+# Copyright © 2018  Pierre-Antoine Comby
+# Copyright © 2018  Gabriel Detraz
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+from django.db import models
+from django.shortcuts import render
+from django.urls import reverse
+from django.utils.translation import ugettext_lazy as _
+from django.contrib import messages
+
+from cotisations.models import Paiement
+from cotisations.payment_methods.mixins import PaymentMethodMixin
+
+from django.shortcuts import render, redirect
+
+
+class NotePayment(PaymentMethodMixin, models.Model):
+    """
+    The model allowing you to pay with NoteKfet2015.
+    """
+
+    class Meta:
+        verbose_name = _("NoteKfet")
+
+    payment = models.OneToOneField(
+        Paiement,
+        on_delete = models.CASCADE,
+        related_name = 'payment_method',
+        editable = False
+    )
+    server = models.CharField(
+        max_length=255,
+        verbose_name=_("server")
+    )
+    port = models.PositiveIntegerField(
+        blank = True,
+        null = True
+    )
+    id_note = models.PositiveIntegerField(
+        blank = True,
+        null = True
+    )
+
+    def end_payment(self, invoice, request):
+        return redirect(reverse(
+            'cotisations:note_kfet:note_payment',
+            kwargs={'factureid': invoice.id}
+        ))

cotisations/payment_methods/note_kfet/note.py

+#!/usr/bin/python3
+# -*- coding:utf-8 -*-
+
+# Codé par PAC , forké de 20-100
+
+""" Module pour dialoguer avec la NoteKfet2015 """
+
+import socket
+import json
+import ssl
+import traceback
+
+
+def get_response(socket):
+    length_str = b''
+    char = socket.recv(1)
+    while char != b'\n':
+        length_str += char
+        char = socket.recv(1)
+    total = int(length_str)
+    return json.loads(socket.recv(total).decode('utf-8'))
+
+def connect(server, port):
+    sock = socket.socket()
+    try:
+        # On établit la connexion sur port 4242
+        sock.connect((server, port))
+        # On passe en SSL
+        sock = ssl.wrap_socket(sock)
+        # On fait un hello
+        sock.send(b'["hello", "manual"]')
+        retcode = get_response(sock)
+    except:
+        # Si on a foiré quelque part, c'est que le serveur est down
+        return (False, sock, "Serveur indisponible")
+    return (True, sock, "")
+
+def login(server, port, username, password,  masque = [[], [], True]):
+    result, sock, err = connect(server, port)
+    if not result:
+        return (False, None, err)
+    try:
+        commande = ["login", [username, password, "bdd", masque]]
+        sock.send(json.dumps(commande).encode("utf-8"))
+        response = get_response(sock)
+        retcode = response['retcode']
+        if retcode == 0:
+            return (True, sock, "")
+        elif retcode == 5:
+            return (False, sock, "Login incorrect")
+        else:
+            return (False, sock, "Erreur inconnue " + str(retcode))
+    except:
+        # Si on a foiré quelque part, c'est que le serveur est down
+        return (False, sock, "Erreur de communication avec le serveur")
+
+
+def don(sock, montant, id_note, facture):
+    """
+    Faire faire un don à l'id_note
+    """
+    try:
+        sock.send(json.dumps(["dons", [[id_note], round(montant*100), "Facture : id=%s, designation=%s" % (facture.id, facture.name())]]).encode("utf-8"))
+        response = get_response(sock)
+        retcode = response['retcode']
+        transaction_retcode = response["msg"][0][0]
+        if 0 < retcode < 100 or 200 <= retcode or 0 < transaction_retcode < 100 or 200 <= transaction_retcode:
+            return (False, "Transaction échouée. (Solde trop négatif ?)")
+        elif retcode == 0:
+            return (True, "")
+        else:
+            return (False, "Erreur inconnue " + str(retcode))
+    except:
+        return (False, "Erreur de communication avec le serveur")

cotisations/payment_methods/note_kfet/urls.py

+# -*- mode: python; coding: utf-8 -*-
+# Re2o est un logiciel d'administration développé initiallement au rezometz. Il
+# se veut agnostique au réseau considéré, de manière à être installable en
+# quelques clics.
+#
+# Copyright © 2018 Gabriel Detraz
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+from django.conf.urls import url
+from . import views
+
+urlpatterns = [
+    url(
+        r'^note_payment/(?P<factureid>[0-9]+)$',
+        views.note_payment,
+        name='note_payment'
+    ),
+]

cotisations/payment_methods/note_kfet/views.py

+# -*- mode: python; coding: utf-8 -*-
+# Re2o est un logiciel d'administration développé initiallement au rezometz. Il
+# se veut agnostique au réseau considéré, de manière à être installable en
+# quelques clics.
+#
+# Copyright © 2018  Gabriel Detraz
+# Copyright © 2018  Pierre-Antoine Comby 
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+"""Payment
+
+Here are the views needed by comnpay
+"""
+
+from collections import OrderedDict
+
+from django.urls import reverse
+from django.shortcuts import redirect, get_object_or_404
+from django.contrib.auth.decorators import login_required
+from django.contrib import messages
+from django.views.decorators.csrf import csrf_exempt
+from django.utils.datastructures import MultiValueDictKeyError
+from django.utils.translation import ugettext as _
+from django.http import HttpResponse, HttpResponseBadRequest
+
+from cotisations.models import Facture
+from cotisations.utils import find_payment_method
+from .models import NotePayment
+from re2o.views import form
+from re2o.acl import (
+    can_create,
+    can_edit
+)
+from .note import login, don
+from .forms import NoteCredentialForm
+
+@login_required
+@can_edit(Facture)
+def note_payment(request, facture, factureid):
+    """
+    Build a request to start the negociation with NoteKfet by using
+    a facture id, the price and the login/password data stored in
+    the preferences.
+    """
+    user = facture.user
+    payment_method = find_payment_method(facture.paiement)
+    if not payment_method or not isinstance(payment_method, NotePayment):
+        messages.error(request, "Erreur inconnue")
+        return redirect(reverse(
+            'users:profil',
+            kwargs={'userid': user.id}
+         ))
+    noteform = NoteCredentialForm(request.POST or None)
+    if noteform.is_valid():
+        pseudo = noteform.cleaned_data['login']
+        password = noteform.cleaned_data['password']
+        result, sock, err = login(payment_method.server, payment_method.port, pseudo, password)
+        if not result:
+            messages.error(request, err)
+            return form(
+                {'form': noteform, 'amount': facture.prix_total()},
+                "cotisations/payment.html",
+                request
+            )
+        else:
+            result, err = don(sock, facture.prix_total(), payment_method.id_note, facture)
+            if not result:
+                messages.error(request, err)
+                return form(
+                    {'form': noteform, 'amount': facture.prix_total()},
+                    "cotisations/payment.html",
+                    request
+                )
+        facture.valid = True
+        facture.save()
+        messages.success(request, "Le paiement par note a bien été effectué")
+        return redirect(reverse(
+            'users:profil',
+            kwargs={'userid': user.id}
+         ))
+    return form(
+            {'form': noteform, 'amount': facture.prix_total()},
+            "cotisations/payment.html",
+            request
+        )

cotisations/payment_methods/urls.py

@@ -19,9 +19,10 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 from django.conf.urls import include, url
-from . import comnpay, cheque
+from . import comnpay, cheque, note_kfet
 
 urlpatterns = [
     url(r'^comnpay/', include(comnpay.urls, namespace='comnpay')),
     url(r'^cheque/', include(cheque.urls, namespace='cheque')),
+    url(r'^note_kfet/', include(note_kfet.urls, namespace='note_kfet')),
 ]

cotisations/templates/cotisations/aff_cotisations.html

@@ -73,7 +73,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 {% can_delete facture %}
 		{% include 'buttons/suppr.html' with href='cotisations:del-facture' id=facture.id %}
                 {% acl_end %}
-		{% history_button facture text=True html_class=False %}
+		{% history_button facture %}
             </td>
             <td>
                 {% if facture.valid %}

cotisations/templates/cotisations/control.html

@@ -105,7 +105,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% endfor %}
     </table>
     {% trans "Edit" as tr_edit %}
-    {% bootstrap_button tr_edit button_type='submit' icon='star' %}
+    {% bootstrap_button tr_edit button_type='submit' icon='ok' button_class='btn-success' %}
 </form>
 
 {% endblock %}

cotisations/templates/cotisations/delete.html

@@ -36,7 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% blocktrans %}Warning: are you sure you really want to delete this {{ object_name }} object ( {{ objet }} )?{% endblocktrans %}
     </h4>
     {% trans "Confirm" as tr_confirm %}
-    {% bootstrap_button tr_confirm button_type='submit' icon='trash' %}
+    {% bootstrap_button tr_confirm button_type='submit' icon='trash' button_class='btn-danger' %}
 </form>
 {% endblock %}
 

cotisations/templates/cotisations/edit_facture.html

@@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h3>{% trans "Edit the invoice" %}</h3>
     {% massive_bootstrap_form factureform 'user' %}
     {{ venteform.management_form }}
-    <h3>{% trans "Invoice's articles" %}</h3>
+    <h3>{% trans "Articles" %}</h3>
     <table class="table table-striped">
         <thead>
             <tr>
@@ -58,7 +58,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
          {% endfor %}
     </table>
     {% trans "Confirm" as tr_confirm %}
-    {% bootstrap_button tr_confirm button_type='submit' icon='star' %}
+    {% bootstrap_button tr_confirm button_type='submit' icon='ok' button_class='btn-success' %}
 </form>
 
 {% endblock %}

cotisations/templates/cotisations/facture.html

@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% if title %}
 <h3>{{ title }}</h3>
 {% else %}
-<h3>{% trans "New invoice" %}</h3>
+<h3>{% trans "Buy" %}</h3>
 {% endif %}
 {% if max_balance %}
 <h4>{% blocktrans %}Maximum allowed balance: {{ max_balance }} €{% endblocktrans %}</h4>
@@ -53,7 +53,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <div id="paymentMethod"></div>
     {% endif %}
     {% if articlesformset %}
-    <h3>{% trans "Invoice's articles" %}</h3>
+    <h3>{% trans "Articles" %}</h3>
     <div id="form_set" class="form-group">
         {{ articlesformset.management_form }}
         {% for articlesform in articlesformset.forms %}
@@ -67,12 +67,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         </div>
         {% endfor %}
     </div>
-    <input class="btn btn-primary btn-sm" role="button" value="{% trans "Add an article"%}" id="add_one">
+    <input class="btn btn-primary btn-block" role="button" value="{% trans "Add an extra article"%}" id="add_one">
     <p>
         {% blocktrans %}Total price: <span id="total_price">0,00</span> €{% endblocktrans %}
     </p>
     {% endif %}
-    {% bootstrap_button action_name button_type='submit' icon='star' %}
+    {% bootstrap_button action_name button_type='submit' icon='ok' button_class='btn-success' %}
 </form>
 
 {% if articlesformset or payment_method%}

cotisations/templates/cotisations/payment.html

@@ -40,7 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% bootstrap_form form %}
         {% endif %}
         {% trans "Pay" as tr_pay %}
-        {% bootstrap_button tr_pay button_type='submit' icon='piggy-bank' %}
+        {% bootstrap_button tr_pay button_type='submit' icon='piggy-bank' button_class='btn-success' %}
     </form>
 {% endblock %}
 

cotisations/views.py

@@ -81,7 +81,7 @@ from .forms import (
 )
 from .tex import render_invoice
 from .payment_methods.forms import payment_method_factory
-from .utils import find_payment_method, send_mail_invoice
+from .utils import find_payment_method
 
 
 @login_required
@@ -148,8 +148,6 @@ def new_facture(request, user, userid):
                     p.facture = new_invoice_instance
                     p.save()
 
-                send_mail_invoice(new_invoice_instance)
-
                 return new_invoice_instance.paiement.end_payment(
                     new_invoice_instance,
                     request
@@ -171,7 +169,7 @@ def new_facture(request, user, userid):
             'articlesformset': article_formset,
             'articlelist': article_list,
             'balance': balance,
-            'action_name': _('Create'),
+            'action_name': _('Confirm'),
         },
         'cotisations/facture.html', request
     )
@@ -193,9 +191,9 @@ def new_custom_invoice(request):
     # Building the invocie form and the article formset
     invoice_form = CustomInvoiceForm(request.POST or None)
 
-    article_formset = formset_factory(SelectArticleForm)(
+    articles_formset = formset_factory(SelectArticleForm)(
         request.POST or None,
-        form_kwargs={'user': request.user, 'target_user': user}
+        form_kwargs={'user': request.user}
     )
 
     if invoice_form.is_valid() and articles_formset.is_valid():
@@ -218,10 +216,9 @@ def new_custom_invoice(request):
         )
         return redirect(reverse('cotisations:index-custom-invoice'))
 
-
     return form({
         'factureform': invoice_form,
-        'action_name': _("Create"),
+        'action_name': _("Confirm"),
         'articlesformset': articles_formset,
         'articlelist': articles
     }, 'cotisations/facture.html', request)
@@ -848,8 +845,6 @@ def credit_solde(request, user, **_kwargs):
                 number=1
             )
 
-            send_mail_invoice(invoice)
-
             return invoice.paiement.end_payment(invoice, request)
     p = get_object_or_404(Paiement, is_balance=True)
     return form({

machines/templates/machines/delete.html

@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% csrf_token %}
     <h4>{% blocktrans %}Warning: are you sure you want to delete this object {{ objet_name }} ( {{ objet }} )?{% endblocktrans %}</h4>
     {% trans "Confirm" as tr_confirm %}
-    {% bootstrap_button tr_confirm button_type="submit" icon="trash" %}
+    {% bootstrap_button tr_confirm button_type="submit" icon='trash' button_class='btn-danger' %}
 </form>
   <br />
   <br />

machines/templates/machines/edit_portlist.html

@@ -51,7 +51,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <input class="btn btn-primary btn-sm" role="button" value=value id="add_one">
     </p>
     {% trans "Create or edit" as tr_create_or_edit %}
-    {% bootstrap_button tr_create_or_edit button_type="submit" icon="star" %}
+    {% bootstrap_button tr_create_or_edit icon='ok' button_class='btn-success' %}
 </form>
 <script type="text/javascript">
     var template = `{{ports.empty_form}}`;

machines/templates/machines/machine.html

@@ -168,7 +168,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     	<h3>{% trans "IPv6 address" %}</h3>
         {% bootstrap_form ipv6form %}
     {% endif %}
-    {% bootstrap_button action_name button_type="submit" icon="star" %}
+    {% bootstrap_button action_name button_type="submit" icon='ok' button_class='btn-success' %}
 </form>
   <br />
   <br />

preferences/templates/preferences/edit_preferences.html

@@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% csrf_token %}
     {% massive_bootstrap_form options 'utilisateur_asso' %}
     {% trans "Edit" as tr_edit %}
-    {% bootstrap_button tr_edit button_type="submit" icon="star" %}
+    {% bootstrap_button tr_edit button_type="submit" icon='ok' button_class='btn-success' %}
 </form>
     <br />
     <br />

preferences/templates/preferences/preferences.html

@@ -39,7 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% if preferenceform %}
     {% bootstrap_form preferenceform %}
     {% endif %}
-    {% bootstrap_button action_name button_type="submit" icon="star" %}
+    {% bootstrap_button action_name button_type="submit" icon='ok' button_class='btn-success' %}
 </form>
   <br />
   <br />

re2o/locale/fr/LC_MESSAGES/django.po

@@ -232,7 +232,7 @@ msgstr "Accéder à mon profil"
 
 #: templates/re2o/index.html:79
 msgid "Services of the organisation"
-msgstr "Serices de l'association"
+msgstr "Services de l'association"
 
 #: templates/re2o/index.html:93
 msgid "Go there"

topologie/templates/topologie/delete.html

@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% csrf_token %}
     <h4>{% blocktrans %}Warning: are you sure you want to delete this {{ objet_name }} object ( {{ objet }} )?{% endblocktrans %}</h4>
     {% trans "Confirm" as tr_confirm %}
-    {% bootstrap_button tr_confirm button_type="submit" icon="trash" %}
+    {% bootstrap_button tr_confirm button_type="submit" icon="trash" button_class='btn-danger' %}
 </form>
   <br />
   <br />

topologie/templates/topologie/switch.html

@@ -44,7 +44,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% massive_bootstrap_form topoform 'switch_interface' %}
     {% endif %}
     {% trans "Create" as tr_create %}
-    {% bootstrap_button tr_create button_type="submit" icon="ok" %}
+    {% bootstrap_button tr_create button_type="submit" icon='ok' button_class='btn-success' %}
 </form>
   <br />
   <br />

topologie/templates/topologie/topo.html

@@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <form class="form" method="post">
     {% csrf_token %}
     {% massive_bootstrap_form topoform 'room,related,machine_interface,members' %}
-    {% bootstrap_button action_name button_type="submit" icon="ok" %}
+    {% bootstrap_button action_name icon='ok' button_class='btn-success' %}
 </form>
   <br />
   <br />

topologie/templates/topologie/topo_more.html

@@ -57,7 +57,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% bootstrap_form domainform %}
     {% endif %}
     {% trans "Create or edit" as tr_create_or_edit %}
-    {% bootstrap_button tr_create_or_edit button_type="submit" icon="ok" %}
+    {% bootstrap_button tr_create_or_edit button_type="submit" icon='ok' button_class='btn-success' %}
 </form>
   <br />
   <br />

users/forms.py

@@ -41,6 +41,8 @@ from django.utils import timezone
 from django.contrib.auth.models import Group, Permission
 from django.utils.translation import ugettext_lazy as _
 
+from machines.models import Interface, Machine, Nas
+from topologie.models import Port
 from preferences.models import OptionalUser
 from re2o.utils import remove_user_room, get_input_formats_help_text
 from re2o.mixins import FormRevMixin
@@ -660,3 +662,53 @@ class EmailSettingsForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
         model = User
         fields = ['email','local_email_enabled', 'local_email_redirect']
 
+
+class InitialRegisterForm(forms.Form):
+    register_room = forms.BooleanField(required=False)
+    register_machine = forms.BooleanField(required=False)
+
+    def __init__(self, *args, **kwargs):
+        switch_ip = kwargs.pop('switch_ip')
+        switch_port = kwargs.pop('switch_port')
+        client_mac = kwargs.pop('client_mac')
+        self.user = kwargs.pop('user')
+        if switch_ip and switch_port:
+            # Looking for a port
+            port = Port.objects.filter(switch__interface__ipv4__ipv4=switch_ip, port=switch_port).first()
+            # If a port exists, checking there is a room AND radius
+            if port:
+                if port.get_port_profile.radius_type != 'NO' and port.get_port_profile.radius_mode == 'STRICT' and hasattr(port, 'room'):
+                    # Requesting user is not in this room ?
+                    if self.user.room != port.room:
+                        self.new_room = port.room
+        if client_mac and switch_ip:
+            # If this interface doesn't already exists
+            if not Interface.objects.filter(mac_address=client_mac):
+                self.mac_address = client_mac
+                self.nas_type = Nas.objects.filter(nas_type__interface__ipv4__ipv4=switch_ip).first()
+        super(InitialRegisterForm, self).__init__(*args, **kwargs)
+        if hasattr(self, 'new_room'):
+            self.fields['register_room'].label = _("New connection from room %s. Is it yours? If that is the case, type OK." % self.new_room)
+        else:
+            self.fields.pop('register_room')
+        if hasattr(self, 'mac_address'):
+            self.fields['register_machine'].label = _("New connection from new device. Register it? Say Yes to get Internet access from it (MAC Address : %s)." % self.mac_address)
+        else:
+            self.fields.pop('register_machine')
+
+    def clean_register_room(self):
+        if self.cleaned_data['register_room']:
+            if self.user.is_class_adherent:
+                remove_user_room(self.new_room)
+                user = self.user.adherent
+                user.room = self.new_room
+                user.save()
+            if self.user.is_class_club:
+                user = self.user.club
+                user.room = self.new_room
+                user.save()
+
+    def clean_register_machine(self):
+        if self.cleaned_data['register_machine']:
+            if self.mac_address and self.nas_type:
+                self.user.autoregister_machine(self.mac_address, self.nas_type)

users/migrations/0077_auto_20180824_1750.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-08-24 15:50
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0076_auto_20180818_1321'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='state',
+            field=models.IntegerField(choices=[(0, 'STATE_ACTIVE'), (1, 'STATE_DISABLED'), (2, 'STATE_ARCHIVE'), (3, 'STATE_NOT_YET_ACTIVE')], default=3),
+        ),
+    ]

users/models.py

@@ -186,10 +186,12 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
     STATE_ACTIVE = 0
     STATE_DISABLED = 1
     STATE_ARCHIVE = 2
+    STATE_NOT_YET_ACTIVE = 3
     STATES = (
         (0, 'STATE_ACTIVE'),
         (1, 'STATE_DISABLED'),
         (2, 'STATE_ARCHIVE'),
+        (3, 'STATE_NOT_YET_ACTIVE'),
     )
 
     surname = models.CharField(max_length=255)
@@ -231,7 +233,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
         blank=True
     )
     pwd_ntlm = models.CharField(max_length=255)
-    state = models.IntegerField(choices=STATES, default=STATE_ACTIVE)
+    state = models.IntegerField(choices=STATES, default=STATE_NOT_YET_ACTIVE)
     registered = models.DateTimeField(auto_now_add=True)
     telephone = models.CharField(max_length=15, blank=True, null=True)
     uid_number = models.PositiveIntegerField(
@@ -329,7 +331,14 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
     @property
     def is_active(self):
         """ Renvoie si l'user est à l'état actif"""
-        return self.state == self.STATE_ACTIVE
+        return self.state == self.STATE_ACTIVE or self.state == self.STATE_NOT_YET_ACTIVE
+
+    def set_active(self):
+        """Enable this user if he subscribed successfully one time before"""
+        if self.state == self.STATE_NOT_YET_ACTIVE:
+            if self.facture_set.filter(valid=True).filter(Q(vente__type_cotisation='All') | Q(vente__type_cotisation='Adhesion')).exists():
+                self.state = self.STATE_ACTIVE
+                self.save()
 
     @property
     def is_staff(self):
@@ -561,6 +570,9 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
             try:
                 user_ldap = LdapUser.objects.get(uidNumber=self.uid_number)
             except LdapUser.DoesNotExist:
+                #  Freshly created users are NOT synced in ldap base
+                if self.state == self.STATE_NOT_YET_ACTIVE:
+                    return
                 user_ldap = LdapUser(uidNumber=self.uid_number)
                 base = True
                 access_refresh = True

users/templates/users/delete.html

@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% csrf_token %}
     <h4>{% blocktrans %}Warning: are you sure you want to delete this {{ objet_name }} object ( {{ objet }} )?{% endblocktrans %}</h4>
     {% trans "Confirm" as tr_confirm %}
-    {% bootstrap_button tr_confirm button_type="submit" icon="trash" %}
+    {% bootstrap_button tr_confirm button_type="submit" icon="trash" button_class='btn-danger' %}
 </form>
 <br />
 <br />

users/templates/users/plugin_out.html

+{% extends "users/sidebar.html" %}
+{% comment %}
+Re2o est un logiciel d'administration développé initiallement au rezometz. Il
+se veut agnostique au réseau considéré, de manière à être installable en
+quelques clics.
+
+Copyright © 2017  Gabriel Détraz
+Copyright © 2017  Goulven Kermarec
+Copyright © 2017  Augustin Lemesle
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+{% endcomment %}
+
+{% load bootstrap3 %}
+{% load massive_bootstrap_form %}
+{% load static %}
+{% load i18n %}
+
+{% block title %}{% trans "Users" %}{% endblock %}
+
+{% block content %}
+
+<h3>{% trans "Your machine and your room were successfully registered. Please disconnect and reconnect your Ethernet cable to benefit from a wired connection." %}</h3>
+<center><img src="{% static '/images/rj45.gif' %}" alt="rj45_in_out"></center>
+
+<br/>
+<br/>
+<br/>
+{% endblock %}
+

users/templates/users/profil.html

@@ -52,7 +52,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             {% elif not users.has_access %}
             <div class="panel panel-danger">
                 <div class="panel-heading dashboard">{% trans "No connection" %}</div>
-                <div class="panel-body dashboard"> 
+                <div class="panel-body dashboard">
                     {% can_create Facture %}
                     <a class="btn btn-danger btn-sm" role="button" href="{% url 'cotisations:new-facture' users.id %}">
                         <i class="fas fa-sign-in-alt"></i> {% trans "Pay for a connection" %}
@@ -213,9 +213,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                         {% if users.state == 0 %}
 			<td><i class="text-success">{% trans "Active" %}</i></td>
                         {% elif users.state == 1 %}
-			<td><i class="text-danger">{% trans "Disabled" %}</i></td>
-                        {% else %}
-			<td><i class="text-warning">{% trans "Archived" %}</i></td>
+			<td><i class="text-warning">{% trans "Disabled" %}</i></td>
+                        {% elif users.state == 2 %}
+			<td><i class="text-danger">{% trans "Archived" %}</i></td>
+                        {% elif users.state == 3 %}
+			<td><i class="text-danger">{% trans "Not yet Member" %}</i></td>
+
                         {% endif %}
                     </tr>
                     <tr>

users/templates/users/user.html

@@ -35,7 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <form class="form" method="post">
     {% csrf_token %}
     {% massive_bootstrap_form userform 'room,school,administrators,members' %}
-    {% bootstrap_button action_name button_type="submit" icon="star" %}
+    {% bootstrap_button action_name button_type="submit" icon='ok' button_class='btn-success' %}
 </form>
 {% if load_js_file %}
 <script src="{{ load_js_file }}"></script>

users/urls.py

@@ -109,6 +109,7 @@ urlpatterns = [
     url(r'^mass_archive/$', views.mass_archive, name='mass-archive'),
     url(r'^$', views.index, name='index'),
     url(r'^index_clubs/$', views.index_clubs, name='index-clubs'),
+    url(r'^initial_register/$', views.initial_register, name='initial-register'),
     url(r'^rest/ml/std/$',
         views.ml_std_list,
         name='ml-std-list'),

users/views.py

@@ -105,7 +105,8 @@ from .forms import (
     PassForm,
     ResetPasswordForm,
     ClubAdminandMembersForm,
-    GroupForm
+    GroupForm,
+    InitialRegisterForm
 )
 
 
@@ -1081,6 +1082,30 @@ def process_passwd(request, req):
         request
     )
 
+@login_required
+def initial_register(request):
+    u_form = InitialRegisterForm(request.POST or None, user=request.user, switch_ip=request.GET.get('switch_ip', None), switch_port=request.GET.get('switch_port', None), client_mac=request.GET.get('client_mac', None))
+    if not u_form.fields:
+        messages.error(request, _("Incorrect URL, or already registered device"))
+        return redirect(reverse(
+            'users:profil',
+            kwargs={'userid': str(request.user.id)}
+        ))
+    if u_form.is_valid():
+        messages.success(request, _("Successful registration! Please"
+                                    " disconnect and reconnect your Ethernet"
+                                    " cable to get Internet access."))
+        return form(
+            {},
+            'users/plugin_out.html',
+            request
+        )
+    return form(
+        {'userform': u_form, 'action_name': _("Register device or room")},
+        'users/user.html',
+        request
+    )
+
 
 class JSONResponse(HttpResponse):
     """ Framework Rest """