diff --git a/gestaoRaul/clients/templates/clients.html b/gestaoRaul/clients/templates/clients.html index b04ed78..1073c83 100644 --- a/gestaoRaul/clients/templates/clients.html +++ b/gestaoRaul/clients/templates/clients.html @@ -87,7 +87,7 @@ Clientes diff --git a/gestaoRaul/comandas/templates/viewcomanda.html b/gestaoRaul/comandas/templates/viewcomanda.html index c852116..2cff02d 100644 --- a/gestaoRaul/comandas/templates/viewcomanda.html +++ b/gestaoRaul/comandas/templates/viewcomanda.html @@ -159,14 +159,21 @@ Detalhes {{comanda.name}} @@ -196,6 +203,28 @@ Detalhes {{comanda.name}} + + + + diff --git a/gestaoRaul/db - Copia (2).sqlite3 b/gestaoRaul/db - Copia (2).sqlite3 deleted file mode 100644 index cf57560..0000000 Binary files a/gestaoRaul/db - Copia (2).sqlite3 and /dev/null differ diff --git a/gestaoRaul/db - Copia.sqlite3 b/gestaoRaul/db - Copia.sqlite3 deleted file mode 100644 index 81b0fd0..0000000 Binary files a/gestaoRaul/db - Copia.sqlite3 and /dev/null differ diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3 index 3da0da1..30396c3 100644 Binary files a/gestaoRaul/db.sqlite3 and b/gestaoRaul/db.sqlite3 differ diff --git a/gestaoRaul/gestaoRaul/__pycache__/settings.cpython-310.pyc b/gestaoRaul/gestaoRaul/__pycache__/settings.cpython-310.pyc index 8748c4c..a92cab9 100644 Binary files a/gestaoRaul/gestaoRaul/__pycache__/settings.cpython-310.pyc and b/gestaoRaul/gestaoRaul/__pycache__/settings.cpython-310.pyc differ diff --git a/gestaoRaul/login/templates/login.html b/gestaoRaul/login/templates/login.html index d36e536..d7d0ab6 100644 --- a/gestaoRaul/login/templates/login.html +++ b/gestaoRaul/login/templates/login.html @@ -12,9 +12,9 @@
-

- -

+ + +
{% csrf_token %} diff --git a/gestaoRaul/templates/static/comandas/css/viewbalcao.css b/gestaoRaul/templates/static/comandas/css/viewbalcao.css index 7bb3ba3..c4e1f31 100644 --- a/gestaoRaul/templates/static/comandas/css/viewbalcao.css +++ b/gestaoRaul/templates/static/comandas/css/viewbalcao.css @@ -2,16 +2,16 @@ display: grid; grid-template-columns: repeat(2, 2fr); gap: 20px; - max-width: 1300px; /* Define a largura máxima do grid */ - margin: 0 auto; /* Centraliza o grid na página */ + max-width: 1300px; + margin: 0 auto; } .grid-list-products { display: grid; grid-template-columns: repeat(3, 2fr); gap: 10px; - max-width: 800px; /* Define a largura máxima do grid */ - margin: 0 auto; /* Centraliza o grid na página */ + max-width: 800px; + margin: 0 auto; } .card { @@ -21,7 +21,7 @@ border-radius: 15px; box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.2); text-align: center; - line-height: 40px; /* Centraliza o texto verticalmente */ + line-height: 40px; font-size: 20px; font-weight: bold; color: #333; diff --git a/gestaoRaul/templates/static/comandas/js/viewcomanda.js b/gestaoRaul/templates/static/comandas/js/viewcomanda.js index 5000bd6..51959dd 100644 --- a/gestaoRaul/templates/static/comandas/js/viewcomanda.js +++ b/gestaoRaul/templates/static/comandas/js/viewcomanda.js @@ -30,6 +30,8 @@ function openModalObs(id) { function modal_payment_comanda() { document.getElementById('payment-comanda').style.display = 'block'; + recebido = document.getElementById('recebido') + recebido.focus() } function close_modal_payment_comanda() { @@ -139,17 +141,35 @@ function backPage() { } -// document.onkeydown = teclado +function troco(){ + recebido = document.getElementById('recebido').value + total = document.getElementById('first-total').innerHTML + resultado = document.getElementById('troco') + total = total.replace('R$ ','') + total = total.replace(',','.') + result = recebido - total + resultado.innerHTML = 'Troco: R$ '+result +} -// function teclado(event){ -// if (event.keyCode == 65){ -// openModal() -// } -// else if (event.keyCode == 73){ -// imprimirFichas() -// } -// } +document.onkeydown = teclado + +function teclado(event){ + if (document.getElementById('payment-comanda').style.display == 'block'){ + if (event.keyCode == 13){ + troco() + }else{ + console.log(event.keyCode) + } + }else{ + if (event.keyCode == 13){ + troco() + }else{ + console.log('') + } + } + +} function addOrder(){ obs = document.getElementById('obs').value var id = document.getElementById('id-temp').value diff --git a/gestaoRaul/templates/static/login/css/login.css b/gestaoRaul/templates/static/login/css/login.css index b528f4b..43f4273 100644 --- a/gestaoRaul/templates/static/login/css/login.css +++ b/gestaoRaul/templates/static/login/css/login.css @@ -38,20 +38,25 @@ body transform: skew(2deg,1deg); border-radius: 10px; } -.c-form h2 -{ + + +.logo { color: #fff; font-weight: 500; text-transform: uppercase; letter-spacing: 5px; - transition: transform 0.2s; + filter: drop-shadow(0px 0px 8px rgba(168, 168, 168, 0.788)); + transition: all 0.5s ease-in-out; + } -.c-form h2:hover -{ - scale: 1.05; - transition: transform 0.2s; +.logo:hover { + filter: drop-shadow(0px 0px 12px rgba(168, 168, 168, 0.788)); + /* transition: transform 1.2s; */ + scale: 1.2; + } + .c-form .c-input { margin-top: 40px; @@ -64,7 +69,7 @@ body .c-form .c-input .c-inputBox label { display: block; - color: #fff; + color: #f1e3d1; margin-bottom: 5px; font-size: 18px; letter-spacing: 1px; @@ -82,20 +87,24 @@ body font-size: 20px; border-radius: 10px; } -.c-form .c-input .c-inputBox input[type="submit"] -{ - background:linear-gradient(315deg,#591309,#fee4c1) ; +.c-form .c-input .c-inputBox input[type="submit"] { + background:#612319; cursor: pointer; margin-top: 20px; letter-spacing: 1px; -} -.c-form .c-input .c-inputBox input[type="submit"]:hover -{ - background:linear-gradient(315deg,#fee4c1,#591309) ; -} -.c-form .c-input .c-inputBox input[type="submit"]:active -{ + box-shadow: 0px 0px 10px rgba(207, 207, 207, 0.671); + transition: all 0.3s ease-in-out; + } + + +.c-form .c-input .c-inputBox input[type="submit"]:hover { + background:#9e6f4f; + scale: 1.05; + } + + +/* .c-form .c-input .c-inputBox input[type="submit"]:active { color: rgba(255, 255, 255, 0.521); background:linear-gradient(315deg,#fee4c1,#591309) ; -} + } */