ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'SogeNotForMembership' into 'main' 

Soge not for membership

See merge request bde/nk20!202
This commit is contained in:
bleizi 2022-09-04 22:56:07 +02:00
parent 5a77a66391 7068170f18
commit eb355f547c
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/treasury/models.py
View File

@ -329,17 +329,18 @@ 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)
if bde_qs.exists(): ## Soge do not pay BDE and kfet memberships this year (2022-2023)
m = bde_qs.get() # if bde_qs.exists():
if MembershipTransaction.objects.filter(membership=m).exists(): # non-free membership # m = bde_qs.get()
if m.transaction not in self.transactions.all(): # if MembershipTransaction.objects.filter(membership=m).exists(): # non-free membership
self.transactions.add(m.transaction) # if m.transaction not in self.transactions.all():
# self.transactions.add(m.transaction)
if kfet_qs.exists(): #
m = kfet_qs.get() # if kfet_qs.exists():
if MembershipTransaction.objects.filter(membership=m).exists(): # non-free membership # m = kfet_qs.get()
if m.transaction not in self.transactions.all(): # if MembershipTransaction.objects.filter(membership=m).exists(): # non-free membership
self.transactions.add(m.transaction) # if m.transaction not in self.transactions.all():
# 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

4
note_kfet/templates/registration/signup.html
View File

@ -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 }}
{{ soge_form|crispy }} {% comment "Soge not for membership (only WEI)" %} {{ soge_form|crispy }} {% endcomment %}
<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 %}