diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3
index b19affd..a9cfccc 100644
Binary files a/gestaoRaul/db.sqlite3 and b/gestaoRaul/db.sqlite3 differ
diff --git a/gestaoRaul/templates/htmx_components/htmx_list_products.html b/gestaoRaul/templates/htmx_components/comandas/htmx_list_products.html
similarity index 100%
rename from gestaoRaul/templates/htmx_components/htmx_list_products.html
rename to gestaoRaul/templates/htmx_components/comandas/htmx_list_products.html
diff --git a/gestaoRaul/templates/htmx_components/htmx_list_products_in_comanda.html b/gestaoRaul/templates/htmx_components/comandas/htmx_list_products_in_comanda.html
similarity index 72%
rename from gestaoRaul/templates/htmx_components/htmx_list_products_in_comanda.html
rename to gestaoRaul/templates/htmx_components/comandas/htmx_list_products_in_comanda.html
index ac2c50e..5a08512 100644
--- a/gestaoRaul/templates/htmx_components/htmx_list_products_in_comanda.html
+++ b/gestaoRaul/templates/htmx_components/comandas/htmx_list_products_in_comanda.html
@@ -1,8 +1,8 @@
{% load static %}
- | Produto |
- Preço |
+ Produto |
+ Preço |
{% for item in consumo%}
@@ -41,6 +41,15 @@
{% endif %}
{% endfor %}
+{% if parcials%}
+
Pagamentos parciais |
+{% endif %}
+{% for parcial in parcials %}
+
+ | {{parcial.description}} ás {{parcial.datetime|date:"H:i"}} |
+ R$ -{{parcial.value}} |
+
+{% endfor %}
| Total R$ {{total}} |
diff --git a/gestaoRaul/templates/htmx_components/htmx_list_products_in_balcao.html b/gestaoRaul/templates/htmx_components/htmx_list_products_in_balcao.html
index 98cd0a9..bade9ea 100644
--- a/gestaoRaul/templates/htmx_components/htmx_list_products_in_balcao.html
+++ b/gestaoRaul/templates/htmx_components/htmx_list_products_in_balcao.html
@@ -1,16 +1,16 @@
- | Produto |
- Preço |
+ Produto |
+ Preço |
{% for item in consumo%}
| {{item.product.name}} |
- R$ {{item.product.price}} |
+ R$ {{item.product.price}} |
|
+ >Excluir
{% endfor %}
diff --git a/gestaoRaul/templates/static/comandas/js/comandas.js b/gestaoRaul/templates/static/comandas/js/comandas.js
index d13de22..294887c 100644
--- a/gestaoRaul/templates/static/comandas/js/comandas.js
+++ b/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() {
diff --git a/gestaoRaul/templates/static/comandas/js/viewcomanda.js b/gestaoRaul/templates/static/comandas/js/viewcomanda.js
index cc2cae9..f41da52 100644
--- a/gestaoRaul/templates/static/comandas/js/viewcomanda.js
+++ b/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('Volte Sempre!😁😊'+style);
+ printWindow.document.write('
Volte Sempre!😁😊
'+style);
printWindow.document.close();
printWindow.print();
printWindow.close();