From b35fc39a605af6cfe8d1942ddf2b6a0480710561 Mon Sep 17 00:00:00 2001
From: Welton Moura <weltonmoura@live.com>
Date: Fri, 28 Mar 2025 14:28:35 -0300
Subject: [PATCH] =?UTF-8?q?style=20e=20verifica=C3=A7ao:=20display=20flex?=
 =?UTF-8?q?=20para=20os=20botoes=20da=20viewComandas=20|=20verifica=C3=A7?=
 =?UTF-8?q?=C3=A3o=20para=20apagar=20produto=20da=20comanda?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__pycache__/htmx_views.cpython-313.pyc    | Bin 9462 -> 9538 bytes
 gestaoRaul/comandas/htmx_views.py             |  42 +++++++++---------
 .../comandas/templates/viewcomanda.html       |  15 ++++---
 gestaoRaul/db.sqlite3                         | Bin 335872 -> 335872 bytes
 .../static/comandas/js/viewcomanda.js         |   6 +--
 5 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/gestaoRaul/comandas/__pycache__/htmx_views.cpython-313.pyc b/gestaoRaul/comandas/__pycache__/htmx_views.cpython-313.pyc
index 4c6f6a3c75f61ddd093cb516fff64d28f7019423..a3e036f0174183fedd31205aaf731f4b54036813 100644
GIT binary patch
delta 864
zcmY+CUq}=|9LHz&{_J_XtLJ!sy+3=m-lZq0=pmR;Nox5AEpE9mE-F(wgtXc_D=Za>
z>WHFZ9yEx0wKv6=ULuGHpJErSUF?X2@cHDTx1gEi3J3P{`|fx4_nl#9e)Yc}5K4kz
z2V{Kux|{j3Ca5lG;BT(i(UdvKQ~%(Q&7C6voPwhefOI8(7Y^bA?=+cZ3x4aaqq>6V
zBXHW9uED?E9_Yk7)*8`$FonL!R+==rNOHU+r<F6wEa|hQOi4d(6@t~la*u42D`dOO
z;WdxP!l!J>5Y2>PyyI~tgoH`1Y__(O{m?O8k(Txq0Lf@s{jU;8*W<W10{^bj9WT$M
zfLt|FKXNu@mL1KOcGJEe1?k4}7h#YA@#<lPhMrVT5N?}KpXnXOOWsN7#?TkCZCkUs
z(cDZHi#`#K;p4tW^EPvB6i@o5?31M7GI_G+@ONKw!C)&N%rDL_ySG@efNFIlX-Lvh
zTto5IdKJZ0)R|`sD6FFf4K?VfMMEubSQWLXsEbZ`mf20zkY^39R_7#*lXR|8;~H1S
zH@UWg)3-GAY)E&;G-qt}qUwyP&fa{l!TWVy(s*f$k1iBY$ne$~{tm+%G5mFgFZ9a$
z+-rz!tL=KCTT687i9RjSr?&NPRI9<kJ%J6oOMtEM<hy@5fZ%*G_;Bz=)rx7;d-yZo
zRI~yi@GtyFmFsCn70;`gsUiTwOo|~T$J}Q20Js3}FeLzZ#~d{)=9pcZ9XI(u`W5<f
z;ugh5ic(L}K`~B%Q6OQNBI54)K;SV0uV5q81IKYt9JAaa_M`QC;xPtZ#UCPvtk-E*
z4i_ULoWTxBblspvh=LxrlBKwbd!(3UmdKau)6xWNo}jLSB0$kfag^c`1wA{3Za|^S
kDYF<xYwh=mq?azcfn!m{5rACD1ejQnA!@G+;+5#|9}-Z|VE_OC

delta 798
zcmZ`%OGq0*7@pa<k0kE6sd*Ta?3(RHn+nz_+6T5^9|kQ%n<XVQh^Vw;A7VFJ&7r7=
zf(WI`6uk7%qoo&%$6lm8lpYGZwPhCxErrrsL5cL-nMztbbYQ;!pYNOR|Cz^|fnWV%
zMHD@NjCbabiQ!kG8Gsx3OW*}lsKq}6u}~e=j*eW7UW2~|kH`L_orP0e!H1Pl2p+@V
zxO&BZ)K6DBdoB;a=n?>hAnB9xx^#~Cgq$lI#wjsYAE|nDUKez??#T&wDDLNUZ%)WY
zX;~=a5i!`&>C(kEt_vRSpK=$Ps?Mxh&HhCd6cYGqLmd9;a;l}O<baOyE&1!@Y;|pH
zm+O$%KvK#W8d>xi7YX7I4U^E1PlshZ99G~Mei%N9Uxx2_ZV_>e%;Er68?y^#6tt0S
zA=yR=3nextOq4KD_hPz?qBhbjq}iy|Lam!=6SbPChYIzp=^dmkrX4<L^RmUuHs5UV
z%^TVd-&U3a>*AVdOL0qzZz`q~H>KWX))7LsAX|d`NoXpgM#rx>;ch3WEI1*>2}RfE
z*XEsA`)0sS^;)T3JJn~U`pow9_I)$bzc2Dpe+BS$fo0c$1l-aS?~3>7;PXp6{u7^t
z<Q@my4S$P&_xe^_%t+oGpWFjrfVswyFwM*{`vBa4^GpSR+7jj15@U1#ycBt>?A8np
zUCAU_Lm>BJ(2F+C5ZL94Gov%JMLZJiWbYDUX=^?Dn1Pcxp<IS{@NH$Bog?(h)<@+6
z1E;W0ZRVz_yNJ)L3Y@{isuGx`giIkx!JzN}uc-;PMABzluhp9nj^nr%ljzeJw2?u}
l8YP_38a<ClN`Fl8JvKDM7ltLK;sQ)!kD=*)4?fT`zX31LzYG8X

diff --git a/gestaoRaul/comandas/htmx_views.py b/gestaoRaul/comandas/htmx_views.py
index 8a90726..f495bdd 100644
--- a/gestaoRaul/comandas/htmx_views.py
+++ b/gestaoRaul/comandas/htmx_views.py
@@ -102,27 +102,29 @@ def removeProductComanda(request, productComanda_id):
         }
     product_comanda = ProductComanda.objects.get(id=productComanda_id)
     comanda = Comanda.objects.get(id= product_comanda.comanda.id)
-    parcial = Payments.objects.filter(comanda=comanda)
-    consumo = ProductComanda.objects.filter(comanda=comanda)
-    valores = somar(consumo,comanda)
-    if product_comanda.product.cuisine == True:
-        order = Order.objects.get(productComanda=product_comanda)
-        product_comanda.delete()
-        msg = JsonResponse({
-            'type': 'broadcast',
-              'message': 'Atenção! Pedido cancelado', 
-              'local':'cozinha',
-                'tipo':'delete',
-                  'id':order.id,
-                  'speak': f'Pedido cancelado!  {order.id_product.name}.'
-                  }) 
-        asyncio.run(enviar_mensagem(msg))
-        # order.delete()
+    if comanda.status == 'OPEN':
+        parcial = Payments.objects.filter(comanda=comanda)
+        consumo = ProductComanda.objects.filter(comanda=comanda)
+        valores = somar(consumo,comanda)
+        if product_comanda.product.cuisine == True:
+            order = Order.objects.get(productComanda=product_comanda)
+            product_comanda.delete()
+            msg = JsonResponse({
+                'type': 'broadcast',
+                'message': 'Atenção! Pedido cancelado', 
+                'local':'cozinha',
+                    'tipo':'delete',
+                    'id':order.id,
+                    'speak': f'Pedido cancelado!  {order.id_product.name}.'
+                    }) 
+            asyncio.run(enviar_mensagem(msg))
+            # order.delete()
+        else:
+            product_comanda.delete()
+
+        return render(request, "htmx_components/comandas/htmx_list_products_in_comanda.html",{'config':config, 'valores': valores,'parcials':parcial,'consumo': consumo, 'comanda':comanda})
     else:
-        product_comanda.delete()
-
-    return render(request, "htmx_components/comandas/htmx_list_products_in_comanda.html",{'config':config, 'valores': valores,'parcials':parcial,'consumo': consumo, 'comanda':comanda})
-
+        pass
 
 
 
diff --git a/gestaoRaul/comandas/templates/viewcomanda.html b/gestaoRaul/comandas/templates/viewcomanda.html
index a70adac..ad3e629 100644
--- a/gestaoRaul/comandas/templates/viewcomanda.html
+++ b/gestaoRaul/comandas/templates/viewcomanda.html
@@ -21,7 +21,7 @@ Detalhes {{comanda.name}}
 <body>
   <input hidden id="id-temp" type="number">
   <div class="grid-container" >
-    <div>
+    <div style="display: flex;padding: 5px;gap:8px">
       <button class="btn-primary" id="openModal" onclick="openModal()" popovertarget="addProduct"
       {%  if comanda.status != 'OPEN'%}
        disabled
@@ -38,6 +38,11 @@ Detalhes {{comanda.name}}
       <button class="btn-secondary" id="pagarComanda"
        onclick="modal_payment_comanda()"
        >Receber</button>
+
+       <button class="btn-primary" id="printComanda" 
+       style="display: flex;"
+       onclick="imprimirConta()"
+       >Imprimir Conta</button>
        {% else %}
 
        <button class="btn-secondary" id="pagarComanda"
@@ -45,12 +50,12 @@ Detalhes {{comanda.name}}
         style="display: none;"
         >Receber</button>
 
-
+        <button class="btn-primary" id="printComanda" 
+        style="display: none;"
+        onclick="imprimirConta()"
+        >Imprimir Conta</button>
       {% endif %}
   
-      <button class="btn-primary" id="printComanda" 
-      style="display: none;"
-      onclick="imprimirConta()">Imprimir Conta</button>
       
       {% if user|groupUser:"Gerente" %}
       <button class="btn-primary" id="reOpenComanda" hx-get="{% url 'reopenComanda' comanda.id %} " hx-trigger="click" hx-swap="none"  onclick="reloadPage()"
diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3
index 400eaa0291aa65f0f0f72336be6757c662d72632..3db0249317c83a1648848d126fb67e08b524a128 100644
GIT binary patch
delta 116
zcmZoTAkuI^WP&tf`$QRM#`ea9)&$0_2~11&GuBUMJ-~Ez`kezzI@{R}GG*~F@@+3X
z%QTq@By)jj^YmR8n4-4}Ut}@>%Cx)OWddU6?Jjp&_6adNGw4od{lMZp-RlF3?Do_T
TEce)0ICn63ZFm39vQq;9{jn=o

delta 125
zcmZoTAkuI^WP&tf!$cWp#)ig()&$0_2~11&Gd4_TJ-~F8iMM3>tpiLt+c^$0W$-Yv
zZ!bK{G?@t`d4Xv&6R-R99T%9Qw~Jn6(gRAiyWC|0V&?5GcUkrcF=sI7O=tbU;>^VE
cJl*31i|qFF4=i`sSd=<_*|xiXXW6L%01&b)bpQYW

diff --git a/gestaoRaul/templates/static/comandas/js/viewcomanda.js b/gestaoRaul/templates/static/comandas/js/viewcomanda.js
index 7eed905..2dc043c 100644
--- a/gestaoRaul/templates/static/comandas/js/viewcomanda.js
+++ b/gestaoRaul/templates/static/comandas/js/viewcomanda.js
@@ -208,11 +208,11 @@ function closeConta(id){
     .then(response => response.json())
     .then(data => {
       if(data.status == 'ok'){
-        buttonPrintComanda.style.display = 'block'
+        buttonPrintComanda.style.display = 'flex'
         buttonClose.style.display = 'none'
         buttonAdd.style.display = 'none'
-        buttonreOpenComanda.style.display = 'block'
-        buttonPayment.style.display = 'block'
+        buttonreOpenComanda.style.display = 'flex'
+        buttonPayment.style.display = 'flex'
         showToast('✅Comanda encerrada!😁','success')
         imprimirConta()
     }