coopeTM/coope
3
0
Fork 0
mirror of https://github.com/nanoy42/coope synced 2024-11-22 11:23:11 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_invalidate' into dev

Browse source
This commit is contained in:
Yoann Pétri 2019-01-23 10:43:39 +01:00
commit d99d5a9ae3
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
users/templates/users/profile.html
View file

@ -80,7 +80,6 @@
console.log(baseColor)
$.get("http://www.thecolorapi.com/scheme?rgb=" + baseColor + "&mode=analogic&count={{products | length}}", function( data ) {
colors = data.colors
console.log(colors)
var bgColor = []
for(var i = 0; i < colors.length; i++){
color = colors[i]

2
users/views.py
View file

@ -922,7 +922,7 @@ def invalidateCotisationHistory(request, pk):
user = cotisationHistory.user
user.profile.cotisationEnd = user.profile.cotisationEnd - timedelta(days=cotisationHistory.duration)
if(cotisationHistory.paymentMethod.affect_balance):
user.profile.balance += cotisation.amount
user.profile.debit -= cotisationHistory.cotisation.amount
user.save()
messages.success(request, "La cotisation a bien été invalidée")
return HttpResponseRedirect(request.META.get('HTTP_REFERER'))