diff --git a/gestaoRaul/balcao/__pycache__/htmx_views.cpython-313.pyc b/gestaoRaul/balcao/__pycache__/htmx_views.cpython-313.pyc index ea57762..af194db 100644 Binary files a/gestaoRaul/balcao/__pycache__/htmx_views.cpython-313.pyc and b/gestaoRaul/balcao/__pycache__/htmx_views.cpython-313.pyc differ diff --git a/gestaoRaul/balcao/__pycache__/urls.cpython-313.pyc b/gestaoRaul/balcao/__pycache__/urls.cpython-313.pyc index cfc2799..8a2f325 100644 Binary files a/gestaoRaul/balcao/__pycache__/urls.cpython-313.pyc and b/gestaoRaul/balcao/__pycache__/urls.cpython-313.pyc differ diff --git a/gestaoRaul/balcao/htmx_views.py b/gestaoRaul/balcao/htmx_views.py index cc330c3..63699b7 100644 --- a/gestaoRaul/balcao/htmx_views.py +++ b/gestaoRaul/balcao/htmx_views.py @@ -6,12 +6,12 @@ from payments.models import Payments from typePay.models import TypePay -def listProduct(request, comanda_id): +def listProductBalcao(request, comanda_id): product = request.GET.get("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 addProduct(request, product_id, comanda_id): +def addProductBalcao(request, product_id, comanda_id): product_comanda = ProductComanda(comanda_id=comanda_id, product_id=product_id) product_comanda.save() consumo = ProductComanda.objects.filter(comanda=comanda_id) @@ -21,7 +21,7 @@ def addProduct(request, product_id, comanda_id): return render(request, "htmx_components/htmx_list_products_in_comanda.html",{'consumo': consumo, 'total': total}) -def removeProductComanda(request, productComanda_id): +def removeProductBalcao(request, productComanda_id): product_comanda = ProductComanda.objects.get(id=productComanda_id) consumo = ProductComanda.objects.filter(comanda=product_comanda.comanda) product_comanda.delete() @@ -31,16 +31,26 @@ def removeProductComanda(request, productComanda_id): return render(request, "htmx_components/htmx_list_products_in_comanda.html",{'consumo': consumo, 'total': total}) -def paymentComanda(request, comanda_id): +def paymentBalcao(request, comanda_id): typePayment = TypePay.objects.get(id=1) consumo = ProductComanda.objects.filter(comanda=comanda_id) + vendasBalcao = Comanda.objects.get(name='VENDAS BALCAO') + print('ggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg') + print(f'ggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg{vendasBalcao.id}') comanda = Comanda.objects.get(name='VENDA BALCÃO') total = 0 for produto in consumo: total += produto.product.price - removeProductComanda(request, produto.id) - pagamento = Payments(value=total, comanda=comanda, type_pay=typePayment,description='VENDA BALÃO') + produto.comanda = 14 + produto.save() + # newObject = ProductComanda.objects.get(comanda=produto.id) + # newObject.comanda= 14 + + # newObject.save() + + + pagamento = Payments(value=total, comanda=comanda, type_pay=typePayment,description='VENDA BALCÃO') pagamento.save() - comanda.save() + # comanda.save() return redirect('comandas') diff --git a/gestaoRaul/balcao/templates/viewBalcao.html b/gestaoRaul/balcao/templates/viewBalcao.html index 6fc5ee8..76d76be 100644 --- a/gestaoRaul/balcao/templates/viewBalcao.html +++ b/gestaoRaul/balcao/templates/viewBalcao.html @@ -5,7 +5,7 @@ {% block 'title' %} -Detalhes {{comanda.name}} +{{comanda.name}} {% endblock %} @@ -70,7 +70,7 @@ Detalhes {{comanda.name}} {{item.product.name}} R$ {{item.product.price}} @@ -96,13 +96,16 @@ Detalhes {{comanda.name}}
-

Adicionar Produto

-
-
- {% for product in products %} +

Buscar Produto

+
+ +
+
+
+ {% for product in products %}
- {{product.name}}
+ {{ forloop.counter0 }} {{product.name}}
R$ {{product.price}}
{% endfor %} diff --git a/gestaoRaul/balcao/urls.py b/gestaoRaul/balcao/urls.py index b616c19..1afeb4d 100644 --- a/gestaoRaul/balcao/urls.py +++ b/gestaoRaul/balcao/urls.py @@ -14,12 +14,12 @@ urlpatterns = [ htmx_urlpatterns = [ # path('listProduct/', htmx_views.listProduct, name='listProduct'), - path('listProduct//', htmx_views.listProduct, name='listProduct'), - path('addProduct//', htmx_views.addProduct, name='addProduct'), - path('removeProductComanda/', htmx_views.removeProductComanda, name='removeProductComanda'), + path('listProduct//', htmx_views.listProductBalcao, name='listProductBalcao'), + path('addProduct//', htmx_views.addProductBalcao, name='addProductBalcao'), + path('removeProductComanda/', htmx_views.removeProductBalcao, name='removeProductBalcao'), # path('closeComanda/', htmx_views.closeComanda, name='closeComanda'), # path('reopenComanda/', htmx_views.reopenComanda, name='reopenComanda'), - path('paymentComanda/', htmx_views.paymentComanda, name='paymentComanda'), + path('paymentComanda/', htmx_views.paymentBalcao, name='paymentBalcao'), ] urlpatterns += htmx_urlpatterns \ No newline at end of file diff --git a/gestaoRaul/comandas/templates/viewcomanda.html b/gestaoRaul/comandas/templates/viewcomanda.html index 194b22a..958f4ad 100644 --- a/gestaoRaul/comandas/templates/viewcomanda.html +++ b/gestaoRaul/comandas/templates/viewcomanda.html @@ -33,11 +33,14 @@ Detalhes {{comanda.name}} {% endif %} >Fechar Comanda - + {% else %} + + + {% endif %} - >Receber + + {% endif %} - hx-get="{% url 'removeProductComanda' item.id %} " hx-trigger="click" hx-target="#list-products-comanda" onclick="open_remove_product_comanda()">🗑️ Excluir - - - - - {% endfor %} + + + + + {% endfor %} Total R$ {{total}} diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3 index ff027e6..92ba2fc 100644 Binary files a/gestaoRaul/db.sqlite3 and b/gestaoRaul/db.sqlite3 differ diff --git a/gestaoRaul/templates/htmx_components/htmx_list_products_balcao.html b/gestaoRaul/templates/htmx_components/htmx_list_products_balcao.html index 6cb4e60..ebd3807 100644 --- a/gestaoRaul/templates/htmx_components/htmx_list_products_balcao.html +++ b/gestaoRaul/templates/htmx_components/htmx_list_products_balcao.html @@ -2,8 +2,15 @@ {% for product in products %} -
- {{product.name}}
+
+ + {{ forloop.counter0 }} {{product.name}}
R$ {{product.price}}
diff --git a/gestaoRaul/templates/static/comandas/js/viewbalcao.js b/gestaoRaul/templates/static/comandas/js/viewbalcao.js index 6bb63cb..b02e840 100644 --- a/gestaoRaul/templates/static/comandas/js/viewbalcao.js +++ b/gestaoRaul/templates/static/comandas/js/viewbalcao.js @@ -92,17 +92,49 @@ function imprimirConta() { function reloadPage(){ setTimeout(function() { - location.reload();}, 100); + location.reload();}, 10); } function backPage() { setTimeout(function() { history.back();}, 100); setTimeout(function() { - location.reload();}, 100); + location.reload();}, 10); } +document.onkeydown = teclado +function teclado(event){ + if (event.keyCode == 50){ + document.getElementById('qtd-product').innerHTML = '2' + } + else if (event.keyCode == 73){ + imprimirFichas() + } + else if (event.keyCode == 51){ + document.getElementById('qtd-product').innerHTML = '3' + } + else if (event.keyCode == 52){ + document.getElementById('qtd-product').innerHTML = '4' + } + else if (event.keyCode == 53){ + document.getElementById('qtd-product').innerHTML = '5' + } + else if (event.keyCode == 54){ + document.getElementById('qtd-product').innerHTML = '6' + } + else if (event.keyCode == 55){ + document.getElementById('qtd-product').innerHTML = '7' + } + else if (event.keyCode == 56){ + document.getElementById('qtd-product').innerHTML = '8' + } + else if (event.keyCode == 57){ + document.getElementById('qtd-product').innerHTML = '9' + } + + +} document.getElementById('openModal').addEventListener('click', openModal); diff --git a/gestaoRaul/templates/static/comandas/js/viewcomanda.js b/gestaoRaul/templates/static/comandas/js/viewcomanda.js index 67e5b77..18792cd 100644 --- a/gestaoRaul/templates/static/comandas/js/viewcomanda.js +++ b/gestaoRaul/templates/static/comandas/js/viewcomanda.js @@ -103,7 +103,19 @@ function backPage() { } +document.onkeydown = teclado +function teclado(event){ + if (event.keyCode == 65){ + openModal() + } + else if (event.keyCode == 73){ + imprimirFichas() + } + // else if (event.keyCode == 70){ + // imprimirConta() + // } +} document.getElementById('openModal').addEventListener('click', openModal);