Merge branch 'master' of https://git.eleves.ens.fr/cof-geek/gestioCOF into Aufinal/clean_code

bda/views.py

@@ -8,15 +8,17 @@ import random
 
 from django.shortcuts import render, get_object_or_404
 from django.contrib.auth.decorators import login_required
-from django.db import models
+from django.db import models, transaction
 from django.db.models import Count, Q
-from django.core import serializers
+from django.core import serializers, mail
 from django.forms.models import inlineformset_factory
 from django.http import HttpResponseBadRequest, HttpResponseRedirect
 from django.core.urlresolvers import reverse
+from django.conf import settings
 import hashlib
 
 from django.core.mail import send_mail
+from django.template import loader
 from django.utils import timezone
 from django.views.generic.list import ListView
 
@@ -273,15 +275,30 @@ def revente(request, tirage_id):
             resellform = ResellForm(participant, request.POST, prefix='resell')
             annulform = AnnulForm(participant, prefix='annul')
             if resellform.is_valid():
+                mails = []
                 attributions = resellform.cleaned_data["attributions"]
-                for attribution in attributions:
-                    revente, created = SpectacleRevente.objects.get_or_create(
-                        attribution=attribution,
-                        defaults={'seller': participant})
-                    if not created:
-                        revente.seller = participant
-                        revente.date = timezone.now()
-                    revente.save()
+                with transaction.atomic():
+                    for attribution in attributions:
+                        revente, created = SpectacleRevente.objects.get_or_create(
+                            attribution=attribution,
+                            defaults={'seller': participant})
+                        if not created:
+                            revente.seller = participant
+                            revente.date = timezone.now()
+                        mail_subject = "BdA-Revente : {:s}".format(attribution.spectacle.title)
+                        mail_body = loader.render_to_string('mail-revente-new.txt', {
+                            'vendeur': participant.user,
+                            'spectacle': attribution.spectacle,
+                            'revente': revente,
+                        })
+                        mails.append(mail.EmailMessage(
+                            mail_subject, mail_body,
+                            from_email=settings.MAIL_DATA['revente']['FROM'],
+                            to=[participant.user.email],
+                            reply_to=[settings.MAIL_DATA['revente']['REPLYTO']],
+                        ))
+                        revente.save()
+                    mail.get_connection().send_messages(mails)
 
         elif 'annul' in request.POST:
             annulform = AnnulForm(participant, request.POST, prefix='annul')
@@ -314,6 +331,8 @@ def revente(request, tirage_id):
                 revente = rev.get()
                 revente.date = timezone.now() - timedelta(hours=1)
                 revente.soldTo = None
+                revente.notif_sent = False
+                revente.tirage_done = False
                 if revente.answered_mail:
                     revente.answered_mail.clear()
                 revente.save()