From ac2a0283d086d8385d3215d2d4bb5926a893cf52 Mon Sep 17 00:00:00 2001
From: Welton Moura <weltonmoura@live.com>
Date: Fri, 28 Mar 2025 14:07:30 -0300
Subject: [PATCH] alter: alterado metodo http para fechar comanda | retirada do
 htmx

---
 .../__pycache__/htmx_views.cpython-313.pyc    | Bin 9763 -> 9462 bytes
 .../comandas/__pycache__/urls.cpython-313.pyc | Bin 1763 -> 1764 bytes
 .../__pycache__/views.cpython-313.pyc         | Bin 8899 -> 9299 bytes
 gestaoRaul/comandas/htmx_views.py             |  21 +-------
 .../comandas/templates/viewcomanda.html       |  21 +++++---
 gestaoRaul/comandas/urls.py                   |   2 +-
 gestaoRaul/comandas/views.py                  |  10 +++-
 gestaoRaul/db.sqlite3                         | Bin 335872 -> 335872 bytes
 .../static/comandas/js/viewcomanda.js         |  47 ++++++++++++++----
 9 files changed, 61 insertions(+), 40 deletions(-)

diff --git a/gestaoRaul/comandas/__pycache__/htmx_views.cpython-313.pyc b/gestaoRaul/comandas/__pycache__/htmx_views.cpython-313.pyc
index b7b10ac4a0b650d798bc9485c0a9eab7780d863f..4c6f6a3c75f61ddd093cb516fff64d28f7019423 100644
GIT binary patch
delta 289
zcmZ4N^Uag*GcPX}0}vd)@GL!6aw4Auqt-<A7w)3LLY9odVp0sIAW0x7l8q5nVhDza
zizA84A&E;MiOZ*RYf5g;V{DONOxpZeGMsU8n#^%V&B+g?Wr5^>X}QU+viz($K%*Ns
zN6PjxF=kGFF7LvaJy}N~nYA1!+_ia%f*liM-sH<lYHS4{ClpWquO!b{GFe_(UbGY>
zAO|8eK|~RVD4QIttjbymWX_pftK7q=u$W7QQ43^N5lC<)Ly-}PEe#}YaoFVMr<CTT
f+7-0|xr{(ud~&j-Y8qp}<OQnIj5d?6s`>!{Rcb@~

delta 417
zcmez7x!8yAGcPX}0}yOI@+>`DW+I;iqtit77x99@LY9odqEZZ|AW0x7l8q5nVh9!k
zi;E+P%OQzNAc@N(iAy4hE2ML4N^K5fY>{9r+<aRyoN@ATQC@BqpcTwO{5gkVvOb#~
zQ!vxyt<w4e%zi~qK+#)l0gjQLe(ozL|B{wvTsc`nMoxk!IVZn3)j2;mF)t;tC<myj
z7l?~BC;Q9D@{7tgxVQM-VBv1}Y4mCJo2)B+hP@~gC|{I4Sye`XwGhahve`?fmx(cd
z@(no`#;nP*^2w|<K;gNYTjlMT7>g$#QB-3q1!<|6{6SHkv2wD2lDudYNI(umXo84x
z5K%qZMM;&l4#-?TIZvsFQE~BaB}Q(L6-6Kei|Qsbsz`Bl0hx?IT>NOVs!AGT-sBz?
jX(=-XCV?567a3JPGBGm>e`aQ2QvCp8edL+ELd6dNvB+Vh

diff --git a/gestaoRaul/comandas/__pycache__/urls.cpython-313.pyc b/gestaoRaul/comandas/__pycache__/urls.cpython-313.pyc
index 706b9f32fb5cb1bbdcb77beddff93d22c00a9d1d..e119cfb38fbc948006ee1755744daa85b8d7edc4 100644
GIT binary patch
delta 196
zcmaFN`-E5SGcPX}0}!xYe3m|em4V?ghyw$>8|4%jxndZV7=lG&Sc4=c`!Gtd=yMeD
zPEKJw%ga_I62luKqRY#`P{h00j)|X<PcAtpzc|%7KQ}QiB~gDe3yZ>JU*=VlRaou|
z6$t=My~SNxlv9vcQj%JfSG-x2Rf$pNCJV;}PR$jj*R^dgYTF+0yT}s!L6C=^se${W
n(qsoVhsl%K%q96bM3^ox2z(G>VC1>LFMp9izLC2~252AvB(gF`

delta 207
zcmaFD`<PemGcPX}0}wnu@+^G{E06|pV1Q?%oC2eoK6?>Q45Jc5ut*GZkQ7V~K?jQl
zvs*GxPGLOD%U&cB!xJN-%gew}#IxCsiJx(DHS;Pq+2ox3;?&7HERvIRnfWHGvfLNC
z#a&vIQ;=9vl3J8kTqFQAZL=7w5+mmaer|rI2JVjvlS9}X_%v2%UDtBFsO5Nq?;=b1
i<bF0ANkL8#rV9)LAH*0Kc`oqFUu2MP<Svo{>IVSK<uAnm

diff --git a/gestaoRaul/comandas/__pycache__/views.cpython-313.pyc b/gestaoRaul/comandas/__pycache__/views.cpython-313.pyc
index e068e05d1c159370937a7d23f1326bae61cfb973..acadf514f80130801dedc49e4920a21d4f5da338 100644
GIT binary patch
delta 426
zcmX@?df9{TGcPX}0}$M}@GO0b_(VPl#+;4np^P#yGD-}=e8K#djKR`U45lC@Kv1Nb
zE~6>Cxq<PXEaS?_@$#~aos(<j&4J`rd2Pnt$q(fxN+dHu)PhM?Aju5GpW7HF`?J^y
z1v7;*<$wghAe1SHa}vL7JvU4sm^qjwm{pI-lo2AL!l23KS7Zj{6p4d~b|6v3nO~HW
zTBMhsR9w^n<ZH4Of%F$ig9t|ukpLosK?EC+&}1%>1F=0pgc6V_2HCHmpim?aq;K&g
z=Sb%lr#k27Cg!Ci7WD(g7J?L60*MBOCzChwh-usqm2Gfu@w>so-R{%q)8coBTYQ1Z
zit39J)|a_$F0j}XDF7AwX{v25Rd8U`>IHJZ=B#7@OF-=5u*uC&Da}c>E1CzC2l=n~
o*W_D@_mw{|@iJO}RA68dn4x)*QRO2O3#094W(FozFbiw~005j_Y5)KL

delta 103
zcmccYaoCmbGcPX}0}vRUe3m|6Y$BfoW5`DJP)3$?X-%2UGZ^p5GHOmPmzQPim^@Y9
z97vv(*JkXQ{8N4+v!ABw=I4qIj6klgvJ}^BpdpMvT>Nlypz?jLk4(Ib)<p_H0RU>$
B9pV50

diff --git a/gestaoRaul/comandas/htmx_views.py b/gestaoRaul/comandas/htmx_views.py
index f243484..8a90726 100644
--- a/gestaoRaul/comandas/htmx_views.py
+++ b/gestaoRaul/comandas/htmx_views.py
@@ -93,21 +93,6 @@ def addProduct(request, product_id, comanda_id):
     
     return render(request, "htmx_components/comandas/htmx_list_products_in_comanda.html",{'config':config, 'valores':valores,'parcials':parcial,'consumo': consumo,'comanda':comanda})
 
-# @group_required(groupName='Garçom')
-# def editOrders(request, productComanda_id, obs):
-#     order = Order.objects.get(productComanda=productComanda_id)
-#     order.obs = obs
-#     order.save()
-#     msg = JsonResponse({
-#             'type': 'broadcast',
-#               'message': obs, 
-#               'local':'cozinha',
-#                 'tipo':'edit',
-#                   'id':order.id,
-#                   'speak': f'Pedido alterado!  {order.id_product.name}, é {obs}.'
-#                   }) 
-#     # asyncio.run(enviar_mensagem(msg))
-#     return JsonResponse({'status': 'ok'})
 
 
 @group_required(groupName='Garçom')
@@ -138,11 +123,7 @@ def removeProductComanda(request, productComanda_id):
 
     return render(request, "htmx_components/comandas/htmx_list_products_in_comanda.html",{'config':config, 'valores': valores,'parcials':parcial,'consumo': consumo, 'comanda':comanda})
 
-@group_required(groupName='Garçom')
-def closeComanda(request, comanda_id):
-    comanda = Comanda.objects.get(id=comanda_id)
-    comanda.status = "PAYING"
-    comanda.save()
+
 
 
 @group_required(groupName='Gerente')
diff --git a/gestaoRaul/comandas/templates/viewcomanda.html b/gestaoRaul/comandas/templates/viewcomanda.html
index 54f8db2..a70adac 100644
--- a/gestaoRaul/comandas/templates/viewcomanda.html
+++ b/gestaoRaul/comandas/templates/viewcomanda.html
@@ -28,27 +28,32 @@ Detalhes {{comanda.name}}
        {% endif %}
        >Add Produto</button>
 
-      <button class="btn-cancel" id="pagarComanda" hx-get="{% url 'closeComanda' comanda.id %} " hx-trigger="click" hx-swap="none"  onclick="imprimirConta()"
+      <button class="btn-cancel" id="closeComanda" onclick="closeConta({{comanda.id}})"
       {% if comanda.status != 'OPEN' %}
       style="display: none;"
       {% endif %}
       >Fechar Conta</button>
 
       {% if comanda.status == 'PAYING' or comanda.status == 'FIADO'%}
-      <button class="btn-secondary" id="pagarComanda" onclick="modal_payment_comanda()">Receber</button>
-      {% else %}
+      <button class="btn-secondary" id="pagarComanda"
+       onclick="modal_payment_comanda()"
+       >Receber</button>
+       {% else %}
+
+       <button class="btn-secondary" id="pagarComanda"
+        onclick="modal_payment_comanda()"
+        style="display: none;"
+        >Receber</button>
 
 
       {% endif %}
   
-      {%  if comanda.status != 'OPEN'%}
-      <button class="btn-primary" id="imprimirFichas" 
+      <button class="btn-primary" id="printComanda" 
       style="display: none;"
-      onclick="imprimirFichas()">Fichas</button>
-      {% endif %}
+      onclick="imprimirConta()">Imprimir Conta</button>
       
       {% if user|groupUser:"Gerente" %}
-      <button class="btn-primary" id="imprimirFichas" hx-get="{% url 'reopenComanda' comanda.id %} " hx-trigger="click" hx-swap="none"  onclick="reloadPage()"
+      <button class="btn-primary" id="reOpenComanda" hx-get="{% url 'reopenComanda' comanda.id %} " hx-trigger="click" hx-swap="none"  onclick="reloadPage()"
       {%  if comanda.status == 'OPEN'%}
       style="display: none;"
       {% elif comanda.status == 'CLOSED' %}
diff --git a/gestaoRaul/comandas/urls.py b/gestaoRaul/comandas/urls.py
index 6964903..c8897fc 100644
--- a/gestaoRaul/comandas/urls.py
+++ b/gestaoRaul/comandas/urls.py
@@ -12,6 +12,7 @@ urlpatterns = [
     path('addContaCliente/', views.addContaCliente, name='addContaCliente'),
     path('notificacao/', views.notificacao, name='notificacao'),
     path('editOrders/<int:productComanda_id>/<str:obs>', views.editOrders, name='editOrders'),
+    path('closeComanda/<int:comanda_id>/', views.closeComanda, name='closeComanda'),
 
 
 
@@ -23,7 +24,6 @@ htmx_urlpatterns = [
     path('listProduct/<int:comanda_id>/', htmx_views.listProduct, name='listProduct'),
     path('addProduct<int:product_id>/<int:comanda_id>/', htmx_views.addProduct, name='addProduct'),
     path('removeProductComanda<int:productComanda_id>/', htmx_views.removeProductComanda, name='removeProductComanda'),
-    path('closeComanda<int:comanda_id>/', htmx_views.closeComanda, name='closeComanda'),
     path('reopenComanda<int:comanda_id>/', htmx_views.reopenComanda, name='reopenComanda'),
     path('paymentComanda<int:comanda_id>/', htmx_views.paymentComanda, name='paymentComanda'),
     path('paymentParcial<int:comanda_id>/', htmx_views.paymentParcial, name='paymentParcial'),
diff --git a/gestaoRaul/comandas/views.py b/gestaoRaul/comandas/views.py
index fd92fbe..4816834 100644
--- a/gestaoRaul/comandas/views.py
+++ b/gestaoRaul/comandas/views.py
@@ -155,4 +155,12 @@ def editOrders(request, productComanda_id, obs):
                   'speak': f'Pedido alterado!  {order.id_product.name}, é {obs}.'
                   }) 
     # asyncio.run(enviar_mensagem(msg))
-    return JsonResponse({'status': 'ok', 'obs':order.obs})
\ No newline at end of file
+    return JsonResponse({'status': 'ok', 'obs':order.obs})
+
+
+@group_required(groupName='Garçom')
+def closeComanda(request, comanda_id):
+    comanda = Comanda.objects.get(id=comanda_id)
+    comanda.status = "PAYING"
+    comanda.save()
+    return JsonResponse({'status': 'ok', 'obs':'order.obs'})
\ No newline at end of file
diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3
index 68abbaf0d4b5861349bf1a8910646486116ef845..400eaa0291aa65f0f0f72336be6757c662d72632 100644
GIT binary patch
delta 209
zcmZoTAkuI^WP&tf!$cWp#)ig()&$1Z1g5PC%**5%S8iulVD@HY;#|2sM3Fg^gPo0;
ziIJr>Y5N9EW_A`PKDX&Rb(wov7#JAX+r9Ldw|nWa>@j3ipU$4Z;?BgTzC9p;<vJ_3
zl?oSwBZD>rBZK7hh;$ZhwgAUSPe1qR$!RQ|OzghX-=(p{vv71WSZxnXXW6R3*fE`b
z0*fOPL&tQl2`qMk9!cB`qK=M0OBk7$Qh{K)^i&qh>6a$3TxDYA+rDxlODZ$S32xhk
Jrn0>20sxi;Hxd8<

delta 216
zcmV;}04M)|z!ZSM6p$MMY>^y80c?R_g<t`NU;?#Z1EwDVu(t;w14{t{4o0_BAp=zi
z2LK>A2>>e%x3DP#2Lu8D0GGKf1C0a*0|EhuN-hJpN-hMvF#%(j2Vew80tZdEP+$bt
z1()Y#1RWnRFf%YYF(54<LP1PJ!-G#CEg)BAY;<pKLrhOoMMRflW(0`>2#J^OW&~dZ
zI3x-Hw^3&VwI~77mj{ppK>`I1mr9TXJ_`!~89_k+000330+$n!1V5M3kOb8N006hC
SkpyJ}1VmyB0JjpA1n!ErraHg?

diff --git a/gestaoRaul/templates/static/comandas/js/viewcomanda.js b/gestaoRaul/templates/static/comandas/js/viewcomanda.js
index 517e3d5..7eed905 100644
--- a/gestaoRaul/templates/static/comandas/js/viewcomanda.js
+++ b/gestaoRaul/templates/static/comandas/js/viewcomanda.js
@@ -188,6 +188,43 @@ function imprimirConta() {
     }
   }
 
