From d9ebb266d5675094a9528c3b644ebb3b77bb4fc4 Mon Sep 17 00:00:00 2001
From: Yoann PIETRI <yoann.pietri@supelec.fr>
Date: Thu, 11 Jan 2018 19:25:41 +0100
Subject: [PATCH 01/26] Users can pay their own cotisation with their solde.

---
 cotisations/forms.py                          |  41 ++++-
 .../templates/cotisations/new_facture.html    |   3 +
 .../cotisations/new_facture_solde.html        | 157 ++++++++++++++++++
 cotisations/urls.py                           |   5 +
 cotisations/views.py                          | 100 ++++++++++-
 preferences/forms.py                          |   1 +
 .../migrations/0028_auto_20180111_1129.py     |  20 +++
 preferences/models.py                         |  19 ++-
 .../preferences/display_preferences.html      |   7 +
 users/models.py                               |   8 +-
 users/templates/users/profil.html             |  13 +-
 11 files changed, 358 insertions(+), 16 deletions(-)
 create mode 100644 cotisations/templates/cotisations/new_facture_solde.html
 create mode 100644 preferences/migrations/0028_auto_20180111_1129.py

diff --git a/cotisations/forms.py b/cotisations/forms.py
index 5845611a..bbe50b69 100644
--- a/cotisations/forms.py
+++ b/cotisations/forms.py
@@ -26,9 +26,8 @@ importé par les views.
 Permet de créer une nouvelle facture pour un user (NewFactureForm),
 et de l'editer (soit l'user avec EditFactureForm,
 soit le trésorier avec TrezEdit qui a plus de possibilités que self
-notamment sur le controle trésorier)
-
-SelectArticleForm est utilisée lors de la creation d'une facture en
+notamment sur le controle trésorier SelectArticleForm est utilisée
+lors de la creation d'une facture en
 parrallèle de NewFacture pour le choix des articles désirés.
 (la vue correspondante est unique)
 
@@ -40,7 +39,7 @@ from __future__ import unicode_literals
 from django import forms
 from django.db.models import Q
 from django.forms import ModelForm, Form
-from django.core.validators import MinValueValidator
+from django.core.validators import MinValueValidator,MaxValueValidator
 from .models import Article, Paiement, Facture, Banque
 
 from re2o.field_permissions import FieldPermissionFormMixin
@@ -246,3 +245,37 @@ class DelBanqueForm(Form):
             self.fields['banques'].queryset = instances
         else:
             self.fields['banques'].queryset = Banque.objects.all()
+
+
+class NewFactureSoldeForm(NewFactureForm):
+    """Creation d'une facture, moyen de paiement, banque et numero
+    de cheque"""
+    def __init__(self, *args, **kwargs):
+        prefix = kwargs.pop('prefix', self.Meta.model.__name__)
+        self.fields['cheque'].required = False
+        self.fields['banque'].required = False
+        self.fields['cheque'].label = 'Numero de chèque'
+        self.fields['banque'].empty_label = "Non renseigné"
+        self.fields['paiement'].empty_label = "Séléctionner\
+        une bite de paiement"
+        paiement_list = Paiement.objects.filter(type_paiement=1)
+        if paiement_list:
+            self.fields['paiement'].widget\
+                .attrs['data-cheque'] = paiement_list.first().id
+
+    class Meta:
+        model = Facture
+        fields = ['paiement', 'banque']
+
+
+    def clean(self):
+        cleaned_data = super(NewFactureSoldeForm, self).clean()
+        paiement = cleaned_data.get("paiement")
+        cheque = cleaned_data.get("cheque")
+        banque = cleaned_data.get("banque")
+        if not paiement:
+            raise forms.ValidationError("Le moyen de paiement est obligatoire")
+        elif paiement.type_paiement == "check" and not (cheque and banque):
+            raise forms.ValidationError("Le numéro de chèque et\
+                la banque sont obligatoires.")
+        return cleaned_data
diff --git a/cotisations/templates/cotisations/new_facture.html b/cotisations/templates/cotisations/new_facture.html
index f2586e8b..9d466cee 100644
--- a/cotisations/templates/cotisations/new_facture.html
+++ b/cotisations/templates/cotisations/new_facture.html
@@ -34,6 +34,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <form class="form" method="post">
     {% csrf_token %}
     <h3>Nouvelle facture</h3>
+    <p>
+	Solde de l'utilisateur : {{ user.solde }} €
+    </p>
     {% bootstrap_form factureform %}
     {{ venteform.management_form }}
     <!-- TODO: FIXME to include data-type="check" for right option in id_cheque select -->
diff --git a/cotisations/templates/cotisations/new_facture_solde.html b/cotisations/templates/cotisations/new_facture_solde.html
new file mode 100644
index 00000000..2efd8e81
--- /dev/null
+++ b/cotisations/templates/cotisations/new_facture_solde.html
@@ -0,0 +1,157 @@
+
+{% extends "cotisations/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 staticfiles%}
+
+{% block title %}Création et modification de factures{% endblock %}
+
+{% block content %}
+{% bootstrap_form_errors venteform.management_form %}
+
+<form class="form" method="post">
+    {% csrf_token %}
+    <h3>Nouvelle facture</h3>
+    {{ venteform.management_form }}
+    <!-- TODO: FIXME to include data-type="check" for right option in id_cheque select -->
+    <h3>Articles de la facture</h3>
+    <div id="form_set" class="form-group">
+    {% for form in venteform.forms %}
+        <div class='product_to_sell form-inline'>
+		Article : &nbsp;
+		{% bootstrap_form form label_class='sr-only' %}
+		&nbsp;
+                <button class="btn btn-danger btn-sm"
+			id="id_form-0-article-remove" type="button">
+                    <span class="glyphicon glyphicon-remove"></span>
+                </button>
+        </div>
+    {% endfor %}
+    </div>
+    <input class="btn btn-primary btn-sm" role="button" value="Ajouter un article" id="add_one">
+    <p>
+        Prix total : <span id="total_price">0,00</span> €
+    </p>
+    {% bootstrap_button "Créer ou modifier" button_type="submit" icon="star" %}
+</form>
+
+<script type="text/javascript">
+
+    var prices = {};
+    {% for article in articlelist %}
+        prices[{{ article.id|escapejs }}] = {{ article.prix }};
+    {% endfor %}
+
+    var template = `Article : &nbsp;
+        {% bootstrap_form venteform.empty_form label_class='sr-only' %}
+        &nbsp;
+        <button class="btn btn-danger btn-sm"
+	    id="id_form-__prefix__-article-remove" type="button">
+	    <span class="glyphicon glyphicon-remove"></span>
+	</button>`
+
+    function add_article(){
+        // Index start at 0 => new_index = number of items
+        var new_index =
+            document.getElementsByClassName('product_to_sell').length;
+        document.getElementById('id_form-TOTAL_FORMS').value ++;
+        var new_article = document.createElement('div');
+        new_article.className = 'product_to_sell form-inline';
+        new_article.innerHTML = template.replace(/__prefix__/g, new_index);
+        document.getElementById('form_set').appendChild(new_article);
+        add_listenner_for_id(new_index);
+    }
+
+    function update_price(){
+        var price = 0;
+        var product_count =
+            document.getElementsByClassName('product_to_sell').length;
+        var article, article_price, quantity;
+        for (i = 0; i < product_count; ++i){
+            article = document.getElementById(
+                'id_form-' + i.toString() + '-article').value;
+            if (article == '') {
+                continue;
+            }
+            article_price = prices[article];
+            quantity = document.getElementById(
+                'id_form-' + i.toString() + '-quantity').value;
+            price += article_price * quantity;
+        }
+        document.getElementById('total_price').innerHTML =
+            price.toFixed(2).toString().replace('.', ',');
+    }
+
+    function add_listenner_for_id(i){
+        document.getElementById('id_form-' + i.toString() + '-article')
+            .addEventListener("change", update_price, true);
+        document.getElementById('id_form-' + i.toString() + '-article')
+            .addEventListener("onkeypress", update_price, true);
+        document.getElementById('id_form-' + i.toString() + '-quantity')
+            .addEventListener("change", update_price, true);
+        document.getElementById('id_form-' + i.toString() + '-article-remove')
+	    .addEventListener("click", function(event) {
+		    var article = event.target.parentNode;
+		    article.parentNode.removeChild(article);
+                    document.getElementById('id_form-TOTAL_FORMS').value --;
+		    update_price();
+		}
+	    )
+    }
+
+    function set_cheque_info_visibility() {
+        var paiement = document.getElementById("id_Facture-paiement");
+        var visible = paiement.value == paiement.getAttribute('data-cheque');
+        p = document.getElementById("id_Facture-paiement");
+        var display = 'none';
+        if (visible) {
+            display = 'block';
+        }
+        document.getElementById("id_Facture-cheque")
+		.parentNode.style.display = display;
+        document.getElementById("id_Facture-banque")
+		.parentNode.style.display = display;
+    }
+
+    // Add events manager when DOM is fully loaded
+    document.addEventListener("DOMContentLoaded", function() {
+        document.getElementById("add_one")
+            .addEventListener("click", add_article, true);
+        var product_count =
+            document.getElementsByClassName('product_to_sell').length;
+        for (i = 0; i < product_count; ++i){
+            add_listenner_for_id(i);
+        }
+        document.getElementById("id_Facture-paiement")
+            .addEventListener("change", set_cheque_info_visibility, true);
+        set_cheque_info_visibility();
+        update_price();
+    });
+
+</script>
+
+{% endblock %}
+
diff --git a/cotisations/urls.py b/cotisations/urls.py
index 2a0c0163..cbeeb8eb 100644
--- a/cotisations/urls.py
+++ b/cotisations/urls.py
@@ -26,6 +26,7 @@ from django.conf.urls import url
 
 import re2o
 from . import views
+from . import payment
 
 urlpatterns = [
     url(r'^new_facture/(?P<userid>[0-9]+)$',
@@ -110,5 +111,9 @@ urlpatterns = [
         views.control,
         name='control'
         ),
+    url(r'^new_facture_solde/(?P<userid>[0-9]+)$',
+        views.new_facture_solde,
+        name='new_facture_solde'
+        ),
     url(r'^$', views.index, name='index'),
 ]
diff --git a/cotisations/views.py b/cotisations/views.py
index d7d953c9..e338943e 100644
--- a/cotisations/views.py
+++ b/cotisations/views.py
@@ -29,6 +29,7 @@ import os
 from django.urls import reverse
 from django.shortcuts import render, redirect
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
+from django.core.validators import MaxValueValidator
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib import messages
 from django.db.models import ProtectedError
@@ -67,7 +68,9 @@ from .forms import (
     NewFactureFormPdf,
     SelectUserArticleForm,
     SelectClubArticleForm,
-    CreditSoldeForm
+    CreditSoldeForm,
+    NewFactureSoldeForm,
+    RechargeForm
 )
 from .tex import render_invoice
 
@@ -584,3 +587,98 @@ def index(request):
     return render(request, 'cotisations/index.html', {
         'facture_list': facture_list
         })
+
+
+@login_required
+def new_facture_solde(request, userid):
+    """Creation d'une facture pour un user. Renvoie la liste des articles
+    et crée des factures dans un formset. Utilise un peu de js coté template
+    pour ajouter des articles.
+    Parse les article et boucle dans le formset puis save les ventes,
+    enfin sauve la facture parente.
+    TODO : simplifier cette fonction, déplacer l'intelligence coté models
+    Facture et Vente."""
+    user = request.user
+    facture = Facture(user=user)
+    paiement, _created = Paiement.objects.get_or_create(moyen='Solde')
+    facture.paiement = paiement
+    # Le template a besoin de connaitre les articles pour le js
+    article_list = Article.objects.filter(
+        Q(type_user='All') | Q(type_user=request.user.class_name)
+    )
+    if request.user.is_class_club:
+        article_formset = formset_factory(SelectClubArticleForm)(request.POST or None)
+    else:
+        article_formset = formset_factory(SelectUserArticleForm)(request.POST or None)
+    if article_formset.is_valid():
+        articles = article_formset
+        # Si au moins un article est rempli
+        if any(art.cleaned_data for art in articles):
+            options, _created = OptionalUser.objects.get_or_create()
+            user_solde = options.user_solde
+            solde_negatif = options.solde_negatif
+            # Si on paye par solde, que l'option est activée,
+            # on vérifie que le négatif n'est pas atteint
+            if user_solde:
+                prix_total = 0
+                for art_item in articles:
+                    if art_item.cleaned_data:
+                        prix_total += art_item.cleaned_data['article']\
+                                .prix*art_item.cleaned_data['quantity']
+                if float(user.solde) - float(prix_total) < solde_negatif:
+                    messages.error(request, "Le solde est insuffisant pour\
+                            effectuer l'opération")
+                    return redirect(reverse(
+                        'users:profil',
+                        kwargs={'userid': userid}
+                        ))
+            with transaction.atomic(), reversion.create_revision():
+                facture.save()
+                reversion.set_user(request.user)
+                reversion.set_comment("Création")
+            for art_item in articles:
+                if art_item.cleaned_data:
+                    article = art_item.cleaned_data['article']
+                    quantity = art_item.cleaned_data['quantity']
+                    new_vente = Vente.objects.create(
+                        facture=facture,
+                        name=article.name,
+                        prix=article.prix,
+                        type_cotisation=article.type_cotisation,
+                        duration=article.duration,
+                        number=quantity
+                    )
+                    with transaction.atomic(), reversion.create_revision():
+                        new_vente.save()
+                        reversion.set_user(request.user)
+                        reversion.set_comment("Création")
+            if any(art_item.cleaned_data['article'].type_cotisation
+                   for art_item in articles if art_item.cleaned_data):
+                messages.success(
+                    request,
+                    "La cotisation a été prolongée\
+                    pour l'adhérent %s jusqu'au %s" % (
+                        user.pseudo, user.end_adhesion()
+                    )
+                    )
+            else:
+                messages.success(request, "La facture a été crée")
+            return redirect(reverse(
+                'users:profil',
+                kwargs={'userid': userid}
+                ))
+        messages.error(
+            request,
+            u"Il faut au moins un article valide pour créer une facture"
+            )
+        return redirect(reverse(
+            'users:profil',
+            kwargs={'userid': userid}
+        ))
+
+    return form({
+        'venteform': article_formset,
+        'articlelist': article_list
+        }, 'cotisations/new_facture_solde.html', request)
+
+
diff --git a/preferences/forms.py b/preferences/forms.py
index 7dda8620..2f79b6fb 100644
--- a/preferences/forms.py
+++ b/preferences/forms.py
@@ -48,6 +48,7 @@ class EditOptionalUserForm(ModelForm):
         téléphone'
         self.fields['user_solde'].label = 'Activation du solde pour\
         les utilisateurs'
+        self.fields['max_recharge'].label = 'Rechargement max'
 
 
 class EditOptionalMachineForm(ModelForm):
diff --git a/preferences/migrations/0028_auto_20180111_1129.py b/preferences/migrations/0028_auto_20180111_1129.py
new file mode 100644
index 00000000..c6c03719
--- /dev/null
+++ b/preferences/migrations/0028_auto_20180111_1129.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-01-11 10:29
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0027_merge_20180106_2019'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='optionaluser',
+            name='max_recharge',
+            field=models.DecimalField(decimal_places=2, default=100, max_digits=5),
+        ),
+    ]
diff --git a/preferences/models.py b/preferences/models.py
index 8dfc4260..1d4b9bd2 100644
--- a/preferences/models.py
+++ b/preferences/models.py
@@ -41,6 +41,11 @@ class OptionalUser(models.Model):
         decimal_places=2,
         default=0
     )
