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

Smaller membership renew btn

This commit is contained in:
Alexandre Iooss 2020-08-25 16:44:01 +02:00
parent e3785e11f1
commit 1fd37bb1ce
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
apps/member/tables.py
View File

@ -96,26 +96,30 @@ class MembershipTable(tables.Table):
t = pretty_money(value) t = pretty_money(value)
# If it is required and if the user has the right, the renew button is displayed. # If it is required and if the user has the right, the renew button is displayed.
if record.club.membership_start is not None: if record.club.membership_start is not None \
if record.date_start < record.club.membership_start: # If the renew is available and record.date_start < record.club.membership_start:
if not Membership.objects.filter( if not Membership.objects.filter(
club=record.club, club=record.club,
user=record.user, user=record.user,
date_start__gte=record.club.membership_start, date_start__gte=record.club.membership_start,
date_end__lte=record.club.membership_end, date_end__lte=record.club.membership_end,
).exists(): # If the renew is not yet performed ).exists(): # If the renew is not yet performed
empty_membership = Membership( empty_membership = Membership(
club=record.club, club=record.club,
user=record.user, user=record.user,
date_start=date.today(), date_start=date.today(),
date_end=date.today(), date_end=date.today(),
fee=0, fee=0,
)
if PermissionBackend.check_perm(get_current_authenticated_user(),
"member:add_membership", empty_membership): # If the user has right
renew_url = reverse_lazy('member:club_renew_membership',
kwargs={"pk": record.pk})
t = format_html(
t + ' <a class="btn btn-sm btn-warning" title="{text}"'
' href="{renew_url}"><i class="fa fa-repeat"></i></a>',
renew_url=renew_url, text=_("Renew")
) )
if PermissionBackend.check_perm(get_current_authenticated_user(),
"member:add_membership", empty_membership): # If the user has right
t = format_html(t + ' <a class="btn btn-warning" href="{url}">{text}</a>',
url=reverse_lazy('member:club_renew_membership',
kwargs={"pk": record.pk}), text=_("Renew"))
return t return t
def render_roles(self, record): def render_roles(self, record):

3
apps/member/templates/member/profile_detail.html
View File

@ -26,7 +26,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
<div class="card bg-light"> <div class="card bg-light">
<div class="card-header position-relative" id="historyListHeading"> <div class="card-header position-relative" id="historyListHeading">
<a class="stretched-link font-weight-bold text-decoration-none" {% if "note.view_note"|has_perm:user_object.note %} <a class="stretched-link font-weight-bold text-decoration-none"
{% if "note.view_note"|has_perm:user_object.note %}
href="{% url 'note:transactions' pk=user_object.note.pk %}" {% endif %}> href="{% url 'note:transactions' pk=user_object.note.pk %}" {% endif %}>
<i class="fa fa-euro"></i> {% trans "Transaction history" %} <i class="fa fa-euro"></i> {% trans "Transaction history" %}
</a> </a>