Compare commits

...

11 Commits

Author SHA1 Message Date
root 5c9cb1905b fix: cartoes table 12px sem R$, headers curtos
Build Fechamento de Caixa / build (macos-14, app) (push) Has been cancelled
Build Fechamento de Caixa / build (ubuntu-22.04, deb) (push) Has been cancelled
Build Fechamento de Caixa / build (windows-2022, msi) (push) Has been cancelled
2026-07-02 20:35:20 +00:00
root a2d3dcc366 fix: openPrintPreview 6px bold titulo 18px
Build Fechamento de Caixa / build (macos-14, app) (push) Has been cancelled
Build Fechamento de Caixa / build (ubuntu-22.04, deb) (push) Has been cancelled
Build Fechamento de Caixa / build (windows-2022, msi) (push) Has been cancelled
2026-07-02 20:28:59 +00:00
root 12e3d081a7 fix: openPrintPreview 9px bold titulo 20px
Build Fechamento de Caixa / build (macos-14, app) (push) Has been cancelled
Build Fechamento de Caixa / build (ubuntu-22.04, deb) (push) Has been cancelled
Build Fechamento de Caixa / build (windows-2022, msi) (push) Has been cancelled
2026-07-02 20:23:13 +00:00
root ad967bf0a1 fix: openPrintPreview 12px bold titulo 20px
Build Fechamento de Caixa / build (macos-14, app) (push) Has been cancelled
Build Fechamento de Caixa / build (ubuntu-22.04, deb) (push) Has been cancelled
Build Fechamento de Caixa / build (windows-2022, msi) (push) Has been cancelled
2026-07-02 20:18:51 +00:00
root d39cc7518b fix: openPrintPreview 15px bold titulo 20px
Build Fechamento de Caixa / build (macos-14, app) (push) Has been cancelled
Build Fechamento de Caixa / build (ubuntu-22.04, deb) (push) Has been cancelled
Build Fechamento de Caixa / build (windows-2022, msi) (push) Has been cancelled
2026-07-02 20:13:10 +00:00
root 52bec03988 fix: botao Editar na tabela agora pede senha antes de abrir
Build Fechamento de Caixa / build (macos-14, app) (push) Has been cancelled
Build Fechamento de Caixa / build (ubuntu-22.04, deb) (push) Has been cancelled
Build Fechamento de Caixa / build (windows-2022, msi) (push) Has been cancelled
2026-07-02 20:07:05 +00:00
root 9639048bf7 fix: askPassword aceita config.dynamic_password
Build Fechamento de Caixa / build (macos-14, app) (push) Has been cancelled
Build Fechamento de Caixa / build (ubuntu-22.04, deb) (push) Has been cancelled
Build Fechamento de Caixa / build (windows-2022, msi) (push) Has been cancelled
2026-07-02 19:38:33 +00:00
root b1585af3f9 fix: fonte 18px bold nos relatorios
Build Fechamento de Caixa / build (macos-14, app) (push) Has been cancelled
Build Fechamento de Caixa / build (ubuntu-22.04, deb) (push) Has been cancelled
Build Fechamento de Caixa / build (windows-2022, msi) (push) Has been cancelled
2026-07-02 19:31:56 +00:00
root 155782f50a fix: fonte 20px bold nos relatorios
Build Fechamento de Caixa / build (macos-14, app) (push) Has been cancelled
Build Fechamento de Caixa / build (ubuntu-22.04, deb) (push) Has been cancelled
Build Fechamento de Caixa / build (windows-2022, msi) (push) Has been cancelled
2026-07-02 19:25:09 +00:00
root 16972f4734 fix: fonte 22px bold em todos os relatórios e preview
Build Fechamento de Caixa / build (macos-14, app) (push) Has been cancelled
Build Fechamento de Caixa / build (ubuntu-22.04, deb) (push) Has been cancelled
Build Fechamento de Caixa / build (windows-2022, msi) (push) Has been cancelled
2026-07-02 19:19:23 +00:00
root d3d5c4fbca fix: fonte grossa 18px bold no preview e impressao
Build Fechamento de Caixa / build (macos-14, app) (push) Has been cancelled
Build Fechamento de Caixa / build (ubuntu-22.04, deb) (push) Has been cancelled
Build Fechamento de Caixa / build (windows-2022, msi) (push) Has been cancelled
2026-07-02 19:10:42 +00:00
+69 -65
View File
@@ -160,7 +160,7 @@
padding: 10px 16px; display: flex; justify-content: space-between; align-items: center; padding: 10px 16px; display: flex; justify-content: space-between; align-items: center;
} }
.dif-label { font-size: 12px; font-weight: 700; color: var(--text); text-transform: uppercase; letter-spacing: 0.5px; } .dif-label { font-size: 12px; font-weight: 700; color: var(--text); text-transform: uppercase; letter-spacing: 0.5px; }
.dif-value { font-size: 22px; font-weight: 700; font-variant-numeric: tabular-nums; } .dif-value { font-size: 18px; font-weight: 700; font-variant-numeric: tabular-nums; }
.dif-value.pos, .dif-value.zero { color: var(--green); } .dif-value.pos, .dif-value.zero { color: var(--green); }
.dif-value.neg { color: var(--red); } .dif-value.neg { color: var(--red); }
@@ -1370,17 +1370,17 @@ function buildConfirmHTML(data) {
const al = cartAli_arr[i] || 0; const al = cartAli_arr[i] || 0;
const px = cartPix_arr[i] || 0; const px = cartPix_arr[i] || 0;
cartTableRows += `<tr> cartTableRows += `<tr>
<td>${cr > 0 ? fmt(cr) : '-'}</td> <td>${cr > 0 ? fmt(cr).replace('R$ ','') : '-'}</td>
<td>${db > 0 ? fmt(db) : '-'}</td> <td>${db > 0 ? fmt(db).replace('R$ ','') : '-'}</td>
<td>${al > 0 ? fmt(al) : '-'}</td> <td>${al > 0 ? fmt(al).replace('R$ ','') : '-'}</td>
<td>${px > 0 ? fmt(px) : '-'}</td> <td>${px > 0 ? fmt(px).replace('R$ ','') : '-'}</td>
</tr>`; </tr>`;
} }
cartTableRows += `<tr class="total-row"> cartTableRows += `<tr class="total-row">
<td>${cartCred > 0 ? fmt(cartCred) : '-'}</td> <td>${cartCred > 0 ? fmt(cartCred).replace('R$ ','') : '-'}</td>
<td>${cartDeb > 0 ? fmt(cartDeb) : '-'}</td> <td>${cartDeb > 0 ? fmt(cartDeb).replace('R$ ','') : '-'}</td>
<td>${cartAli > 0 ? fmt(cartAli) : '-'}</td> <td>${cartAli > 0 ? fmt(cartAli).replace('R$ ','') : '-'}</td>
<td>${cartPix > 0 ? fmt(cartPix) : '-'}</td> <td>${cartPix > 0 ? fmt(cartPix).replace('R$ ','') : '-'}</td>
</tr>`; </tr>`;
let html = `<!DOCTYPE html> let html = `<!DOCTYPE html>
@@ -1389,28 +1389,28 @@ function buildConfirmHTML(data) {
<title>Fechamento de Caixa</title> <title>Fechamento de Caixa</title>
<style> <style>
* { box-sizing: border-box; margin: 0; padding: 0; } * { box-sizing: border-box; margin: 0; padding: 0; }
body { font-family: 'Courier New', monospace; font-size: 15px; width: 80mm; margin: 0 auto; padding: 8px; font-weight: bold !important; print-color-adjust: exact; -webkit-print-color-adjust: exact; } body { font-family: 'Courier New', monospace; font-size: 18px; font-weight: bold !important; width: 80mm; margin: 0 auto; padding: 8px; font-weight: bold !important; print-color-adjust: exact; -webkit-print-color-adjust: exact; }
.header { text-align: center; margin-bottom: 8px; } .header { text-align: center; margin-bottom: 8px; }
.header h1 { font-size: 20px; font-weight: bold !important; } .header h1 { font-size: 24px; font-weight: bold !important; }
.header h2 { font-size: 16px; font-weight: bold !important; } .header h2 { font-size: 18px; font-weight: bold !important; }
hr { border: none; border-top: 2px solid #000; margin: 6px 0; } hr { border: none; border-top: 2px solid #000; margin: 6px 0; }
.section-title { font-weight: bold !important; font-size: 14px; border-top: 2px solid #000; padding-top: 4px; margin-top: 8px; } .section-title { font-weight: bold !important; font-size: 18px; border-top: 2px solid #000; padding-top: 4px; margin-top: 8px; }
.row { display: flex; justify-content: space-between; padding: 2px 0; font-size: 14px; font-weight: bold !important; } .row { display: flex; justify-content: space-between; padding: 2px 0; font-size: 18px; font-weight: bold !important; }
.row.total-row { font-weight: bold !important; } .row.total-row { font-weight: bold !important; }
.cart-table { table-layout: fixed; width: 100%; border-collapse: collapse; font-size: 13px; margin-top: 4px; font-weight: bold !important; } .cart-table { table-layout: fixed; width: 100%; border-collapse: collapse; font-size: 12px; margin-top: 4px; font-weight: bold !important; }
.cart-table th { font-weight: bold !important; border-bottom: 2px solid #000; padding: 3px; font-size: 13px; width: 25%; } .cart-table th { font-weight: bold !important; border-bottom: 2px solid #000; padding: 2px 3px; font-size: 12px; width: 25%; }
.cart-table td { padding: 3px 5px; text-align: right; font-weight: bold !important; font-size: 13px; } .cart-table td { padding: 2px 3px; text-align: right; font-weight: bold !important; font-size: 12px; }
.cart-table td:first-child { text-align: left; } .cart-table td:first-child { text-align: left; }
.cart-table tr.total-row { font-weight: bold !important; border-top: 2px solid #000; } .cart-table tr.total-row { font-weight: bold !important; border-top: 2px solid #000; }
.subtotal { font-size: 13px; margin-top: 4px; } .subtotal { font-size: 12px; margin-top: 4px; }
.subtotal .row { padding: 1px 0; font-weight: bold !important; } .subtotal .row { padding: 1px 0; font-weight: bold !important; }
.diff-ok { color: #2e7d32; font-weight: bold !important; } .diff-ok { color: #2e7d32; font-weight: bold !important; }
.diff-bad { color: #c0272d; font-weight: bold !important; } .diff-bad { color: #c0272d; font-weight: bold !important; }
.obs { font-size: 12px; color: #555; margin-top: 6px; white-space: pre-wrap; font-weight: bold !important; } .obs { font-size: 16px; color: #555; margin-top: 6px; white-space: pre-wrap; font-weight: bold !important; }
.footer { text-align: center; font-size: 12px; color: #555; margin-top: 8px; font-weight: bold !important; } .footer { text-align: center; font-size: 14px; color: #555; margin-top: 8px; font-weight: bold !important; }
@media print { body { background: #fff; font-weight: bold !important; font-size: 15px !important; } } @media print { body { background: #fff; font-weight: bold !important; font-size: 18px !important; } }
</head><body> </head><body>
<div class="header"> <div class="header">
<h1>${data.loja}</h1> <h1>${data.loja}</h1>
<h2>Fechamento de Caixa</h2> <h2>Fechamento de Caixa</h2>
</div> </div>
@@ -1447,7 +1447,7 @@ ${cancelamentos_arr.map(c => `<div class="row"><span>${c.numero ? `Nº ${c.numer
<table class="cart-table"> <table class="cart-table">
<thead> <thead>
<tr> <tr>
<th>CRÉDITO</th><th>DÉBITO</th><th>ALIMENT.</th><th>PIX</th> <th>CRÉD</th><th>DÉBIT</th><th>ALIM</th><th>PIX</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -1585,18 +1585,18 @@ function buildPrintHTML(data) {
const al = cartAli_arr[i] || 0; const al = cartAli_arr[i] || 0;
const px = cartPix_arr[i] || 0; const px = cartPix_arr[i] || 0;
cartTableRows += `<tr> cartTableRows += `<tr>
<td>${cr > 0 ? fmt(cr) : '-'}</td> <td>${cr > 0 ? fmt(cr).replace('R$ ','') : '-'}</td>
<td>${db > 0 ? fmt(db) : '-'}</td> <td>${db > 0 ? fmt(db).replace('R$ ','') : '-'}</td>
<td>${al > 0 ? fmt(al) : '-'}</td> <td>${al > 0 ? fmt(al).replace('R$ ','') : '-'}</td>
<td>${px > 0 ? fmt(px) : '-'}</td> <td>${px > 0 ? fmt(px).replace('R$ ','') : '-'}</td>
</tr>`; </tr>`;
} }
// Totals row // Totals row
cartTableRows += `<tr class="total-row"> cartTableRows += `<tr class="total-row">
<td>${cartCred > 0 ? fmt(cartCred) : '-'}</td> <td>${cartCred > 0 ? fmt(cartCred).replace('R$ ','') : '-'}</td>
<td>${cartDeb > 0 ? fmt(cartDeb) : '-'}</td> <td>${cartDeb > 0 ? fmt(cartDeb).replace('R$ ','') : '-'}</td>
<td>${cartAli > 0 ? fmt(cartAli) : '-'}</td> <td>${cartAli > 0 ? fmt(cartAli).replace('R$ ','') : '-'}</td>
<td>${cartPix > 0 ? fmt(cartPix) : '-'}</td> <td>${cartPix > 0 ? fmt(cartPix).replace('R$ ','') : '-'}</td>
</tr>`; </tr>`;
const sysTotal = data.sys_total || 0; const sysTotal = data.sys_total || 0;
@@ -1609,26 +1609,26 @@ function buildPrintHTML(data) {
<title>Fechamento de Caixa</title> <title>Fechamento de Caixa</title>
<style> <style>
* { box-sizing: border-box; margin: 0; padding: 0; } * { box-sizing: border-box; margin: 0; padding: 0; }
body { font-family: 'Courier New', monospace; font-size: 15px; width: 80mm; margin: 0 auto; padding: 8px; font-weight: bold !important; print-color-adjust: exact; -webkit-print-color-adjust: exact; } body { font-family: 'Courier New', monospace; font-size: 18px; font-weight: bold !important; width: 80mm; margin: 0 auto; padding: 8px; print-color-adjust: exact; -webkit-print-color-adjust: exact; }
.header { text-align: center; margin-bottom: 8px; } .header { text-align: center; margin-bottom: 8px; }
.header h1 { font-size: 20px; font-weight: bold !important; } .header h1 { font-size: 24px; font-weight: bold !important; }
.header h2 { font-size: 16px; font-weight: bold !important; } .header h2 { font-size: 18px; font-weight: bold !important; }
hr { border: none; border-top: 2px solid #000; margin: 6px 0; } hr { border: none; border-top: 2px solid #000; margin: 6px 0; }
.section-title { font-weight: bold !important; font-size: 14px; border-top: 2px solid #000; padding-top: 4px; margin-top: 8px; } .section-title { font-weight: bold !important; font-size: 18px; border-top: 2px solid #000; padding-top: 4px; margin-top: 8px; }
.row { display: flex; justify-content: space-between; padding: 2px 0; font-size: 14px; font-weight: bold !important; } .row { display: flex; justify-content: space-between; padding: 2px 0; font-size: 18px; font-weight: bold !important; }
.row.total-row { font-weight: bold !important; } .row.total-row { font-weight: bold !important; }
.cart-table { table-layout: fixed; width: 100%; border-collapse: collapse; font-size: 13px; margin-top: 4px; font-weight: bold !important; } .cart-table { table-layout: fixed; width: 100%; border-collapse: collapse; font-size: 12px; margin-top: 4px; font-weight: bold !important; }
.cart-table th { font-weight: bold !important; border-bottom: 2px solid #000; padding: 3px; font-size: 13px; width: 25%; } .cart-table th { font-weight: bold !important; border-bottom: 2px solid #000; padding: 2px 3px; font-size: 12px; width: 25%; }
.cart-table td { padding: 3px 5px; text-align: right; font-weight: bold !important; font-size: 13px; } .cart-table td { padding: 2px 3px; text-align: right; font-weight: bold !important; font-size: 12px; }
.cart-table td:first-child { text-align: left; } .cart-table td:first-child { text-align: left; }
.cart-table tr.total-row { font-weight: bold !important; border-top: 2px solid #000; } .cart-table tr.total-row { font-weight: bold !important; border-top: 2px solid #000; }
.subtotal { font-size: 13px; margin-top: 4px; } .subtotal { font-size: 12px; margin-top: 4px; }
.subtotal .row { padding: 1px 0; font-weight: bold !important; } .subtotal .row { padding: 1px 0; font-weight: bold !important; }
.diff-ok { color: #2e7d32; font-weight: bold !important; } .diff-ok { color: #2e7d32; font-weight: bold !important; }
.diff-bad { color: #c0272d; font-weight: bold !important; } .diff-bad { color: #c0272d; font-weight: bold !important; }
.obs { font-size: 12px; color: #555; margin-top: 6px; white-space: pre-wrap; font-weight: bold !important; } .obs { font-size: 16px; color: #555; margin-top: 6px; white-space: pre-wrap; font-weight: bold !important; }
.footer { text-align: center; font-size: 12px; color: #555; margin-top: 8px; font-weight: bold !important; } .footer { text-align: center; font-size: 14px; color: #555; margin-top: 8px; font-weight: bold !important; }
@media print { body { background: #fff; font-weight: bold !important; font-size: 15px !important; } } @media print { body { background: #fff; font-weight: bold !important; font-size: 18px !important; } }
</style> </style>
</head><body> </head><body>
<div class="header"> <div class="header">
@@ -1668,7 +1668,7 @@ ${cancLines.map(l => `<div class="row"><span>${l.label}</span><span>${fmt(l.valo
<table class="cart-table"> <table class="cart-table">
<thead> <thead>
<tr> <tr>
<th>CRÉDITO</th><th>DÉBITO</th><th>ALIMENT.</th><th>PIX</th> <th>CRÉD</th><th>DÉBIT</th><th>ALIM</th><th>PIX</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -1738,17 +1738,20 @@ function buildReportHTML(data) {
<title>Relatório de Fechamento</title> <title>Relatório de Fechamento</title>
<style> <style>
* { box-sizing: border-box; margin: 0; padding: 0; } * { box-sizing: border-box; margin: 0; padding: 0; }
body { font-family: 'Courier New', monospace; font-size: 13px; width: 80mm; margin: 0 auto; padding: 8px; } body { font-family: 'Courier New', monospace; font-size: 18px; font-weight: bold; width: 80mm; margin: 0 auto; padding: 8px; }
.header { text-align: center; margin-bottom: 8px; } .header { text-align: center; margin-bottom: 10px; }
hr { border: none; border-top: 1px dashed #000; margin: 6px 0; } hr { border: none; border-top: 1px dashed #000; margin: 6px 0; }
.row { display: flex; justify-content: space-between; padding: 2px 0; font-size: 12px; } .row { display: flex; justify-content: space-between; padding: 3px 0; font-size: 18px; font-weight: bold; }
.row .val { font-weight: bold; } .row .val { font-weight: bold; }
.footer { text-align: center; font-size: 11px; color: #555; margin-top: 8px; } .footer { text-align: center; font-size: 13px; color: #555; margin-top: 8px; }
@media print { body { margin: 0; } } @media print { body { margin: 0; font-size: 18px !important; font-weight: bold !important; } }
</style> </style>
</head><body> </head><body>
<div class="header"> <div class="header">
<div>📅 Data: ${data.data} &nbsp; 👤 Operador: ${data.operador} &nbsp; ⏰ Turno: ${data.turno} &nbsp; 🏪 Loja: ${data.loja}</div> <div>📅 Data: ${data.data}</div>
<div>👤 Operador: ${data.operador}</div>
<div>⏰ Turno: ${data.turno}</div>
<div>🏪 Loja: ${data.loja}</div>
</div> </div>
<hr> <hr>
<div class="row"><span>💸 Sangrias:</span><span class="val">${fmt(sangrias)}</span></div> <div class="row"><span>💸 Sangrias:</span><span class="val">${fmt(sangrias)}</span></div>
@@ -1771,7 +1774,7 @@ function buildReportHTML(data) {
<div class="row"><span>🍗 Frango Assado:</span><span class="val">${data.frango || 0}</span></div> <div class="row"><span>🍗 Frango Assado:</span><span class="val">${data.frango || 0}</span></div>
<div class="row"><span>💰 Vendas:</span><span class="val">${fmt(data.vendas || 0)}</span></div> <div class="row"><span>💰 Vendas:</span><span class="val">${fmt(data.vendas || 0)}</span></div>
<hr> <hr>
<div style="text-align:center;font-size:10px;color:#888">ID: ${data.loja}_${data.data}_${data.operador}</div> <div style="text-align:center;font-size:12px;color:#888">ID: ${data.loja}_${data.data}_${data.operador}</div>
<div class="footer">Gerado em ${new Date().toLocaleString('pt-BR')}</div> <div class="footer">Gerado em ${new Date().toLocaleString('pt-BR')}</div>
</body></html>`; </body></html>`;
} }
@@ -1795,21 +1798,21 @@ function openPrintPreview(data, mode) {
const previewStyle = ` const previewStyle = `
<style> <style>
body { width: 80mm; margin: 0 auto; font-family: 'Courier New', monospace; font-size: 13px; background: #fff; padding: 10px; } body { width: 80mm; margin: 0 auto; font-family: 'Courier New', monospace; font-size: 6px; background: #fff; padding: 10px; font-weight: bold; }
.header { text-align: center; margin-bottom: 8px; } .header { text-align: center; margin-bottom: 8px; }
.header h1 { font-size: 18px; } .header h1 { font-size: 18px; font-weight: bold; }
.header h2 { font-size: 14px; font-weight: normal; } .header h2 { font-size: 6px; font-weight: bold; }
hr { border: none; border-top: 1px dashed #000; margin: 6px 0; } hr { border: none; border-top: 1px dashed #000; margin: 6px 0; }
.section-title { font-weight: bold; font-size: 14px; border-top: 1px dashed #000; padding-top: 4px; margin-top: 6px; } .section-title { font-weight: bold; font-size: 6px; border-top: 1px dashed #000; padding-top: 4px; margin-top: 6px; }
.row { display: flex; justify-content: space-between; padding: 2px 0; } .row { display: flex; justify-content: space-between; padding: 2px 0; font-size: 6px; font-weight: bold; }
table { width: 100%; border-collapse: collapse; font-size: 12px; } table { width: 100%; border-collapse: collapse; font-size: 6px; font-weight: bold; }
td { padding: 2px 4px; vertical-align: top; } td { padding: 2px 4px; vertical-align: top; font-weight: bold; }
td:nth-child(2) { text-align: right; } td:nth-child(2) { text-align: right; }
td:nth-child(3) { text-align: right; color: #555; font-size: 11px; } td:nth-child(3) { text-align: right; color: #555; font-size: 5px; }
.grand-total { font-size: 16px; font-weight: bold; text-align: center; padding: 6px; border: 2px solid #000; margin: 8px 0; } .grand-total { font-size: 18px; font-weight: bold; text-align: center; padding: 6px; border: 2px solid #000; margin: 8px 0; }
.obs { font-size: 11px; color: #555; margin-top: 6px; white-space: pre-wrap; } .obs { font-size: 5px; color: #555; margin-top: 6px; white-space: pre-wrap; font-weight: normal; }
.footer { text-align: center; font-size: 11px; color: #555; margin-top: 8px; } .footer { text-align: center; font-size: 5px; color: #555; margin-top: 8px; font-weight: normal; }
@media print { body { background: #fff; } } @media print { body { background: #fff; font-size: 6px !important; font-weight: bold !important; } }
</style> </style>
`; `;
@@ -2363,6 +2366,7 @@ window.abrirEditaFechamentoIndex = async function(idx) {
} }
closeConsultaModal(); closeConsultaModal();
if (!await askPassword()) return;
window.abrirEditaFechamento(full); window.abrirEditaFechamento(full);
}; };
@@ -2691,7 +2695,7 @@ function askPassword() {
inp.addEventListener('keydown', e => { if (e.key === 'Enter') document.getElementById('pw-ok-btn').click(); }); inp.addEventListener('keydown', e => { if (e.key === 'Enter') document.getElementById('pw-ok-btn').click(); });
document.getElementById('pw-ok-btn').addEventListener('click', () => { document.getElementById('pw-ok-btn').addEventListener('click', () => {
const val = document.getElementById('pw-input').value; const val = document.getElementById('pw-input').value;
if (val === fixedPw || val === dynPw) { if (val === fixedPw || val === dynPw || val === config.dynamic_password) {
document.getElementById('pw-modal').remove(); document.getElementById('pw-modal').remove();
resolve(true); resolve(true);
} else { } else {