feat: pagamento parcial comanda part2

gestaoRaul/balcao/templates/viewBalcao.html

@@ -36,15 +36,15 @@
 
       <table id="list-products-balcao">
         <tr>
-          <th style="text-align: left;">Produto</th>
-          <th style="text-align: left;">Preço</th>
+          <th style="text-align: left;"><b>Produto</b></th>
+          <th style="text-align: left;"><b>Preço</b></th>
         </tr>
         {% for item in consumo%}
 
         <tr>
           <td>{{item.product.name}}</td>
           <td>R$ {{item.product.price}}    </td>
-          <td><button class="btn-cancel" onclick="removeProductBalcao({{item.id}})">🗑️ Excluir</button></td>
+          <td><button class="btn-cancel" onclick="removeProductBalcao({{item.id}})">Excluir</button></td>
         </tr>
 
         {% endfor %}

gestaoRaul/comandas/htmx_views.py

@@ -27,7 +27,7 @@ def listProduct(request, comanda_id):
     for p in allProducts:
         if p.active == True:
             products.append(p)
-    return render(request, "htmx_components/htmx_list_products.html", {"products": products,'comanda_id':comanda_id})
+    return render(request, "htmx_components/comandas/htmx_list_products.html", {"products": products,'comanda_id':comanda_id})
 
 @group_required(groupName='Garçom')
 def addProduct(request, product_id, comanda_id):
@@ -36,12 +36,13 @@ def addProduct(request, product_id, comanda_id):
     product_comanda.save()
     product = Product.objects.get(id=product_id)
     comanda = Comanda.objects.get(id=comanda_id)
+    parcial = Payments.objects.filter(comanda=comanda)
     if product.cuisine == True:
         order = Order(id_comanda=comanda, id_product=product, productComanda=product_comanda, obs='')
         order.save()
     consumo = ProductComanda.objects.filter(comanda=comanda_id)
     total = somar(consumo,comanda)
-    return render(request, "htmx_components/htmx_list_products_in_comanda.html",{'consumo': consumo, 'total': total, 'comanda':comanda})
+    return render(request, "htmx_components/comandas/htmx_list_products_in_comanda.html",{'parcials':parcial,'consumo': consumo, 'total': total, 'comanda':comanda})
 
 @group_required(groupName='Garçom')
 def editOrders(request, productComanda_id, obs):
@@ -55,10 +56,11 @@ def editOrders(request, productComanda_id, obs):
 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)
     product_comanda.delete()
     total = somar(consumo, comanda)
-    return render(request, "htmx_components/htmx_list_products_in_comanda.html",{'consumo': consumo, 'total': total, 'comanda':comanda})
+    return render(request, "htmx_components/comandas/htmx_list_products_in_comanda.html",{'parcials':parcial,'consumo': consumo, 'total': total, 'comanda':comanda})
 
 @group_required(groupName='Garçom')
 def closeComanda(request, comanda_id):

gestaoRaul/comandas/templates/viewcomanda.html

@@ -76,8 +76,8 @@ Detalhes {{comanda.name}}
 <img hidden src="{% static 'midia/logo.png' %}" style="width: 240px; height: 200px;">
     <table id="list-products-comanda">
       <tr>
-        <th style="text-align: left;">Produto</th>
-        <th style="text-align: left;">Preço</th>
+        <th style="text-align: left;"><b>Produto</b></th>
+        <th style="text-align: left;"><b>Preço</b></th>
       </tr>
 
     {%  for item in consumo%}
@@ -117,11 +117,13 @@ Detalhes {{comanda.name}}
         {% endif %}
       </tr>
         {% endfor %}
+        {% if parcials%}
+        <td colspan="2" style="text-align: center;"><b>Pagamentos parciais</b></td>
+        {% endif %}
         {% for parcial in parcials %}
         <tr>
-          <td  style="text-align: left; color: chartreuse;">{{parcial.datetime}}</td>
-          <td  style="text-align: left; color: chartreuse;">R$ -{{parcial.value}}</td>
-          <td  style="text-align: left; color: chartreuse;">{{parcial.description}}</td>
+          <td>{{parcial.description}} ás {{parcial.datetime|date:"H:i"}}</td>
+          <td>R$ -{{parcial.value}}</td>
         </tr>
         {% endfor %}
 
@@ -130,7 +132,7 @@ Detalhes {{comanda.name}}
 
     <tfoot>
       <tr>
-        <td colspan="2" style="text-align: center;">Total R$ {{total}}</td>
+        <td colspan="2" style="text-align: center;"><b>Total R$ {{total}}</b></td>
       </tr>
     </tfoot>
   </table>
