Skip to content

Commit

Permalink
mes-202: Fix issues with user member card
Browse files Browse the repository at this point in the history
  • Loading branch information
jjoseba committed Jun 26, 2024
1 parent 4cd9d7f commit 618210a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 2 additions & 0 deletions market/views/member.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ def get_card_data(member_type, member):


class MemberCard(TemplateView):
template_name = 'member/card.html'

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
account = Account.objects.filter(owner=self.request.user).first()
Expand Down
11 changes: 4 additions & 7 deletions templates/provider/detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{% market_url 'market:edit_provider' object.pk as url %}
{% include 'provider/header_detail.html' with account=object.provider edit_url=url %}

<div class="container mt-1">
<div class="container mt-1 pb-4">

{% if request.user.is_staff %}
<div class="card detail-card">
Expand All @@ -33,23 +33,20 @@

<div class="col-md-5 p-4">
<div class="mb-3 d-flex align-items-start">
{% if request.user.is_staff %}
<a href="{% market_url 'market:member_card' object.pk %}" class="btn bg-brand btn-primary btn-action mr-3 px-3">{% translate "Ver carnet de socia" %}</a>

<div class="form-group ">
<label>{% translate "Número de socia" %}</label><br>
{{object.member_id|default_if_none:'-'}}
</div>
{% endif %}

</div>

{% include 'common/gallery.html' with gallery=object.gallery %}
<hr>
{% include 'common/social_links.html' with obj=object %}
{% if request.user.is_superuser %}
<hr class="mt-4">
<span class="text-primary"><strong>{% translate "Número de socia" %}:</strong></span>
{{object.member_id|default_if_none:'-'}}<br>
{% endif %}
</div>

<div class="col-md-12 mb-4">
Expand All @@ -69,7 +66,7 @@ <h4 class="mb-3"><i class="material-icons-outlined text-primary">eco</i> {% tran
{% if object.benefit %}
<a class="btn btn-secondary btn-action text-light mr-4" href="{% market_url 'benefits:detail' object.benefit.pk %}">{% translate "Ver ventajas" %}</a>
{% elif request.user.is_staff or request.user.is_superuser %}
<a class="btn btn-primary mr-4" href="{% market_url 'benefits:add_provider_benefit' object.pk %}" data-toggle="tooltip" title="Añadir ventaja"><i class="material-icons mr-2">local_activity</i>{% translate "Añadir ventaja" %}</a>
<a class="btn btn-primary btn-action mr-4" href="{% market_url 'benefits:add_provider_benefit' object.pk %}" data-toggle="tooltip" title="Añadir ventaja"><i class="material-icons mr-2">local_activity</i>{% translate "Añadir ventaja" %}</a>
{% elif request.user.entity == entity %}
<h5 class="mb-3">Ahora mismo no ofreces ventajas, para añadirlas ponte en contacto con <a href="mailto:madrid@mercadosocial.net">madrid@mercadosocial.net</a> </h5>
{% endif %}
Expand Down

0 comments on commit 618210a

Please sign in to comment.