From fe00c4da90022204e186245ad46bfb47099ad79f Mon Sep 17 00:00:00 2001
From: Welton Moura <weltonmoura@live.com>
Date: Tue, 1 Jul 2025 12:28:47 -0300
Subject: [PATCH] =?UTF-8?q?refactor:=20remo=C3=A7=C3=A3o=20do=20htmx=20do?=
 =?UTF-8?q?=20excluir=20item=20da=20comanda=20|=20feedback=20da=20exclus?=
 =?UTF-8?q?=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__pycache__/htmx_views.cpython-312.pyc    | Bin 4882 -> 5016 bytes
 .../comandas/__pycache__/urls.cpython-312.pyc | Bin 1871 -> 1872 bytes
 gestaoRaul/comandas/htmx_views.py             |  14 +-
 .../comandas/templates/viewcomanda.html       |  20 +--
 gestaoRaul/comandas/urls.py                   |   2 +-
 gestaoRaul/db.sqlite3                         | Bin 356352 -> 356352 bytes
 .../htmx_list_products_in_comanda.html        | 142 +++++++++---------
 gestaoRaul/templates/static/base.css          |   7 +-
 .../static/comandas/css/viewcomanda.css       |  94 ------------
 .../static/comandas/js/viewcomanda.js         |  61 +++++++-
 10 files changed, 151 insertions(+), 189 deletions(-)

diff --git a/gestaoRaul/comandas/__pycache__/htmx_views.cpython-312.pyc b/gestaoRaul/comandas/__pycache__/htmx_views.cpython-312.pyc
index 6c5f6336a3d15278b898e5855457f00e56248d41..d3dc32f0cdc374c7ab22f959220682e327fb5938 100644
GIT binary patch
delta 567
zcmbQFHbb57G%qg~0}zycNY0qgzmZRci7AeGvI)~=X4ewF$@BSSC#y5BVxCwcG5J29
z;bc~pX_Fn9<R+&xTe9WZ)G%jBPv+;5ne4zM4-#T3QQrKE#gUOwXtE7k{^WgZXSvLQ
zMk@hvao^^t?EH-NA`IfH*Tr-$is@VzGrlNhyu<y1nDJ#Xmk#$kV$w6*7r0**)9G}7
zz$1N~N9iJu(iI++J7Ow?G<3K>;TN5deuKyJhM3F^aXBawll{oa!Yluol}$k50|OhU
z!Uq9n22S3|jGXTn4JLo!l$A6Cy6hHjQEGlcYMyg`Zem_aVv!wC%y+UHmm{Oa<T^gd
z&5c|cOpMl(U-8(B+W@7Cv_J$qkkI5PG61n{Cp+-kN`Z~yD@d%&P0cHTndJkN51Txl
z_Zg$b<~qJoMn;FpU-;G7oI%<=CMyWY$9sa9JRkyWIM`fvsJS3fFAyOKB3wX(8;I}*
z62%~u3J_3)Vs}7dQF3NtPLUr_LB`~H0zE*xwFPAvwLwt<_FWOkSz!5<3`G_oHrN0T
po80`A(wtPgqL|6WLXP}ujJ%(j8JJW*FacQ~Lna><@@4_41^`wumIeR-

delta 636
zcmbQCK1q%5G%qg~0}v>lNy^CO+sLQF#P^DcfnhpB3S$aWCSxtr<c*xBlS`Q<F>{yj
zO`gMIJK3GNi@CW(0?3w~e1TJBGAqk8M<tLEAdsaBp^?cFbr`RPb2TG`4Wk(u@&sy_
zv!o~c^T;rjXl~A9b!21|oxFi9U-%Y#VsT|&a%TQ5=AzQPA_1Vr$@1)Hxh#PUkbT9O
zo4>L1GsX%q@QU<%cY4p^U%`A?Lgy-v?gusoUYYAWN*8&QuJEWl;TN5denCFwLVE58
z28L=zCng}}#}o>p5}7hUR0&fx(?<q|IK~>L&kPI#wIDIhTBZjaJd@iw-<cZ$ZM(&l
zoS&PRmy#HtnNlPPvYr`8C@3ftS%74Di&FCoQuCZ4YKk0yV$PG-a5*wsZGOkq$i!$n
zxq#PR+zu#Qqy-|_frKVU5y<2s`^m?6ZKc4*@D(Ih=BDPAz|8Rj%KJ=~<$K0xHTfNv
z<Yrm^7)C~?$yEYsY_1@!UXzyz$j5twm^>f?YysG8cBt7PQ6CTia&wUzi0}XrzCfZF
zq!Q=_5P*0CW`96pQF3NtPEi0*LEK~&!5*MLHVVozYJ&nF?7Je6)4=j88H%hxY_JD7
pY;yBcN^?@}isB~!6msO3VdVYH%)q4jfeFa^=rGw+*qa5U8UP;bl!E{O

diff --git a/gestaoRaul/comandas/__pycache__/urls.cpython-312.pyc b/gestaoRaul/comandas/__pycache__/urls.cpython-312.pyc
index b0a2808edba2a54cafce37ceb1f82ee41fc76b21..60191b4a72a70c92f0dcfa46d14261a6ba04167e 100644
GIT binary patch
delta 70
zcmX@lcY%-hG%qg~0}zNxCuf*!<h5ZD(=AHP%`Zz0D9TSMO)hcH&rQrrNz~sQ$I{Eh
ZZ?Qw`x>e*wtH=upWmj0rC;ws#1pww47x4f9

delta 69
zcmcb>cb<>;G%qg~0}$*yk(6P)k=KSrRHrC4H@_@3peR43G`Yk%KQ}QiC2?~+OD_|@
Y`3|Y;mJt^%BQC_3USTPl{F^Nl02>P!`2YX_

