diff --git a/gestaoRaul/comandas/templates/viewcomanda.html b/gestaoRaul/comandas/templates/viewcomanda.html index 8e37126..e9f84d5 100644 --- a/gestaoRaul/comandas/templates/viewcomanda.html +++ b/gestaoRaul/comandas/templates/viewcomanda.html @@ -58,13 +58,13 @@ Detalhes {{comanda.name}}
- Nome: {{comanda.name}} | - Mesa: {{comanda.mesa}} + Nome: {{comanda.name}} | + Mesa: {{comanda.mesa}}
-

Aberta em: {{comanda.dt_open|date:"D"}} {{comanda.dt_open|date:"d/m/Y - H:i"}}

- +

Aberta em: {{comanda.dt_open|date:"D"}} {{comanda.dt_open|date:"d/m/Y - H:i"}}

+ diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3 index b289d19..ab208ba 100644 Binary files a/gestaoRaul/db.sqlite3 and b/gestaoRaul/db.sqlite3 differ diff --git a/gestaoRaul/orders/templates/orders.html b/gestaoRaul/orders/templates/orders.html index 16a35ec..fc627ab 100644 --- a/gestaoRaul/orders/templates/orders.html +++ b/gestaoRaul/orders/templates/orders.html @@ -29,7 +29,7 @@
- + diff --git a/gestaoRaul/templates/htmx_components/orders/htmx_list_orders.html b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders.html index 4729b86..538480a 100644 --- a/gestaoRaul/templates/htmx_components/orders/htmx_list_orders.html +++ b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders.html @@ -2,7 +2,7 @@
- + diff --git a/gestaoRaul/templates/static/comandas/js/viewcomanda.js b/gestaoRaul/templates/static/comandas/js/viewcomanda.js index dc7b576..03fdf9d 100644 --- a/gestaoRaul/templates/static/comandas/js/viewcomanda.js +++ b/gestaoRaul/templates/static/comandas/js/viewcomanda.js @@ -41,14 +41,18 @@ function imprimirFichas() { font-size: 24px;} `; const agora = new Date(); - var dateString = agora.getDay() + '/' + agora.getMonth() + '/' + agora.getFullYear() + ' - ' + agora.getHours() + ':' + agora.getMinutes()+' - Raul Rock Bar & Café'; + var dateString = agora.getDate() + '/' + (agora.getMonth()+1) + '/' + agora.getFullYear() + ' - ' + agora.getHours() + ':' + agora.getMinutes()+' - Raul Rock Bar & Café'; if (element) { var content = element.innerHTML; // console.log(content); - content = content.replace(/]*>(?:(?!<\/img>)[\s\S])*<\/img>/gi,''); + content = content.replace( /]*>/gi,''); + content = content.replace(/]*>(?:(?!<\/tfoot>)[\s\S])*<\/tfoot>/gi,''); + content = content.replace(/]*>(?:(?!<\/th>)[\s\S])*<\/th>/gi,''); - content = content.replace(/<\/tr>/g,'
'); + // content = content.replace(/<\/tr>/g,''); + content = content.replace(/<\/tr>/g,''); + console.log(content); var printWindow = window.open('', '_blank'); @@ -67,26 +71,37 @@ function imprimirConta() { const element = document.getElementById("list-products-comanda"); const style = ``; const agora = new Date(); - var dateString = agora.getDay() + '/' + agora.getMonth() + '/' + agora.getFullYear() + ' - ' + agora.getHours() + ':' + agora.getMinutes()+' - Raul Rock Bar & Café'; + var dateString = agora.getDate() + '/' + (agora.getMonth()+1) + '/' + agora.getFullYear() + ' - ' + agora.getHours() + ':' + agora.getMinutes(); if (element) { var content = element.innerHTML; // console.log(content); - content = content.replace(/]*>(?:(?!<\/img>)[\s\S])*<\/img>/gi,''); + content = content.replace(/]*>/gi,''); content = content.replace(/]*>(?:(?!<\/th>)[\s\S])*<\/th>/gi,''); - // content = content.replace(/<\/tr>/g,''); - console.log(content); + // content = content.replace('icons',''); + content = '' + +'
' + +document.getElementById('name-comanda').innerText.replace(' | ', '') + +'
' + +document.getElementById('mesa-comanda').innerText + +'
' + +document.getElementById('open-comanda').innerText + +'
Fechado em: ' + +dateString + +content + +'
' + + var printWindow = window.open('', '_blank'); - printWindow.document.write('
Produto
'+dateString+'
'+dateString+'
'+dateString+ '
VÁLIDO SOMENTE POR ESSA NOITE'+'
'+dateString+'
'+content+'
'+style); + printWindow.document.write(''+content+'
Volte Sempre!😁😊'+style); printWindow.document.close(); printWindow.print(); printWindow.close(); diff --git a/gestaoRaul/templates/static/midia/logo.png b/gestaoRaul/templates/static/midia/logo.png new file mode 100644 index 0000000..15ae440 Binary files /dev/null and b/gestaoRaul/templates/static/midia/logo.png differ diff --git a/gestaoRaul/templates/static/orders/js/orders.js b/gestaoRaul/templates/static/orders/js/orders.js index c9bb8c4..7589b3c 100644 --- a/gestaoRaul/templates/static/orders/js/orders.js +++ b/gestaoRaul/templates/static/orders/js/orders.js @@ -1,4 +1,4 @@ -function openTab(evt, cityName) { +function openTab(evt, etapa) { // Declarar todas as abas e conteúdos var i, tabcontent, tablinks; tabcontent = document.getElementsByClassName("tabcontent"); @@ -10,6 +10,14 @@ function openTab(evt, cityName) { tablinks[i].className = tablinks[i].className.replace(" active", ""); } // Mostrar o conteúdo da aba selecionada e marcar a aba como ativa - document.getElementById(cityName).style.display = "block"; + document.getElementById(etapa).style.display = "block"; evt.currentTarget.className += " active"; - } \ No newline at end of file + // console.log(evt.currentTarget.className += " active"); + } + + + tabcontent = document.getElementsByClassName("tabcontent"); + for (i = 0; i < tabcontent.length; i++) { + tabcontent[i].style.display = "none"; + } + tabcontent[0].style.display = "block"; \ No newline at end of file