diff --git a/gestaoRaul/clients/__pycache__/urls.cpython-310.pyc b/gestaoRaul/clients/__pycache__/urls.cpython-310.pyc index f23e20b..d1a2534 100644 Binary files a/gestaoRaul/clients/__pycache__/urls.cpython-310.pyc and b/gestaoRaul/clients/__pycache__/urls.cpython-310.pyc differ diff --git a/gestaoRaul/clients/__pycache__/views.cpython-310.pyc b/gestaoRaul/clients/__pycache__/views.cpython-310.pyc index aa42040..4aca971 100644 Binary files a/gestaoRaul/clients/__pycache__/views.cpython-310.pyc and b/gestaoRaul/clients/__pycache__/views.cpython-310.pyc differ diff --git a/gestaoRaul/clients/templates/clients.html b/gestaoRaul/clients/templates/clients.html index 950c372..7baa309 100644 --- a/gestaoRaul/clients/templates/clients.html +++ b/gestaoRaul/clients/templates/clients.html @@ -1,5 +1,7 @@ {% extends "base.html" %} {% load static %} +{% load custom_filter_tag %} + @@ -34,7 +36,7 @@ Clientes {{client.name}} - R$ {{client.debt}} + R$ {{client.id | totalFiado}} {{client.contact}} {{client.active}} diff --git a/gestaoRaul/clients/templates/viewclient.html b/gestaoRaul/clients/templates/viewclient.html index 12dddc5..f4fdeae 100644 --- a/gestaoRaul/clients/templates/viewclient.html +++ b/gestaoRaul/clients/templates/viewclient.html @@ -16,7 +16,7 @@ Comandas

{{client.name}}

-

R$ {{total}}

+

R$ {{client.id | totalFiado}}

diff --git a/gestaoRaul/clients/views.py b/gestaoRaul/clients/views.py index a597eb9..97d513c 100644 --- a/gestaoRaul/clients/views.py +++ b/gestaoRaul/clients/views.py @@ -15,21 +15,24 @@ def clients(request): return render(request, 'clients.html', {'clients': clients}) def viewClient(request,clientId): + # config = { + # 'taxa': False + # } client = Client.objects.get(id=int(clientId)) comandas = Comanda.objects.filter(client = client).filter(status = 'FIADO') total = Decimal(0) - for comanda in comandas: - totalConsumo = 0 - totalParcial = 0 - consumo = ProductComanda.objects.filter(comanda=comanda) - parcial = Payments.objects.filter(comanda=comanda) - for p in parcial: - totalParcial += p.value - for produto in consumo: - totalConsumo += produto.product.price - total+= (totalConsumo - totalParcial) - total+= round(total * Decimal(0.1), 2) - return render(request, 'viewclient.html', {'total': total, 'client': client, 'comandas': comandas}) + # for comanda in comandas: + # totalConsumo = 0 + # totalParcial = 0 + # consumo = ProductComanda.objects.filter(comanda=comanda) + # parcial = Payments.objects.filter(comanda=comanda) + # for p in parcial: + # totalParcial += p.value + # for produto in consumo: + # totalConsumo += produto.product.price + # total+= (totalConsumo - totalParcial) + # total = total + round(total * Decimal(0.1), 2) if config['taxa'] else total + return render(request, 'viewclient.html', {'client': client, 'comandas': comandas}) @group_required(groupName='Gerente') diff --git a/gestaoRaul/comandas/__pycache__/views.cpython-310.pyc b/gestaoRaul/comandas/__pycache__/views.cpython-310.pyc index 81ab57b..03ba283 100644 Binary files a/gestaoRaul/comandas/__pycache__/views.cpython-310.pyc and b/gestaoRaul/comandas/__pycache__/views.cpython-310.pyc differ diff --git a/gestaoRaul/comandas/templates/viewcomanda.html b/gestaoRaul/comandas/templates/viewcomanda.html index bc8bcb8..cb2b2a6 100644 --- a/gestaoRaul/comandas/templates/viewcomanda.html +++ b/gestaoRaul/comandas/templates/viewcomanda.html @@ -117,6 +117,7 @@ Detalhes {{comanda.name}} {% endif %} {% endfor %} + {% if config.taxa %} Taxa de serviço 10% @@ -125,6 +126,8 @@ Detalhes {{comanda.name}} R$ {{valores.taxa}} + {% endif %} + {% if parcials%} Pagamentos parciais {% endif %} @@ -140,7 +143,11 @@ Detalhes {{comanda.name}} + {% if config.taxa %} Total R$ {{valores.totalComTaxa}} + {% else %} + Total R$ {{valores.totalSemTaxa}} + {% endif %} @@ -191,12 +198,16 @@ Detalhes {{comanda.name}}

