diff --git a/gestaoRaul/balcao/__pycache__/htmx_views.cpython-310.pyc b/gestaoRaul/balcao/__pycache__/htmx_views.cpython-310.pyc index b1a4426..5366351 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 3fc38a3..47d3c9d 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 c36723f..0bcf69c 100644 --- a/gestaoRaul/balcao/htmx_views.py +++ b/gestaoRaul/balcao/htmx_views.py @@ -9,26 +9,41 @@ from typePay.models import TypePay 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}) + print(products) + return render(request, "htmx_components/htmx_list_products_balcao.html", {"products": products,}) -def addProductBalcao(request, product_id, comanda_id): - product_comanda = ProductComanda(comanda_id=comanda_id, product_id=product_id) - product_comanda.save() +def addProductBalcao(request, product_id, comanda_id, qtd): + for i in range(qtd): + product_comanda = ProductComanda(comanda_id=comanda_id, product_id=product_id) + product_comanda.save() consumo = ProductComanda.objects.filter(comanda=comanda_id) total = 0 for produto in consumo: total += produto.product.price - return render(request, "htmx_components/htmx_list_products_in_comanda.html",{'consumo': consumo, 'total': total}) + return render(request, "htmx_components/htmx_list_products_in_balcao.html",{'consumo': consumo, 'total': total}) + + +def addProductBalcaoTeclado(request, product_id, comanda_id, qtd): + print('entrouuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu', product_id, comanda_id) + for i in range(qtd): + product_comanda = ProductComanda(comanda_id=comanda_id, product_id=product_id) + product_comanda.save() + consumo = ProductComanda.objects.filter(comanda=comanda_id) + total = 0 + for produto in consumo: + total += produto.product.price + return render(request, "htmx_components/htmx_list_products_in_balcao.html",{'consumo': consumo, 'total': total}) def removeProductBalcao(request, productComanda_id): + print(request.COOKIES['qtd']) product_comanda = ProductComanda.objects.get(id=productComanda_id) consumo = ProductComanda.objects.filter(comanda=product_comanda.comanda) product_comanda.delete() total = 0 for produto in consumo: total += produto.product.price - return render(request, "htmx_components/htmx_list_products_in_comanda.html",{'consumo': consumo, 'total': total}) + return render(request, "htmx_components/htmx_list_products_in_balcao.html",{'consumo': consumo, 'total': total}) def paymentBalcao(request, comanda_id): diff --git a/gestaoRaul/balcao/templates/viewBalcao.html b/gestaoRaul/balcao/templates/viewBalcao.html index f1e2256..d7af32e 100644 --- a/gestaoRaul/balcao/templates/viewBalcao.html +++ b/gestaoRaul/balcao/templates/viewBalcao.html @@ -2,15 +2,12 @@ {% load static %} - - {% block 'title' %} {{comanda.name}} {% endblock %} - {% block 'head' %} {% endblock %} @@ -18,19 +15,11 @@ {% block 'body' %} -

Venda Balcão

- - - - - -
- - - - +
@@ -70,8 +47,8 @@ + hx-get="{% url 'removeProductBalcao' item.id %} " hx-trigger="click" hx-target="#list-products-balcao" + >🗑️ Excluir @@ -87,27 +64,58 @@ - -
- -

Buscar Produto

- +
{% for product in products %} -
+ {% if forloop.counter0 == 0 %} + +
+ + + {{product.name}}