+    max_recharge = models.DecimalField(
+        max_digits=5,
+        decimal_places=2,
+        default=100
+    )
     gpg_fingerprint = models.BooleanField(default=True)
     all_can_create = models.BooleanField(
         default=False,
@@ -107,7 +112,10 @@ class OptionalUser(models.Model):
     def clean(self):
         """Creation du mode de paiement par solde"""
         if self.user_solde:
-            cotisations.models.Paiement.objects.get_or_create(moyen="Solde")
+            p = cotisations.models.Paiement.objects.filter(moyen="Solde")
+            if not len(p):
+                c = cotisations.models.Paiement(moyen="Solde")
+                c.save()
 
 
 class OptionalMachine(models.Model):
@@ -436,7 +444,14 @@ class AssoOption(models.Model):
         blank=True,
         null=True
     )
-
+    PAYMENT = (
+        ('NONE', 'NONE'),
+        ('COMNPAY', 'COMNPAY'),
+    )
+    payment = models.CharField(max_length=255,
+        choices=PAYMENT,
+        default='NONE',
+    )
     class Meta:
         permissions = (
             ("view_assooption", "Peut voir les options de l'asso"),
diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html
index 7802929d..38649e16 100644
--- a/preferences/templates/preferences/display_preferences.html
+++ b/preferences/templates/preferences/display_preferences.html
@@ -54,6 +54,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <tr>
             <th>Creations d'users par tous</th>
             <td>{{ useroptions.all_can_create }}</td>
+        {% if useroptions.user_solde %}
+        <th>Rechargement max</th>
+        <td>{{ useroptions.max_recharge }}</td>
+        {% endif %}
         </tr>
     </table>
     <h4>Préférences machines</h4>
@@ -159,7 +163,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <tr>
             <th>Objet utilisateur de l'association</th>
             <td>{{ assooptions.utilisateur_asso }}</td>
+            <th>Moyen de paiement automatique</th>
+            <td>{{ assooptions.payment }}</td>
         </tr>
+
     </table>
     <h4>Messages personalisé dans les mails</h4>
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:edit-options' 'MailMessageOption' %}">
diff --git a/users/models.py b/users/models.py
index 998678cd..1852c687 100644
--- a/users/models.py
+++ b/users/models.py
@@ -153,7 +153,7 @@ class UserManager(BaseUserManager):
         user.set_password(password)
         if su:
             user.is_superuser=True
-        user.save(using=self._db)    
+        user.save(using=self._db)
         return user
 
     def create_user(self, pseudo, surname, email, password=None):
@@ -409,13 +409,11 @@ class User(FieldPermissionModelMixin, AbstractBaseUser, PermissionsMixin):
         options, _created = OptionalUser.objects.get_or_create()
         user_solde = options.user_solde
         if user_solde:
-            solde_object, _created = Paiement.objects.get_or_create(
-                moyen='Solde'
-            )
+            solde_objects = Paiement.objects.filter(moyen='Solde')
             somme_debit = Vente.objects.filter(
                 facture__in=Facture.objects.filter(
                     user=self,
-                    paiement=solde_object
+                    paiement__in=solde_objects
                 )
             ).aggregate(
                 total=models.Sum(
diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html
index 0e5f30e4..8f399043 100644
--- a/users/templates/users/profil.html
+++ b/users/templates/users/profil.html
@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}Profil{% endblock %}
 
 {% block content %}
-<h2>{{ users.class_name }}</h2>
+<h2>{{ users.class_name }} : {{ users.surname }} {{users.name}}</h2>
     <div>
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:edit-info' users.id %}">
             <i class="glyphicon glyphicon-edit"></i>
@@ -135,13 +135,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% if user_solde %}
         <tr>
             <th>Solde</th>
-            <td>{{ users.solde }} €</td>
-        </tr>
+            <td>{{ users.solde }} €
+		    <a class="btn btn-primary btn-sm" style='float:right' role="button" href="{% url 'cotisations:recharge' %}">
+                    <i class="glyphicon glyphicon-piggy-bank"></i>
+                    Recharger
+                </a>
+            </td>
 	{% endif %}
 	{% if users.shell %}
 	    <th>Shell</th>
 	    <td>{{ users.shell }}</td>
 	{% endif %}
+        </tr>
     </table>
     {% if users.is_class_club %}
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:edit-club-admin-members' users.club.id %}">
@@ -191,7 +196,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <p>Aucune machine</p>
     {% endif %}
     <h2>Cotisations</h2>
-    <h4>{% can_create Facture %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new-facture' users.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Ajouter une cotisation</a>{% acl_end %}  {% if user_solde %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:credit-solde' users.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Modifier le solde</a>{% endif%}</h4>
+    <h4>{% can_create Facture %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new-facture' users.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Ajouter une cotisation</a>  {% if user_solde %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:credit-solde' users.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Modifier le solde</a>{% endif%}{% acl_else %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new_facture_solde' user.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Ajouter une cotisation par solde</a>{% acl_end %}</h4>
     {% if facture_list %}
     {% include "cotisations/aff_cotisations.html" with facture_list=facture_list %}
     {% else %}

From f7657a223627490c5465588535fe38d5b96d9b28 Mon Sep 17 00:00:00 2001
From: Hugo LEVY-FALK <hugo.levy--falk@supelec.fr>
Date: Fri, 12 Jan 2018 01:07:25 +0100
Subject: [PATCH 02/26] Rechargement via comnpay du solde.

---
 cotisations/forms.py                          |   8 ++
 cotisations/models.py                         |   2 +-
 cotisations/payment.py                        | 101 ++++++++++++++++++
 cotisations/payment_utils/__init__.py         |   0
 cotisations/payment_utils/comnpay.py          |  68 ++++++++++++
 .../templates/cotisations/payment.html        |  37 +++++++
 .../templates/cotisations/recharge.html       |  39 +++++++
 cotisations/urls.py                           |  16 +++
 cotisations/views.py                          |  23 ++++
 machines/models.py                            |   1 +
 preferences/forms.py                          |   2 +-
 .../migrations/0029_auto_20180111_1134.py     |  20 ++++
 .../migrations/0030_auto_20180111_2346.py     |  24 +++++
 preferences/models.py                         |   4 +-
 .../preferences/display_preferences.html      |   4 +-
 15 files changed, 343 insertions(+), 6 deletions(-)
 create mode 100644 cotisations/payment.py
 create mode 100644 cotisations/payment_utils/__init__.py
 create mode 100644 cotisations/payment_utils/comnpay.py
 create mode 100644 cotisations/templates/cotisations/payment.html
 create mode 100644 cotisations/templates/cotisations/recharge.html
 create mode 100644 preferences/migrations/0029_auto_20180111_1134.py
 create mode 100644 preferences/migrations/0030_auto_20180111_2346.py

diff --git a/cotisations/forms.py b/cotisations/forms.py
index bbe50b69..303ee32e 100644
--- a/cotisations/forms.py
+++ b/cotisations/forms.py
@@ -279,3 +279,11 @@ class NewFactureSoldeForm(NewFactureForm):
             raise forms.ValidationError("Le numéro de chèque et\
                 la banque sont obligatoires.")
         return cleaned_data
+
+
+class RechargeForm(Form):
+    value = forms.FloatField(
+        label='Valeur',
+        min_value=0.01,
+        validators = []
+    )
diff --git a/cotisations/models.py b/cotisations/models.py
index a775237c..07c3b8fa 100644
--- a/cotisations/models.py
+++ b/cotisations/models.py
@@ -289,7 +289,7 @@ class Vente(models.Model):
         if not user_request.has_perm('cotisations.change_vente'):
             return False, u"Vous n'avez pas le droit d'éditer les ventes"
         elif not user_request.has_perm('cotisations.change_all_facture') and not self.facture.user.can_edit(user_request, *args, **kwargs)[0]:
-            return False, u"Vous ne pouvez pas éditer les factures de cet user protégé"       
+            return False, u"Vous ne pouvez pas éditer les factures de cet user protégé"
         elif not user_request.has_perm('cotisations.change_all_vente') and\
             (self.facture.control or not self.facture.valid):
             return False, u"Vous n'avez pas le droit d'éditer une vente\
diff --git a/cotisations/payment.py b/cotisations/payment.py
new file mode 100644
index 00000000..ab7260b2
--- /dev/null
+++ b/cotisations/payment.py
@@ -0,0 +1,101 @@
+"""Payment
+
+Here are defined some views dedicated to online payement.
+"""
+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.http import HttpResponse, HttpResponseBadRequest
+
+from collections import OrderedDict
+from .models import Facture
+from .payment_utils.comnpay import Payment as ComnpayPayment
+
+@csrf_exempt
+@login_required
+def accept_payment(request, factureid):
+    facture = get_object_or_404(Facture, id=factureid)
+    messages.success(
+        request,
+        "Le paiement de {} € a été accepté.".format(facture.prix())
+    )
+    return redirect(reverse('users:profil', kwargs={'userid':request.user.id}))
+
+
+@csrf_exempt
+@login_required
+def refuse_payment(request):
+    messages.error(
+        request,
+        "Le paiement a été refusé."
+    )
+    return redirect(reverse('users:profil', kwargs={'userid':request.user.id}))
+
+@csrf_exempt
+def ipn(request):
+    p = ComnpayPayment()
+    order = ('idTpe', 'idTransaction', 'montant', 'result', 'sec', )
+    try:
+        data = OrderedDict([(f, request.POST[f]) for f in order])
+    except MultiValueDictKeyError:
+        return HttpResponseBadRequest("HTTP/1.1 400 Bad Request")
+
+    if not p.validSec(data, "DEMO"):
+        return HttpResponseBadRequest("HTTP/1.1 400 Bad Request")
+
+    result = True if (request.POST['result'] == 'OK') else False
+    idTpe = request.POST['idTpe']
+    idTransaction = request.POST['idTransaction']
+
+    # On vérifie que le paiement nous est destiné
+    if not idTpe == "DEMO":
+        return HttpResponseBadRequest("HTTP/1.1 400 Bad Request")
+
+    try:
+        factureid = int(idTransaction)
+    except ValueError:
+        return HttpResponseBadRequest("HTTP/1.1 400 Bad Request")
+
+    facture = get_object_or_404(Facture, id=factureid)
+
+    # On vérifie que le paiement est valide
+    if not result:
+        # Le paiement a échoué : on effectue les actions nécessaires (On indique qu'elle a échoué)
+        facture.delete()
+
+        # On notifie au serveur ComNPay qu'on a reçu les données pour traitement
+        return HttpResponse("HTTP/1.1 200 OK")
+
+    facture.valid = True
+    facture.save()
+
+    # A nouveau, on notifie au serveur qu'on a bien traité les données
+    return HttpResponse("HTTP/1.0 200 OK")
+
+
+def comnpay(facture, host):
+    p = ComnpayPayment(
+        "DEMO",
+        "DEMO",
+        'https://' + host + reverse('cotisations:accept_payment', kwargs={'factureid':facture.id}),
+        'https://' + host + reverse('cotisations:refuse_payment'),
+        'https://' + host + reverse('cotisations:ipn'),
+        "",
+        "D"
+    )
+    r = {
+        'action' : 'https://secure.homologation.comnpay.com',
+        'method' : 'POST',
+        'content' : p.buildSecretHTML("Rechargement du solde", facture.prix(), idTransaction=str(facture.id)),
+        'amount' : facture.prix,
+    }
+    return r
+
+
+PAYMENT_SYSTEM = {
+    'COMNPAY' : comnpay,
+    'NONE' : None
+}
diff --git a/cotisations/payment_utils/__init__.py b/cotisations/payment_utils/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/cotisations/payment_utils/comnpay.py b/cotisations/payment_utils/comnpay.py
new file mode 100644
index 00000000..6c1701d3
--- /dev/null
+++ b/cotisations/payment_utils/comnpay.py
@@ -0,0 +1,68 @@
+import time
+from random import randrange
+import base64
+import hashlib
+from collections import OrderedDict
+from itertools import chain
+
+class Payment():
+
+    vad_number = ""
+    secret_key = ""
+    urlRetourOK = ""
+    urlRetourNOK = ""
+    urlIPN = ""
+    source = ""
+    typeTr = "D"
+
+    def __init__(self, vad_number = "", secret_key = "", urlRetourOK = "", urlRetourNOK = "", urlIPN = "", source="", typeTr="D"):
+        self.vad_number = vad_number
+        self.secret_key = secret_key
+        self.urlRetourOK = urlRetourOK
+        self.urlRetourNOK = urlRetourNOK
+        self.urlIPN = urlIPN
+        self.source = source
+        self.typeTr = typeTr
+
+    def buildSecretHTML(self, produit="Produit", montant="0.00", idTransaction=""):
+        if idTransaction == "":
+            self.idTransaction = str(time.time())+self.vad_number+str(randrange(999))
+        else:
+            self.idTransaction = idTransaction
+
+        array_tpe   = OrderedDict(
+                montant= str(montant),
+                idTPE= self.vad_number,
+                idTransaction= self.idTransaction,
+                devise= "EUR",
+                lang= 'fr',
+                nom_produit= produit,
+                source= self.source,
+                urlRetourOK= self.urlRetourOK,
+                urlRetourNOK= self.urlRetourNOK,
+                typeTr= str(self.typeTr)
+        )
+
+        if self.urlIPN!="":
+            array_tpe['urlIPN'] = self.urlIPN
+
+        array_tpe['key'] = self.secret_key;
+        strWithKey = base64.b64encode(bytes('|'.join(array_tpe.values()), 'utf-8'))
+        del array_tpe["key"]
+        array_tpe['sec'] = hashlib.sha512(strWithKey).hexdigest()
+
+        ret = ""
+        for key in array_tpe:
+            ret += '<input type="hidden" name="'+key+'" value="'+array_tpe[key]+'"/>'
+
+        return ret
+
+    def validSec(self, values, secret_key):
+        if "sec" in values:
+            sec = values['sec']
+            del values["sec"]
+            strWithKey = hashlib.sha512(base64.b64encode(bytes('|'.join(values.values()) +"|"+secret_key, 'utf-8'))).hexdigest()
+            return strWithKey.upper() == sec.upper()
+        else:
+            return False
+
diff --git a/cotisations/templates/cotisations/payment.html b/cotisations/templates/cotisations/payment.html
new file mode 100644
index 00000000..46f26784
--- /dev/null
+++ b/cotisations/templates/cotisations/payment.html
@@ -0,0 +1,37 @@
+{% extends "cotisations/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 staticfiles%}
+
+{% block title %}Rechargement du solde{% endblock %}
+
+{% block content %}
+<h3>Recharger de {{ amount }} €</h3>
+<form class="form" method="{{ method }}" action="{{action}}">
+    {{ content | safe }}
+    {% bootstrap_button "Payer" button_type="submit" icon="piggy-bank" %}
+</form>
+{% endblock %}
diff --git a/cotisations/templates/cotisations/recharge.html b/cotisations/templates/cotisations/recharge.html
new file mode 100644
index 00000000..6ca68696
--- /dev/null
+++ b/cotisations/templates/cotisations/recharge.html
@@ -0,0 +1,39 @@
+{% extends "cotisations/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 staticfiles%}
+
+{% block title %}Rechargement du solde{% endblock %}
+
+{% block content %}
+<h3>Rechargement du solde</h3>
+<p>Solde de l'utilisateur : {{ request.user.solde }} €</p>
+<form class="form" method="post">
+    {% csrf_token %}
+    {% bootstrap_form rechargeform %}
+    {% bootstrap_button "Valider" button_type="submit" icon="piggy-bank" %}
+</form>
+{% endblock %}
diff --git a/cotisations/urls.py b/cotisations/urls.py
index cbeeb8eb..0040e48c 100644
--- a/cotisations/urls.py
+++ b/cotisations/urls.py
@@ -115,5 +115,21 @@ urlpatterns = [
         views.new_facture_solde,
         name='new_facture_solde'
         ),
+    url(r'^recharge/$',
+        views.recharge,
+        name='recharge'
+        ),
+    url(r'^payment/accept/(?P<factureid>[0-9]+)$',
+        payment.accept_payment,
+        name='accept_payment'
+       ),
+    url(r'^payment/refuse/$',
+        payment.refuse_payment,
+        name='refuse_payment'
+       ),
+    url(r'^payment/ipn/$',
+        payment.ipn,
+        name='ipn'
+       ),
     url(r'^$', views.index, name='index'),
 ]
diff --git a/cotisations/views.py b/cotisations/views.py
index e338943e..10e85ed0 100644
--- a/cotisations/views.py
+++ b/cotisations/views.py
@@ -37,6 +37,8 @@ from django.db import transaction
 from django.db.models import Q
 from django.forms import modelformset_factory, formset_factory
 from django.utils import timezone
+from django.views.decorators.csrf import csrf_exempt
+from django.views.decorators.debug import sensitive_variables
 from reversion import revisions as reversion
 from reversion.models import Version
 # Import des models, forms et fonctions re2o
@@ -72,6 +74,7 @@ from .forms import (
     NewFactureSoldeForm,
     RechargeForm
 )
+from . import payment
 from .tex import render_invoice
 
 
@@ -682,3 +685,23 @@ def new_facture_solde(request, userid):
         }, 'cotisations/new_facture_solde.html', request)
 
 
+@login_required
+def recharge(request):
+    f = RechargeForm(request.POST or None)
+    if f.is_valid():
+        facture = Facture(user=request.user)
+        paiement, _created = Paiement.objects.get_or_create(moyen='Rechargement en ligne')
+        facture.paiement = paiement
+        facture.valid = False
+        facture.save()
+        v = Vente.objects.create(
+            facture=facture,
+            name='solde',
+            prix=f.cleaned_data['value'],
+            number=1,
+        )
+        v.save()
+        options, _created = AssoOption.objects.get_or_create()
+        content = payment.PAYMENT_SYSTEM[options.payment](facture, request.get_host())
+        return render(request, 'cotisations/payment.html', content)
+    return form({'rechargeform':f}, 'cotisations/recharge.html', request)
diff --git a/machines/models.py b/machines/models.py
index 59965983..15864707 100644
--- a/machines/models.py
+++ b/machines/models.py
@@ -2153,3 +2153,4 @@ def srv_post_save(sender, **kwargs):
 def text_post_delete(sender, **kwargs):
     """Regeneration dns après modification d'un SRV"""
     regen('dns')
+
diff --git a/preferences/forms.py b/preferences/forms.py
index 2f79b6fb..1fa42efc 100644
--- a/preferences/forms.py
+++ b/preferences/forms.py
@@ -48,7 +48,7 @@ class EditOptionalUserForm(ModelForm):
         téléphone'
         self.fields['user_solde'].label = 'Activation du solde pour\
         les utilisateurs'
-        self.fields['max_recharge'].label = 'Rechargement max'
+        self.fields['max_solde'].label = 'Solde maximum'
 
 
 class EditOptionalMachineForm(ModelForm):
diff --git a/preferences/migrations/0029_auto_20180111_1134.py b/preferences/migrations/0029_auto_20180111_1134.py
new file mode 100644
index 00000000..92220312
--- /dev/null
+++ b/preferences/migrations/0029_auto_20180111_1134.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-01-11 10:34
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0028_auto_20180111_1129'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='assooption',
+            name='payment',
+            field=models.CharField(choices=[('NONE', 'NONE'), ('COMNPAY', 'COMNPAY')], default='NONE', max_length=255),
+        ),
+    ]
diff --git a/preferences/migrations/0030_auto_20180111_2346.py b/preferences/migrations/0030_auto_20180111_2346.py
new file mode 100644
index 00000000..7f912bbd
--- /dev/null
+++ b/preferences/migrations/0030_auto_20180111_2346.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-01-11 22:46
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0029_auto_20180111_1134'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='optionaluser',
+            name='max_recharge',
+        ),
+        migrations.AddField(
+            model_name='optionaluser',
+            name='max_solde',
+            field=models.DecimalField(decimal_places=2, default=50, max_digits=5),
+        ),
+    ]
diff --git a/preferences/models.py b/preferences/models.py
index 1d4b9bd2..44bb6580 100644
--- a/preferences/models.py
+++ b/preferences/models.py
@@ -41,10 +41,10 @@ class OptionalUser(models.Model):
         decimal_places=2,
         default=0
     )
