coopeTM/coope
3
0
Fork 0
mirror of https://github.com/nanoy42/coope synced 2024-12-25 00:13:46 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix-3.2.2' into 'master'

Browse source 
Fix 3.2.2

See merge request coope/coopev3!5
This commit is contained in:
Nanoy 2019-01-11 08:51:02 +01:00
commit cf00ff87a1
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -1,3 +1,5 @@
## v3.2.2
* Fix cotisation cancer
## v3.2.1 ## v3.2.1
* Le module django_tex est directement inclu dans le projet (disparition du module sur pip) * Le module django_tex est directement inclu dans le projet (disparition du module sur pip)
## v3.2.0 ## v3.2.0

2
templates/footer.html
View file

@ -39,6 +39,6 @@
<li><a href="https://www.facebook.com/coopesmetz/" class="icon fa-facebook alt"><span class="label">Facebook</span></a></li> <li><a href="https://www.facebook.com/coopesmetz/" class="icon fa-facebook alt"><span class="label">Facebook</span></a></li>
</ul> </ul>
</section> </section>
<p class="copyright">coope.rez v3.2.1 (release stable) &copy; 2018 Yoann Pietri.</p> <p class="copyright">coope.rez v3.2.2 (release stable) &copy; 2018 Yoann Pietri.</p>

3
users/views.py
View file

@ -8,6 +8,7 @@ from django.http import HttpResponse, HttpResponseRedirect
from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
from django.contrib.auth.decorators import login_required, permission_required from django.contrib.auth.decorators import login_required, permission_required
from django.forms.models import model_to_dict from django.forms.models import model_to_dict
from django.utils import timezone
import simplejson as json import simplejson as json
from datetime import datetime, timedelta from datetime import datetime, timedelta
@ -878,7 +879,7 @@ def addCotisationHistory(request, pk):
cotisation.coopeman = request.user cotisation.coopeman = request.user
cotisation.amount = cotisation.cotisation.amount cotisation.amount = cotisation.cotisation.amount
cotisation.duration = cotisation.cotisation.duration cotisation.duration = cotisation.cotisation.duration
if(user.profile.cotisationEnd): if(user.profile.cotisationEnd and user.profile.cotisationEnd > timezone.now()):
cotisation.endDate = user.profile.cotisationEnd + timedelta(days=cotisation.cotisation.duration) cotisation.endDate = user.profile.cotisationEnd + timedelta(days=cotisation.cotisation.duration)
else: else:
cotisation.endDate = datetime.now() + timedelta(days=cotisation.cotisation.duration) cotisation.endDate = datetime.now() + timedelta(days=cotisation.cotisation.duration)