Compare commits

...

3 Commits

Author SHA1 Message Date
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
+55 -22
View File
@@ -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('');
@@ -2582,6 +2589,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 +2631,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 +2640,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 +2651,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 || []).map(r => [r.nome||r.Nome||'', r.valor, 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 || []).map(r => [r.desc||r.Desc||'', r.obs||r.Obs||'', r.valor]);
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 || []).map(r => [r.hora||r.Hora||'', r.retirada, 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 || []).map(r => [r.numero||r.Numero||'', r.valor, 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 || []).map(r => [r.nome||r.Nome||'', r.valor]);
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 || []).map(r => [r.nome||r.Nome||'', r.valor]);
const receberHTML = editTableHTML('receber', ['Nome', 'Valor (R$)'], receber_rows.length ? receber_rows : [['','']], [1]);
// --- Totais (só leitura formatado) ---
@@ -2650,10 +2681,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');