From 39ce14804afd7b3fe051046a8ec15a45d9bc4655 Mon Sep 17 00:00:00 2001
From: Krophil <pierre.brunet@krophil.fr>
Date: Sat, 2 Sep 2017 15:05:36 +0200
Subject: [PATCH] Add refillings list

---
 counter/templates/counter/counter_list.jinja  |  6 ++--
 .../templates/counter/refilling_list.jinja    | 33 +++++++++++++++++++
 counter/urls.py                               |  2 ++
 counter/views.py                              | 20 +++++++++++
 4 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 counter/templates/counter/refilling_list.jinja

diff --git a/counter/templates/counter/counter_list.jinja b/counter/templates/counter/counter_list.jinja
index bc6144b2..b807a7d3 100644
--- a/counter/templates/counter/counter_list.jinja
+++ b/counter/templates/counter/counter_list.jinja
@@ -18,7 +18,8 @@
     <a href="{{ url('counter:stats', counter_id=c.id) }}">{% trans %}Stats{% endtrans %}</a> -
     {% endif %}
     {% if user.is_owner(c) %}
-    <a href="{{ url('counter:prop_admin', counter_id=c.id) }}">{% trans %}Props{% endtrans %}</a>
+    <a href="{{ url('counter:prop_admin', counter_id=c.id) }}">{% trans %}Props{% endtrans %}</a> -
+    <a href="{{ url('counter:refilling_list', counter_id=c.id) }}">{% trans %}Refillings list{% endtrans %}</a>
     {% endif %}
     </li>
     {% endfor %}
@@ -39,7 +40,8 @@
     <a href="{{url('stock:new', counter_id=c.id)}}">{% trans %}Create new stock{% endtrans%}</a> -
     {% endif %}
     {% if user.is_owner(c) %}
-    <a href="{{ url('counter:prop_admin', counter_id=c.id) }}">{% trans %}Props{% endtrans %}</a>
+    <a href="{{ url('counter:prop_admin', counter_id=c.id) }}">{% trans %}Props{% endtrans %}</a> -
+    <a href="{{ url('counter:refilling_list', counter_id=c.id) }}">{% trans %}Refillings list{% endtrans %}</a>
     {% endif %}
     </li>
     {% endfor %}
diff --git a/counter/templates/counter/refilling_list.jinja b/counter/templates/counter/refilling_list.jinja
new file mode 100644
index 00000000..13ebcaf3
--- /dev/null
+++ b/counter/templates/counter/refilling_list.jinja
@@ -0,0 +1,33 @@
+{% extends "core/base.jinja" %}
+{% from 'core/macros.jinja' import paginate %}
+
+{% block title %}
+{%- trans %}Refilling list{% endtrans %} -- {{ counter.name }}
+{% endblock %}
+
+{% block content %}
+  <h3>{% trans %}Refilling{% endtrans %}</h3>
+  <table>
+  <tr>
+    <th>{% trans %}Customer{% endtrans %}</th>
+    <th>{% trans %}Amount{% endtrans %}</th>
+    <th>{% trans %}Payment method{% endtrans %}</th>
+    <th>{% trans %}Seller{% endtrans %}</th>
+    <th>{% trans %}Actions{% endtrans %}</th>
+  </tr>
+    {%- for refilling in object_list %}
+  <tr>
+    <td><a href="{{ url('core:user_profile', user_id=refilling.customer.user.id) }}">{{ refilling.customer }}</a></td>
+    <td>{{ refilling.amount }}</td>
+    <td>{{ refilling.payment_method }}</td>
+    <td>{{ refilling.operator }}</td>
+    <td><a href="{{ url('counter:refilling_delete', refilling_id=refilling.id)}}">Delete</a></td>
+  </tr>
+  </table>
+  
+  {%- endfor %}
+{% if is_paginated %}
+    {{ paginate(page_obj, paginator) }}
+{% endif %}
+{%- endblock %}
+
diff --git a/counter/urls.py b/counter/urls.py
index 5f939804..aaade292 100644
--- a/counter/urls.py
+++ b/counter/urls.py
@@ -56,6 +56,8 @@ urlpatterns = [
     url(r'^admin/eticket/(?P<eticket_id>[0-9]+)$', EticketEditView.as_view(), name='edit_eticket'),
     url(r'^admin/selling/(?P<selling_id>[0-9]+)/delete$', SellingDeleteView.as_view(), name='selling_delete'),
     url(r'^admin/refilling/(?P<refilling_id>[0-9]+)/delete$', RefillingDeleteView.as_view(), name='refilling_delete'),
+    url(r'^admin/(?P<counter_id>[0-9]+)/refillings$', CounterRefillingListView.as_view(), name='refilling_list'),
+
 ]
 
 
diff --git a/counter/views.py b/counter/views.py
index 9d4963f8..bc008d54 100644
--- a/counter/views.py
+++ b/counter/views.py
@@ -1280,3 +1280,23 @@ class EticketPDFView(CanViewMixin, DetailView):
         p.showPage()
         p.save()
         return response
+
+
+class CounterRefillingListView(CounterAdminTabsMixin, CounterAdminMixin, ListView):
+    """
+    List of refillings on a counter
+    """
+    model = Refilling
+    template_name = 'counter/refilling_list.jinja'
+    current_tab = "counters"
+    paginate_by = 30
+
+    def dispatch(self, request, *args, **kwargs):
+        self.counter = get_object_or_404(Counter, pk=kwargs['counter_id'])
+        self.queryset = Refilling.objects.filter(counter__id=self.counter.id)
+        return super(CounterRefillingListView, self).dispatch(request, *args, **kwargs)
+
+    def get_context_data(self, **kwargs):
+        kwargs = super(CounterRefillingListView, self).get_context_data(**kwargs)
+        kwargs['counter'] = self.counter
+        return kwargs