Migrate and improve subscriptions

core/templates/core/user_account.jinja

@@ -71,7 +71,7 @@
         <td>
             <ul>
                 {% for it in i.items.all() %}
-                <li>{{ it.product_name }} - {{ it.product_unit_price }} €</li>
+                <li>{{ it.quantity }} x {{ it.product_name }} - {{ it.product_unit_price }} €</li>
                 {% endfor %}
             </ul>
         </td>

core/templates/core/user_edit.jinja

@@ -28,7 +28,7 @@
     {% endif %}
     {% if form.instance == user %}
     <p><a href="{{ url('core:password_change') }}">{% trans %}Change my password{% endtrans %}</a></p>
-    {% elif user.is_root() %}
+    {% elif user.is_root %}
     <p><a href="{{ url('core:password_root_change', user_id=form.instance.id) }}">{% trans %}Change user password{% endtrans %}</a></p>
     {% endif %}
 </form>

core/templates/core/user_mini.jinja

@@ -0,0 +1,19 @@
+<div id="user_profile">
+    <div id="pictures">
+        {% if profile.profile_pict %}
+        <img src="{{ profile.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}" />
+        {% endif %}
+    </div>
+    <p>{{ profile.get_full_name() }}</p>
+    {% if profile.nick_name %}
+    <p id="nickname">&laquo; {{ profile.nick_name }} &raquo;</p>
+    {% endif %}
+    {% if profile.date_of_birth %}
+    <p>{% trans %}Born: {% endtrans %}{{ profile.date_of_birth|date("d/m/Y") }}</p>
+    {% endif %}
+    {% if profile.promo %}
+    <p><img src="{{ static('core/img/promo_%02d.png' % profile.promo) }}" alt="Promo {{ profile.promo }}" class="promo_pict" />
+    {% trans %}Promo: {% endtrans %}{{ profile.promo }}</p>
+    {% endif %}
+</div>
+

core/urls.py

@@ -25,6 +25,7 @@ urlpatterns = [
 
     # User views
     url(r'^user/$', UserListView.as_view(), name='user_list'),
+    url(r'^user/(?P<user_id>[0-9]+)/mini$', UserMiniView.as_view(), name='user_profile_mini'),
     url(r'^user/(?P<user_id>[0-9]+)/$', UserView.as_view(), name='user_profile'),
     url(r'^user/(?P<user_id>[0-9]+)/edit$', UserUpdateProfileView.as_view(), name='user_edit'),
     url(r'^user/(?P<user_id>[0-9]+)/groups$', UserUpdateGroupView.as_view(), name='user_groups'),

core/views/forms.py

@@ -50,7 +50,6 @@ class SelectFile(TextInput):
                 'name': name,
                 }
         output += '<span name="' + name + '" class="choose_file_button">' + _("Choose file") + '</span>'
-        print(output)
         return output
 
 # Forms

core/views/user.py

@@ -121,6 +121,15 @@ class UserView(CanViewMixin, DetailView):
     context_object_name = "profile"
     template_name = "core/user_detail.jinja"
 
+class UserMiniView(CanViewMixin, DetailView):
+    """
+    Display a user's profile
+    """
+    model = User
+    pk_url_kwarg = "user_id"
+    context_object_name = "profile"
+    template_name = "core/user_mini.jinja"
+
 class UserListView(ListView):
     """
     Displays the user list