From ac87c3a47d4d6e2005ae6eeb4600cb937da2ed0a Mon Sep 17 00:00:00 2001 From: Welton Moura Date: Fri, 27 Dec 2024 18:26:56 -0300 Subject: [PATCH] atualizar valor todal modal receber --- .../__pycache__/htmx_views.cpython-310.pyc | Bin 2406 -> 2583 bytes gestaoRaul/balcao/htmx_views.py | 25 +++- gestaoRaul/balcao/templates/viewBalcao.html | 5 +- gestaoRaul/db.sqlite3 | Bin 266240 -> 266240 bytes .../htmx_list_products_in_balcao.html | 5 +- .../static/comandas/js/viewbalcao.js | 115 ++++++------------ 6 files changed, 64 insertions(+), 86 deletions(-) diff --git a/gestaoRaul/balcao/__pycache__/htmx_views.cpython-310.pyc b/gestaoRaul/balcao/__pycache__/htmx_views.cpython-310.pyc index e0d61e76874d270d609b90afb1bd2049554ee538..a52198b812838f3e0392e0a14cbfddba71b0cd9c 100644 GIT binary patch literal 2583 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 diff --git a/gestaoRaul/balcao/htmx_views.py b/gestaoRaul/balcao/htmx_views.py index 69568a7..8ea02ae 100644 --- a/gestaoRaul/balcao/htmx_views.py +++ b/gestaoRaul/balcao/htmx_views.py @@ -1,5 +1,7 @@ from django.shortcuts import render, redirect from django.views.decorators.csrf import csrf_exempt +from django.db.models import Count, F + from comandas.models import Comanda, ProductComanda @@ -9,10 +11,24 @@ from typePay.models import TypePay @csrf_exempt def listProductBalcao(request, comanda_id, search_product): - print('chegouuuuuuuuuuuuuuuuuuuuuuuuuuu') - product = search_product - products = Product.objects.filter(name__icontains=product) - return render(request, "htmx_components/htmx_list_products_balcao.html", {"products": products,'comanda_id':comanda_id}) + print(search_product) + if len(search_product) == 0: + produtos_mais_vendidos = list(ProductComanda.objects.values('product').annotate( + quantidade=Count('product'), + nome=F('product__name') ).order_by('-quantidade')) + products = Product.objects.all() + products_ordenados = [] + + for produto in produtos_mais_vendidos: + for p in products: + if p.name == produto['nome']: + products_ordenados.append(p) + + return render(request, "htmx_components/htmx_list_products_balcao.html", {"products": products,'comanda_id':comanda_id}) + else: + product = search_product + products = Product.objects.filter(name__icontains=product) + return render(request, "htmx_components/htmx_list_products_balcao.html", {"products": products,'comanda_id':comanda_id}) # def listProductBalcao(request, comanda_id): @@ -32,7 +48,6 @@ def addProductBalcao(request, product_id, comanda_id, qtd): @csrf_exempt def addProductBalcaoTeclado(request, product_id, comanda_id, qtd): - qtd = int(request.COOKIES.get('qtd')) for i in range(qtd): product_comanda = ProductComanda(comanda_id=comanda_id, product_id=product_id) product_comanda.save() diff --git a/gestaoRaul/balcao/templates/viewBalcao.html b/gestaoRaul/balcao/templates/viewBalcao.html index 97fa7d0..407d1f9 100644 --- a/gestaoRaul/balcao/templates/viewBalcao.html +++ b/gestaoRaul/balcao/templates/viewBalcao.html @@ -58,6 +58,9 @@ Total R$ {{total}} + + {{total}} + @@ -144,7 +147,7 @@