diff --git a/gestaoRaul/comandas/htmx_views.py b/gestaoRaul/comandas/htmx_views.py
index 3c5a7ee..1787fee 100644
--- a/gestaoRaul/comandas/htmx_views.py
+++ b/gestaoRaul/comandas/htmx_views.py
@@ -53,12 +53,22 @@ def removeProductComanda(request, productComanda_id):
                     'id':order.id,
                     'speak': f'Pedido cancelado!  {order.id_product.name}.'
                     }) 
-            asyncio.run(enviar_mensagem(msg))
+            # asyncio.run(enviar_mensagem(msg))
             # order.delete()
+            consumo = ProductComanda.objects.filter(comanda=comanda)
+            valores = somar(consumo,comanda)
         else:
             product_comanda.delete()
+            consumo = ProductComanda.objects.filter(comanda=comanda)
+            valores = somar(consumo,comanda)
 
-        return render(request, "htmx_components/comandas/htmx_list_products_in_comanda.html",{'config':config, 'valores': valores,'parcials':parcial,'consumo': consumo, 'comanda':comanda})
+        return render(request,
+            "htmx_components/comandas/htmx_list_products_in_comanda.html",
+            {'config':config,
+            'valores': valores,
+            'parcials':parcial,
+            'consumo': consumo, 
+            'comanda':comanda})
     else:
         pass
 
diff --git a/gestaoRaul/comandas/templates/viewcomanda.html b/gestaoRaul/comandas/templates/viewcomanda.html
index 6af1eb6..04d886a 100644
--- a/gestaoRaul/comandas/templates/viewcomanda.html
+++ b/gestaoRaul/comandas/templates/viewcomanda.html
@@ -103,7 +103,7 @@ Detalhes {{comanda.name}}
 
     {%  for item in consumo%}
 
-    <tr>
+    <tr id="item-{{item.id}}">
       <td id="id-for-print-{{item.id}}">
          <spam style="cursor: pointer;" onclick="inforOrders({{item.id}})">
         {{item.product.name}}</spam>
@@ -131,13 +131,12 @@ Detalhes {{comanda.name}}
       {%  if comanda.status != 'OPEN'%}
       {% else %}
       <td>
+        
         <img
+        
         src="{% static 'midia/icons/delete.svg' %}"
         style="width: 35px; height: 35px; cursor: pointer;"
