diff --git a/core/templates/core/macros.jinja b/core/templates/core/macros.jinja
index 21ef4151..dc80964c 100644
--- a/core/templates/core/macros.jinja
+++ b/core/templates/core/macros.jinja
@@ -34,6 +34,11 @@
{%- endmacro %}
+{% macro user_subscription(user) %}
+ {% trans subscription_end=get_subscriber(user).subscriptions.last().subscription_end %}Subscribed until {{ subscription_end }}{% endtrans %}
+ {% trans %}Account number: {% endtrans %}{{ user.customer.account_id }}
+{%- endmacro %}
+
{% macro show_slots(user) %}
{% if get_subscriber(user).slots.filter(start_date__gte=timezone.now()).exists() %}
{% if get_subscriber(profile).is_subscribed() %}
{% if user == profile or user.is_root or user.is_board_member %}
- {% trans subscription_end=get_subscriber(profile).subscriptions.last().subscription_end %}Subscribed until {{ subscription_end }}{% endtrans %}
- {% trans %}Account number: {% endtrans %}{{ profile.customer.account_id }}
+ {{ user_subscription(profile) }}
{% endif %}
{% if user == profile or user.is_root or user.is_board_member or user.is_launderette_manager %}
{# Shows tokens bought by the user #}
diff --git a/counter/templates/counter/counter_click.jinja b/counter/templates/counter/counter_click.jinja
index 0a2178ed..648ac247 100644
--- a/counter/templates/counter/counter_click.jinja
+++ b/counter/templates/counter/counter_click.jinja
@@ -1,5 +1,5 @@
{% extends "core/base.jinja" %}
-{% from "core/macros.jinja" import user_mini_profile %}
+{% from "core/macros.jinja" import user_mini_profile, user_subscription %}
{% macro add_product(id, content, class="") %}
@@ -28,6 +28,7 @@
{% trans %}Amount: {% endtrans %}{{ customer.amount }} €