From 57f6f3a7fa6eb381b3c7390762dc15300611eefd Mon Sep 17 00:00:00 2001 From: Welton Moura Date: Wed, 8 Jan 2025 16:50:50 -0300 Subject: [PATCH] feat: calcular troco com base no valor recebido --- gestaoRaul/balcao/templates/viewBalcao.html | 193 ++++++++---------- .../__pycache__/htmx_views.cpython-313.pyc | Bin 3798 -> 3799 bytes gestaoRaul/comandas/htmx_views.py | 2 +- gestaoRaul/db.sqlite3 | Bin 241664 -> 241664 bytes gestaoRaul/templates/base.html | 4 +- .../static/comandas/js/viewbalcao.js | 33 ++- 6 files changed, 110 insertions(+), 122 deletions(-) diff --git a/gestaoRaul/balcao/templates/viewBalcao.html b/gestaoRaul/balcao/templates/viewBalcao.html index f927cd8..f9b3e89 100644 --- a/gestaoRaul/balcao/templates/viewBalcao.html +++ b/gestaoRaul/balcao/templates/viewBalcao.html @@ -1,13 +1,12 @@ {% extends "base.html" %} {% load static %} - {% block 'title' %} + {{comanda.name}} + {% endblock %} - - {% block 'head' %} {% endblock %} @@ -16,117 +15,85 @@ {% block 'body' %} -
+
-

Venda Balcão

-
+

Venda Balcão

+
- + - + -
+
- - - - - - - {% for item in consumo%} - - - - - - - - - - {% endfor %} - +
ProdutoPreço
{{item.product.name}}R$ {{item.product.price}}
- + + - - + {% for item in consumo%} + + + + + - + + {% endfor %} + + + + + + + +
Total R$ {{total}}ProdutoPreço
{{item.product.name}}R$ {{item.product.price}}
Total R$ {{total}}
-
- -
-

Buscar Produto

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

Buscar Produto

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

+ R$ {{product.price}} +
-
- - - {{product.name}}