@@ -201,7 +203,7 @@ Detalhes {{comanda.name}}
     <h2>Pagamento Parcial</h2>
     <form method="post" action="{% url 'paymentParcial' comanda.id %} ">
       {% csrf_token %}
-      <input id="value-parcial" name="value-parcial" type="number" step="0.01" placeholder="Valor">
+      <input id="value-parcial" name="value-parcial" type="number" step="0.01" max="{{total}}" placeholder="Valor">
       <input id="name-parcial" name="name-parcial" type="text" placeholder="Nome" >
     <footer>
       <div style="display: flex;gap: 10px;">

gestaoRaul/templates/htmx_components/comandas/htmx_list_products_in_comanda.html

@@ -1,8 +1,8 @@
 {% load static %}
 
 <tr>
-    <th style="text-align: left;">Produto</th>
-    <th style="text-align: left;">Preço</th>
+    <th style="text-align: left;"><b>Produto</b></th>
+    <th style="text-align: left;"><b>Preço</b></th>
   </tr>
 
 {%  for item in consumo%}
@@ -41,6 +41,15 @@
   {% endif %}
 </tr>
 {% endfor %}
+{% 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>
       <td colspan="2" style="text-align: center;">Total R$ {{total}}</td>

gestaoRaul/templates/htmx_components/htmx_list_products_in_balcao.html

@@ -1,16 +1,16 @@
 <tr>
-    <th style="text-align: left;">Produto</th>
-    <th style="text-align: left;">Preço</th>
+    <th style="text-align: left;"><b>Produto</b></th>
+    <th style="text-align: left;"><b>Preço</b></th>
   </tr>
 
 {%  for item in consumo%}
 
 <tr>
   <td>{{item.product.name}}</td>
-  <td>R$ {{item.product.price}}</td>
+  <td>R$ {{item.product.price}}     </td>
   <td><button class="btn-cancel" onclick="removeProductBalcao({{item.id}})"
    
-    >🗑️ Excluir</button></td>
+    >Excluir</button></td>
 </tr>
 
 {% endfor %}

gestaoRaul/templates/static/comandas/js/comandas.js

@@ -5,8 +5,9 @@ document.cookie = `pronto=0`;
 
 function openModal() {
     document.getElementById('Modal-create-comanda').style.display = 'block';
-    // HTMLDialogElement.show()
-    // HTMLDialogElement.showModal()
+    textField = document.getElementById('name-comanda')
+    textField.focus()
+
 }
 
 function closeModal() {

gestaoRaul/templates/static/comandas/js/viewcomanda.js

@@ -2,6 +2,9 @@
 
 function openModal() {
     document.getElementById('Modal-add-product').style.display = 'block';
+    textField = document.getElementById('search-product')
+    textField.value = '';
+    textField.focus()
 }
 function openModalAlter() {
     document.getElementById('Modal-alter-comanda').style.display = 'block';
@@ -23,8 +26,9 @@ function openModalObs(id) {
     document.getElementById('modal-obs').style.display = 'block';
     idd = document.getElementById('id-temp').value = id;
     obs = document.getElementById('obs').value;
-    console.log(id);
-    console.log(obs);
+    textField = document.getElementById('obs')
+    textField.focus()
+
 }
 
 
@@ -35,15 +39,15 @@ function modal_payment_comanda() {
 }
 function modal_payment_parcial() {
     document.getElementById('payment-parcial').style.display = 'block';
-    // recebido = document.getElementById('recebido')
-    // recebido.focus()
+    value = document.getElementById('value-parcial')
+    value.focus()
+
 }
 
 
 function modal_conta_client() {
     document.getElementById('conta-cliente').style.display = 'block';
-    // recebido = document.getElementById('recebido')
-    // recebido.focus()
+
 }
 
 function close_modal_conta_client() {
@@ -51,6 +55,9 @@ function close_modal_conta_client() {
 }
 
 
+function close_modal_payment_parcial() {
+    document.getElementById('payment-parcial').style.display = 'none';
+}
 function close_modal_payment_comanda() {
     document.getElementById('payment-comanda').style.display = 'none';
 }
@@ -136,7 +143,7 @@ function imprimirConta() {
          
     
       var printWindow = window.open('', '_blank');
-      printWindow.document.write('<table>'+content+'</table><b>Volte Sempre!😁😊</b>'+style);
+      printWindow.document.write('<table>'+content+'</table><br><b>Volte Sempre!😁😊</b><br>'+style);
       printWindow.document.close();
       printWindow.print();
       printWindow.close();