From 0ecb78a101a84685c8f5426df011f9ef40c77efd Mon Sep 17 00:00:00 2001 From: Skia Date: Fri, 22 Jul 2016 13:34:34 +0200 Subject: [PATCH] Fix some counter stuff --- counter/models.py | 2 + counter/templates/counter/counter_list.jinja | 5 + counter/templates/counter/counter_main.jinja | 6 +- counter/views.py | 26 ++--- eboutic/models.py | 4 - eboutic/views.py | 7 +- locale/fr/LC_MESSAGES/django.mo | Bin 17522 -> 17589 bytes locale/fr/LC_MESSAGES/django.po | 100 ++++++++++--------- 8 files changed, 79 insertions(+), 71 deletions(-) diff --git a/counter/models.py b/counter/models.py index 00c06bde..cb35d290 100644 --- a/counter/models.py +++ b/counter/models.py @@ -95,6 +95,8 @@ class Counter(models.Model): return self.name def get_absolute_url(self): + if self.type == "EBOUTIC": + return reverse('eboutic:main') return reverse('counter:details', kwargs={'counter_id': self.id}) def can_be_edited_by(self, user): diff --git a/counter/templates/counter/counter_list.jinja b/counter/templates/counter/counter_list.jinja index cf15129b..0bf14e72 100644 --- a/counter/templates/counter/counter_list.jinja +++ b/counter/templates/counter/counter_list.jinja @@ -10,8 +10,13 @@

{% trans %}Counter admin list{% endtrans %}

{% else %} diff --git a/counter/templates/counter/counter_main.jinja b/counter/templates/counter/counter_main.jinja index 683ba353..1dcbd143 100644 --- a/counter/templates/counter/counter_main.jinja +++ b/counter/templates/counter/counter_main.jinja @@ -9,11 +9,7 @@ {% endmacro %} {% block content %} -

{% trans %}Counter{% endtrans %}

-

{{ counter }}

-

{% trans %}Club: {% endtrans %} {{ counter.club }}

-

{% trans %}Products: {% endtrans %} {{ counter.products.all() }}

- +

{% trans counter_name=counter %}{{ counter_name }} counter{% endtrans %}

{% trans %}Sellings{% endtrans %}

