From d285fbe04a233e4c9b667779848892e691d45fb9 Mon Sep 17 00:00:00 2001
From: klmp200 <klmp200@klmp200.net>
Date: Sat, 8 Oct 2016 23:07:10 +0200
Subject: [PATCH] Add account number and suscription on counter

---
 core/templates/core/macros.jinja              | 5 +++++
 core/templates/core/user_detail.jinja         | 5 ++---
 counter/templates/counter/counter_click.jinja | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

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 @@
 </div>
 {%- endmacro %}
 
+{% macro user_subscription(user) %}
+        {% trans subscription_end=get_subscriber(user).subscriptions.last().subscription_end %}Subscribed until {{ subscription_end }}{% endtrans %}<br/>
+        {% trans %}Account number: {% endtrans %}{{ user.customer.account_id }}<br/>
+{%- endmacro %}
+
 {% macro show_slots(user) %}
     {% if get_subscriber(user).slots.filter(start_date__gte=timezone.now()).exists() %}
         <h5>{% trans %}Slot{% endtrans %}</h5>
diff --git a/core/templates/core/user_detail.jinja b/core/templates/core/user_detail.jinja
index baed6b85..d83ba11b 100644
--- a/core/templates/core/user_detail.jinja
+++ b/core/templates/core/user_detail.jinja
@@ -1,5 +1,5 @@
 {% extends "core/base.jinja" %}
-{% from "core/macros.jinja" import show_slots, show_tokens %}
+{% from "core/macros.jinja" import show_slots, show_tokens, user_subscription %}
 
 {% block title %}
 {% trans user_name=profile.get_display_name() %}{{ user_name }}'s profile{% endtrans %}
@@ -56,8 +56,7 @@
 <p>
 {% 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 %}<br/>
-        {% trans %}Account number: {% endtrans %}{{ profile.customer.account_id }}<br/>
+        {{ 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 @@
 <div id="user_info">
     <h5>{% trans %}Customer{% endtrans %}</h5>
     {{ user_mini_profile(customer.user) }}
+    {{ user_subscription(customer.user) }}
     <p>{% trans %}Amount: {% endtrans %}{{ customer.amount }} €</p>
 </div>
 <div id="bar_ui">