-        hx-get="{% url 'removeProductComanda' item.id  %} " 
-        hx-trigger="click" 
-        hx-target="#list-products-comanda" 
-        hx-confirm="Tem certeza que deseja excluir o produto {{item.product.name}}?" >
+         >
       </img>
       </td>
         {% endif %}
@@ -180,30 +179,21 @@ Detalhes {{comanda.name}}
 <button class="btn-secondary" onclick="modal_payment_parcial()">Pagamento Parcial</button>
   </div>
 
-  
-
       
-      
-      <div id="addProduct"  class="popover">
-        <!-- <div id="productForm" > -->
+      <div hidden id="addProduct" >
           {% csrf_token %}
-
           <input type="text" oninput="searchProduct()" id="search-product" name="search-product" placeholder="Buscar Produto" ><br>
           <div id="product-list" class="grid-list-products">
-            
             {% for product in products %}
-
                 <div class="card-product" onclick="addProductComanda({{product.id}}, {{comanda.id}}, '{{product.cuisine}}')" >
                   {{product.name}} <br>
                   R$ {{product.price}}
                 </div >
                 {% endfor %}
               </div>
-            <!-- </div> -->
           </div>
           
 
-      
 <dialog id="payment-comanda" style="display: none;" >
   <article>
     <form action="{% url 'paymentComanda' comanda.id %}" method="post">