-    max_recharge = models.DecimalField(
+    max_solde = models.DecimalField(
         max_digits=5,
         decimal_places=2,
-        default=100
+        default=50
     )
     gpg_fingerprint = models.BooleanField(default=True)
     all_can_create = models.BooleanField(
diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html
index 38649e16..d483cdb4 100644
--- a/preferences/templates/preferences/display_preferences.html
+++ b/preferences/templates/preferences/display_preferences.html
@@ -55,8 +55,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <th>Creations d'users par tous</th>
             <td>{{ useroptions.all_can_create }}</td>
         {% if useroptions.user_solde %}
-        <th>Rechargement max</th>
-        <td>{{ useroptions.max_recharge }}</td>
+        <th>Solde maximum</th>
+        <td>{{ useroptions.max_solde }}</td>
         {% endif %}
         </tr>
     </table>

From cbe541d382758162da57ef009d8fc42434cca968 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Fri, 12 Jan 2018 16:03:48 +0100
Subject: [PATCH 03/26] =?UTF-8?q?Fix,=20le=20solde=20est=20calcul=C3=A9=20?=
 =?UTF-8?q?pour=20des=20factures=20valides?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 users/models.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/users/models.py b/users/models.py
index 1852c687..148142a4 100644
--- a/users/models.py
+++ b/users/models.py
@@ -413,7 +413,8 @@ class User(FieldPermissionModelMixin, AbstractBaseUser, PermissionsMixin):
             somme_debit = Vente.objects.filter(
                 facture__in=Facture.objects.filter(
                     user=self,
-                    paiement__in=solde_objects
+                    paiement__in=solde_objects,
+                    valid=True
                 )
             ).aggregate(
                 total=models.Sum(
@@ -422,7 +423,7 @@ class User(FieldPermissionModelMixin, AbstractBaseUser, PermissionsMixin):
                 )
             )['total'] or 0
             somme_credit = Vente.objects.filter(
-                facture__in=Facture.objects.filter(user=self),
+                facture__in=Facture.objects.filter(user=self, valid=True),
                 name="solde"
             ).aggregate(
                 total=models.Sum(

From 5319ed266c3fe872237074d568fde4f61f66f286 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Sat, 13 Jan 2018 15:53:53 +0100
Subject: [PATCH 04/26] Un peu de joli icone

---
 cotisations/templates/cotisations/recharge.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cotisations/templates/cotisations/recharge.html b/cotisations/templates/cotisations/recharge.html
index 6ca68696..d38b7614 100644
--- a/cotisations/templates/cotisations/recharge.html
+++ b/cotisations/templates/cotisations/recharge.html
@@ -29,8 +29,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}Rechargement du solde{% endblock %}
 
 {% block content %}
-<h3>Rechargement du solde</h3>
-<p>Solde de l'utilisateur : {{ request.user.solde }} €</p>
+<h2>Rechargement du solde</h2>
+<h3>Solde : <span class="label label-default">{{ request.user.solde }} €</span></h3>
 <form class="form" method="post">
     {% csrf_token %}
     {% bootstrap_form rechargeform %}

From a71e01e18a478e763a2f47f873899bf8e8944573 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Sun, 14 Jan 2018 20:15:21 +0100
Subject: [PATCH 05/26] Montant minimal de rechargement + refactor de la
 fonction payment + self adhesion

---
 cotisations/forms.py                          | 15 ++++++++++++++
 cotisations/payment.py                        |  3 ++-
 cotisations/views.py                          |  4 ++--
 preferences/forms.py                          |  2 ++
 .../0031_optionaluser_self_adhesion.py        | 20 +++++++++++++++++++
 .../0032_optionaluser_min_online_payment.py   | 20 +++++++++++++++++++
 preferences/models.py                         |  9 +++++++++
 .../preferences/display_preferences.html      | 14 +++++++++----
 8 files changed, 80 insertions(+), 7 deletions(-)
 create mode 100644 preferences/migrations/0031_optionaluser_self_adhesion.py
 create mode 100644 preferences/migrations/0032_optionaluser_min_online_payment.py

diff --git a/cotisations/forms.py b/cotisations/forms.py
index 303ee32e..c4e02397 100644
--- a/cotisations/forms.py
+++ b/cotisations/forms.py
@@ -41,6 +41,8 @@ from django.db.models import Q
 from django.forms import ModelForm, Form
 from django.core.validators import MinValueValidator,MaxValueValidator
 from .models import Article, Paiement, Facture, Banque
+from preferences.models import OptionalUser
+from users.models import User
 
 from re2o.field_permissions import FieldPermissionFormMixin
 
@@ -287,3 +289,16 @@ class RechargeForm(Form):
         min_value=0.01,
         validators = []
     )
+
+    def __init__(self, *args, **kwargs):
+        self.user = kwargs.pop('user')
+        super(RechargeForm, self).__init__(*args, **kwargs)
+
+    def clean_value(self):
+        value = self.cleaned_data['value']
+        options, _created = OptionalUser.objects.get_or_create()
+        if value < options.min_online_payment:
+            raise forms.ValidationError("Montant inférieur au montant minimal de paiement en ligne (%s) €" % options.min_online_payment)
+        if value + self.user.solde > options.max_solde:
+            raise forms.ValidationError("Le solde ne peux excéder %s " % options.max_solde)
+        return value
diff --git a/cotisations/payment.py b/cotisations/payment.py
index ab7260b2..b2e684d7 100644
--- a/cotisations/payment.py
+++ b/cotisations/payment.py
@@ -76,7 +76,8 @@ def ipn(request):
     return HttpResponse("HTTP/1.0 200 OK")
 
 
-def comnpay(facture, host):
+def comnpay(facture, request):
+    host = request.get_host()
     p = ComnpayPayment(
         "DEMO",
         "DEMO",
diff --git a/cotisations/views.py b/cotisations/views.py
index 10e85ed0..24320b2b 100644
--- a/cotisations/views.py
+++ b/cotisations/views.py
@@ -687,7 +687,7 @@ def new_facture_solde(request, userid):
 
 @login_required
 def recharge(request):
-    f = RechargeForm(request.POST or None)
+    f = RechargeForm(request.POST or None, user=request.user)
     if f.is_valid():
         facture = Facture(user=request.user)
         paiement, _created = Paiement.objects.get_or_create(moyen='Rechargement en ligne')
@@ -702,6 +702,6 @@ def recharge(request):
         )
         v.save()
         options, _created = AssoOption.objects.get_or_create()
-        content = payment.PAYMENT_SYSTEM[options.payment](facture, request.get_host())
+        content = payment.PAYMENT_SYSTEM[options.payment](facture, request)
         return render(request, 'cotisations/payment.html', content)
     return form({'rechargeform':f}, 'cotisations/recharge.html', request)
diff --git a/preferences/forms.py b/preferences/forms.py
index 1fa42efc..03fa6360 100644
--- a/preferences/forms.py
+++ b/preferences/forms.py
@@ -49,6 +49,8 @@ class EditOptionalUserForm(ModelForm):
         self.fields['user_solde'].label = 'Activation du solde pour\
         les utilisateurs'
         self.fields['max_solde'].label = 'Solde maximum'
+        self.fields['min_online_payment'].label = 'Montant de rechargement minimum en ligne'
+        self.fields['self_adhesion'].label = 'Auto inscription'
 
 
 class EditOptionalMachineForm(ModelForm):
diff --git a/preferences/migrations/0031_optionaluser_self_adhesion.py b/preferences/migrations/0031_optionaluser_self_adhesion.py
new file mode 100644
index 00000000..48a95044
--- /dev/null
+++ b/preferences/migrations/0031_optionaluser_self_adhesion.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-01-12 11:34
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0030_auto_20180111_2346'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='optionaluser',
+            name='self_adhesion',
+            field=models.BooleanField(default=False, help_text='Un nouvel utilisateur peut se créer son compte sur re2o'),
+        ),
+    ]
diff --git a/preferences/migrations/0032_optionaluser_min_online_payment.py b/preferences/migrations/0032_optionaluser_min_online_payment.py
new file mode 100644
index 00000000..ef78d012
--- /dev/null
+++ b/preferences/migrations/0032_optionaluser_min_online_payment.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-01-13 16:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0031_optionaluser_self_adhesion'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='optionaluser',
+            name='min_online_payment',
+            field=models.DecimalField(decimal_places=2, default=10, max_digits=5),
+        ),
+    ]
diff --git a/preferences/models.py b/preferences/models.py
index 44bb6580..d4c25c24 100644
--- a/preferences/models.py
+++ b/preferences/models.py
@@ -46,11 +46,20 @@ class OptionalUser(models.Model):
         decimal_places=2,
         default=50
     )
