From 1f3e186e270fd3acc84033577c4df6cd40d1d581 Mon Sep 17 00:00:00 2001
From: Skia <skia@libskia.so>
Date: Thu, 21 Jul 2016 20:03:31 +0200
Subject: [PATCH] Update counters and some views

---
 core/templates/core/user_tools.jinja          |  12 ++++----
 counter/migrations/0009_auto_20160721_1902.py |  19 +++++++++++++
 counter/models.py                             |  11 ++++----
 counter/templates/counter/counter_click.jinja |   4 ++-
 counter/templates/counter/counter_main.jinja  |   2 ++
 counter/views.py                              |  16 +++++++----
 locale/fr/LC_MESSAGES/django.mo               | Bin 16727 -> 16806 bytes
 locale/fr/LC_MESSAGES/django.po               |  26 ++++++++----------
 sith/settings_sample.py                       |   1 +
 sith/urls.py                                  |   1 +
 10 files changed, 60 insertions(+), 32 deletions(-)
 create mode 100644 counter/migrations/0009_auto_20160721_1902.py

diff --git a/core/templates/core/user_tools.jinja b/core/templates/core/user_tools.jinja
index 4d63f1be..7306c11a 100644
--- a/core/templates/core/user_tools.jinja
+++ b/core/templates/core/user_tools.jinja
@@ -13,12 +13,6 @@
     {% if user.is_in_group(settings.SITH_GROUPS['root']['name']) %}
     <li><a href="{{ url('core:group_list') }}">{% trans %}Groups{% endtrans %}</a></li>
     {% endif %}
-    {% if user.is_in_group(settings.SITH_GROUPS['counter-admin']['name']) %}
-    <li><a href="{{ url('counter:admin_list') }}">{% trans %}Counters management{% endtrans %}</a></li>
-    {% endif %}
-    {% if user.is_in_group(settings.SITH_GROUPS['accounting-admin']['name']) %}
-    <li><a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a></li>
-    {% endif %}
     {% if user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user.is_in_group(settings.SITH_GROUPS['root']['name']) %}
     <li><a href="{{ url('subscription:subscription') }}">{% trans %}Subscriptions{% endtrans %}</a></li>
     {% endif %}
@@ -27,6 +21,9 @@
 <hr>
 <h4>{% trans %}Counters{% endtrans %}</h4>
 <ul>
+    {% if user.is_in_group(settings.SITH_GROUPS['counter-admin']['name']) or user.is_in_group(settings.SITH_GROUPS['root']['name']) %}
+    <li><a href="{{ url('counter:admin_list') }}">{% trans %}General counters management{% endtrans %}</a></li>
+    {% endif %}
     {% for b in settings.SITH_COUNTER_BARS %}
     {% if user.is_in_group(b[1]+" admin") %}
     <li><a href="{{ url('counter:details', counter_id=b[0]) }}">{{ b[1] }}</a> -
@@ -38,6 +35,9 @@
 <hr>
 <h4>{% trans %}Accounting{% endtrans %}</h4>
 <ul>
+    {% if user.is_in_group(settings.SITH_GROUPS['accounting-admin']['name']) or user.is_in_group(settings.SITH_GROUPS['root']['name']) %}
+    <li><a href="{{ url('accounting:bank_list') }}">{% trans %}General accounting{% endtrans %}</a></li>
+    {% endif %}
     {% for m in user.membership.filter(end_date=None).filter(role__gte=7).all() %}
     {% for b in m.club.bank_accounts.all() %}
     <li><strong>{% trans %}Bank account: {% endtrans %}</strong>
diff --git a/counter/migrations/0009_auto_20160721_1902.py b/counter/migrations/0009_auto_20160721_1902.py
new file mode 100644
index 00000000..933f1a53
--- /dev/null
+++ b/counter/migrations/0009_auto_20160721_1902.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('counter', '0008_auto_20160718_1805'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='counter',
+            name='type',
+            field=models.CharField(max_length=255, verbose_name='subscription type', choices=[('BAR', 'Bar'), ('OFFICE', 'Office'), ('EBOUTIC', 'Eboutic')]),
+        ),
+    ]
diff --git a/counter/models.py b/counter/models.py
index 3adf2eac..00c06bde 100644
--- a/counter/models.py
+++ b/counter/models.py
@@ -10,7 +10,6 @@ from random import randrange
 from club.models import Club
 from accounting.models import CurrencyField
 from core.models import Group, User
-from subscription.models import Subscriber
 
 class Customer(models.Model):
     """
@@ -82,7 +81,7 @@ class Counter(models.Model):
     products = models.ManyToManyField(Product, related_name="counters", blank=True)
     type = models.CharField(_('subscription type'),
             max_length=255,
-            choices=[('BAR',_('Bar')), ('OFFICE',_('Office'))])
+            choices=[('BAR',_('Bar')), ('OFFICE',_('Office')), ('EBOUTIC',_('Eboutic'))])
     edit_groups = models.ManyToManyField(Group, related_name="editable_counters", blank=True)
     view_groups = models.ManyToManyField(Group, related_name="viewable_counters", blank=True)
     barmen_session = {}
@@ -132,7 +131,7 @@ class Counter(models.Model):
 
     def get_barmen_list(counter_id):
         """