diff --git a/counter/views.py b/counter/views.py index c06632e8..768c13c3 100644 --- a/counter/views.py +++ b/counter/views.py @@ -124,12 +124,20 @@ class CounterClick(DetailView): self.object = self.get_object() self.customer = Customer.objects.filter(user__id=self.kwargs['user_id']).first() self.refill_form = None - if len(Counter.get_barmen_list(self.object.id)) < 1: # Check that at least one barman is logged in + 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 return self.cancel(request) if 'basket' not in request.session.keys(): request.session['basket'] = {} request.session['basket_total'] = 0 request.session['not_enough'] = False + if self.object.type != "BAR": + self.operator = request.user + elif self.is_barman_price(): + self.operator = self.customer.user + else: + self.operator = Counter.get_random_barman(self.object.id) if 'add_product' in request.POST['action']: self.add_product(request) @@ -147,7 +155,7 @@ class CounterClick(DetailView): return self.render_to_response(context) def is_barman_price(self): - if self.customer.user.id in [s.id for s in Counter.get_barmen_list(self.object.id)]: + if self.object.type == "BAR" and self.customer.user.id in [s.id for s in Counter.get_barmen_list(self.object.id)]: return True else: return False @@ -210,7 +218,7 @@ class CounterClick(DetailView): nb = 1 else: nb = int(nb) - p = Product.objects.filter(code=code).first() + p = self.object.products.filter(code=code).first() if p is not None: while nb > 0 and not self.add_product(request, nb, p.id): nb -= 1 @@ -220,10 +228,6 @@ class CounterClick(DetailView): def finish(self, request): """ Finish the click session, and validate the basket """ with transaction.atomic(): - if self.is_barman_price(): - seller = self.customer.user - else: - seller = Counter.get_random_barman(self.object.id) request.session['last_basket'] = [] for pid,infos in request.session['basket'].items(): # This duplicates code for DB optimization (prevent to load many times the same object) @@ -236,7 +240,7 @@ class CounterClick(DetailView): raise DataError(_("You have not enough money to buy all the basket")) request.session['last_basket'].append("%d x %s" % (infos['qty'], p.name)) s = Selling(product=p, counter=self.object, unit_price=uprice, - quantity=infos['qty'], seller=seller, customer=self.customer) + quantity=infos['qty'], seller=self.operator, customer=self.customer) s.save() request.session['last_customer'] = self.customer.user.get_display_name() request.session['last_total'] = "%0.2f" % self.sum_basket(request) @@ -256,14 +260,10 @@ class CounterClick(DetailView): def refill(self, request): """Refill the customer's account""" - if self.is_barman_price(): - operator = self.customer.user - else: - operator = Counter.get_random_barman(self.object.id) form = RefillForm(request.POST) if form.is_valid(): form.instance.counter = self.object - form.instance.operator = operator + form.instance.operator = self.operator form.instance.customer = self.customer form.instance.save() else: diff --git a/eboutic/models.py b/eboutic/models.py index 27a81bc6..b329b39e 100644 --- a/eboutic/models.py +++ b/eboutic/models.py @@ -5,10 +5,6 @@ from accounting.models import CurrencyField from counter.models import Counter, Product from core.models import User -class Eboutic(Counter): - class Meta: - proxy = True - class Basket(models.Model): """ Basket is built when the user validate its session basket and asks for payment diff --git a/eboutic/views.py b/eboutic/views.py index 19040999..6e9e6888 100644 --- a/eboutic/views.py +++ b/eboutic/views.py @@ -1,15 +1,14 @@ from django.shortcuts import render from django.core.urlresolvers import reverse_lazy -from eboutic.models import Eboutic from django.views.generic import TemplateView, View from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render from django.db import transaction, DataError from django.utils.translation import ugettext as _ -from counter.models import Product, Customer -from eboutic.models import Basket, Invoice, Eboutic, BasketItem, InvoiceItem +from counter.models import Product, Customer, Counter +from eboutic.models import Basket, Invoice, BasketItem, InvoiceItem # Create your views here. class EbouticMain(TemplateView): @@ -69,7 +68,7 @@ class EbouticMain(TemplateView): def get_context_data(self, **kwargs): kwargs = super(EbouticMain, self).get_context_data(**kwargs) kwargs['basket_total'] = EbouticMain.sum_basket(self.request) - kwargs['eboutic'] = Eboutic.objects.filter(type="EBOUTIC").first() + kwargs['eboutic'] = Counter.objects.filter(type="EBOUTIC").first() return kwargs class EbouticCommand(TemplateView): diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index bb5b310a443824cd4c10dd1ad7e287df7a89f942..ac491fbd566d5dab9f23d5251b75fa7c7d40f796 100644 GIT binary patch delta 5823 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 delta 5765 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\n" "Language-Team: AE info \n" @@ -30,11 +30,11 @@ msgstr "IBAN" msgid "account number" msgstr "numero de compte" -#: accounting/models.py:92 club/models.py:109 counter/models.py:214 +#: accounting/models.py:92 club/models.py:109 counter/models.py:216 msgid "start date" msgstr "date de début" -#: accounting/models.py:93 club/models.py:110 counter/models.py:215 +#: accounting/models.py:93 club/models.py:110 counter/models.py:217 msgid "end date" msgstr "date de fin" @@ -43,7 +43,7 @@ msgid "is closed" msgstr "est fermé" #: accounting/models.py:97 accounting/models.py:136 counter/models.py:21 -#: counter/models.py:162 +#: counter/models.py:164 msgid "amount" msgstr "montant" @@ -55,8 +55,8 @@ msgstr "montant effectif" msgid "number" msgstr "numéro" -#: accounting/models.py:137 core/models.py:462 counter/models.py:165 -#: counter/models.py:193 eboutic/models.py:17 eboutic/models.py:30 +#: accounting/models.py:137 core/models.py:462 counter/models.py:167 +#: counter/models.py:195 eboutic/models.py:13 eboutic/models.py:26 msgid "date" msgstr "date" @@ -68,7 +68,7 @@ msgstr "intitulé" msgid "remark" msgstr "remarque" -#: accounting/models.py:140 counter/models.py:166 eboutic/models.py:32 +#: accounting/models.py:140 counter/models.py:168 eboutic/models.py:28 #: subscription/models.py:34 msgid "payment method" msgstr "méthode de paiement" @@ -144,10 +144,11 @@ msgstr "Nouveau compte club" #: accounting/templates/accounting/bank_account_list.jinja:15 #: accounting/templates/accounting/club_account_details.jinja:44 #: accounting/templates/accounting/journal_details.jinja:51 -#: club/templates/club/club_detail.jinja:7 core/templates/core/page.jinja:30 +#: club/templates/club/club_detail.jinja:7 core/templates/core/page.jinja:31 #: core/templates/core/user_base.jinja:8 #: core/templates/core/user_tools.jinja:30 -#: counter/templates/counter/counter_list.jinja:14 +#: counter/templates/counter/counter_list.jinja:15 +#: counter/templates/counter/counter_list.jinja:18 msgid "Edit" msgstr "Éditer" @@ -227,7 +228,7 @@ msgid "No" msgstr "Non" #: accounting/templates/accounting/club_account_details.jinja:43 -#: core/templates/core/page.jinja:27 +#: core/templates/core/page.jinja:28 msgid "View" msgstr "Voir" @@ -304,7 +305,7 @@ msgstr "Adresse" msgid "You can not make loops in clubs" msgstr "Vous ne pouvez pas faire de boucles dans les clubs" -#: club/models.py:107 eboutic/models.py:16 eboutic/models.py:29 +#: club/models.py:107 eboutic/models.py:12 eboutic/models.py:25 msgid "user" msgstr "nom d'utilisateur" @@ -342,7 +343,7 @@ msgstr "Club" msgid "Back to list" msgstr "Retour à la liste" -#: club/templates/club/club_detail.jinja:10 core/templates/core/page.jinja:33 +#: club/templates/club/club_detail.jinja:10 core/templates/core/page.jinja:34 msgid "Prop" msgstr "Propriétés" @@ -545,14 +546,18 @@ msgid "Users" msgstr "Utilisateurs" #: core/templates/core/base.jinja:30 +msgid "Wiki" +msgstr "" + +#: core/templates/core/base.jinja:31 msgid "Pages" msgstr "Pages" -#: core/templates/core/base.jinja:31 +#: core/templates/core/base.jinja:32 msgid "Clubs" msgstr "Clubs" -#: core/templates/core/base.jinja:44 +#: core/templates/core/base.jinja:45 msgid "Site made by good people" msgstr "Site réalisé par des gens biens" @@ -624,7 +629,7 @@ msgid "Please login to see this page." msgstr "Merci de vous identifier pour voir cette page." #: core/templates/core/login.jinja:31 -#: counter/templates/counter/counter_main.jinja:52 +#: counter/templates/counter/counter_main.jinja:48 msgid "login" msgstr "login" @@ -645,15 +650,15 @@ msgstr "Créer une page" msgid "Not found" msgstr "Non trouvé" -#: core/templates/core/page.jinja:28 +#: core/templates/core/page.jinja:29 msgid "History" msgstr "Historique" -#: core/templates/core/page.jinja:43 +#: core/templates/core/page.jinja:45 msgid "Page does not exist" msgstr "La page n'existe pas." -#: core/templates/core/page.jinja:45 +#: core/templates/core/page.jinja:47 msgid "Create it?" msgstr "La créer ?" @@ -669,6 +674,7 @@ msgid "Page history" msgstr "Historique de la page" #: core/templates/core/page_hist.jinja:5 +#, python-format msgid "You're seeing the history of page \"%(page_name)s\"" msgstr "Vous consultez l'historique de la page \"%(page_name)s\"" @@ -911,25 +917,23 @@ msgstr "Bureau" msgid "Eboutic" msgstr "Eboutic" -#: counter/models.py:168 +#: counter/models.py:170 msgid "bank" msgstr "banque" -#: counter/models.py:189 eboutic/models.py:55 +#: counter/models.py:191 eboutic/models.py:51 msgid "unit price" msgstr "prix unitaire" -#: counter/models.py:190 eboutic/models.py:56 +#: counter/models.py:192 eboutic/models.py:52 msgid "quantity" msgstr "quantité" #: counter/templates/counter/counter_click.jinja:20 -#: counter/templates/counter/counter_main.jinja:12 msgid "Counter" msgstr "Comptoir" #: counter/templates/counter/counter_click.jinja:22 -#: counter/templates/counter/counter_main.jinja:14 msgid "Club: " msgstr "Club : " @@ -961,7 +965,7 @@ msgid "Basket: " msgstr "Panier : " #: counter/templates/counter/counter_click.jinja:58 -#: counter/templates/counter/counter_main.jinja:28 +#: counter/templates/counter/counter_main.jinja:24 #: eboutic/templates/eboutic/eboutic_main.jinja:31 msgid "Total: " msgstr "Total : " @@ -971,7 +975,6 @@ msgid "Finish" msgstr "Terminer" #: counter/templates/counter/counter_click.jinja:69 -#: counter/templates/counter/counter_main.jinja:15 #: eboutic/templates/eboutic/eboutic_main.jinja:39 msgid "Products: " msgstr "Produits : " @@ -989,39 +992,43 @@ msgstr "Liste des comptoirs" msgid "New counter" msgstr "Nouveau comptoir" -#: counter/templates/counter/counter_list.jinja:18 +#: counter/templates/counter/counter_list.jinja:23 msgid "There is no counters in this website." msgstr "Il n'y a pas de comptoirs dans ce site web." -#: counter/templates/counter/counter_main.jinja:19 +#: counter/templates/counter/counter_main.jinja:12 +msgid "%(counter_name)s counter" +msgstr "Comptoir %(counter_name)s" + +#: counter/templates/counter/counter_main.jinja:15 msgid "Sellings" msgstr "Ventes" -#: counter/templates/counter/counter_main.jinja:21 +#: counter/templates/counter/counter_main.jinja:17 msgid "Last selling: " msgstr "Dernière vente : " -#: counter/templates/counter/counter_main.jinja:22 +#: counter/templates/counter/counter_main.jinja:18 msgid "Client: " msgstr "Client : " -#: counter/templates/counter/counter_main.jinja:22 +#: counter/templates/counter/counter_main.jinja:18 msgid "New amount: " msgstr "Nouveau montant : " -#: counter/templates/counter/counter_main.jinja:31 +#: counter/templates/counter/counter_main.jinja:27 msgid "Enter client code:" msgstr "Entrez un code client : " -#: counter/templates/counter/counter_main.jinja:35 +#: counter/templates/counter/counter_main.jinja:31 msgid "validate" msgstr "valider" -#: counter/templates/counter/counter_main.jinja:38 +#: counter/templates/counter/counter_main.jinja:34 msgid "Please, login" msgstr "Merci de vous identifier" -#: counter/templates/counter/counter_main.jinja:43 +#: counter/templates/counter/counter_main.jinja:39 msgid "Barman: " msgstr "Barman : " @@ -1034,43 +1041,43 @@ msgstr "Compte de %(user_name)s" msgid "User account" msgstr "Compte utilisateur" -#: counter/views.py:200 +#: counter/views.py:208 msgid "END" msgstr "FIN" -#: counter/views.py:202 +#: counter/views.py:210 msgid "CAN" msgstr "ANN" -#: counter/views.py:236 +#: counter/views.py:240 msgid "You have not enough money to buy all the basket" msgstr "Vous n'avez pas assez d'argent pour acheter le panier" -#: eboutic/models.py:31 sith/settings.py:231 sith/settings_sample.py:231 +#: eboutic/models.py:27 sith/settings.py:231 sith/settings_sample.py:231 msgid "Credit card" msgstr "Carte banquaire" -#: eboutic/models.py:31 +#: eboutic/models.py:27 msgid "Sith account" msgstr "Compte utilisateur" -#: eboutic/models.py:33 +#: eboutic/models.py:29 msgid "validated" msgstr "validé" -#: eboutic/models.py:44 +#: eboutic/models.py:40 msgid "Invoice already validated" msgstr "Facture déjà validée" -#: eboutic/models.py:54 +#: eboutic/models.py:50 msgid "product name" msgstr "nom du produit" -#: eboutic/models.py:65 +#: eboutic/models.py:61 msgid "basket" msgstr "panier" -#: eboutic/models.py:68 +#: eboutic/models.py:64 msgid "invoice" msgstr "facture" @@ -1094,7 +1101,7 @@ msgstr "Le paiement a échoué" msgid "Payment successful" msgstr "Le paiement a été effectué" -#: eboutic/views.py:117 +#: eboutic/views.py:116 msgid "You have not enough money to buy the basket" msgstr "Vous n'avez pas assez d'argent pour acheter le panier" @@ -1203,6 +1210,9 @@ 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 "%(c)s counter" +#~ msgstr "Comptoir %(c)s" + #~ msgid "Page" #~ msgstr "Page"