+
+function closeConta(id){
+
+  const resultadoConfirmacao = confirm("Encerrar comanda?");
+  const buttonAdd = document.getElementById('openModal')
+  const buttonClose = document.getElementById('closeComanda')
+  const buttonreOpenComanda = document.getElementById('reOpenComanda')
+  const buttonPrintComanda = document.getElementById('printComanda')
+  const buttonPayment = document.getElementById('pagarComanda')
+  if (resultadoConfirmacao){
+
+  fetch(`/comandas/closeComanda/${id}/`, {
+    method: 'PUT',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-CSRFToken': document.querySelector('[name="csrfmiddlewaretoken"]').value}
+    })
+    .then(response => response.json())
+    .then(data => {
+      if(data.status == 'ok'){
+        buttonPrintComanda.style.display = 'block'
+        buttonClose.style.display = 'none'
+        buttonAdd.style.display = 'none'
+        buttonreOpenComanda.style.display = 'block'
+        buttonPayment.style.display = 'block'
+        showToast('✅Comanda encerrada!😁','success')
+        imprimirConta()
+    }
+  })
+  .catch(error => {
+    showToast('❌Ocorreu um erro!😢','error')
+  });
+}
+
+}
+
+
 function reloadPage(){
   setTimeout(function() {
     location.reload();}, 100);
@@ -237,16 +274,6 @@ function addOrder(){
     showToast('❌Ocorreu um erro!😢','error')
   });
 
-
-  //   .then(function(response) {
-  //     if(response.status == 200){
-  //       closeModalObs()
-  //       showToast('✅Pedido atualizado com sucesso!😁','success')
-  //       tooltipObs.dataset.tooltip = response.data
-  //     }else{
-  //       showToast('❌Ocorreu um erro!😢','error')
-  //     }
-  // })
 }