-        Returns the barman list as list of Subscriber
+        Returns the barman list as list of User
 
         Also handle the timeout of the barmen
         """
@@ -141,7 +140,7 @@ class Counter(models.Model):
         if counter_id in list(Counter.barmen_session.keys()):
             for b in Counter.barmen_session[counter_id]['users']:
                 # Reminder: user is stored as a tuple with its login time
-                bl.append(Subscriber.objects.filter(id=b[0]).first())
+                bl.append(User.objects.filter(id=b[0]).first())
             if (timezone.now() - Counter.barmen_session[counter_id]['time']) < timedelta(minutes=settings.SITH_BARMAN_TIMEOUT):
                 Counter.barmen_session[counter_id]['time'] = timezone.now()
             else:
@@ -151,9 +150,9 @@ class Counter(models.Model):
                 Counter.barmen_session[counter_id]['users'] = set()
         return bl
 
-    def get_random_barman(counter_id): # TODO: improve this function
+    def get_random_barman(counter_id):
         bl = Counter.get_barmen_list(counter_id)
-        return bl[0]
+        return bl[randrange(0, len(bl))]
 
 class Refilling(models.Model):
     """
diff --git a/counter/templates/counter/counter_click.jinja b/counter/templates/counter/counter_click.jinja
index ee231827..317a1b36 100644
--- a/counter/templates/counter/counter_click.jinja
+++ b/counter/templates/counter/counter_click.jinja
@@ -25,6 +25,7 @@
     <h5>{% trans %}Customer{% endtrans %}</h5>
     <p>{{ customer.user.get_display_name() }}, {{ customer.amount }} €</p>
 </div>
+{% if counter.type == 'BAR' %}
 <div>
     <h5>{% trans %}Refilling{% endtrans %}</h5>
     <form method="post" action="{{ url('counter:click', counter_id=counter.id, user_id=customer.user.id) }}">
@@ -34,6 +35,7 @@
         <input type="submit" value="{% trans %}Go{% endtrans %}" />
     </form>
 </div>
+{% endif %}
 <div>
     <h5>{% trans %}Selling{% endtrans %}</h5>
     {% if request.session['not_enough'] %}
@@ -47,7 +49,7 @@
     </form>
     <p>{% trans %}Basket: {% endtrans %}</p>
     <ul>
-        {% for id,infos in request.session['basket'].items() %}
+        {% for id,infos in request.session['basket']|dictsort %}
         {% set product = counter.products.filter(id=id).first() %}
         {% set s = infos['qty'] * infos['price'] / 100 %}
         <li>{{ del_product(id, '-') }} {{ infos['qty'] }} {{ add_product(id, '+') }} {{ product.name }}: {{ "%0.2f"|format(s) }} €</li>
diff --git a/counter/templates/counter/counter_main.jinja b/counter/templates/counter/counter_main.jinja
index 743ec0b1..683ba353 100644
--- a/counter/templates/counter/counter_main.jinja
+++ b/counter/templates/counter/counter_main.jinja
@@ -38,6 +38,7 @@
         <p>{% trans %}Please, login{% endtrans %}</p>
         {% endif %}
     </div>
+    {% if counter.type == 'BAR' %}
     <div>
         <h3>{% trans %}Barman: {% endtrans %}</h3>
         <ul>
@@ -51,6 +52,7 @@
             <p><input type="submit" value="{% trans %}login{% endtrans %}" /></p>
         </form>
     </div>
+    {% endif %}
 {% endblock %}
 
 
diff --git a/counter/views.py b/counter/views.py
index c3dc1419..899a90a4 100644
--- a/counter/views.py
+++ b/counter/views.py
@@ -72,7 +72,10 @@ class CounterMain(DetailView, ProcessFormView, FormMixin):
         kwargs['login_form'] = AuthenticationForm()
         kwargs['login_form'].fields['username'].widget.attrs['autofocus'] = True
         kwargs['form'] = self.get_form()
-        kwargs['barmen'] = Counter.get_barmen_list(self.object.id)
+        if self.object.type == 'BAR':
+            kwargs['barmen'] = Counter.get_barmen_list(self.object.id)
+        elif self.request.user.is_authenticated():
+            kwargs['barmen'] = [self.request.user]
         if 'last_basket' in self.request.session.keys():
             kwargs['last_basket'] = self.request.session.pop('last_basket')
             kwargs['last_customer'] = self.request.session.pop('last_customer')
@@ -109,8 +112,10 @@ class CounterClick(DetailView):
         request.session['not_enough'] = False
         self.refill_form = None
         ret = super(CounterClick, self).get(request, *args, **kwargs)