Pagamento

+ {% if config.taxa %}

R$ {{ valores.totalComTaxa }}

R$ {{ valores.totalComTaxa }}

R$ {{ valores.totalSemTaxa }}

- Taxa de serviço + {% else %} +

R$ {{ valores.totalSemTaxa }}

+ + {% endif %}
@@ -268,7 +279,7 @@ Detalhes {{comanda.name}}
{% csrf_token %}

Adicionar na Conta

-

R$ {{ total }}

+

R$ {{ valores.totalSemTaxa }}

diff --git a/gestaoRaul/comandas/templatetags/__pycache__/custom_filter_tag.cpython-310.pyc b/gestaoRaul/comandas/templatetags/__pycache__/custom_filter_tag.cpython-310.pyc index f8f3af6..3222700 100644 Binary files a/gestaoRaul/comandas/templatetags/__pycache__/custom_filter_tag.cpython-310.pyc and b/gestaoRaul/comandas/templatetags/__pycache__/custom_filter_tag.cpython-310.pyc differ diff --git a/gestaoRaul/comandas/templatetags/custom_filter_tag.py b/gestaoRaul/comandas/templatetags/custom_filter_tag.py index 1f86a59..0b93dce 100644 --- a/gestaoRaul/comandas/templatetags/custom_filter_tag.py +++ b/gestaoRaul/comandas/templatetags/custom_filter_tag.py @@ -2,12 +2,16 @@ from decimal import Decimal from django import template from comandas.models import Comanda, ProductComanda +from clients.models import Client from payments.models import Payments register = template.Library() @register.filter(name='total') def filter_total(value): + config = { + 'taxa': False + } id = value comanda_id = int(id) totalParcial = Decimal(0) @@ -21,9 +25,31 @@ def filter_total(value): for produto in consumo: total += produto.product.price taxa = round(total * Decimal(0.1), 2) - total = (total + taxa) - totalParcial + total = (total + taxa) - totalParcial if config['taxa'] else total - totalParcial return f'R$ {total}' +@register.filter(name='totalFiado') +def viewClient(clientId): + config = { + 'taxa': False + } + client = Client.objects.get(id=int(clientId)) + comandas = Comanda.objects.filter(client = client).filter(status = 'FIADO') + total = Decimal(0) + for comanda in comandas: + totalConsumo = 0 + totalParcial = 0 + consumo = ProductComanda.objects.filter(comanda=comanda) + parcial = Payments.objects.filter(comanda=comanda) + for p in parcial: + totalParcial += p.value + for produto in consumo: + totalConsumo += produto.product.price + total+= (totalConsumo - totalParcial) + total = total + round(total * Decimal(0.1), 2) if config['taxa'] else total + return total + + @register.filter(name='groupUser') def has_group(user, group_name): diff --git a/gestaoRaul/comandas/views.py b/gestaoRaul/comandas/views.py index 221fd5b..4063fb6 100644 --- a/gestaoRaul/comandas/views.py +++ b/gestaoRaul/comandas/views.py @@ -41,6 +41,9 @@ def somar(consumo:ProductComanda, comanda:Comanda): @group_required(groupName='Garçom') def viewComanda(request): + config = { + 'taxa': False + } id = request.GET.get('parametro') comanda_id = int(id) comanda = Comanda.objects.get(id=comanda_id) @@ -60,7 +63,7 @@ def viewComanda(request): if p.name == produto['nome'] and p.active == True: products_ordenados.append(p) valores = somar(consumo,comanda) - return render(request, 'viewcomanda.html', {'valores':valores,'parcials':parcial,'clients':clients,'comanda': comanda, 'consumo': consumo, 'products': products_ordenados,'mesas':mesas}) + return render(request, 'viewcomanda.html', {'config':config, 'valores':valores,'parcials':parcial,'clients':clients,'comanda': comanda, 'consumo': consumo, 'products': products_ordenados,'mesas':mesas}) @group_required(groupName='Garçom') diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3 index fddbf6b..a88c3b4 100644 Binary files a/gestaoRaul/db.sqlite3 and b/gestaoRaul/db.sqlite3 differ