mirror of
https://gitlab.crans.org/bde/nk20
synced 2025-02-25 17:36:31 +00:00
Compare commits
No commits in common. "eb355f547c65b2d14a6d98274deaf435f708695c" and "5a77a66391dbc95c896f9345559557464c931c07" have entirely different histories.
eb355f547c
...
5a77a66391
@ -329,18 +329,17 @@ class SogeCredit(models.Model):
|
|||||||
bde_qs = Membership.objects.filter(user=self.user, club=bde, date_start__gte=bde.membership_start)
|
bde_qs = Membership.objects.filter(user=self.user, club=bde, date_start__gte=bde.membership_start)
|
||||||
kfet_qs = Membership.objects.filter(user=self.user, club=kfet, date_start__gte=kfet.membership_start)
|
kfet_qs = Membership.objects.filter(user=self.user, club=kfet, date_start__gte=kfet.membership_start)
|
||||||
|
|
||||||
## Soge do not pay BDE and kfet memberships this year (2022-2023)
|
if bde_qs.exists():
|
||||||
# if bde_qs.exists():
|
m = bde_qs.get()
|
||||||
# m = bde_qs.get()
|
if MembershipTransaction.objects.filter(membership=m).exists(): # non-free membership
|
||||||
# if MembershipTransaction.objects.filter(membership=m).exists(): # non-free membership
|
if m.transaction not in self.transactions.all():
|
||||||
# if m.transaction not in self.transactions.all():
|
self.transactions.add(m.transaction)
|
||||||
# self.transactions.add(m.transaction)
|
|
||||||
#
|
if kfet_qs.exists():
|
||||||
# if kfet_qs.exists():
|
m = kfet_qs.get()
|
||||||
# m = kfet_qs.get()
|
if MembershipTransaction.objects.filter(membership=m).exists(): # non-free membership
|
||||||
# if MembershipTransaction.objects.filter(membership=m).exists(): # non-free membership
|
if m.transaction not in self.transactions.all():
|
||||||
# if m.transaction not in self.transactions.all():
|
self.transactions.add(m.transaction)
|
||||||
# self.transactions.add(m.transaction)
|
|
||||||
|
|
||||||
if 'wei' in settings.INSTALLED_APPS:
|
if 'wei' in settings.INSTALLED_APPS:
|
||||||
from wei.models import WEIClub
|
from wei.models import WEIClub
|
||||||
|
@ -23,11 +23,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{{ form|crispy }}
|
{{ form|crispy }}
|
||||||
{{ profile_form|crispy }}
|
{{ profile_form|crispy }}
|
||||||
{% comment "Soge not for membership (only WEI)" %} {{ soge_form|crispy }} {% endcomment %}
|
{{ soge_form|crispy }}
|
||||||
<button class="btn btn-success" type="submit">
|
<button class="btn btn-success" type="submit">
|
||||||
{% trans "Sign up" %}
|
{% trans "Sign up" %}
|
||||||
</button>
|
</button>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
Loading…
x
Reference in New Issue
Block a user