-        if len(Counter.get_barmen_list(self.object.id)) < 1: # Check that at least one barman is logged in
-            return self.cancel(request) # Otherwise, go to main view
+        if ((self.object.type != "BAR" and not request.user.is_authenticated()) or
+                (self.object.type == "BAR" and
+                len(Counter.get_barmen_list(self.object.id)) < 1)): # Check that at least one barman is logged in
+            ret = self.cancel(request) # Otherwise, go to main view
         return ret
 
     def post(self, request, *args, **kwargs):
@@ -173,7 +178,7 @@ class CounterClick(DetailView):
             request.session['basket'][pid]['qty'] += q
         else:
             request.session['basket'][pid] = {'qty': q, 'price': int(price*100)}
-        request.session['not_enough'] = False
+        request.session['not_enough'] = False # Reset not_enough to save the session
         request.session.modified = True
         return True
 
@@ -283,7 +288,8 @@ class CounterLogin(RedirectView):
         form = AuthenticationForm(request, data=request.POST)
         if form.is_valid():
             user = Subscriber.objects.filter(username=form.cleaned_data['username']).first()
-            Counter.add_barman(self.counter_id, user.id)
+            if user.is_subscribed():
+                Counter.add_barman(self.counter_id, user.id)
         else:
             print("Error logging the barman") # TODO handle that nicely
         return super(CounterLogin, self).post(request, *args, **kwargs)
diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
index 4af6dae04129c02b56dc3cb9565ed741d478df95..acc139106eabe64bdddc295ac9e22b5f8d03e78f 100644
GIT binary patch
delta 5638
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
BU@8Cr

delta 5542
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

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index bd42e751..352cf2dd 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-21 12:08+0200\n"
+"POT-Creation-Date: 2016-07-21 17:39+0200\n"
 "PO-Revision-Date: 2016-07-18\n"
 "Last-Translator: Skia <skia@libskia.so>\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -113,8 +113,7 @@ msgstr "Il n'y a pas de types comptable dans ce site web."
 #: accounting/templates/accounting/bank_account_details.jinja:5
 #: accounting/templates/accounting/club_account_details.jinja:5
 #: accounting/templates/accounting/journal_details.jinja:5
-#: core/templates/core/user_tools.jinja:20
-#: core/templates/core/user_tools.jinja:39
+#: core/templates/core/user_tools.jinja:36
 msgid "Accounting"
 msgstr "Comptabilité"
 
@@ -147,7 +146,7 @@ msgstr "Nouveau compte club"
 #: club/templates/club/club_detail.jinja:7
 #: core/templates/core/page_detail.jinja:7
 #: core/templates/core/user_base.jinja:8
-#: core/templates/core/user_tools.jinja:33
+#: core/templates/core/user_tools.jinja:30
 #: counter/templates/counter/counter_list.jinja:14
 msgid "Edit"
 msgstr "Éditer"
@@ -865,17 +864,21 @@ msgid "Sith management"
 msgstr "Gestion de Sith"
 
 #: core/templates/core/user_tools.jinja:17
-msgid "Counters management"
-msgstr "Gestion des comptoirs"
-
-#: core/templates/core/user_tools.jinja:23
 msgid "Subscriptions"
 msgstr "Cotisations"
 
-#: core/templates/core/user_tools.jinja:28
+#: core/templates/core/user_tools.jinja:22
 msgid "Counters"
 msgstr "Comptoirs"
 
+#: core/templates/core/user_tools.jinja:25
+msgid "General counters management"
+msgstr "Gestion générale des comptoirs"
+
+#: core/templates/core/user_tools.jinja:39
+msgid "General accounting"
+msgstr "Comptabilité générale"
+
 #: core/templates/core/user_tools.jinja:47
 msgid "Club account: "
 msgstr "Compte club : "
@@ -1152,8 +1155,3 @@ msgid "You must either choose an existing user or create a new one properly"
 msgstr ""
 "Vous devez soit choisir un utilisateur existant, ou en créer un proprement."
 
-#~ msgid "View account"
-#~ msgstr "Voir le compte"
-
-#~ msgid "View account:"
-#~ msgstr "Voir le compte:"
diff --git a/sith/settings_sample.py b/sith/settings_sample.py
index 43238b23..4f98cf39 100644
--- a/sith/settings_sample.py
+++ b/sith/settings_sample.py
@@ -44,6 +44,7 @@ INSTALLED_APPS = (
     'subscription',
     'accounting',
     'counter',
+    'eboutic',
 )
 
 MIDDLEWARE_CLASSES = (
diff --git a/sith/urls.py b/sith/urls.py
index 6cccd726..60de79eb 100644
--- a/sith/urls.py
+++ b/sith/urls.py
@@ -27,5 +27,6 @@ urlpatterns = [
     url(r'^club/', include('club.urls', namespace="club", app_name="club")),
     url(r'^counter/', include('counter.urls', namespace="counter", app_name="counter")),
     url(r'^accounting/', include('accounting.urls', namespace="accounting", app_name="accounting")),
+    url(r'^eboutic/', include('eboutic.urls', namespace="eboutic", app_name="eboutic")),
     url(r'^admin/', include(admin.site.urls)),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) # TODO: remove me for production!!!