Compare commits

..

4 Commits

Author SHA1 Message Date
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
root 5f1d9a4e2f fix: reverte senha btn-anterior + fonte maior no resumo de envio
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 18:57:56 +00:00
root cc45ed9df7 fix: btn-anterior senha + fonte impressao maior
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 18:48:33 +00:00
root 378a589572 fix: btn-anterior agora exige senha
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 18:46:12 +00:00
+43 -51
View File
@@ -565,7 +565,7 @@
<p style="font-size:13px;color:#444;margin-bottom:14px">
Tem certeza que deseja <strong>enviar este fechamento e encerrar o caixa?</strong>
</p>
<div id="confirm-summary" style="border:1px solid #b3d9f7;border-radius:8px;padding:14px;background:#f0f7ff;font-size:14px;font-family:Arial,sans-serif;line-height:1.6">
<div id="confirm-summary" style="border:1px solid #b3d9f7;border-radius:8px;padding:18px;background:#f0f7ff;font-size:16px;font-family:Arial,sans-serif;line-height:1.8">
</div>
<p style="font-size:11px;color:#888;margin-top:10px">
Após enviar, <strong>não dá pra editar este fechamento</strong> sem a senha do Filipe.
@@ -1795,21 +1795,21 @@ function openPrintPreview(data, mode) {
const previewStyle = `
<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: 18px; background: #fff; padding: 10px; font-weight: bold; }
.header { text-align: center; margin-bottom: 8px; }
.header h1 { font-size: 18px; }
.header h2 { font-size: 14px; font-weight: normal; }
.header h1 { font-size: 24px; font-weight: bold; }
.header h2 { font-size: 18px; font-weight: bold; }
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; }
.row { display: flex; justify-content: space-between; padding: 2px 0; }
table { width: 100%; border-collapse: collapse; font-size: 12px; }
td { padding: 2px 4px; vertical-align: top; }
.section-title { font-weight: bold; font-size: 17px; border-top: 1px dashed #000; padding-top: 4px; margin-top: 6px; }
.row { display: flex; justify-content: space-between; padding: 2px 0; font-size: 16px; font-weight: bold; }
table { width: 100%; border-collapse: collapse; font-size: 16px; font-weight: bold; }
td { padding: 2px 4px; vertical-align: top; font-weight: bold; }
td:nth-child(2) { text-align: right; }
td:nth-child(3) { text-align: right; color: #555; font-size: 11px; }
.grand-total { font-size: 16px; 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; }
.footer { text-align: center; font-size: 11px; color: #555; margin-top: 8px; }
@media print { body { background: #fff; } }
td:nth-child(3) { text-align: right; color: #555; font-size: 13px; }
.grand-total { font-size: 20px; font-weight: bold; text-align: center; padding: 6px; border: 2px solid #000; margin: 8px 0; }
.obs { font-size: 13px; color: #555; margin-top: 6px; white-space: pre-wrap; font-weight: normal; }
.footer { text-align: center; font-size: 13px; color: #555; margin-top: 8px; font-weight: normal; }
@media print { body { background: #fff; font-size: 18px !important; font-weight: bold !important; } }
</style>
`;
@@ -2005,26 +2005,26 @@ function openConfirmModal() {
const diferenca = sysTotal - saldoEsp - cancelamentos;
const diffClass = diferenca === 0 ? '#2e7d32' : (diferenca > 0 ? '#e65100' : '#c0272d');
document.getElementById('confirm-summary').innerHTML =
`<div style="margin-bottom:6px"><strong>📅 Data:</strong> ${estado.data} &nbsp; <strong>👤 Operador:</strong> ${operador} &nbsp; <strong>⏰ Turno:</strong> ${turno} &nbsp; <strong>🏪 Loja:</strong> ${loja}</div>
`<div style="margin-bottom:6px;font-size:17px"><strong>📅 Data:</strong> ${estado.data} &nbsp; <strong>👤 Operador:</strong> ${operador} &nbsp; <strong>⏰ Turno:</strong> ${turno} &nbsp; <strong>🏪 Loja:</strong> ${loja}</div>
<hr style="border:none;border-top:1px dashed #b3d9f7;margin:6px 0">
<div>💸 Sangrias: <strong>${fmt(sangrias)}</strong></div>
<div>📝 Despesas: <strong>${fmt(despesas)}</strong></div>
<div>💰 Vales: <strong>${fmt(vales)}</strong></div>
<div>👥 À Receber: <strong>${fmt(receber)}</strong></div>
<div>🔵 PIX CNPJ: <strong>${fmt(pixcnpj)}</strong></div>
<div>💳 Crédito: <strong>${fmt(cartCred)}</strong></div>
<div>💳 Débito: <strong>${fmt(cartDeb)}</strong></div>
<div>💳 Alimentação: <strong>${fmt(cartAli)}</strong></div>
<div>❌ Cancelamentos: <strong>${fmt(cancelamentos)}</strong></div>
<div>👥 Clientes: <strong>${estado.clientes || 0}</strong></div>
<div>🍗 Frango Assado: <strong>${estado.frango || 0}</strong></div>
<div>💰 Vendas: <strong>${fmt(estado.vendas || 0)}</strong></div>
<div>📋 Fechamento (contado): <strong>${fmt(fechamento)}</strong></div>
<div>🖥️ Total Sistema: <strong>${fmt(sysTotal)}</strong></div>
<div style="font-size:16px">💸 Sangrias: <strong>${fmt(sangrias)}</strong></div>
<div style="font-size:16px">📝 Despesas: <strong>${fmt(despesas)}</strong></div>
<div style="font-size:16px">💰 Vales: <strong>${fmt(vales)}</strong></div>
<div style="font-size:16px">👥 À Receber: <strong>${fmt(receber)}</strong></div>
<div style="font-size:16px">🔵 PIX CNPJ: <strong>${fmt(pixcnpj)}</strong></div>
<div style="font-size:16px">💳 Crédito: <strong>${fmt(cartCred)}</strong></div>
<div style="font-size:16px">💳 Débito: <strong>${fmt(cartDeb)}</strong></div>
<div style="font-size:16px">💳 Alimentação: <strong>${fmt(cartAli)}</strong></div>
<div style="font-size:16px">❌ Cancelamentos: <strong>${fmt(cancelamentos)}</strong></div>
<div style="font-size:16px">👥 Clientes: <strong>${estado.clientes || 0}</strong></div>
<div style="font-size:16px">🍗 Frango Assado: <strong>${estado.frango || 0}</strong></div>
<div style="font-size:16px">💰 Vendas: <strong>${fmt(estado.vendas || 0)}</strong></div>
<div style="font-size:16px">📋 Fechamento (contado): <strong>${fmt(fechamento)}</strong></div>
<div style="font-size:16px">🖥️ Total Sistema: <strong>${fmt(sysTotal)}</strong></div>
<hr style="border:none;border-top:1px dashed #b3d9f7;margin:6px 0">
<div>🎯 Saldo Esperado (contado): <strong>${fmt(saldoEsp)}</strong></div>
<div style="margin-top:4px">📐 Diferença: <strong style="color:${diffClass}">${fmt(diferenca)}</strong></div>
<div style="margin-top:4px;font-size:10px;color:#888">ID: ${estado.loja}_${estado.data}_${estado.operador}</div>`;
<div style="font-size:16px">🎯 Saldo Esperado (contado): <strong>${fmt(saldoEsp)}</strong></div>
<div style="margin-top:4px;font-size:16px">📐 Diferença: <strong style="color:${diffClass}">${fmt(diferenca)}</strong></div>
<div style="margin-top:8px;font-size:12px;color:#888">ID: ${estado.loja}_${estado.data}_${estado.operador}</div>`;
console.log('[DEBUG] openConfirmModal: tentando abrir modal');
document.getElementById('modal-confirm').classList.add('open');
}
@@ -2647,16 +2647,8 @@ window.toggleEditConsulta = async function() {
// Se já está editando, apenas fecha
if (window._editModalOpen) { closeEditModal(); return; }
// Pede senha admin primeiro — sempre, para proteger edições
const pw = config.admin_password;
if (pw) {
const ok = await askPassword();
if (!ok) return;
} else {
// Sem senha configurada — avisa e abre mesmo assim (primeiro uso)
const ok = await askPassword(); // mostra diálogo vazio para o admin configurar mentalmente
if (!ok) return;
}
// Pede senha — sempre, uma vez (aceita fixa ou dinâmica)
if (!await askPassword()) return;
openEditModal(full);
closeRelatorioModal();
@@ -3557,26 +3549,26 @@ window.printRelatorio = function() {
<title>Fechamento de Caixa</title>
<style>
* { box-sizing: border-box; margin: 0; padding: 0; }
body { font-family: 'Courier New', monospace; font-size: 14px; width: 80mm; margin: 0 auto; padding: 8px; font-weight: bold; print-color-adjust: exact; -webkit-print-color-adjust: exact; }
body { font-family: 'Courier New', monospace; font-size: 18px; width: 80mm; margin: 0 auto; padding: 8px; font-weight: bold; print-color-adjust: exact; -webkit-print-color-adjust: exact; }
.header { text-align: center; margin-bottom: 8px; }
.header h1 { font-size: 20px; font-weight: bold; }
.header h2 { font-size: 15px; font-weight: normal; }
.header h1 { font-size: 24px; font-weight: bold; }
.header h2 { font-size: 18px; font-weight: normal; }
hr { border: none; border-top: 2px solid #000; margin: 6px 0; }
.section-title { font-weight: bold; font-size: 14px; border-top: 2px solid #000; padding-top: 4px; margin-top: 8px; }
.row { display: flex; justify-content: space-between; padding: 2px 0; font-size: 13px; font-weight: bold; }
.section-title { font-weight: bold; font-size: 17px; border-top: 2px solid #000; padding-top: 4px; margin-top: 8px; }
.row { display: flex; justify-content: space-between; padding: 2px 0; font-size: 16px; font-weight: bold; }
.row.total-row { font-weight: bold; }
.cart-table { table-layout: fixed; width: 100%; border-collapse: collapse; font-size: 13px; margin-top: 4px; font-weight: bold; }
.cart-table { table-layout: fixed; width: 100%; border-collapse: collapse; font-size: 16px; margin-top: 4px; font-weight: bold; }
.cart-table th { font-weight: bold; border-bottom: 2px solid #000; padding: 2px; width: 25%; }
.cart-table td { padding: 2px 4px; text-align: right; font-weight: bold; }
.cart-table td:first-child { text-align: left; }
.cart-table tr.total-row { font-weight: bold; border-top: 2px solid #000; }
.subtotal { font-size: 13px; margin-top: 4px; }
.subtotal { font-size: 16px; margin-top: 4px; }
.subtotal .row { padding: 2px 0; }
.diff-ok { color: #2e7d32; font-weight: bold; }
.diff-bad { color: #c0272d; font-weight: bold; }
.obs { font-size: 11px; color: #555; margin-top: 6px; white-space: pre-wrap; font-weight: normal; }
.footer { text-align: center; font-size: 11px; color: #555; margin-top: 8px; }
@media print { body { background: #fff; font-weight: bold !important; } }
.obs { font-size: 13px; color: #555; margin-top: 6px; white-space: pre-wrap; font-weight: normal; }
.footer { text-align: center; font-size: 13px; color: #555; margin-top: 8px; }
@media print { body { background: #fff; font-weight: bold !important; font-size: 18px !important; } }
</style>
</head><body>
${buildPrintHTML(data)}