+    min_online_payment = models.DecimalField(
+        max_digits=5,
+        decimal_places=2,
+        default=10
+    )
     gpg_fingerprint = models.BooleanField(default=True)
     all_can_create = models.BooleanField(
         default=False,
         help_text="Tous les users peuvent en créer d'autres",
     )
+    self_adhesion = models.BooleanField(
+        default=False,
+        help_text="Un nouvel utilisateur peut se créer son compte sur re2o"
+    )
 
     class Meta:
         permissions = (
diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html
index d483cdb4..45a4fd11 100644
--- a/preferences/templates/preferences/display_preferences.html
+++ b/preferences/templates/preferences/display_preferences.html
@@ -54,11 +54,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <tr>
             <th>Creations d'users par tous</th>
             <td>{{ useroptions.all_can_create }}</td>
-        {% if useroptions.user_solde %}
-        <th>Solde maximum</th>
-        <td>{{ useroptions.max_solde }}</td>
-        {% endif %}
+            <th>Auto inscription</th>
+            <td>{{ useroptions.self_adhesion }}</td>
         </tr>
+	{% if useroptions.user_solde %}
+	<tr>
+	<th>Solde maximum</th>
+        <td>{{ useroptions.max_solde }}</td>
+	<th>Montant minimal de rechargement en ligne</th>
+	<td>{{ useroptions.min_online_payment }}</td>
+	</tr>
+	{% endif %}
     </table>
     <h4>Préférences machines</h4>
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:edit-options' 'OptionalMachine' %}">

From b0fca7f6b6420ce1723d689fb4fc41553fc14222 Mon Sep 17 00:00:00 2001
From: Yoann Pietri <yoann.pietri@supelec.fr>
Date: Sun, 14 Jan 2018 23:47:44 +0100
Subject: [PATCH 06/26] =?UTF-8?q?Impl=C3=A9mentation=20de=20l'auto=20inscr?=
 =?UTF-8?q?iption?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 preferences/forms.py                              |  1 +
 preferences/models.py                             | 10 ++++++++++
 .../preferences/display_preferences.html          |  6 ++++++
 .../templates/preferences/edit_preferences.html   |  2 +-
 preferences/views.py                              |  1 +
 re2o/acl.py                                       |  5 ++---
 re2o/settings.py                                  |  2 +-
 templates/base.html                               | 15 +++++++++++++--
 users/models.py                                   | 11 +++++++----
 users/templates/users/user.html                   |  4 ++++
 users/views.py                                    |  6 ++++--
 11 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/preferences/forms.py b/preferences/forms.py
index 03fa6360..fc214f52 100644
--- a/preferences/forms.py
+++ b/preferences/forms.py
@@ -117,6 +117,7 @@ class EditGeneralOptionForm(ModelForm):
         self.fields['site_name'].label = 'Nom du site web'
         self.fields['email_from'].label = "Adresse mail d\
         'expedition automatique"
+        self.fields['GTU_sum_up'].label = "Résumé des CGU"
 
 
 class EditAssoOptionForm(ModelForm):
diff --git a/preferences/models.py b/preferences/models.py
index d4c25c24..133d6f82 100644
--- a/preferences/models.py
+++ b/preferences/models.py
@@ -302,6 +302,16 @@ class GeneralOption(models.Model):
     req_expire_hrs = models.IntegerField(default=48)
     site_name = models.CharField(max_length=32, default="Re2o")
     email_from = models.EmailField(default="www-data@serveur.net")
+    GTU_sum_up = models.TextField(
+        default="",
+        blank=True,
+    )
+    GTU = models.FileField(
+        upload_to = '',
+        default="",
+        null=True,
+        blank=True,
+    )
 
     class Meta:
         permissions = (
diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html
index 45a4fd11..e46564a3 100644
--- a/preferences/templates/preferences/display_preferences.html
+++ b/preferences/templates/preferences/display_preferences.html
@@ -137,7 +137,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	<tr>
             <th>Message global affiché sur le site</th>
             <td>{{ generaloptions.general_message }}</td>
+            <th>Résumé des CGU</th>
+            <td>{{ generaloptions.GTU_sum_up }}</td>
 	<tr>
+    <tr>
+        <th>CGU</th>
+        <td>{{generaloptions.GTU}}</th>
+    </tr>
     </table>
     <h4>Données de l'association</h4>
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:edit-options' 'AssoOption' %}">
diff --git a/preferences/templates/preferences/edit_preferences.html b/preferences/templates/preferences/edit_preferences.html
index 02f006c1..8d75f289 100644
--- a/preferences/templates/preferences/edit_preferences.html
+++ b/preferences/templates/preferences/edit_preferences.html
@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <h3>Edition des préférences</h3>
 
-<form class="form" method="post">
+<form class="form" method="post" enctype="multipart/form-data">
 {% csrf_token %}
 {% massive_bootstrap_form options 'utilisateur_asso' %}
 {% bootstrap_button "Créer ou modifier" button_type="submit" icon="star" %}
diff --git a/preferences/views.py b/preferences/views.py
index c7ee5202..7a609a76 100644
--- a/preferences/views.py
+++ b/preferences/views.py
@@ -95,6 +95,7 @@ def edit_options(request, section):
         return redirect(reverse('index'))
     options = form_instance(
         request.POST or None,
+        request.FILES or None,
         instance=options_instance
     )
     if options.is_valid():
diff --git a/re2o/acl.py b/re2o/acl.py
index ffbbea42..23636ee4 100644
--- a/re2o/acl.py
+++ b/re2o/acl.py
@@ -45,11 +45,10 @@ def can_create(model):
     def decorator(view):
         def wrapper(request, *args, **kwargs):
             can, msg = model.can_create(request.user, *args, **kwargs)
+            #options, _created = OptionalUser.objects.get_or_create()
             if not can:
                 messages.error(request, msg or "Vous ne pouvez pas accéder à ce menu")
-                return redirect(reverse('users:profil',
-                    kwargs={'userid':str(request.user.id)}
-                ))
+                return redirect(reverse('index'))
             return view(request, *args, **kwargs)
         return wrapper
     return decorator
diff --git a/re2o/settings.py b/re2o/settings.py
index c342ef93..f88bd266 100644
--- a/re2o/settings.py
+++ b/re2o/settings.py
@@ -150,7 +150,7 @@ STATICFILES_DIRS = (
     ),
 )
 
-MEDIA_ROOT = '/var/www/re2o/static'
+MEDIA_ROOT = '/var/www/re2o/media'
 
 STATIC_URL = '/static/'
 
diff --git a/templates/base.html b/templates/base.html
index b3a9bb5d..0a0c3db0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -26,6 +26,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {# Load the tag library #}
 {% load bootstrap3 %}
 {% load acl %}
+{% load self_adhesion %}
+{% self_adhesion as var_sa %}
 <!DOCTYPE html>
 <html lang="fr">
     <head prefix="og: http://ogp.me/ns#">
@@ -102,17 +104,26 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                             </form>
                         </div>
                         <ul class="nav navbar-nav navbar-right">
-                            <li>
                                 {% if request.user.is_authenticated %}
+                                <li>
                                 <a href="{% url 'logout' %}">
                                     <span class="glyphicon glyphicon-log-out"></span> Logout
                                 </a>
+                                </li>
                                 {% else %}
+                                {% if var_sa %}
+                                <li>
+                                    <a href="{% url 'users:new-user' %}">
+                                    <span class="glyphicon glyphicon-user"></span> Créer un compte
+                                </a>
+                                </li>
+                                {% endif %}
+                                <li>
                                 <a href="{% url 'login' %}">
                                     <span class="glyphicon glyphicon-log-in"></span> Login
                                 </a>
+                                </li>
                                 {% endif %}
-			    </li>
 			</ul>
                         {% can_view_app preferences %}
                         <ul class="nav navbar-nav navbar-right">
diff --git a/users/models.py b/users/models.py
index 148142a4..d3c1d175 100644
--- a/users/models.py
+++ b/users/models.py
@@ -684,10 +684,13 @@ class User(FieldPermissionModelMixin, AbstractBaseUser, PermissionsMixin):
         an user or if the `options.all_can_create` is set.
         """
         options, _created = OptionalUser.objects.get_or_create()
-        if options.all_can_create:
-            return True, None
+        if(not user_request.is_authenticated and not options.self_adhesion):
+            return False, None
         else:
-            return user_request.has_perm('users.add_user'), u"Vous n'avez pas le\
+            if(options.all_can_create or options.self_adhesion):
+                return True, None
+            else:
+                return user_request.has_perm('users.add_user'), u"Vous n'avez pas le\
                     droit de créer un utilisateur"
 
     def can_edit(self, user_request, *args, **kwargs):
@@ -862,7 +865,7 @@ class Club(User):
         """
         if user_request.has_perm('users.view_user'):
             return True, None
-        if user_request.is_class_adherent:
+        if hasattr(user_request,'is_class_adherent') and user_request.is_class_adherent:
             if user_request.adherent.club_administrator.all() or user_request.adherent.club_members.all():
                 return True, None
         return False, u"Vous n'avez pas accès à la liste des utilisateurs."
diff --git a/users/templates/users/user.html b/users/templates/users/user.html
index 26b7e0ee..20931031 100644
--- a/users/templates/users/user.html
+++ b/users/templates/users/user.html
@@ -36,6 +36,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% massive_bootstrap_form userform 'room,school,administrators,members' %}
     {% bootstrap_button "Créer ou modifier" button_type="submit" icon="star" %}
 </form>
+<br>
+<p>En cliquant sur Créer ou modifier, l'utilisateur s'engage à respecter les <a href="/media/{{ GTU }}" download="CGU" >règles d'utilisation du réseau</a>.</p>
+<h3>Résumé des règles d'utilisations</h3>
+<p>{{ GTU_sum_up }}</p>
 <br/>
 <br/>
 <br/>
diff --git a/users/views.py b/users/views.py
index bff33907..e3f73f38 100644
--- a/users/views.py
+++ b/users/views.py
@@ -117,12 +117,14 @@ def password_change_action(u_form, user, request, req=False):
         kwargs={'userid':str(user.id)}
         ))
 
