ynerant/plateforme-tfjm2
1
0
Fork 0
mirror of https://gitlab.com/animath/si/plateforme.git synced 2025-02-25 08:26:29 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: ynerant:f9645b016af3bbe328fbea412cadaa74d34db135
Branches Tags
ynerant:dev
ynerant:main
ynerant:docs
..
compare: ynerant:0c45a88246fdcecf9c591d2d7b9cc35f5b78d883
Branches Tags
ynerant:dev
ynerant:main
ynerant:docs

No commits in common. "f9645b016af3bbe328fbea412cadaa74d34db135" and "0c45a88246fdcecf9c591d2d7b9cc35f5b78d883" have entirely different histories.
f9645b016a ... 0c45a88246

2 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

2
registration/signals.py
View File

@ -49,5 +49,5 @@ def update_payment_amount(instance, **_):
""" """
if instance.type == 'free' or instance.type == 'scholarship': if instance.type == 'free' or instance.type == 'scholarship':
instance.amount = 0 instance.amount = 0
elif instance.pk and instance.registrations.exists(): elif instance.pk:
instance.amount = instance.registrations.count() * instance.tournament.price instance.amount = instance.registrations.count() * instance.tournament.price

6
registration/views.py
View File

@ -460,7 +460,7 @@ class PaymentUpdateView(LoginRequiredMixin, UpdateView):
context['title'] = _("Update payment") context['title'] = _("Update payment")
# Grouping is only possible if there isn't any validated payment in the team # Grouping is only possible if there isn't any validated payment in the team
context['can_group'] = all(p.valid is False for reg in self.object.team.students.all() context['can_group'] = all(p.valid is False for reg in self.object.team.students.all()
for p in reg.payments.filter(final=self.object.final).all()) for p in reg.payments.filter(valid=self.object.valid).all())
context['bank_transfer_form'] = PaymentForm(payment_type='bank_transfer', context['bank_transfer_form'] = PaymentForm(payment_type='bank_transfer',
data=self.request.POST or None, data=self.request.POST or None,
instance=self.object) instance=self.object)
@ -480,7 +480,7 @@ class PaymentUpdateView(LoginRequiredMixin, UpdateView):
if self.request.user.registration.participates: if self.request.user.registration.participates:
if old_instance.valid is not False: if old_instance.valid is not False:
raise PermissionDenied(_("This payment is already valid or pending validation.")) raise PermissionDenied(_("This payment is already valid or pending validation."))
if old_instance.valid is False: else:
form.instance.valid = None form.instance.valid = None
if old_instance.receipt: if old_instance.receipt:
old_instance.receipt.delete() old_instance.receipt.delete()
@ -504,7 +504,7 @@ class PaymentUpdateGroupView(LoginRequiredMixin, DetailView):
return self.handle_no_permission() return self.handle_no_permission()
if any(p.valid is not False for reg in payment.team.students.all() if any(p.valid is not False for reg in payment.team.students.all()
for p in reg.payments.filter(final=payment.final).all()): for p in reg.payments.filter(valid=payment.valid).all()):
raise PermissionDenied(_("Since one payment is already validated, or pending validation, " raise PermissionDenied(_("Since one payment is already validated, or pending validation, "
"grouping is not possible.")) "grouping is not possible."))
return super().dispatch(request, *args, **kwargs) return super().dispatch(request, *args, **kwargs)