diff --git a/gestaoRaul/balcao/__pycache__/htmx_views.cpython-310.pyc b/gestaoRaul/balcao/__pycache__/htmx_views.cpython-310.pyc index 77199f8..622af60 100644 Binary files a/gestaoRaul/balcao/__pycache__/htmx_views.cpython-310.pyc and b/gestaoRaul/balcao/__pycache__/htmx_views.cpython-310.pyc differ diff --git a/gestaoRaul/balcao/__pycache__/urls.cpython-310.pyc b/gestaoRaul/balcao/__pycache__/urls.cpython-310.pyc index 47d3c9d..9946b1d 100644 Binary files a/gestaoRaul/balcao/__pycache__/urls.cpython-310.pyc and b/gestaoRaul/balcao/__pycache__/urls.cpython-310.pyc differ diff --git a/gestaoRaul/balcao/htmx_views.py b/gestaoRaul/balcao/htmx_views.py index 5dc3e48..79c45b6 100644 --- a/gestaoRaul/balcao/htmx_views.py +++ b/gestaoRaul/balcao/htmx_views.py @@ -1,16 +1,24 @@ from django.shortcuts import render, redirect +from django.views.decorators.csrf import csrf_exempt + from comandas.models import Comanda, ProductComanda from products.models import Product from payments.models import Payments from typePay.models import TypePay - -def listProductBalcao(request, comanda_id): - product = request.GET.get("search-product") +@csrf_exempt +def listProductBalcao(request, comanda_id, search_product): + print('chegouuuuuuuuuuuuuuuuuuuuuuuuuuu') + product = search_product products = Product.objects.filter(name__icontains=product) - print(products) - return render(request, "htmx_components/htmx_list_products_balcao.html", {"products": products,}) + return render(request, "htmx_components/htmx_list_products_balcao.html", {"products": products,'comanda_id':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 addProductBalcao(request, product_id, comanda_id, qtd): for i in range(qtd): diff --git a/gestaoRaul/balcao/templates/viewBalcao.html b/gestaoRaul/balcao/templates/viewBalcao.html index cc6b2aa..4fd5fca 100644 --- a/gestaoRaul/balcao/templates/viewBalcao.html +++ b/gestaoRaul/balcao/templates/viewBalcao.html @@ -72,15 +72,13 @@

Buscar Produto


@@ -94,7 +92,7 @@ id="productId-{{ product.id }}" style="background-color: #293552;" - hx-get="{% url 'addProductBalcaoTeclado' product.id comanda.id 1 %}" hx-trigger="click" hx-target="#list-products-balcao" + > @@ -108,9 +106,9 @@ name="productBox" id="productId-{{ product.id }}" style="background-color: #293552;" - hx-get="{% url 'addProductBalcaoTeclado' product.id comanda.id 1 %} " hx-trigger="click" hx-target="#list-products-balcao" - > - {{ forloop.counter0 }} {{product.name}}
+ + > + {{product.name}}
R$ {{product.price}} diff --git a/gestaoRaul/balcao/urls.py b/gestaoRaul/balcao/urls.py index 561a8e1..4dbdc78 100644 --- a/gestaoRaul/balcao/urls.py +++ b/gestaoRaul/balcao/urls.py @@ -14,7 +14,7 @@ urlpatterns = [ htmx_urlpatterns = [ # path('listProduct/', htmx_views.listProduct, name='listProduct'), - path('listProductBalcao//', htmx_views.listProductBalcao, name='listProductBalcao'), + path('listProductBalcao///', htmx_views.listProductBalcao, name='listProductBalcao'), path('addProductBalcao///', htmx_views.addProductBalcao, name='addProductBalcao'), path('addProductBalcaoTeclado///', htmx_views.addProductBalcaoTeclado, name='addProductBalcaoTeclado'), path('removeProductBalcao/', htmx_views.removeProductBalcao, name='removeProductBalcao'), diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3 index e435ad5..b190cf5 100644 Binary files a/gestaoRaul/db.sqlite3 and b/gestaoRaul/db.sqlite3 differ diff --git a/gestaoRaul/templates/base.html b/gestaoRaul/templates/base.html index 947d45a..f2599ba 100644 --- a/gestaoRaul/templates/base.html +++ b/gestaoRaul/templates/base.html @@ -9,7 +9,6 @@ - {% block 'head' %} {% endblock %} @@ -18,7 +17,7 @@
- +
{% block 'body' %} {% endblock %} + \ No newline at end of file diff --git a/gestaoRaul/templates/htmx_components/htmx_list_products_balcao.html b/gestaoRaul/templates/htmx_components/htmx_list_products_balcao.html index 9480b22..303497a 100644 --- a/gestaoRaul/templates/htmx_components/htmx_list_products_balcao.html +++ b/gestaoRaul/templates/htmx_components/htmx_list_products_balcao.html @@ -8,10 +8,10 @@ name="productBox" id="productId-{{ product.id }}" style="background-color: #293552;" - hx-get="{% url 'addProductBalcaoTeclado' product.id comanda.id 1 %} " hx-trigger="click" hx-target="#list-products-balcao" + > - + {{product.name}}

R$ {{product.price}} @@ -22,9 +22,9 @@ name="productBox" id="productId-{{ product.id }}" style="background-color: #293552;" - hx-get="{% url 'addProductBalcaoTeclado' product.id comanda.id 1 %} " hx-trigger="click" hx-target="#list-products-balcao" - > - {{ forloop.counter0 }} {{product.name}}
+ + > + {{product.name}}
R$ {{product.price}} diff --git a/gestaoRaul/templates/static/comandas/js/viewbalcao.js b/gestaoRaul/templates/static/comandas/js/viewbalcao.js index a8b3976..d38058d 100644 --- a/gestaoRaul/templates/static/comandas/js/viewbalcao.js +++ b/gestaoRaul/templates/static/comandas/js/viewbalcao.js @@ -103,10 +103,10 @@ document.onkeydown = teclado function teclado(event){ if (event.keyCode == 13){ - // const productId = document.getElementById('0').value; - // const comandaId = document.getElementById('comanda0').value; addProductBalcao() reloadPage() + }else{ + console.log(event.keyCode) } } @@ -132,9 +132,6 @@ function addProductBalcao() { reloadPage() } -// document.getElementById('openModal').addEventListener('click', openModal); - - document.getElementById('productForm').addEventListener('submit', function(event) { event.preventDefault(); @@ -151,4 +148,42 @@ qtd.addEventListener('input', () => { console.log(chave, valor); }); - \ No newline at end of file + + + +function searchProduct() { + var search_product = document.getElementById('search-product').value + var productListElement = document.getElementById("product-list"); + if(search_product.length >= 1){ + fetch(`/balcao/listProductBalcao/13/${search_product}`, { + method: 'GET', + } + ).then(function(response) { + return response.text(); + }).then(function(text) { + productListElement.innerHTML = text; + + })} + +} + +function addProductClick(productId, comandaId) { + var xhr = new XMLHttpRequest(); + xhr.open("GET", "{% url 'addProductBalcaoTeclado' product.id comanda.id 1 %}", true); + xhr.onreadystatechange = function() { + if (xhr.readyState === 4 && xhr.status === 200) { + var response = JSON.parse(xhr.responseText); + var listProductsBalcaoElement = document.getElementById("list-products-balcao"); + listProductsBalcaoElement.innerHTML = response.html; + } + }; + xhr.send(); +} + + + +// hx-get="{% url 'listProductBalcao' comanda.id %}" +// hx-trigger="keyup" +// hx-target="#product-list" + +// hx-get="{% url 'addProductBalcaoTeclado' product.id comanda.id 1 %}" hx-trigger="click" hx-target="#list-products-balcao" \ No newline at end of file