-@login_required
 @can_create(Adherent)
 def new_user(request):
     """ Vue de création d'un nouvel utilisateur,
     envoie un mail pour le mot de passe"""
     user = AdherentForm(request.POST or None, user=request.user)
+    options, _created = GeneralOption.objects.get_or_create()
+    GTU_sum_up = options.GTU_sum_up
+    GTU = options.GTU
     if user.is_valid():
         user = user.save(commit=False)
         with transaction.atomic(), reversion.create_revision():
@@ -136,7 +138,7 @@ def new_user(request):
             'users:profil',
             kwargs={'userid':str(user.id)}
             ))
-    return form({'userform': user}, 'users/user.html', request)
+    return form({'userform': user,'GTU_sum_up':GTU_sum_up,'GTU':GTU}, 'users/user.html', request)
 
 
 @login_required

From c57f155e245fed60d507f6bb72bdfbff82df1e4c Mon Sep 17 00:00:00 2001
From: Yoann Pietri <yoann.pietri@supelec.fr>
Date: Mon, 15 Jan 2018 01:06:08 +0100
Subject: [PATCH 07/26] Oubli d'ajout de fichiers

---
 .../0033_generaloption_gtu_sum_up.py          | 20 +++++++++++++
 .../migrations/0034_auto_20180114_2025.py     | 25 +++++++++++++++++
 .../migrations/0035_auto_20180114_2132.py     | 20 +++++++++++++
 .../migrations/0036_auto_20180114_2141.py     | 20 +++++++++++++
 .../migrations/0037_auto_20180114_2156.py     | 20 +++++++++++++
 .../migrations/0038_auto_20180114_2209.py     | 20 +++++++++++++
 re2o/templatetags/self_adhesion.py            | 28 +++++++++++++++++++
 7 files changed, 153 insertions(+)
 create mode 100644 preferences/migrations/0033_generaloption_gtu_sum_up.py
 create mode 100644 preferences/migrations/0034_auto_20180114_2025.py
 create mode 100644 preferences/migrations/0035_auto_20180114_2132.py
 create mode 100644 preferences/migrations/0036_auto_20180114_2141.py
 create mode 100644 preferences/migrations/0037_auto_20180114_2156.py
 create mode 100644 preferences/migrations/0038_auto_20180114_2209.py
 create mode 100644 re2o/templatetags/self_adhesion.py

diff --git a/preferences/migrations/0033_generaloption_gtu_sum_up.py b/preferences/migrations/0033_generaloption_gtu_sum_up.py
new file mode 100644
index 00000000..63c2df5e
--- /dev/null
+++ b/preferences/migrations/0033_generaloption_gtu_sum_up.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-01-14 19:12
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0032_optionaluser_min_online_payment'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='generaloption',
+            name='GTU_sum_up',
+            field=models.TextField(blank=True, default='', help_text='Résumé des CGU'),
+        ),
+    ]
diff --git a/preferences/migrations/0034_auto_20180114_2025.py b/preferences/migrations/0034_auto_20180114_2025.py
new file mode 100644
index 00000000..b6969021
--- /dev/null
+++ b/preferences/migrations/0034_auto_20180114_2025.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-01-14 19:25
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0033_generaloption_gtu_sum_up'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='generaloption',
+            name='GTU',
+            field=models.FileField(default='', upload_to='GTU'),
+        ),
+        migrations.AlterField(
+            model_name='generaloption',
+            name='GTU_sum_up',
+            field=models.TextField(blank=True, default=''),
+        ),
+    ]
diff --git a/preferences/migrations/0035_auto_20180114_2132.py b/preferences/migrations/0035_auto_20180114_2132.py
new file mode 100644
index 00000000..e3767828
--- /dev/null
+++ b/preferences/migrations/0035_auto_20180114_2132.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-01-14 20:32
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0034_auto_20180114_2025'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='generaloption',
+            name='GTU',
+            field=models.FileField(default='', upload_to='/var/www/static/'),
+        ),
+    ]
diff --git a/preferences/migrations/0036_auto_20180114_2141.py b/preferences/migrations/0036_auto_20180114_2141.py
new file mode 100644
index 00000000..1b844ac8
--- /dev/null
+++ b/preferences/migrations/0036_auto_20180114_2141.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-01-14 20:41
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0035_auto_20180114_2132'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='generaloption',
+            name='GTU',
+            field=models.FileField(default='', upload_to=''),
+        ),
+    ]
diff --git a/preferences/migrations/0037_auto_20180114_2156.py b/preferences/migrations/0037_auto_20180114_2156.py
new file mode 100644
index 00000000..efafa806
--- /dev/null
+++ b/preferences/migrations/0037_auto_20180114_2156.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-01-14 20:56
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0036_auto_20180114_2141'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='generaloption',
+            name='GTU',
+            field=models.FileField(default='', null=True, upload_to=''),
+        ),
+    ]
diff --git a/preferences/migrations/0038_auto_20180114_2209.py b/preferences/migrations/0038_auto_20180114_2209.py
new file mode 100644
index 00000000..3077ebff
--- /dev/null
+++ b/preferences/migrations/0038_auto_20180114_2209.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-01-14 21:09
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0037_auto_20180114_2156'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='generaloption',
+            name='GTU',
+            field=models.FileField(blank=True, default='', null=True, upload_to=''),
+        ),
+    ]
diff --git a/re2o/templatetags/self_adhesion.py b/re2o/templatetags/self_adhesion.py
new file mode 100644
index 00000000..e940a5a9
--- /dev/null
+++ b/re2o/templatetags/self_adhesion.py
@@ -0,0 +1,28 @@
+# 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.
+from django import template
+from preferences.models import OptionalUser, GeneralOption
+register = template.Library()
+@register.simple_tag
+def self_adhesion():
+    options, _created = OptionalUser.objects.get_or_create()
+    return options.self_adhesion

From d69433014917b339a8a4104b15e3f99a7d25e0c0 Mon Sep 17 00:00:00 2001
From: Hugo Levy-Falk <hugo.levy--falk@supelec.fr>
Date: Mon, 15 Jan 2018 01:06:54 +0100
Subject: [PATCH 08/26] Stockage en BDD des identifiants comnpay.

---
 .gitignore                                    |  1 +
 cotisations/payment.py                        | 23 +++++---
 preferences/aes_field.py                      | 53 +++++++++++++++++++
 .../migrations/0039_auto_20180115_0003.py     | 26 +++++++++
 .../migrations/0040_auto_20180115_0010.py     | 26 +++++++++
 preferences/models.py                         | 12 +++++
 re2o/settings_local.example.py                |  4 ++
 7 files changed, 139 insertions(+), 6 deletions(-)
 create mode 100644 preferences/aes_field.py
 create mode 100644 preferences/migrations/0039_auto_20180115_0003.py
 create mode 100644 preferences/migrations/0040_auto_20180115_0010.py