diff --git a/gestaoRaul/comandas/urls.py b/gestaoRaul/comandas/urls.py
index 3b055ce..e97a62f 100644
--- a/gestaoRaul/comandas/urls.py
+++ b/gestaoRaul/comandas/urls.py
@@ -22,7 +22,7 @@ urlpatterns = [
 
 
 htmx_urlpatterns = [
-    path('removeProductComanda<int:productComanda_id>/', htmx_views.removeProductComanda, name='removeProductComanda'),
+    path('removeProductComanda/<int:productComanda_id>/', htmx_views.removeProductComanda, name='removeProductComanda'),
     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/db.sqlite3 b/gestaoRaul/db.sqlite3
index 20d86d79d34ce113ea454f36f3c4ec648a17c0bf..28e4f055ecb70d27cafede6b565edcd6ea90a0dd 100644
GIT binary patch
delta 3401
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

delta 2000
zcmZ`)du$X%9G=I{?d|UEZX<^UDR!?dw9t0DkGp-GpqxOZ&~i|~R}2uN{-HdYm>7{F
z6jam$Lv!LJ!~_&IVgy<byZ@+xX#Au2C~BexV;ZA>kf3R$Vgy8IZ!2j7ZnF7qe)G*Y
z^L;aOyJL9jj^U~MX2=Er;GXdp_BOcC=wH8Che2^j*Wf$FQN0I((&H_E+@5rrEl0D=
zY{trF96fCsrsJ2oH$9)K!0ISd0ISr?>P2-_s3|4)eWwzu*|N3b=)oztQ5Y=phgwSB
zp^ZXueMSAQ!6U)o5twbojpApNAA$FjOl^}$k6wau@ckv&_$F=zXDELNy;SV1m=~Nm
zgpBH#lmN%Xa{+%68F0oy=||~4X_-XCtKy&Hh<Hv~B+Zu`sYPm_3r?Y?;OSH7F`+(&
zA@WFn1bq=4kKkAYN2N|s)tj3}TNF&TlOU=NMDTtDCn6|Ca9COocxE?hy(V>osiFHx
zPuS;^{nCrqm_8{=LlauP5oKQpF4-LcefKn~;}g%7dBL}*(OfPj_A%RgC_jYePZM7k
z_b40X-{kiaR}&+N<?8Q=Po+ljDqTH<7L%pYKCwt&9YR&2beniY-I@p_LO&Qn)2oxp
z+wz>m=gNmlLD{8jRUVcTiL;5#iD%?i$(9oI_aXE^OgtdX5Dx^8oI$gNhHybRO0JUh
z@faa^Cn-mVNjW;79F?|!<;9g1OIL;DWR%@}G7yqMA1Q~oikui9TN=mxAz3D`fpJ<f
zZ2RQ!cy~FFO0t`-Jc}9=>V#B-=g*?<ByLr@*pWfq!LuXi7rA#uJm|WLUWTmh?C0?w
z=&-Z&x*RwP{vs?sN%;!Am(_ljsg@-i-P?pV2Ip?Y(_oBW3WoV)z-xFOgcf}=g}1tO
z{QZ0<U&SXo7Pl|SYYTIos~5L*<`UveK>(%<1wn?nyVm5iMT@nC`Gt8cV;CLn@!(<#
zKf}$MCG(6BZ*N=OnagYK`DMBG1*ynG(+UABEO%390N07tc>&Cc+M}Q1$|Y6H1z^kZ
zaCqD5T-%D=-8pSVXTBr<@$Qdz<x?F3XpY3kd&9iQ04&EyO5mSz`xv-Po9c1(j0ZtH
zoVHx-2Y;9GIJm+e09tRZD%e?%cgFFsct^k+xF5!)Y2x?dSK{g5Hxu{q?2dj}z7N5o
zEIvu_uy8)$7hnP2q;v`A)#K`6^@y@xc|wURh%U(CH;`Ch3D?DUpKrs#`8ICqTQT?o
zxEGAEo#OV^aR<o-ZVR`D6Y)p*XU>2R!8_n|Fopuui#DKEl!902$r0{mIyAz?=r<#r
zw!Nlc#6S+PeKD*|v*9$`hGrRA_WzSMb;GxOH|<r{7Fx<AG?`@jS<BN+&$Uh4gLl>x
z^czW;b~f$nY1{J*%fmH==82?R{+p1o3`;lDOfBvC=m+pPJMo*@^4y8^h;3#KC!E>K
zxQ?Ikk~IbAhNLvJp{G69@J(-iZ6Q-8P4d8$%&cwerpw$r9_Xtnq$f%}d~HI;^mX5~
zY&YYrsx8?6qh+LZ({kL5Th7CrsP&&yE1fkny5)MFnf5T*34UTuf21E>;2P>v*9|be
ztZ9Wl{B*{$ZBGWZg(>vZ1umJk-K@!`b8W}9{BY^D*N^tuHzaG=x@)n$WWmxkW8BhN
zH3fb$)p9j6!?r1FnoQ7g{ft{lKN;gr!DVc5OM)-{;I?7d#eQ$VH7`C!&C6V6@YP@3
z%GvD0aV4luk)QPGY6lP$J*IxGzNKzadR0vsQwEiX6rG*fq@vh6fdo>y@VY>V=<RFC
z?0IBhZqIfJ$Wawtzc*o?w(q(o%afFxo~;t7AD5sfljLT4Vl7D`a*PhHC3CZLdbV8?
zgOkMAiH>6TEz>es?EQ0ly038&q7SSiGh^g9TU--!*?=2*o}w$)kz431>&T<QlrH$I
J%C75_e*q8W#(4k$

diff --git a/gestaoRaul/templates/htmx_components/comandas/htmx_list_products_in_comanda.html b/gestaoRaul/templates/htmx_components/comandas/htmx_list_products_in_comanda.html
index 4ed56e1..20e7295 100644
--- a/gestaoRaul/templates/htmx_components/comandas/htmx_list_products_in_comanda.html
+++ b/gestaoRaul/templates/htmx_components/comandas/htmx_list_products_in_comanda.html
@@ -2,85 +2,83 @@
 {% load custom_filter_tag %}
 
 
-<tr>
-  <th style="text-align: left;"><b>Produto</b></th>
-  <th style="text-align: left;"><b>Preço</b></th>
-</tr>
+ <tr>
+        <th style="text-align: left;"><b>Produto</b></th>
+        <th style="text-align: left;"><b>Preço</b></th>
+      </tr>
 
-{%  for item in consumo%}
+    {%  for item in consumo%}
 
-<tr>
-  <td id="id-for-print-{{item.id}}">
-    <spam style="cursor: pointer;" onclick="inforOrders({{item.id}})">
-  {{item.product.name}}</spam>
-  {% if item.product.cuisine == True %}
-  <input hidden id="{{item.id}}-obsOrder" type="order" value="{{item.id | obsOrder}}">
+    <tr id="item-{{item.id}}">
+      <td id="id-for-print-{{item.id}}">
+         <spam style="cursor: pointer;" onclick="inforOrders({{item.id}})">
+        {{item.product.name}}</spam>
+        {% if item.product.cuisine == True %}
+        <input hidden id="{{item.id}}-obsOrder" type="order" value="{{item.id | obsOrder}}">
+       
 
-    <img
-    onclick="openModalObs({{item.id}})"
-    src="{% static 'midia/icons/note.svg' %}"
-    style="width: 25px; height: 35px; cursor: pointer;">
-  </img>
+          <img
+            onclick="openModalObs({{item.id}})"
+            src="{% static 'midia/icons/note.svg' %}"
+            style="width: 25px; height: 35px; cursor: pointer;">
+          </img>
+       
 
-<img
-onclick="printOrder({{item.id}})"
-src="{% static 'midia/icons/print.svg' %}"
-style="width: 35px; height: 35px; cursor: pointer;">
-</img>
-  {% endif %}
+        <img
+          onclick="printOrder({{item.id}})"
+          src="{% static 'midia/icons/print.svg' %}"
+          style="width: 35px; height: 35px; cursor: pointer;">
+        </img>
+        {% endif %}
 
-</td>
-<td>R$ {{item.product.price}}</td>
+      </td>
+      <td>R$ {{item.product.price}}</td>
+
+      {%  if comanda.status != 'OPEN'%}
+      {% else %}
+      <td>
+        
+        <img
+        onclick="removeProductComanda({{item.id}}, '{{item.product.name}}')"
+        src="{% static 'midia/icons/delete.svg' %}"
+        style="width: 35px; height: 35px; cursor: pointer;"
+         >
+      </img>
+      </td>
+        {% endif %}
+    </tr>
+        {% endfor %}
+        {% if config.taxa %}
+        <tr>
+          <td>
+            Taxa de serviço 10%
+          </td>
+          <td>
+            R$ {{valores.taxa}}
+          </td>
+        </tr>
+        {% endif %}
+
+        {% if parcials%}
+        <td colspan="2" style="text-align: center;"><b>Pagamentos parciais</b></td>
+        {% endif %}
+        {% for parcial in parcials %}
+        <tr>
+          <td>{{parcial.description}} ás {{parcial.datetime|date:"H:i"}}</td>
+          <td>R$ -{{parcial.value}}</td>
+        </tr>
+        {% endfor %}
 
 
 
 
-{%  if comanda.status != 'OPEN'%}
-{% else %}
-<td>
-  <img
-  src="{% static 'midia/icons/delete.svg' %}"
-  style="width: 35px; height: 35px; cursor: pointer;"
-  hx-get="{% url 'removeProductComanda' item.id  %} " 
-  hx-trigger="click" 
-  hx-target="#list-products-comanda" 
-  hx-confirm="Tem certeza que deseja excluir o produto {{item.product.name}}?" >
-</img>
-</td>
-  {% endif %}
-</tr>
-  {% endfor %}
-  {% if config.taxa %}
-  <tr>
-    <td>
-      Taxa de serviço 10%
-    </td>
-    <td>
-      R$ {{valores.taxa}}
-    </td>
-  </tr>
-  {% endif %}
-  
-  {% if parcials%}
-  <td colspan="2" style="text-align: center;"><b>Pagamentos parciais</b></td>
-  {% endif %}
-  {% for parcial in parcials %}
-  <tr>
-    <td>{{parcial.description}} ás {{parcial.datetime|date:"H:i"}}</td>
-    <td>R$ -{{parcial.value}}</td>
-  </tr>
-  {% endfor %}
-
-
-
-
-<tfoot>
-  <tr>
-    {% if config.taxa %}
-    <td colspan="2" style="text-align: center;"><b>Total R$ {{valores.totalComTaxa}}</b></td>
-    {% else %}
-    <td colspan="2" style="text-align: center;"><b>Total R$ {{valores.totalSemTaxa}}</b></td>
-    {% endif %}
-  </tr>
-</tfoot>
+      <tfoot>
+      <tr>
+        {% if config.taxa %}
+        <td colspan="2" style="text-align: center;"><b>Total R$ {{valores.totalComTaxa}}</b></td>
+        {% else %}
+        <td colspan="2" style="text-align: center;"><b>Total R$ {{valores.totalSemTaxa}}</b></td>
+        {% endif %}
+      </tr>
+    </tfoot>
 
diff --git a/gestaoRaul/templates/static/base.css b/gestaoRaul/templates/static/base.css
index 5002dc5..4f35803 100644
--- a/gestaoRaul/templates/static/base.css
+++ b/gestaoRaul/templates/static/base.css
@@ -32,8 +32,7 @@
     --pico-nav-link-spacing-vertical: 0.5rem;
     --pico-nav-link-spacing-horizontal: 0.5rem;
     --pico-nav-breadcrumb-divider: ">";
-    --pico-icon-checkbox: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='rgb(255, 255, 255)' stroke-width='4' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpolyline points='20 6 9 17 4 12'%3E%3C/polyline%3E%3C/svg%3E");
-    --pico-icon-minus: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='rgb(255, 255, 255)' stroke-width='4' stroke-linecap='round' stroke-linejoin='round'%3E%3Cline x1='5' y1='12' x2='19' y2='12'%3E%3C/line%3E%3C/svg%3E");
+    --pico-icon-minus: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='48' height='48' viewBox='0 0 24 24' fill='none' stroke='rgb(255, 255, 255)' stroke-width='4' stroke-linecap='round' stroke-linejoin='round'%3E%3Cline x1='5' y1='12' x2='19' y2='12'%3E%3C/line%3E%3C/svg%3E");
     --pico-icon-chevron: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='rgb(136, 145, 164)' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpolyline points='6 9 12 15 18 9'%3E%3C/polyline%3E%3C/svg%3E");
     --pico-icon-date: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='rgb(136, 145, 164)' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='4' width='18' height='18' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='16' y1='2' x2='16' y2='6'%3E%3C/line%3E%3Cline x1='8' y1='2' x2='8' y2='6'%3E%3C/line%3E%3Cline x1='3' y1='10' x2='21' y2='10'%3E%3C/line%3E%3C/svg%3E");
     --pico-icon-time: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='rgb(136, 145, 164)' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cpolyline points='12 6 12 12 16 14'%3E%3C/polyline%3E%3C/svg%3E");
@@ -147,8 +146,8 @@ input, textarea, select {
 
 
 .card-product {
-  height: 180px;
-  width: 200px;
+  height: 130px;
+  width: 150px;
   padding: 10px;
   align-items: center;
   align-content: center;
diff --git a/gestaoRaul/templates/static/comandas/css/viewcomanda.css b/gestaoRaul/templates/static/comandas/css/viewcomanda.css
index a667610..347d853 100644
--- a/gestaoRaul/templates/static/comandas/css/viewcomanda.css
+++ b/gestaoRaul/templates/static/comandas/css/viewcomanda.css
@@ -18,108 +18,14 @@
     max-width: 800px;
   }
   
-  /* .card-product {
-    height: 180px;
-    width: 200px;
-    padding: 10px;
-    align-items: center;
-    align-content: center;
-    text-align: center;
-    line-height: 1.5;
-    background: var(--main-gradient);
-    box-shadow: 3px 3px 10px rgba(2, 2, 2, 0.678);
-    border-radius: 5px;
-    transition: transform 0.4s, box-shadow 0.4s;
-    }
-  
-  .card-product:hover {
-    transform: scale(1.05);
-    transition: transform 0.4s, box-shadow 0.4s;
-    box-shadow: 0px 0px 10px rgba(86, 187, 255, 0.815);
-  } */
   
   table td th {
     text-align: center;
   }
   
-  .close {
-    height: 45px;
-    transition: transform 0.4s;
-  }
-  .close:hover {
-    transform: scale(1.2);
-    transition: transform 0.4s;
-    filter: drop-shadow(0px 0px 8px rgba(255, 1, 1, 0.452));
-  }
-
-  .popover{
-    display: none;
-    position: relative;
-    width: 98%;
-    height: 96%;
-    max-width: 800px;
-    top: 20px;
-    left: 25%;
-    padding: 20px;
-    background-color: #1f1f1fb6;
-    border-radius: 15px;
-    border: none;
-    box-shadow: 0px 0px 8px rgba(143, 143, 143, 0.2);
-    text-align: justify;
-    line-height: 50px; 
-    font-size: 18px;
-    font-weight: bold;
-    z-index: 1;
-    /* color: #333; */
-    transition: transform 0.4s;
-    animation: jump 0.5s;
-  }
 
 
-  .popover::backdrop {
-    background-color: rgba(39, 39, 39, 0.315);
-    backdrop-filter: blur(5px);
-  }
-
-  .toast-add {
-    position: fixed;
-    width: 30%;
-    top: 40px;
-    left: 50%;
-    justify-items: center;
-    align-items: center;
-    transform: translateX(-50%);
-    background-color: #599100;
-    color: #000000;
-    font-weight: bold;
-    padding: 20px 1px 1px 1px;
-    border-radius: 10px;
-    opacity: 0;
-    visibility: hidden;
-    transition: opacity 0.5s ease-in-out, visibility 0.5s ease-in-out;
-    z-index: 200 !important;
-  }
-  
-  .toast-add p {
-    color: #000000;
-  }
-  
-  .toast-add.show {
-    opacity: 1;
-    visibility: visible;
-  }
   @media screen and (max-width: 730px) {
-    .toast-add {
-      width: 90%;
-    }
-
-    .popover{
-      width: 98%;
-      height: 98%;
-      max-width: 800px;
-      top: 20px;
-      left: 10px;
-      }
 
       .card-product {
         height: 100%;
diff --git a/gestaoRaul/templates/static/comandas/js/viewcomanda.js b/gestaoRaul/templates/static/comandas/js/viewcomanda.js
index 028858c..24e4da4 100644
--- a/gestaoRaul/templates/static/comandas/js/viewcomanda.js
+++ b/gestaoRaul/templates/static/comandas/js/viewcomanda.js
@@ -9,6 +9,7 @@ const { value: formValues } = await Swal.fire({
   title: "Adicionar Produto",
   html: htmlModal,
   width: '100em',
+  position:"top",
   theme: "dark",
     didOpen: () => {
     Swal.getPopup().classList.add('swal2-noautoclose');
@@ -451,4 +452,62 @@ function inforOrders(id){
   var order = document.getElementById(id+'-obsOrder').value.split('|');
 
   feedback(order[2], "", order[1]+' - '+order[5]);
-}
\ No newline at end of file
+}
+
+
+
+async function removeProductComanda(itemId, productName) {
+  var table = document.getElementById('list-products-comanda');
+
+  Swal.fire({
+    theme: "dark",
+    title: `Remover ${productName} da comanda?`,
+    icon: "warning",
+    showCancelButton: true,
+    confirmButtonColor: "#d33",
+    cancelButtonColor: "#3085d6",
+    confirmButtonText: "Sim, remover!",
+    cancelButtonText: "Cancelar",
+  }).then(async (result) => {
+  if (result.isConfirmed) {
+
+    const csrfToken =  document.querySelector('[name="csrfmiddlewaretoken"]').value
+    if (!csrfToken) {
+      throw new Error('Token de segurança não encontrado');
+    }
+
+     const response = await fetch(`/comandas/removeProductComanda/${itemId}/`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'X-CSRFToken': csrfToken
+      },
+     
+    });
+
+     if (!response.ok) {
+      const errorData = await response.json().catch(() => ({}));
+      Swal.fire({
+        theme:"dark",
+        title: "😬 Ops!",
+        text: errorData.message || `Erro HTTP: ${response.status}`,
+        icon: "error"
+      });
+      throw new Error(errorData.message || `Erro HTTP: ${response.status}`);
+    }
+
+    
+    const result = await response.text();
+    table.innerHTML = result;
+
+    Swal.fire({
+      theme:"dark",
+      title: "Feito!",
+      text: productName+" foi removido da comanda",
+      icon: "success"
+    });
+  }
+});
+}
+
+