Compare commits

..

4 Commits

Author SHA1 Message Date
root 8ea5ba771a feat: impressao bold; JSON vales/sangrias/despesas/pixcnpj/receber/cancelamentos; recalc on add row
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-06-30 18:08:19 +00:00
root 84578fe43d feat: _recalcEditTotals oninput; fmtBR onblur; IDs nos spans de totais
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-06-30 14:58:42 +00:00
root 3e94789cb0 fix: editTableHTML has local fmtNum; removes all fmtCell calls from openEditModal
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-06-30 14:45:36 +00:00
root 292d0b85d9 fix: fmtCell inline money formatting (remove fmtMoney ref)
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-06-30 14:34:23 +00:00
+109 -71
View File
@@ -1380,32 +1380,32 @@ function buildConfirmHTML(data) {
<td>${cartPix > 0 ? fmt(cartPix) : '-'}</td>
</tr>`;
return `<!DOCTYPE html>
let html = `<!DOCTYPE html>
<html><head>
<meta charset="UTF-8">
<title>Fechamento de Caixa</title>
<style>
* { 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: 13px; 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: 18px; }
.header h1 { font-size: 18px; font-weight: bold; }
.header h2 { font-size: 14px; font-weight: normal; }
hr { border: none; border-top: 1px dashed #000; margin: 5px 0; }
.section-title { font-weight: bold; font-size: 13px; border-top: 1px dashed #000; padding-top: 3px; margin-top: 6px; }
.row { display: flex; justify-content: space-between; padding: 1px 0; font-size: 12px; }
.row { display: flex; justify-content: space-between; padding: 1px 0; font-size: 12px; font-weight: bold; }
.row.total-row { font-weight: bold; }
.cart-table { width: 100%; border-collapse: collapse; font-size: 11px; margin-top: 4px; }
.cart-table { width: 100%; border-collapse: collapse; font-size: 11px; margin-top: 4px; font-weight: bold; }
.cart-table th { font-weight: bold; border-bottom: 1px solid #000; padding: 2px; }
.cart-table td { padding: 2px 4px; text-align: right; }
.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: 1px dashed #000; }
.subtotal { font-size: 12px; margin-top: 4px; }
.diff-ok { color: #2e7d32; }
.diff-bad { color: #c0272d; }
.obs { font-size: 11px; color: #555; margin-top: 6px; white-space: pre-wrap; }
.subtotal .row { padding: 1px 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 { margin: 0; } }
</style>
@media print { body { background: #fff; font-weight: bold !important; } }
</head><body>
<div class="header">
<h1>${data.loja}</h1>
@@ -1604,26 +1604,26 @@ function buildPrintHTML(data) {
<title>Fechamento de Caixa</title>
<style>
* { 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: 13px; 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: 18px; }
.header h1 { font-size: 18px; font-weight: bold; }
.header h2 { font-size: 14px; font-weight: normal; }
hr { border: none; border-top: 1px dashed #000; margin: 5px 0; }
.section-title { font-weight: bold; font-size: 13px; border-top: 1px dashed #000; padding-top: 3px; margin-top: 6px; }
.row { display: flex; justify-content: space-between; padding: 1px 0; font-size: 12px; }
.row { display: flex; justify-content: space-between; padding: 1px 0; font-size: 12px; font-weight: bold; }
.row.total-row { font-weight: bold; }
.cart-table { width: 100%; border-collapse: collapse; font-size: 11px; margin-top: 4px; }
.cart-table { width: 100%; border-collapse: collapse; font-size: 11px; margin-top: 4px; font-weight: bold; }
.cart-table th { font-weight: bold; border-bottom: 1px solid #000; padding: 2px; }
.cart-table td { padding: 2px 4px; text-align: right; }
.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: 1px dashed #000; }
.subtotal { font-size: 12px; margin-top: 4px; }
.subtotal .row { padding: 1px 0; }
.diff-ok { color: #2e7d32; }
.diff-bad { color: #c0272d; }
.obs { font-size: 11px; color: #555; margin-top: 6px; white-space: pre-wrap; }
.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 { margin: 0; } }
@media print { body { background: #fff; font-weight: bold !important; } }
</style>
</head><body>
<div class="header">
@@ -2516,14 +2516,21 @@ function askPassword() {
// Monta HTML de uma grade editável dentro do modal
function editTableHTML(id, headers, rows, numericCols) {
const fmtNum = v => {
const n = parseFloat(v);
return isNaN(n) ? '' : 'R$ ' + n.toLocaleString('pt-BR', { minimumFractionDigits: 2 });
};
const hdr = headers.map((h,i) => `<th style="padding:2px 4px;text-align:${numericCols.includes(i)?'right':'left'};font-size:10px;white-space:nowrap">${h}</th>`).join('');
const body = rows.map((row, ri) => {
const cells = row.map((val, ci) => {
const isNum = numericCols.includes(ci);
const displayVal = (val !== null && val !== undefined && val !== '')
? (isNum ? fmtMoney(val) : val)
? (isNum ? fmtNum(val) : val)
: '';
return `<td style="padding:1px 2px"><input data-tbl="${id}" data-row="${ri}" data-col="${ci}" value="${displayVal}" ${isNum ? `style="width:100%;padding:2px;font-size:11px;text-align:right;border:1px solid #ccc;border-radius:2px"` : `style="width:100%;padding:2px;font-size:11px;border:1px solid #ccc;border-radius:2px"`} /></td>`;
const extra = isNum
? `oninput="window._recalcEditTotals()" onblur="this.value=fmtBR(this)" `
: '';
return `<td style="padding:1px 2px"><input data-tbl="${id}" data-row="${ri}" data-col="${ci}" value="${displayVal}" ${extra}${isNum ? `style="width:100%;padding:2px;font-size:11px;text-align:right;border:1px solid #ccc;border-radius:2px"` : `style="width:100%;padding:2px;font-size:11px;border:1px solid #ccc;border-radius:2px"`} /></td>`;
}).join('');
return `<tr>${cells}</tr>`;
}).join('');
@@ -2549,8 +2556,10 @@ window._editAddRow = function(tblId) {
for (let c = 0; c < cols; c++) {
const td = row.insertCell(-1);
const isNum = numericCols.includes(c);
td.innerHTML = `<input data-tbl="${tblId}" data-row="${newRowIdx}" data-col="${c}" value="" ${isNum ? `style="width:100%;padding:2px;font-size:11px;text-align:right;border:1px solid #ccc;border-radius:2px"` : `style="width:100%;padding:2px;font-size:11px;border:1px solid #ccc;border-radius:2px"`} />`;
td.innerHTML = `<input data-tbl="${tblId}" data-row="${newRowIdx}" data-col="${c}" value="" ${isNum ? `oninput="window._recalcEditTotals()" onblur="this.value=fmtBR(this)" style="width:100%;padding:2px;font-size:11px;text-align:right;border:1px solid #ccc;border-radius:2px"` : `style="width:100%;padding:2px;font-size:11px;border:1px solid #ccc;border-radius:2px"`} />`;
}
// Recalcula após adicionar
window._recalcEditTotals();
};
// Lê todos os dados das grades editáveis do modal
@@ -2582,6 +2591,35 @@ function readEditTables() {
return tables;
}
// Recalcula todos os totais do modal de edição e atualiza o display
window._recalcEditTotals = function() {
const tables = readEditTables();
const cartCred_tot = (tables.credito || []).reduce((s, r) => s + (r[0] || 0), 0);
const cartDeb_tot = (tables.debito || []).reduce((s, r) => s + (r[0] || 0), 0);
const cartAli_tot = (tables.alimentacao || []).reduce((s, r) => s + (r[0] || 0), 0);
const cartPix_tot = (tables.pix || []).reduce((s, r) => s + (r[0] || 0), 0);
const vales_tot = (tables.vales || []).reduce((s, r) => s + (r[1] || 0), 0);
const desp_tot = (tables.despesas || []).reduce((s, r) => s + (r[2] || 0), 0);
const sang_tot = (tables.sangrias || []).reduce((s, r) => s + (r[1] || 0), 0);
const pixcnpj_tot = (tables.pixcnpj || []).reduce((s, r) => s + (r[1] || 0), 0);
const recv_tot = (tables.receber || []).reduce((s, r) => s + (r[1] || 0), 0);
const canc_tot = (tables.cancelamentos || []).reduce((s, r) => s + (r[1] || 0), 0);
const el = id => document.getElementById(id);
const fmtTot = v => v > 0 ? 'R$ ' + v.toLocaleString('pt-BR', { minimumFractionDigits: 2 }) : '—';
if (el('edit-total-credito')) el('edit-total-credito').textContent = fmtTot(cartCred_tot);
if (el('edit-total-debito')) el('edit-total-debito').textContent = fmtTot(cartDeb_tot);
if (el('edit-total-alimentacao')) el('edit-total-alimentacao').textContent = fmtTot(cartAli_tot);
if (el('edit-total-pix')) el('edit-total-pix').textContent = fmtTot(cartPix_tot);
if (el('edit-total-vales')) el('edit-total-vales').textContent = fmtTot(vales_tot);
if (el('edit-total-despesas')) el('edit-total-despesas').textContent = fmtTot(desp_tot);
if (el('edit-total-sangrias')) el('edit-total-sangrias').textContent = fmtTot(sang_tot);
if (el('edit-total-pixcnpj')) el('edit-total-pixcnpj').textContent = fmtTot(pixcnpj_tot);
if (el('edit-total-receber')) el('edit-total-receber').textContent = fmtTot(recv_tot);
if (el('edit-total-cancel')) el('edit-total-cancel').textContent = fmtTot(canc_tot);
};
// Modal de edição completo com todas as grades
function openEditModal(full) {
window._editModalOpen = true;
@@ -2595,12 +2633,7 @@ function openEditModal(full) {
return 'R$ ' + n.toLocaleString('pt-BR', { minimumFractionDigits: 2 });
};
// helper para fmt table cell
const fmtCell = (v, isNum) => {
if (v === null || v === undefined || v === '') return '';
if (isNum) return fmtMoney(v);
return v;
};
// helper inline para fmt table cell (já em editTableHTML)
const editedInfo = full.edited_at
? `<div style="background:#fff8e1;border-radius:4px;padding:6px 10px;font-size:11px;color:#666;margin-bottom:8px">
@@ -2609,10 +2642,10 @@ function openEditModal(full) {
: '';
// --- Cartões ---
const cartCred_rows = (dados.cartoes?.credito || full.cartoes_credito || []).map((r, i) => [fmtCell(typeof r === 'object' ? r.valor : r, true)]);
const cartDeb_rows = (dados.cartoes?.debito || full.cartoes_debito || []).map((r, i) => [fmtCell(typeof r === 'object' ? r.valor : r, true)]);
const cartAli_rows = (dados.cartoes?.alimentacao || full.cartoes_alimentacao || []).map((r, i) => [fmtCell(typeof r === 'object' ? r.valor : r, true)]);
const cartPix_rows = (dados.cartoes?.pix || full.cartoes_pix || []).map((r, i) => [fmtCell(typeof r === 'object' ? r.valor : r, true)]);
const cartCred_rows = (dados.cartoes?.credito || full.cartoes_credito || []).map(r => [typeof r === 'object' ? r.valor : r]);
const cartDeb_rows = (dados.cartoes?.debito || full.cartoes_debito || []).map(r => [typeof r === 'object' ? r.valor : r]);
const cartAli_rows = (dados.cartoes?.alimentacao || full.cartoes_alimentacao || []).map(r => [typeof r === 'object' ? r.valor : r]);
const cartPix_rows = (dados.cartoes?.pix || full.cartoes_pix || []).map(r => [typeof r === 'object' ? r.valor : r]);
const cartCredHTML = editTableHTML('credito', ['Valor (R$)'], cartCred_rows.length ? cartCred_rows : [['']], [0]);
const cartDebHTML = editTableHTML('debito', ['Valor (R$)'], cartDeb_rows.length ? cartDeb_rows : [['']], [0]);
@@ -2620,27 +2653,27 @@ function openEditModal(full) {
const cartPixHTML = editTableHTML('pix', ['Valor (R$)'], cartPix_rows.length ? cartPix_rows : [['']], [0]);
// --- Vales ---
const vales_rows = (full.vales || []).map(r => [r.nome||r.Nome||'', fmtCell(r.valor, true), r.obs||r.Obs||'']);
const vales_rows = (full.vales_arr || []).map(r => [r.nome||r.Nome||'', r.valor||0, r.obs||r.Obs||'']);
const valesHTML = editTableHTML('vales', ['Nome', 'Valor (R$)', 'Obs'], vales_rows.length ? vales_rows : [['','','']], [1]);
// --- Despesas ---
const despesas_rows = (full.despesas || []).map(r => [r.desc||r.Desc||'', r.obs||r.Obs||'', fmtCell(r.valor, true)]);
const despesas_rows = (full.despesas_arr || []).map(r => [r.desc||r.Desc||'', r.obs||r.Obs||'', r.valor||0]);
const despesasHTML = editTableHTML('despesas', ['Descrição', 'Obs', 'Valor (R$)'], despesas_rows.length ? despesas_rows : [['','','']], [2]);
// --- Sangrias ---
const sangrias_rows = (full.sangrias || []).map(r => [r.hora||r.Hora||'', fmtCell(r.retirada, true), r.gerente||r.Gerente||'']);
const sangrias_rows = (full.sangrias_arr || []).map(r => [r.hora||r.Hora||'', r.retirada||r.valor||0, r.gerente||r.Gerente||'']);
const sangriasHTML = editTableHTML('sangrias', ['Hora', 'Valor (R$)', 'Gerente'], sangrias_rows.length ? sangrias_rows : [['','','']], [1]);
// --- Cancelamentos ---
const cancel_rows = (full.cancelamentos || []).map(r => [r.numero||r.Numero||'', fmtCell(r.valor, true), r.motivo||r.Motivo||'']);
const cancel_rows = (full.cancelamentos_arr || []).map(r => [r.numero||r.Numero||'', r.valor||0, r.motivo||r.Motivo||'']);
const cancelHTML = editTableHTML('cancelamentos', ['Número', 'Valor (R$)', 'Motivo'], cancel_rows.length ? cancel_rows : [['','','']], [1]);
// --- PIX CNPJ ---
const pixcnpj_rows = (full.pixcnpj || []).map(r => [r.nome||r.Nome||'', fmtCell(r.valor, true)]);
const pixcnpj_rows = (full.pixcnpj_arr || []).map(r => [r.nome||r.desc||r.Desc||'', r.valor||0]);
const pixcnpjHTML = editTableHTML('pixcnpj', ['Nome', 'Valor (R$)'], pixcnpj_rows.length ? pixcnpj_rows : [['','']], [1]);
// --- A Receber ---
const receber_rows = (full.receber || []).map(r => [r.nome||r.Nome||'', fmtCell(r.valor, true)]);
const receber_rows = (full.receber_arr || []).map(r => [r.nome||r.Nome||'', r.valor||0]);
const receberHTML = editTableHTML('receber', ['Nome', 'Valor (R$)'], receber_rows.length ? receber_rows : [['','']], [1]);
// --- Totais (só leitura formatado) ---
@@ -2650,10 +2683,12 @@ function openEditModal(full) {
<div><strong>Total Débito:</strong> <span id="edit-total-debito">${fmtMR(full.total_cartao_debito||0)}</span></div>
<div><strong>Total Alimentação:</strong> <span id="edit-total-alimentacao">${fmtMR(full.total_cartao_alimentacao||0)}</span></div>
<div><strong>Total PIX:</strong> <span id="edit-total-pix">${fmtMR(full.total_cartao_pix||0)}</span></div>
<div><strong>Total Sangrias:</strong> ${fmtMR(full.total_sangrias||0)}</div>
<div><strong>Total Despesas:</strong> ${fmtMR(full.total_despesas||0)}</div>
<div><strong>Total Vales:</strong> ${fmtMR(full.total_vales||0)}</div>
<div><strong>Total PIX CNPJ:</strong> ${fmtMR(full.total_pixcnpj||0)}</div>
<div><strong>Total Sangrias:</strong> <span id="edit-total-sangrias">${fmtMR(full.total_sangrias||0)}</span></div>
<div><strong>Total Despesas:</strong> <span id="edit-total-despesas">${fmtMR(full.total_despesas||0)}</span></div>
<div><strong>Total Vales:</strong> <span id="edit-total-vales">${fmtMR(full.total_vales||0)}</span></div>
<div><strong>Total PIX CNPJ:</strong> <span id="edit-total-pixcnpj">${fmtMR(full.total_pixcnpj||0)}</span></div>
<div><strong>Total Receber:</strong> <span id="edit-total-receber">${fmtMR(full.total_areceber||0)}</span></div>
<div><strong>Total Cancel:</strong> <span id="edit-total-cancel">${fmtMR(full.total_cancelamentos||0)}</span></div>
</div>`;
const overlay = document.createElement('div');
@@ -3091,33 +3126,36 @@ function consultaToPrintData(full) {
// Imprime o relatório — usa iframe como openPrintPreview (Tauri não bloqueia)
window.printRelatorio = function() {
const full = window._currentConsulta;
if (!full) return;
const data = consultaToPrintData(full);
const html = buildPrintHTML(data);
const previewStyle = `
<style>
body { width: 80mm; margin: 0 auto; font-family: 'Courier New', monospace; font-size: 13px; background: #fff; padding: 10px; }
.header { text-align: center; margin-bottom: 8px; }
.header h1 { font-size: 18px; }
.header h2 { font-size: 14px; font-weight: normal; }
hr { border: none; border-top: 1px dashed #000; margin: 5px 0; }
.section-title { font-weight: bold; font-size: 13px; border-top: 1px dashed #000; padding-top: 3px; margin-top: 6px; }
.row { display: flex; justify-content: space-between; padding: 1px 0; font-size: 12px; }
.row.total-row { font-weight: bold; }
.cart-table { width: 100%; border-collapse: collapse; font-size: 11px; margin-top: 4px; }
.cart-table th { font-weight: bold; border-bottom: 1px solid #000; padding: 2px; }
.cart-table td { padding: 2px 4px; text-align: right; }
.cart-table td:first-child { text-align: left; }
.cart-table tr.total-row { font-weight: bold; border-top: 1px dashed #000; }
.subtotal { font-size: 12px; margin-top: 4px; }
.diff-ok { color: #2e7d32; }
.diff-bad { color: #c0272d; }
.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; } }
</style>`;
const fullHtml = `<!DOCTYPE html><html><head><meta charset="UTF-8"><title>Recibo</title>${previewStyle}</head><body>${html}</body></html>`;
let html = `<!DOCTYPE html>
<html><head>
<meta charset="UTF-8">
<title>Fechamento de Caixa</title>
<style>
* { box-sizing: border-box; margin: 0; padding: 0; }
body { font-family: 'Courier New', monospace; font-size: 13px; 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: 18px; font-weight: bold; }
.header h2 { font-size: 14px; font-weight: normal; }
hr { border: none; border-top: 1px dashed #000; margin: 5px 0; }
.section-title { font-weight: bold; font-size: 13px; border-top: 1px dashed #000; padding-top: 3px; margin-top: 6px; }
.row { display: flex; justify-content: space-between; padding: 1px 0; font-size: 12px; font-weight: bold; }
.row.total-row { font-weight: bold; }
.cart-table { width: 100%; border-collapse: collapse; font-size: 11px; margin-top: 4px; font-weight: bold; }
.cart-table th { font-weight: bold; border-bottom: 1px solid #000; padding: 2px; }
.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: 1px dashed #000; }
.subtotal { font-size: 12px; margin-top: 4px; }
.subtotal .row { padding: 1px 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; } }
</style>
</head><body>
${buildPrintHTML(data)}
</body></html>`;
const existing = document.getElementById('print-preview-overlay');
if (existing) document.body.removeChild(existing);
@@ -3139,7 +3177,7 @@ window.printRelatorio = function() {
overlay.appendChild(btnFechar);
overlay.appendChild(btnImprimir);
document.body.appendChild(overlay);
iframe.srcdoc = fullHtml;
iframe.srcdoc = html;
};
// Intercepta o envio — se sync_status=editing, faz PATCH