diff --git a/.gitignore b/.gitignore
index 438dfbcd..c65c2cc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ re2o.png
 __pycache__/*
 static_files/*
 static/logo/*
+media/*
diff --git a/cotisations/payment.py b/cotisations/payment.py
index b2e684d7..07cbe5dc 100644
--- a/cotisations/payment.py
+++ b/cotisations/payment.py
@@ -11,6 +11,8 @@ from django.utils.datastructures import MultiValueDictKeyError
 from django.http import HttpResponse, HttpResponseBadRequest
 
 from collections import OrderedDict
+
+from preferences.models import AssoOption
 from .models import Facture
 from .payment_utils.comnpay import Payment as ComnpayPayment
 
@@ -36,6 +38,7 @@ def refuse_payment(request):
 
 @csrf_exempt
 def ipn(request):
+    option, _created = AssoOption.objects.get_or_create()
     p = ComnpayPayment()
     order = ('idTpe', 'idTransaction', 'montant', 'result', 'sec', )
     try:
@@ -43,7 +46,7 @@ def ipn(request):
     except MultiValueDictKeyError:
         return HttpResponseBadRequest("HTTP/1.1 400 Bad Request")
 
-    if not p.validSec(data, "DEMO"):
+    if not p.validSec(data, option.payment_pass):
         return HttpResponseBadRequest("HTTP/1.1 400 Bad Request")
 
     result = True if (request.POST['result'] == 'OK') else False
@@ -51,7 +54,7 @@ def ipn(request):
     idTransaction = request.POST['idTransaction']
 
     # On vérifie que le paiement nous est destiné
-    if not idTpe == "DEMO":
+    if not idTpe == option.payment_id:
         return HttpResponseBadRequest("HTTP/1.1 400 Bad Request")
 
     try:
@@ -78,10 +81,14 @@ def ipn(request):
 
 def comnpay(facture, request):
     host = request.get_host()
+    option, _created = AssoOption.objects.get_or_create()
     p = ComnpayPayment(
-        "DEMO",
-        "DEMO",
-        'https://' + host + reverse('cotisations:accept_payment', kwargs={'factureid':facture.id}),
+        str(option.payment_id),
+        str(option.payment_pass),
+        'https://' + host + reverse(
+            'cotisations:accept_payment',
+            kwargs={'factureid':facture.id}
+        ),
         'https://' + host + reverse('cotisations:refuse_payment'),
         'https://' + host + reverse('cotisations:ipn'),
         "",
@@ -90,7 +97,11 @@ def comnpay(facture, request):
     r = {
         'action' : 'https://secure.homologation.comnpay.com',
         'method' : 'POST',
-        'content' : p.buildSecretHTML("Rechargement du solde", facture.prix(), idTransaction=str(facture.id)),
+        'content' : p.buildSecretHTML(
+            "Rechargement du solde",
+            facture.prix(),
+            idTransaction=str(facture.id)
+        ),
         'amount' : facture.prix,
     }
     return r
diff --git a/preferences/aes_field.py b/preferences/aes_field.py
new file mode 100644
index 00000000..76712a81
--- /dev/null
+++ b/preferences/aes_field.py
@@ -0,0 +1,53 @@
+import string
+import binascii
+from random import choice
+from Crypto.Cipher import AES
+
+from django.db import models
+from django.conf import settings
+
+EOD = '`%EofD%`'  # This should be something that will not occur in strings
+
+
+def genstring(length=16, chars=string.printable):
+    return ''.join([choice(chars) for i in range(length)])
+
+
+def encrypt(key, s):
+    obj = AES.new(key)
+    datalength = len(s) + len(EOD)
+    if datalength < 16:
+        saltlength = 16 - datalength
+    else:
+        saltlength = 16 - datalength % 16
+    ss = ''.join([s, EOD, genstring(saltlength)])
+    return obj.encrypt(ss)
+
+
+def decrypt(key, s):
+    obj = AES.new(key)
+    ss = obj.decrypt(s)
+    return ss.split(bytes(EOD, 'utf-8'))[0]
+
+
+class AESEncryptedField(models.CharField):
+    def save_form_data(self, instance, data):
+        setattr(instance, self.name,
+                binascii.b2a_base64(encrypt(settings.AES_KEY, data)))
+
+    def value_from_object(self, obj):
+        return decrypt(settings.AES_KEY,
+                       binascii.a2b_base64(getattr(obj, self.attname))).decode('utf-8')
+
+    def to_python(self, value):
+        if value is None:
+            return None
+        return decrypt(settings.AES_KEY,
+                       binascii.a2b_base64(value)).decode('utf-8')
+
+    def from_db_value(self, value, expression, connection, *args):
+
+        if value is None:
+            return value
+        return decrypt(settings.AES_KEY,
+                       binascii.a2b_base64(value)).decode('utf-8')
diff --git a/preferences/migrations/0039_auto_20180115_0003.py b/preferences/migrations/0039_auto_20180115_0003.py
new file mode 100644
index 00000000..da1b6631
--- /dev/null
+++ b/preferences/migrations/0039_auto_20180115_0003.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-01-14 23:03
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import preferences.aes_field
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0038_auto_20180114_2209'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='assooption',
+            name='payment_id',
+            field=models.CharField(max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='assooption',
+            name='payment_pass',
+            field=preferences.aes_field.AESEncryptedField(max_length=255, null=True),
+        ),
+    ]
diff --git a/preferences/migrations/0040_auto_20180115_0010.py b/preferences/migrations/0040_auto_20180115_0010.py
new file mode 100644
index 00000000..407cb831
--- /dev/null
+++ b/preferences/migrations/0040_auto_20180115_0010.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-01-14 23:10
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import preferences.aes_field
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0039_auto_20180115_0003'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='assooption',
+            name='payment_id',
+            field=models.CharField(default='', max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='assooption',
+            name='payment_pass',
+            field=preferences.aes_field.AESEncryptedField(default='', max_length=255),
+        ),
+    ]
diff --git a/preferences/models.py b/preferences/models.py
index 133d6f82..d4ef9645 100644
--- a/preferences/models.py
+++ b/preferences/models.py
@@ -28,6 +28,8 @@ from __future__ import unicode_literals
 from django.db import models
 import cotisations.models
 
+from .aes_field import AESEncryptedField
+
 
 class OptionalUser(models.Model):
     """Options pour l'user : obligation ou nom du telephone,
@@ -471,6 +473,16 @@ class AssoOption(models.Model):
         choices=PAYMENT,
         default='NONE',
     )
+    payment_id = models.CharField(
+        max_length=255,
+        default='',
+    )
+    payment_pass = AESEncryptedField(
+        max_length=255,
+        default='',
+    )
+
+
     class Meta:
         permissions = (
             ("view_assooption", "Peut voir les options de l'asso"),
diff --git a/re2o/settings_local.example.py b/re2o/settings_local.example.py
index 107fd18f..26c1317d 100644
--- a/re2o/settings_local.example.py
+++ b/re2o/settings_local.example.py
@@ -26,6 +26,10 @@ SECRET_KEY = 'SUPER_SECRET_KEY'
 
 DB_PASSWORD = 'SUPER_SECRET_DB'
 
+# AES key for secret key encryption
+AES_KEY = 'WHAT_A_WONDERFULL_KEY'
+
+
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False
 

From 754c43d331d13a882e834e8fc89acb95e8860e1e Mon Sep 17 00:00:00 2001
From: Yoann Pietri <yoann.pietri@supelec.fr>
Date: Fri, 19 Jan 2018 23:47:14 +0100
Subject: [PATCH 09/26] =?UTF-8?q?Cache=20le=20bouton=20si=20n=C3=A9cessair?=
 =?UTF-8?q?e.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 users/templates/users/profil.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html
index 8f399043..f56ed99e 100644
--- a/users/templates/users/profil.html
+++ b/users/templates/users/profil.html
@@ -196,7 +196,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <p>Aucune machine</p>
     {% endif %}
     <h2>Cotisations</h2>
-    <h4>{% can_create Facture %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new-facture' users.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Ajouter une cotisation</a>  {% if user_solde %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:credit-solde' users.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Modifier le solde</a>{% endif%}{% acl_else %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new_facture_solde' user.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Ajouter une cotisation par solde</a>{% acl_end %}</h4>
+    <h4>{% can_create Facture %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new-facture' users.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Ajouter une cotisation</a>  {% if user_solde %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:credit-solde' users.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Modifier le solde</a>{% endif%}{% acl_else %}{% if user_solde %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new_facture_solde' user.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Ajouter une cotisation par solde</a>{% endif %}{% acl_end %}</h4>
     {% if facture_list %}
     {% include "cotisations/aff_cotisations.html" with facture_list=facture_list %}
     {% else %}

From bbb87882760da7bd7ae84df895fd6db9701af506 Mon Sep 17 00:00:00 2001
From: Hugo LEVY-FALK <hugo.levy--falk@supelec.fr>
Date: Sat, 27 Jan 2018 00:07:28 +0100
Subject: [PATCH 10/26] Meilleure gestion du AESField

---
 preferences/aes_field.py           | 20 +++++++++++++++-----
 re2o/templatetags/self_adhesion.py |  2 ++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/preferences/aes_field.py b/preferences/aes_field.py
index 76712a81..d48e9c4a 100644
--- a/preferences/aes_field.py
+++ b/preferences/aes_field.py
@@ -27,6 +27,7 @@ def encrypt(key, s):
 def decrypt(key, s):
     obj = AES.new(key)
     ss = obj.decrypt(s)
+    print(ss)
     return ss.split(bytes(EOD, 'utf-8'))[0]
 
 
@@ -35,10 +36,6 @@ class AESEncryptedField(models.CharField):
         setattr(instance, self.name,
                 binascii.b2a_base64(encrypt(settings.AES_KEY, data)))
 
-    def value_from_object(self, obj):
-        return decrypt(settings.AES_KEY,
-                       binascii.a2b_base64(getattr(obj, self.attname))).decode('utf-8')
-
     def to_python(self, value):
         if value is None:
             return None
@@ -46,8 +43,21 @@ class AESEncryptedField(models.CharField):
                        binascii.a2b_base64(value)).decode('utf-8')
 
     def from_db_value(self, value, expression, connection, *args):
-
+        print('from db')
+        print(value)
         if value is None:
             return value
         return decrypt(settings.AES_KEY,
                        binascii.a2b_base64(value)).decode('utf-8')
+
+    def get_prep_value(self, value):
+        print('get prep value')
+        print(value)
+        print(binascii.b2a_base64(encrypt(
+                    settings.AES_KEY,
+                    value
+        )))
+        return binascii.b2a_base64(encrypt(
+                    settings.AES_KEY,
+                    value
+        ))
diff --git a/re2o/templatetags/self_adhesion.py b/re2o/templatetags/self_adhesion.py
index e940a5a9..e1577a13 100644
--- a/re2o/templatetags/self_adhesion.py
+++ b/re2o/templatetags/self_adhesion.py
@@ -21,7 +21,9 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 from django import template
 from preferences.models import OptionalUser, GeneralOption
+
 register = template.Library()
+
 @register.simple_tag
 def self_adhesion():
     options, _created = OptionalUser.objects.get_or_create()

From ff68769c5a4254bd4391adfa3672c05a6ee4a502 Mon Sep 17 00:00:00 2001
From: Hugo LEVY-FALK <hugo.levy--falk@supelec.fr>
Date: Sat, 27 Jan 2018 00:32:13 +0100
Subject: [PATCH 11/26] =?UTF-8?q?Affiche=20le=20rechargement=20si=20le=20m?=
 =?UTF-8?q?oyen=20de=20paiement=20est=20d=C3=A9fini.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 users/templates/users/profil.html | 2 +-
 users/views.py                    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html
index f56ed99e..8d72b983 100644
--- a/users/templates/users/profil.html
+++ b/users/templates/users/profil.html
@@ -132,7 +132,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>Aucun</td>
             {% endif %}
         </tr>
-        {% if user_solde %}
+        {% if allow_online_payment %}
         <tr>
             <th>Solde</th>
             <td>{{ users.solde }} €
diff --git a/users/views.py b/users/views.py
index e3f73f38..c8c340b9 100644
--- a/users/views.py
+++ b/users/views.py
@@ -85,7 +85,7 @@ from users.forms import (
 )
 from cotisations.models import Facture
 from machines.models import Machine
-from preferences.models import OptionalUser, GeneralOption
+from preferences.models import OptionalUser, GeneralOption, AssoOption
 
 from re2o.views import form
 from re2o.utils import (
@@ -782,6 +782,8 @@ def profil(request, users, userid):
     )
     options, _created = OptionalUser.objects.get_or_create()
     user_solde = options.user_solde
+    options, _created = AssoOption.objects.get_or_create()
+    allow_online_payment = options.payment != 'NONE'
     return render(
         request,
         'users/profil.html',
@@ -792,6 +794,7 @@ def profil(request, users, userid):
             'ban_list': bans,
             'white_list': whitelists,
             'user_solde': user_solde,
+            'allow_online_payment' : allow_online_payment,
         }
     )
 

From 2381fd4bf9fab054910d132e7337d888650bcfe6 Mon Sep 17 00:00:00 2001
From: Hugo LEVY-FALK <hugo.levy--falk@supelec.fr>
Date: Sat, 27 Jan 2018 12:50:11 +0100
Subject: [PATCH 12/26] On a besoin de pycrypto.

---
 install_re2o.sh  | 17 ++++++++---------
 requirements.txt |  1 +
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/install_re2o.sh b/install_re2o.sh
index 5c39345b..206a18ba 100755
--- a/install_re2o.sh
+++ b/install_re2o.sh
@@ -29,8 +29,6 @@ setup_ldap() {
 
 install_re2o_server() {
 
-
-
 export DEBIAN_FRONTEND=noninteractive
 
 apt-get -y install sudo dialog
@@ -107,7 +105,7 @@ clear
 
 
 if [ $sql_is_local == 2 ]
-then 
+then
 TITLE="Login sql"
 sql_login=$(dialog --title "$TITLE" \
 	--backtitle "$BACKTITLE" \
@@ -169,7 +167,7 @@ ldap_password=$(dialog --title "$TITLE" \
         2>&1 >/dev/tty)
 clear
 if [ $ldap_is_local == 2 ]
-then 
+then
 TITLE="Cn ldap admin"
 ldap_cn=$(dialog --title "$TITLE" \
 	--backtitle "$BACKTITLE" \
@@ -209,7 +207,7 @@ email_port=$(dialog --clear \
                 2>&1 >/dev/tty)
 clear
 if [ $ldap_is_local == 2 ]
-then 
+then
 TITLE="Cn ldap admin"
 ldap_cn=$(dialog --title "$TITLE" \
 	--backtitle "$BACKTITLE" \
@@ -240,6 +238,7 @@ apt-get -y install python3-django python3-dateutil texlive-latex-base texlive-fo
 pip3 install django-bootstrap3
 pip3 install django-ldapdb
 pip3 install django-macaddress
+pip3 install pycrypto
 
 if [ $sql_bdd_type == 1 ]
 then
@@ -253,7 +252,7 @@ then
     echo $mysql_command
     while true; do
 	read -p "Continue (y/n)?" choice
-	case "$choice" in 
+	case "$choice" in
 	y|Y ) break;;
 	n|N ) exit;;
 	* ) echo "invalid";;
@@ -276,14 +275,14 @@ else
     echo sudo -u postgres psql $pgsql_command3
     while true; do
 	read -p "Continue (y/n)?" choice
-	case "$choice" in 
+	case "$choice" in
 	y|Y ) break;;
 	n|N ) exit;;
 	* ) echo "invalid";;
 	esac
     done
     fi
-fi 
+fi
 
 if [ $ldap_is_local == 1 ]
 then
@@ -430,7 +429,7 @@ if [ ! -z "$1" ]
 then
 if [ $1 == ldap ]
 then
-if [ ! -z "$2" ] 
+if [ ! -z "$2" ]
 then
 echo Installation du ldap
 setup_ldap $2 $3
diff --git a/requirements.txt b/requirements.txt
index 7b5aa474..32957784 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
 django-bootstrap3
 django-macaddress
 python-dateutil
+pycrypto

From 827780def3dda0f2f0608d2c52ec9a443ca957f1 Mon Sep 17 00:00:00 2001
From: root <root@arachne>
Date: Sat, 27 Jan 2018 13:02:24 +0100
Subject: [PATCH 13/26] =?UTF-8?q?pip=20c'est=20la=20vie,=20mais=20askip=20?=
 =?UTF-8?q?=C3=A7a=20pla=C3=AEt=20pas.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install_re2o.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/install_re2o.sh b/install_re2o.sh
index 206a18ba..ba470bf4 100755
--- a/install_re2o.sh
+++ b/install_re2o.sh
@@ -234,11 +234,10 @@ install_base=$(dialog --clear \
 	$HEIGHT $WIDTH \
 	2>&1 >/dev/tty)
 
-apt-get -y install python3-django python3-dateutil texlive-latex-base texlive-fonts-recommended python3-djangorestframework python3-django-reversion python3-pip libsasl2-dev libldap2-dev libssl-dev
+apt-get -y install python3-django python3-dateutil texlive-latex-base texlive-fonts-recommended python3-djangorestframework python3-django-reversion python3-pip libsasl2-dev libldap2-dev libssl-dev python3-crypto
 pip3 install django-bootstrap3
 pip3 install django-ldapdb
 pip3 install django-macaddress
-pip3 install pycrypto
 
 if [ $sql_bdd_type == 1 ]
 then

From 477aab3a7f217dedfba33bc486f118e68d52b5e4 Mon Sep 17 00:00:00 2001
From: Hugo LEVY-FALK <hugo.levy--falk@supelec.fr>
Date: Sat, 27 Jan 2018 13:52:36 +0100
Subject: [PATCH 14/26] Pouvoir prendre de l'argent c'est bien. En prendre
 seulement si on veut, c'est mieux.

---
 cotisations/views.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/cotisations/views.py b/cotisations/views.py
index 24320b2b..16d25295 100644
--- a/cotisations/views.py
+++ b/cotisations/views.py
@@ -687,6 +687,16 @@ def new_facture_solde(request, userid):
 
 @login_required
 def recharge(request):
+    options, _created = AssoOption.objects.get_or_create()
+    if options.payment == 'NONE':
+        messages.error(
+            request,
+            "Le paiement en ligne est désactivé."
+        )
+        return redirect(reverse(
+            'users:profil',
+            kwargs={'userid': request.user.id}
+        ))
     f = RechargeForm(request.POST or None, user=request.user)
     if f.is_valid():
         facture = Facture(user=request.user)
@@ -701,7 +711,6 @@ def recharge(request):
             number=1,
         )
         v.save()
-        options, _created = AssoOption.objects.get_or_create()
         content = payment.PAYMENT_SYSTEM[options.payment](facture, request)
         return render(request, 'cotisations/payment.html', content)
     return form({'rechargeform':f}, 'cotisations/recharge.html', request)

From c3aace28df575060ecdaefecc3b99ec4f020a145 Mon Sep 17 00:00:00 2001
From: Yoann Pietri <yoann.pietri@supelec.fr>
Date: Sat, 27 Jan 2018 23:15:01 +0100
Subject: [PATCH 15/26] =?UTF-8?q?Affiche=20les=20CGU=20que=20lorsqu'on=20c?=
 =?UTF-8?q?r=C3=A9e=20un=20nouvel=20utilisateur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 users/templates/users/user.html |  2 ++
 users/views.py                  | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/users/templates/users/user.html b/users/templates/users/user.html
index 20931031..fc8d06d0 100644
--- a/users/templates/users/user.html
+++ b/users/templates/users/user.html
@@ -37,9 +37,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% bootstrap_button "Créer ou modifier" button_type="submit" icon="star" %}
 </form>
 <br>
+{% if showCGU %}
 <p>En cliquant sur Créer ou modifier, l'utilisateur s'engage à respecter les <a href="/media/{{ GTU }}" download="CGU" >règles d'utilisation du réseau</a>.</p>
 <h3>Résumé des règles d'utilisations</h3>
 <p>{{ GTU_sum_up }}</p>
+{% endif %}
 <br/>
 <br/>
 <br/>
diff --git a/users/views.py b/users/views.py
index c8c340b9..40fd80d0 100644
--- a/users/views.py
+++ b/users/views.py
@@ -138,7 +138,7 @@ def new_user(request):
             'users:profil',
             kwargs={'userid':str(user.id)}
             ))
-    return form({'userform': user,'GTU_sum_up':GTU_sum_up,'GTU':GTU}, 'users/user.html', request)
+    return form({'userform': user,'GTU_sum_up':GTU_sum_up,'GTU':GTU,'showCGU':True}, 'users/user.html', request)
 
 
 @login_required
@@ -160,7 +160,7 @@ def new_club(request):
             'users:profil',
             kwargs={'userid':str(club.id)}
             ))
-    return form({'userform': club}, 'users/user.html', request)
+    return form({'userform': club, 'showCGU':False}, 'users/user.html', request)
 
 
 @login_required
@@ -181,7 +181,7 @@ def edit_club_admin_members(request, club_instance, clubid):
             'users:profil',
             kwargs={'userid':str(club_instance.id)}
             ))
-    return form({'userform': club}, 'users/user.html', request)
+    return form({'userform': club, 'showCGU':False}, 'users/user.html', request)
 
 
 @login_required
@@ -366,7 +366,7 @@ def add_ban(request, user, userid):
             request,
             "Attention, cet utilisateur a deja un bannissement actif"
         )
-    return form({'userform': ban}, 'users/user.html', request)
+        return form({'userform': ban}, 'users/user.html', request)
 
 @login_required
 @can_edit(Ban)
@@ -415,7 +415,7 @@ def add_whitelist(request, user, userid):
             request,
             "Attention, cet utilisateur a deja un accès gracieux actif"
         )
-    return form({'userform': whitelist}, 'users/user.html', request)
+        return form({'userform': whitelist}, 'users/user.html', request)
 
 
 @login_required

From 7ae8908caba811e3ae7e59319413f4410e6e0059 Mon Sep 17 00:00:00 2001
From: Yoann Pietri <yoann.pietri@supelec.fr>
Date: Sat, 27 Jan 2018 23:52:43 +0100
Subject: [PATCH 16/26] Retrait des boutons de la sidebar pour la self adhesion

---
 users/templates/users/sidebar.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/users/templates/users/sidebar.html b/users/templates/users/sidebar.html
index 27f6b2b1..71727243 100644
--- a/users/templates/users/sidebar.html
+++ b/users/templates/users/sidebar.html
@@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% load acl %}
 
 {% block sidebar %}
+   {% if request.user.is_authenticated%}
    {% can_create Club %}
         <a class="list-group-item list-group-item-success" href="{% url "users:new-club" %}">
             <i class="glyphicon glyphicon-plus"></i>
@@ -37,6 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             Créer un adhérent
         </a>
     {% acl_end %}
+    {% endif %}
     {% can_view_all Club %}
 	<a class="list-group-item list-group-item-info" href="{% url "users:index-clubs" %}">
             <i class="glyphicon glyphicon-list"></i>

From a405983cfadef756acf61f86c92d351884892076 Mon Sep 17 00:00:00 2001
From: Yoann PIETRI <yoann.pietri@supelec.fr>
Date: Thu, 11 Jan 2018 19:25:41 +0100
Subject: [PATCH 17/26] Users can pay their own cotisation with their solde.

---
 preferences/forms.py                                       | 1 +
 preferences/models.py                                      | 4 ++++
 preferences/templates/preferences/display_preferences.html | 4 ++++
 users/templates/users/profil.html                          | 2 +-
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/preferences/forms.py b/preferences/forms.py
index fc214f52..6d6414c3 100644
--- a/preferences/forms.py
+++ b/preferences/forms.py
@@ -51,6 +51,7 @@ class EditOptionalUserForm(ModelForm):
         self.fields['max_solde'].label = 'Solde maximum'
         self.fields['min_online_payment'].label = 'Montant de rechargement minimum en ligne'
         self.fields['self_adhesion'].label = 'Auto inscription'
+        self.fields['max_recharge'].label = 'Rechargement max'
 
 
 class EditOptionalMachineForm(ModelForm):
diff --git a/preferences/models.py b/preferences/models.py
index d4ef9645..d49a074f 100644
--- a/preferences/models.py
+++ b/preferences/models.py
@@ -52,6 +52,10 @@ class OptionalUser(models.Model):
         max_digits=5,
         decimal_places=2,
         default=10
+    max_recharge = models.DecimalField(
+        max_digits=5,
+        decimal_places=2,
+        default=100
     )
     gpg_fingerprint = models.BooleanField(default=True)
     all_can_create = models.BooleanField(
diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html
index e46564a3..9f958d72 100644
--- a/preferences/templates/preferences/display_preferences.html
+++ b/preferences/templates/preferences/display_preferences.html
@@ -56,6 +56,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ useroptions.all_can_create }}</td>
             <th>Auto inscription</th>
             <td>{{ useroptions.self_adhesion }}</td>
+        {% if useroptions.user_solde %}
+        <th>Rechargement max</th>
+        <td>{{ useroptions.max_recharge }}</td>
+        {% endif %}
         </tr>
 	{% if useroptions.user_solde %}
 	<tr>
diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html
index 8d72b983..0b6c6f94 100644
--- a/users/templates/users/profil.html
+++ b/users/templates/users/profil.html
@@ -196,7 +196,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <p>Aucune machine</p>
     {% endif %}
     <h2>Cotisations</h2>
-    <h4>{% can_create Facture %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new-facture' users.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Ajouter une cotisation</a>  {% if user_solde %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:credit-solde' users.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Modifier le solde</a>{% endif%}{% acl_else %}{% if user_solde %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new_facture_solde' user.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Ajouter une cotisation par solde</a>{% endif %}{% acl_end %}</h4>
+	<h4>{% can_create Facture %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new-facture' users.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Ajouter une cotisation</a>  {% if user_solde %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:credit-solde' users.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Modifier le solde</a>{% endif%}{% acl_else %}{% if user_solde %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new_facture_solde' user.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Ajouter une cotisation par solde</a>{% endif }{% acl_end %}</h4>
     {% if facture_list %}
     {% include "cotisations/aff_cotisations.html" with facture_list=facture_list %}
     {% else %}

From a5a967271edd4e34ee547f5ffa4a8bfd3308286b Mon Sep 17 00:00:00 2001
From: Hugo LEVY-FALK <hugo.levy--falk@supelec.fr>
Date: Fri, 12 Jan 2018 01:07:25 +0100
Subject: [PATCH 18/26] Rechargement via comnpay du solde.

---
 cotisations/views.py                                       | 5 +++++
 preferences/models.py                                      | 2 +-
 preferences/templates/preferences/display_preferences.html | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cotisations/views.py b/cotisations/views.py
index 16d25295..35748765 100644
--- a/cotisations/views.py
+++ b/cotisations/views.py
@@ -711,6 +711,11 @@ def recharge(request):
             number=1,
         )
         v.save()
+<<<<<<< HEAD
         content = payment.PAYMENT_SYSTEM[options.payment](facture, request)
+=======
+        options, _created = AssoOption.objects.get_or_create()
+        content = payment.PAYMENT_SYSTEM[options.payment](facture, request.get_host())
+>>>>>>> Rechargement via comnpay du solde.
         return render(request, 'cotisations/payment.html', content)
     return form({'rechargeform':f}, 'cotisations/recharge.html', request)
diff --git a/preferences/models.py b/preferences/models.py
index d49a074f..4d2a29dd 100644
--- a/preferences/models.py
+++ b/preferences/models.py
@@ -55,7 +55,7 @@ class OptionalUser(models.Model):
     max_recharge = models.DecimalField(
         max_digits=5,
         decimal_places=2,
-        default=100
+        default=50
     )
     gpg_fingerprint = models.BooleanField(default=True)
     all_can_create = models.BooleanField(
diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html
index 9f958d72..53b4ca05 100644
--- a/preferences/templates/preferences/display_preferences.html
+++ b/preferences/templates/preferences/display_preferences.html
@@ -57,8 +57,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <th>Auto inscription</th>
             <td>{{ useroptions.self_adhesion }}</td>
         {% if useroptions.user_solde %}
-        <th>Rechargement max</th>
-        <td>{{ useroptions.max_recharge }}</td>
+        <th>Solde maximum</th>
+        <td>{{ useroptions.max_solde }}</td>
         {% endif %}
         </tr>
 	{% if useroptions.user_solde %}

From 208d703d95732f75915b2069476c634ea326cba6 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Sun, 14 Jan 2018 20:15:21 +0100
Subject: [PATCH 19/26] Montant minimal de rechargement + refactor de la
 fonction payment + self adhesion

---
 cotisations/views.py                                       | 5 -----
 preferences/templates/preferences/display_preferences.html | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/cotisations/views.py b/cotisations/views.py
index 35748765..16d25295 100644
--- a/cotisations/views.py
+++ b/cotisations/views.py
@@ -711,11 +711,6 @@ def recharge(request):
             number=1,
         )
         v.save()
-<<<<<<< HEAD
         content = payment.PAYMENT_SYSTEM[options.payment](facture, request)
-=======
-        options, _created = AssoOption.objects.get_or_create()
-        content = payment.PAYMENT_SYSTEM[options.payment](facture, request.get_host())
->>>>>>> Rechargement via comnpay du solde.
         return render(request, 'cotisations/payment.html', content)
     return form({'rechargeform':f}, 'cotisations/recharge.html', request)
diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html
index 53b4ca05..e46564a3 100644
--- a/preferences/templates/preferences/display_preferences.html
+++ b/preferences/templates/preferences/display_preferences.html
@@ -56,10 +56,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ useroptions.all_can_create }}</td>
             <th>Auto inscription</th>
             <td>{{ useroptions.self_adhesion }}</td>
-        {% if useroptions.user_solde %}
-        <th>Solde maximum</th>
-        <td>{{ useroptions.max_solde }}</td>
-        {% endif %}
         </tr>
 	{% if useroptions.user_solde %}
 	<tr>

From d6fbabe3415840dcfea5b3e6244868bd03f8864f Mon Sep 17 00:00:00 2001
From: Hugo Levy-Falk <hugo.levy--falk@supelec.fr>
Date: Mon, 15 Jan 2018 01:06:54 +0100
Subject: [PATCH 20/26] Stockage en BDD des identifiants comnpay.

---
 preferences/aes_field.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/preferences/aes_field.py b/preferences/aes_field.py
index d48e9c4a..4d927abd 100644
--- a/preferences/aes_field.py
+++ b/preferences/aes_field.py
@@ -27,7 +27,6 @@ def encrypt(key, s):
 def decrypt(key, s):
     obj = AES.new(key)
     ss = obj.decrypt(s)
-    print(ss)
     return ss.split(bytes(EOD, 'utf-8'))[0]
 
 
@@ -36,6 +35,10 @@ class AESEncryptedField(models.CharField):
         setattr(instance, self.name,
                 binascii.b2a_base64(encrypt(settings.AES_KEY, data)))
 
+    def value_from_object(self, obj):
+        return decrypt(settings.AES_KEY,
+                       binascii.a2b_base64(getattr(obj, self.attname))).decode('utf-8')
+
     def to_python(self, value):
         if value is None:
             return None
@@ -43,20 +46,12 @@ class AESEncryptedField(models.CharField):
                        binascii.a2b_base64(value)).decode('utf-8')
 
     def from_db_value(self, value, expression, connection, *args):
-        print('from db')
-        print(value)
         if value is None:
             return value
         return decrypt(settings.AES_KEY,
                        binascii.a2b_base64(value)).decode('utf-8')
 
     def get_prep_value(self, value):
-        print('get prep value')
-        print(value)
-        print(binascii.b2a_base64(encrypt(
-                    settings.AES_KEY,
-                    value
-        )))
         return binascii.b2a_base64(encrypt(
                     settings.AES_KEY,
                     value

From f016882597829cd257d89e346c326d0d2e8504aa Mon Sep 17 00:00:00 2001
From: Yoann Pietri <yoann.pietri@supelec.fr>
Date: Fri, 19 Jan 2018 23:47:14 +0100
Subject: [PATCH 21/26] =?UTF-8?q?Cache=20le=20bouton=20si=20n=C3=A9cessair?=
 =?UTF-8?q?e.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 users/templates/users/profil.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html
index 0b6c6f94..8d72b983 100644
--- a/users/templates/users/profil.html
+++ b/users/templates/users/profil.html
@@ -196,7 +196,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <p>Aucune machine</p>
     {% endif %}
     <h2>Cotisations</h2>
-	<h4>{% can_create Facture %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new-facture' users.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Ajouter une cotisation</a>  {% if user_solde %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:credit-solde' users.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Modifier le solde</a>{% endif%}{% acl_else %}{% if user_solde %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new_facture_solde' user.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Ajouter une cotisation par solde</a>{% endif }{% acl_end %}</h4>
+    <h4>{% can_create Facture %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new-facture' users.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Ajouter une cotisation</a>  {% if user_solde %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:credit-solde' users.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Modifier le solde</a>{% endif%}{% acl_else %}{% if user_solde %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new_facture_solde' user.id %}"><i class="glyphicon glyphicon-piggy-bank"></i> Ajouter une cotisation par solde</a>{% endif %}{% acl_end %}</h4>
     {% if facture_list %}
     {% include "cotisations/aff_cotisations.html" with facture_list=facture_list %}
     {% else %}

From 6d335881a69b982413d49c0f9b8631a8d1413b03 Mon Sep 17 00:00:00 2001
From: Hugo LEVY-FALK <hugo.levy--falk@supelec.fr>
Date: Sat, 27 Jan 2018 00:07:28 +0100
Subject: [PATCH 22/26] Meilleure gestion du AESField

---
 preferences/aes_field.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/preferences/aes_field.py b/preferences/aes_field.py
index 4d927abd..27b026f7 100644
--- a/preferences/aes_field.py
+++ b/preferences/aes_field.py
@@ -27,6 +27,7 @@ def encrypt(key, s):
 def decrypt(key, s):
     obj = AES.new(key)
     ss = obj.decrypt(s)
+    print(ss)
     return ss.split(bytes(EOD, 'utf-8'))[0]
 
 
@@ -35,10 +36,6 @@ class AESEncryptedField(models.CharField):
         setattr(instance, self.name,
                 binascii.b2a_base64(encrypt(settings.AES_KEY, data)))
 
-    def value_from_object(self, obj):
-        return decrypt(settings.AES_KEY,
-                       binascii.a2b_base64(getattr(obj, self.attname))).decode('utf-8')
-
     def to_python(self, value):
         if value is None:
             return None

From fd6c5cee768a05c9f26cd1c1b9329db139dcc29f Mon Sep 17 00:00:00 2001
From: Hugo LEVY-FALK <hugo.levy--falk@supelec.fr>
Date: Sat, 27 Jan 2018 12:50:11 +0100
Subject: [PATCH 23/26] On a besoin de pycrypto.

---
 install_re2o.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/install_re2o.sh b/install_re2o.sh
index ba470bf4..80cdda74 100755
--- a/install_re2o.sh
+++ b/install_re2o.sh
@@ -28,6 +28,9 @@ setup_ldap() {
 
 
 install_re2o_server() {
+echo "Installation de Re2o !
+Cet utilitaire va procéder à l'installation initiale de re2o. Le serveur présent doit être vierge.
+Preconfiguration..."
 
 export DEBIAN_FRONTEND=noninteractive
 
@@ -238,6 +241,7 @@ apt-get -y install python3-django python3-dateutil texlive-latex-base texlive-fo
 pip3 install django-bootstrap3
 pip3 install django-ldapdb
 pip3 install django-macaddress
+pip3 install pycrypto
 
 if [ $sql_bdd_type == 1 ]
 then

From 73baab5720469cd8497ccde4961156b76623baef Mon Sep 17 00:00:00 2001
From: root <root@arachne>
Date: Sat, 27 Jan 2018 13:02:24 +0100
Subject: [PATCH 24/26] =?UTF-8?q?pip=20c'est=20la=20vie,=20mais=20askip=20?=
 =?UTF-8?q?=C3=A7a=20pla=C3=AEt=20pas.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install_re2o.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/install_re2o.sh b/install_re2o.sh
index 80cdda74..e2fc60ac 100755
--- a/install_re2o.sh
+++ b/install_re2o.sh
@@ -241,7 +241,6 @@ apt-get -y install python3-django python3-dateutil texlive-latex-base texlive-fo
 pip3 install django-bootstrap3
 pip3 install django-ldapdb
 pip3 install django-macaddress
-pip3 install pycrypto
 
 if [ $sql_bdd_type == 1 ]
 then

From f033add0db879015d92067f14007ce2cfc6556fb Mon Sep 17 00:00:00 2001
From: Hugo LEVY-FALK <hugo.levy--falk@supelec.fr>
Date: Sun, 28 Jan 2018 09:23:28 +0100
Subject: [PATCH 25/26] Fix erreur de rebase

---
 preferences/forms.py  | 1 -
 preferences/models.py | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/preferences/forms.py b/preferences/forms.py
index 6d6414c3..fc214f52 100644
--- a/preferences/forms.py
+++ b/preferences/forms.py
@@ -51,7 +51,6 @@ class EditOptionalUserForm(ModelForm):
         self.fields['max_solde'].label = 'Solde maximum'
         self.fields['min_online_payment'].label = 'Montant de rechargement minimum en ligne'
         self.fields['self_adhesion'].label = 'Auto inscription'
-        self.fields['max_recharge'].label = 'Rechargement max'
 
 
 class EditOptionalMachineForm(ModelForm):
diff --git a/preferences/models.py b/preferences/models.py
index 4d2a29dd..d4ef9645 100644
--- a/preferences/models.py
+++ b/preferences/models.py
@@ -52,10 +52,6 @@ class OptionalUser(models.Model):
         max_digits=5,
         decimal_places=2,
         default=10
-    max_recharge = models.DecimalField(
-        max_digits=5,
-        decimal_places=2,
-        default=50
     )
     gpg_fingerprint = models.BooleanField(default=True)
     all_can_create = models.BooleanField(

From d8f8ba2e1a8165b3958d5d7007e5999cb3431667 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Mon, 29 Jan 2018 16:46:46 +0000
Subject: [PATCH 26/26] =?UTF-8?q?Fix=20probl=C3=A8me=20avec=20aes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 preferences/aes_field.py                             |  4 ++++
 preferences/migrations/0039_auto_20180115_0003.py    |  5 -----
 ...o_20180115_0010.py => 0040_auto_20180129_1745.py} | 12 ++++++------
 preferences/models.py                                |  3 ++-
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename preferences/migrations/{0040_auto_20180115_0010.py => 0040_auto_20180129_1745.py} (75%)

diff --git a/preferences/aes_field.py b/preferences/aes_field.py
index 27b026f7..81f8accc 100644
--- a/preferences/aes_field.py
+++ b/preferences/aes_field.py
@@ -33,6 +33,8 @@ def decrypt(key, s):
 
 class AESEncryptedField(models.CharField):
     def save_form_data(self, instance, data):
+        if value is None:
+            return value
         setattr(instance, self.name,
                 binascii.b2a_base64(encrypt(settings.AES_KEY, data)))
 
@@ -49,6 +51,8 @@ class AESEncryptedField(models.CharField):
                        binascii.a2b_base64(value)).decode('utf-8')
 
     def get_prep_value(self, value):
+        if value is None:
+            return value
         return binascii.b2a_base64(encrypt(
                     settings.AES_KEY,
                     value
diff --git a/preferences/migrations/0039_auto_20180115_0003.py b/preferences/migrations/0039_auto_20180115_0003.py
index da1b6631..3dbe2b4c 100644
--- a/preferences/migrations/0039_auto_20180115_0003.py
+++ b/preferences/migrations/0039_auto_20180115_0003.py
@@ -18,9 +18,4 @@ class Migration(migrations.Migration):
             name='payment_id',
             field=models.CharField(max_length=255, null=True),
         ),
-        migrations.AddField(
-            model_name='assooption',
-            name='payment_pass',
-            field=preferences.aes_field.AESEncryptedField(max_length=255, null=True),
-        ),
     ]
diff --git a/preferences/migrations/0040_auto_20180115_0010.py b/preferences/migrations/0040_auto_20180129_1745.py
similarity index 75%
rename from preferences/migrations/0040_auto_20180115_0010.py
rename to preferences/migrations/0040_auto_20180129_1745.py
index 407cb831..dc7800f4 100644
--- a/preferences/migrations/0040_auto_20180115_0010.py
+++ b/preferences/migrations/0040_auto_20180129_1745.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.7 on 2018-01-14 23:10
+# Generated by Django 1.10.7 on 2018-01-29 16:45
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -13,14 +13,14 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.AddField(
+            model_name='assooption',
+            name='payment_pass',
+            field=preferences.aes_field.AESEncryptedField(blank=True, max_length=255, null=True),
+        ),
         migrations.AlterField(
             model_name='assooption',
             name='payment_id',
             field=models.CharField(default='', max_length=255),
         ),
-        migrations.AlterField(
-            model_name='assooption',
-            name='payment_pass',
-            field=preferences.aes_field.AESEncryptedField(default='', max_length=255),
-        ),
     ]
diff --git a/preferences/models.py b/preferences/models.py
index d4ef9645..4f1f388e 100644
--- a/preferences/models.py
+++ b/preferences/models.py
@@ -479,7 +479,8 @@ class AssoOption(models.Model):
     )
     payment_pass = AESEncryptedField(
         max_length=255,
-        default='',
+        null=True,
+        blank=True,
     )