+ R$ {{product.price}} +
+ + {% else %} + +
{{ forloop.counter0 }} {{product.name}}
R$ {{product.price}}
+ + {% endif %} + {% endfor %}
@@ -123,60 +131,10 @@ - - - - - - -
- - - - - - - - - diff --git a/gestaoRaul/balcao/urls.py b/gestaoRaul/balcao/urls.py index d98e51b..561a8e1 100644 --- a/gestaoRaul/balcao/urls.py +++ b/gestaoRaul/balcao/urls.py @@ -14,8 +14,9 @@ urlpatterns = [ htmx_urlpatterns = [ # path('listProduct/', htmx_views.listProduct, name='listProduct'), - path('listProduct//', htmx_views.listProductBalcao, name='listProductBalcao'), - path('addProduct//', htmx_views.addProductBalcao, name='addProductBalcao'), + 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'), # path('closeComanda/', htmx_views.closeComanda, name='closeComanda'), # path('reopenComanda/', htmx_views.reopenComanda, name='reopenComanda'), diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3 index 3fe4aea..a03f3bc 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 ebd3807..9480b22 100644 --- a/gestaoRaul/templates/htmx_components/htmx_list_products_balcao.html +++ b/gestaoRaul/templates/htmx_components/htmx_list_products_balcao.html @@ -2,20 +2,39 @@ {% for product in products %} -
+ {% if forloop.counter0 == 0 %} + +
+ + + {{product.name}}

+ R$ {{product.price}} +
+ + {% else %} + +
+ {{ forloop.counter0 }} {{product.name}}
+ R$ {{product.price}} +
+ + {% endif %} - {{ forloop.counter0 }} {{product.name}}
- R$ {{product.price}} -
{% endfor %} + + diff --git a/gestaoRaul/templates/htmx_components/htmx_list_products_in_balcao.html b/gestaoRaul/templates/htmx_components/htmx_list_products_in_balcao.html new file mode 100644 index 0000000..988064f --- /dev/null +++ b/gestaoRaul/templates/htmx_components/htmx_list_products_in_balcao.html @@ -0,0 +1,23 @@ + + + + + +{% for item in consumo%} + + + + + + + +{% endfor %} + + + + + + +
Produto Preço{{item.product.name}} R$ {{item.product.price}}
ProdutoPreço
{{item.product.name}}R$ {{item.product.price}}
Total R$ {{total}}
+ + diff --git a/gestaoRaul/templates/static/comandas/js/viewbalcao.js b/gestaoRaul/templates/static/comandas/js/viewbalcao.js index 2ddbd01..eb1a4b8 100644 --- a/gestaoRaul/templates/static/comandas/js/viewbalcao.js +++ b/gestaoRaul/templates/static/comandas/js/viewbalcao.js @@ -1,11 +1,11 @@ -function openModal() { - document.getElementById('Modal-add-product').style.display = 'block'; -} +// function openModal() { +// document.getElementById('Modal-add-product').style.display = 'block'; +// } -function open_remove_product_comanda() { - document.getElementById('remove-product-comanda').style.display = 'block'; -} +// function open_remove_product_comanda() { +// document.getElementById('remove-product-comanda').style.display = 'block'; +// } function modal_payment_comanda() { document.getElementById('payment-comanda').style.display = 'block'; @@ -15,14 +15,11 @@ function close_modal_payment_comanda() { document.getElementById('payment-comanda').style.display = 'none'; } -function closeModal() { - document.getElementById('Modal-add-product').style.display = 'none'; -} +// function closeModal() { +// document.getElementById('Modal-add-product').style.display = 'none'; +// } -function removeCloseModal() { - document.getElementById('remove-product-comanda').style.display = 'none'; -} function imprimirFichas() { const element = document.getElementById("list-products-comanda"); @@ -105,43 +102,62 @@ function backPage() { document.onkeydown = teclado function teclado(event){ - if (event.keyCode == 50){ - document.getElementById('qtd-product').innerHTML = '2' + if (event.keyCode == 13){ + // const productId = document.getElementById('0').value; + // const comandaId = document.getElementById('comanda0').value; + addProductBalcao() + reloadPage() } // 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); + + +function addProductBalcao() { + var productId = document.getElementById('0').innerText; + var comandaId = document.getElementById('comanda0').innerText; + var qtd = document.getElementById('qtd-product').value; + console.log(productId, comandaId) + const url = `/balcao/addProductBalcaoTeclado${productId}/${comandaId}/${qtd}/`; + const listProductsBalcao = document.getElementById('list-products-balcao'); + fetch(url, { + method: 'GET', + headers: { + 'Content-Type': 'application/json' + }, + + }) + + + +} + +// document.getElementById('openModal').addEventListener('click', openModal); + + document.getElementById('productForm').addEventListener('submit', function(event) { event.preventDefault(); }); + + + +function salvarValor() { + const elemento = document.getElementById('qtd-product'); + const chave = 'qtd'; + const valor = elemento.value; + localStorage.setItem(chave, valor); + setCookie(chave, valor); + console.log(chave, valor); + + } \ No newline at end of file