diff --git a/gestaoRaul/comandas/__pycache__/htmx_views.cpython-313.pyc b/gestaoRaul/comandas/__pycache__/htmx_views.cpython-313.pyc
index b7b10ac..4c6f6a3 100644
Binary files a/gestaoRaul/comandas/__pycache__/htmx_views.cpython-313.pyc and b/gestaoRaul/comandas/__pycache__/htmx_views.cpython-313.pyc differ
diff --git a/gestaoRaul/comandas/__pycache__/urls.cpython-313.pyc b/gestaoRaul/comandas/__pycache__/urls.cpython-313.pyc
index 706b9f3..e119cfb 100644
Binary files a/gestaoRaul/comandas/__pycache__/urls.cpython-313.pyc and b/gestaoRaul/comandas/__pycache__/urls.cpython-313.pyc differ
diff --git a/gestaoRaul/comandas/__pycache__/views.cpython-313.pyc b/gestaoRaul/comandas/__pycache__/views.cpython-313.pyc
index e068e05..acadf51 100644
Binary files a/gestaoRaul/comandas/__pycache__/views.cpython-313.pyc and b/gestaoRaul/comandas/__pycache__/views.cpython-313.pyc differ
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 68abbaf..400eaa0 100644
Binary files a/gestaoRaul/db.sqlite3 and b/gestaoRaul/db.sqlite3 differ
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')
-  //     }
-  // })
 }