- R$ {{product.price}} -
+ {% else %} - {% else %} +
+ {{product.name}}
+ R$ {{product.price}} +
-
- {{product.name}}
- R$ {{product.price}} -
+ {% endif %} - {% endif %} + {% endfor %} +
- {% endfor %} -
- -
+
@@ -134,26 +101,28 @@
- +
+ + + +
+ + - + diff --git a/gestaoRaul/comandas/__pycache__/htmx_views.cpython-313.pyc b/gestaoRaul/comandas/__pycache__/htmx_views.cpython-313.pyc index a6f93294caef6cfa8cfd2203dff9a4fa39879671..45832030aa3337ee5ea75c7576e3bf140f46f17b 100644 GIT binary patch delta 88 zcmca6dtH|IGcPX}0}$9Bu1hc6$Xm|CT*awBxs7Kbqr+qk-o@zLyWHa^HWN5QtgV|C-?F>vnhh*0Bda*{r~^~ delta 87 zcmcaEdrg-2GcPX}0}$k`s7o){$Xm|CbcCV1pccGL`yR_SumOkyvNL5r4piBHM zG?6uGOn?Ah0SPDwf`(`8C`F+JO(bFpRv;Fzf-lrw z4Kz)<&g8_5IAWYWuP;!n`n;fknK7B+k&~V*g#ugs!gw9|gqcPEECr7cw431~hBx|5 zp9?eCg|YTTT_vrX3+KIx!^*Yl1&h6Eu{Z2ewP-LB^=V2V;@7;9`HPn>NiOEivU*Dy z>~~>@yqj_dkf}tM^sCF@Br-07K@R$H540KKt&~ebA;?<~XD3(4Y$isCchDWHpxX%U zqFgWJbGzhI@)7x@uJ*!889DTi)Q~foI1u(rC*7zPDh=g6~XV;jDO% z;pnw*pkZ1gLj*Wsx&;`p;J5|Hq!$@ZZ#@nBKs?6=GR1jfu5exWf|5aSxebw@lRmPa zd`R9CHwy1dxxxXqn`|cQ$y+2vRtkG))gatqg`b5j!UkG(24FP7!(GQ&gjP(Aq z@EV7QP_tg~10+z5*|f6*U*(vk5p#E>rG?@s!9PM9hEG2jUaJvP1|o`|{1V~x%6L}QGdj(Dal%|wq>x=#|brt&{v}YT3QnCX3Y4ROBGNbFEv~*Vbl*W=!wXhcOo3%@6!zP?V-`s@TirlH@ zM^lVt8j7j`#q0MPs|7fn+l+5z)VNbE<8ebuz*trx4V;CkrZfruds9|HpArmvLq5%z r20DKmPFA~9PmNR17g54$NcDy6ad)b99FiJVjGG9nVVJsWJGTD~zAUUu delta 1126 zcmY+@Z%ma{7y$5dp7Z{@-1nSwFBdT+@dDv+lY8%bUoQU?jR`6j2107E*@W3*m2j`? zL+cCB3QJcD=I98uVN0`3mN3e9s7-LL53cCK+Hy&YthqJYQpVx~=sGXdhju>v-t#6-uu{RS2UE(MYto$cje5Bl}s%gR{gpm5`fupsKaD zVc&MI2Z_Hbp^(-z*gkhi0rH>?B5xOLRT>Y}G>C>>@S``Zxv6Y-KEV=@M`X%5v>Pr5 ziJy-OeGKQz-%nEKw@$c))kygaFM)$6>+f#UXbxiLhpqf z^)|oCZ^`VN+`04twE9Si!i0VfIwzWZ!^C0d;qUBcQrbA8U9^n`sA(>n56wT!d$iTO zOY3Mg4bwuJOPihTQ_zdk=)iwXOijb8NKFHCuHS_FI(Y&W&V}2sjN=^)pFoJTF`SgN zGMtb!Gu$PqW4KdN&G2zaCBv^uN*I1cq7e)#%(`eW=OXTZ3r$-(5c9%Kx9^4Nb*9$2 z;o=o&zhOu2f~+v;3oDpyTUHB&)FyDAkEa;*)Ti9-eY~NTQsL&RWbK@ ze-{U5VF&&}^v^<}Mu*%creSPhW?^OQ;wYZM-U_U<1IeA@rN}7M0%-N5W)>5+E}2QJB2c zrg`q6s8JyFeo~*?;MwL;j9-ka#-I^53itp&&iC@5k>o+Qu@zZa<2uRfs}+e6A`AKi zu|@JMSr9+>kbD`h6jMVaL!2HWEecyf1!7uuX|%$QgsjrCGApKaRczDCV`dmx`)tSDj?MM{IwXhp2J!nQ)C#kOrlR5T{`j*z5+5Q@7K lWcX}1YuTlCc|?6KuP?r~HfmMG
  • Início
  • Comandas
    • -
  • Balcão
    • +
  • Mapa
  • Produtos
    • diff --git a/gestaoRaul/templates/static/comandas/js/viewbalcao.js b/gestaoRaul/templates/static/comandas/js/viewbalcao.js index a5c59fb..f1e837f 100644 --- a/gestaoRaul/templates/static/comandas/js/viewbalcao.js +++ b/gestaoRaul/templates/static/comandas/js/viewbalcao.js @@ -2,14 +2,26 @@ function modal_payment_comanda() { document.getElementById('payment-comanda').style.display = 'block'; + recebido = document.getElementById('recebido') + recebido.focus() +} + +function troco(){ + recebido = document.getElementById('recebido').value + total = document.getElementById('first-total').innerHTML + resultado = document.getElementById('troco') + total = total.replace('R$ ','') + total = total.replace(',','.') + result = recebido - total + resultado.innerHTML = 'Troco: R$ '+result } function close_modal_payment_comanda() { document.getElementById('payment-comanda').style.display = 'none'; + document.getElementById('search-product').focus() } - function imprimirFichas() { const element = document.getElementById("list-products-balcao"); const style = `