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

Merge branch 'hotfix-3.0.2' into dev

Browse source
This commit is contained in:
Yoann Pétri 2018-12-18 11:39:53 +01:00
commit aa897d833c
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gestion/views.py
View file

@ -231,8 +231,9 @@ def cancel_consumption(request, pk):
""" """
consumption = get_object_or_404(ConsumptionHistory, pk=pk) consumption = get_object_or_404(ConsumptionHistory, pk=pk)
user = consumption.customer user = consumption.customer
user.profile.debit -= consumption.amount if consumption.paymentMethod.affect_balance:
user.save() user.profile.debit -= consumption.amount
user.save()
consumptionT = Consumption.objects.get(customer=user, product=consumption.product) consumptionT = Consumption.objects.get(customer=user, product=consumption.product)
consumptionT.quantity -= consumption.quantity consumptionT.quantity -= consumption.quantity
consumptionT.save() consumptionT.save()
@ -252,8 +253,9 @@ def cancel_menu(request, pk):
""" """
menu_history = get_object_or_404(MenuHistory, pk=pk) menu_history = get_object_or_404(MenuHistory, pk=pk)
user = menu_history.customer user = menu_history.customer
user.profile.debit -= menu_history.amount if menu_history.paymentMethod.affect_balance:
user.save() user.profile.debit -= menu_history.amount
user.save()
for product in manu_history.menu.articles: for product in manu_history.menu.articles:
consumptionT = Consumption.objects.get(customer=user, product=product) consumptionT = Consumption.objects.get(customer=user, product=product)
consumptionT -= menu_history.quantity consumptionT -= menu_history.quantity

1
templates/footer.html
View file

@ -41,3 +41,4 @@
</section> </section>
<p class="copyright">coope.rez v3.1.0 (version dev) &copy; 2018 Yoann Pietri.</p> <p class="copyright">coope.rez v3.1.0 (version dev) &copy; 2018 Yoann Pietri.</p>