fix: parseNum vendas; screen: edit modal separado c/ senha, edited_at/by, fmtBR inputs
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

This commit is contained in:
root
2026-06-30 13:57:03 +00:00
parent 7134c85bb7
commit 80740afbf0
+167 -112
View File
@@ -1157,7 +1157,7 @@ function saveState() {
};
estado.clientes = parseInt(document.getElementById('f-clientes').value) || 0;
estado.frango = parseInt(document.getElementById('f-frango').value) || 0;
estado.vendas = parseFloat(document.getElementById('f-vendas').value) || 0;
estado.vendas = parseNum(val('f-vendas'));
estado.updatedAt = new Date().toISOString();
try { localStorage.setItem(LS_KEY, JSON.stringify(estado)); } catch(e) {}
}
@@ -2350,96 +2350,9 @@ function buildRelatorioModal(full) {
${obs ? `<div style="background:#fff8e1;border-radius:6px;padding:8px;margin-bottom:10px;font-size:12px"><strong>Obs:</strong> ${obs}</div>` : ''}
<div id="edit-section" style="display:none;margin-bottom:10px">
<input type="hidden" id="edit-id" value="${full.id || ''}" />
<div style="font-size:12px;color:#666;margin-bottom:6px;font-weight:bold">✏️ Editar valores do caixa (requer senha admin):</div>
<div style="display:grid;grid-template-columns:1fr 1fr;gap:6px;margin-bottom:8px">
<div>
<label style="font-size:10px;color:#555">Troco:</label>
<input type="text" id="edit-troco" value="${fmtMoney(troco)}" style="width:100%;padding:3px;border:1px solid #ccc;border-radius:3px;font-size:12px" />
</div>
<div>
<label style="font-size:10px;color:#555">Credito:</label>
<input type="text" id="edit-credito" value="${fmtMoney(credito)}" style="width:100%;padding:3px;border:1px solid #ccc;border-radius:3px;font-size:12px" />
</div>
<div>
<label style="font-size:10px;color:#555">Debito:</label>
<input type="text" id="edit-debito" value="${fmtMoney(debito)}" style="width:100%;padding:3px;border:1px solid #ccc;border-radius:3px;font-size:12px" />
</div>
<div>
<label style="font-size:10px;color:#555">Alimentacao:</label>
<input type="text" id="edit-alimentacao" value="${fmtMoney(alimentacao)}" style="width:100%;padding:3px;border:1px solid #ccc;border-radius:3px;font-size:12px" />
</div>
<div>
<label style="font-size:10px;color:#555">Vales:</label>
<input type="text" id="edit-vales" value="${fmtMoney(vales)}" style="width:100%;padding:3px;border:1px solid #ccc;border-radius:3px;font-size:12px" />
</div>
<div>
<label style="font-size:10px;color:#555">PIX Cartao:</label>
<input type="text" id="edit-pixcartao" value="${fmtMoney(pixCartao)}" style="width:100%;padding:3px;border:1px solid #ccc;border-radius:3px;font-size:12px" />
</div>
<div>
<label style="font-size:10px;color:#555">PIX CNPJ:</label>
<input type="text" id="edit-pixcnpj" value="${fmtMoney(pixCnpj)}" style="width:100%;padding:3px;border:1px solid #ccc;border-radius:3px;font-size:12px" />
</div>
<div>
<label style="font-size:10px;color:#555">A Receber:</label>
<input type="text" id="edit-areceber" value="${fmtMoney(parseFloat(full.saldo_areceber||0))}" style="width:100%;padding:3px;border:1px solid #ccc;border-radius:3px;font-size:12px" />
</div>
</div>
<div style="font-size:12px;color:#666;margin-bottom:4px;font-weight:bold;margin-top:6px">💰 Valores Contados:</div>
<div style="display:grid;grid-template-columns:1fr 1fr 1fr;gap:6px;margin-bottom:8px">
<div>
<label style="font-size:10px;color:#555">Dinheiro:</label>
<input type="text" id="edit-fd" value="${fmtMoney(fd)}" style="width:100%;padding:3px;border:1px solid #ccc;border-radius:3px;font-size:12px" />
</div>
<div>
<label style="font-size:10px;color:#555">Cartoes:</label>
<input type="text" id="edit-fc" value="${fmtMoney(fc)}" style="width:100%;padding:3px;border:1px solid #ccc;border-radius:3px;font-size:12px" />
</div>
<div>
<label style="font-size:10px;color:#555">A Receber:</label>
<input type="text" id="edit-fr" value="${fmtMoney(fr)}" style="width:100%;padding:3px;border:1px solid #ccc;border-radius:3px;font-size:12px" />
</div>
</div>
<div style="display:grid;grid-template-columns:1fr 1fr 1fr 1fr;gap:6px;margin-bottom:8px">
<div>
<label style="font-size:10px;color:#555">Sangrias:</label>
<input type="text" id="edit-sangrias" value="${fmtMoney(totalSangrias)}" style="width:100%;padding:3px;border:1px solid #ccc;border-radius:3px;font-size:12px" />
</div>
<div>
<label style="font-size:10px;color:#555">Despesas:</label>
<input type="text" id="edit-despesas" value="${fmtMoney(totalDespesas)}" style="width:100%;padding:3px;border:1px solid #ccc;border-radius:3px;font-size:12px" />
</div>
<div>
<label style="font-size:10px;color:#555">Clientes:</label>
<input type="number" id="edit-clientes" value="${clientes}" style="width:100%;padding:3px;border:1px solid #ccc;border-radius:3px;font-size:12px" />
</div>
<div>
<label style="font-size:10px;color:#555">Frango:</label>
<input type="number" id="edit-frango" value="${frango}" style="width:100%;padding:3px;border:1px solid #ccc;border-radius:3px;font-size:12px" />
</div>
<div>
<label style="font-size:10px;color:#555">Vendas:</label>
<input type="text" id="edit-vendas" value="${fmtMoney(full.vendas || 0)}" style="width:100%;padding:3px;border:1px solid #ccc;border-radius:3px;font-size:12px" />
</div>
</div>
<div style="font-size:12px;color:#666;margin-bottom:4px;font-weight:bold;margin-top:6px">📋 Meta / Observacoes:</div>
<div style="margin-bottom:6px">
<label style="font-size:10px;color:#555">Saldo Esperado:</label>
<input type="text" id="edit-esperado" value="${fmtMoney(saldoEsperado)}" style="width:100%;padding:3px;border:1px solid #ccc;border-radius:3px;font-size:12px" />
</div>
<div style="margin-bottom:6px">
<label style="font-size:10px;color:#555">Observacoes:</label>
<textarea id="edit-obs" style="width:100%;padding:3px;border:1px solid #ccc;border-radius:3px;font-size:12px;height:50px">${obs}</textarea>
</div>
</div>
<div style="display:flex;gap:8px;flex-wrap:wrap">
<button onclick="window.printRelatorio()" style="flex:1;padding:8px;background:#1565c0;color:#fff;border:none;border-radius:6px;cursor:pointer;font-size:13px">🖨️ Imprimir</button>
<button onclick="(function(f){window.abrirFechamentoEdicao(f)})(window._currentConsulta)" style="flex:1;padding:8px;background:#7b1fa2;color:#fff;border:none;border-radius:6px;cursor:pointer;font-size:13px">✏️ Editar caixa completo</button>
<button onclick="window.toggleEditConsulta()" style="flex:1;padding:8px;background:#e65100;color:#fff;border:none;border-radius:6px;cursor:pointer;font-size:13px" id="btn-edit-consulta">✏️ Editar totais (senha)</button>
<button onclick="window.salvarEdicaoConsulta()" style="flex:1;padding:8px;background:#2e7d32;color:#fff;border:none;border-radius:6px;cursor:pointer;font-size:13px;display:none" id="btn-salvar-consulta">💾 Salvar</button>
<button onclick="window.toggleEditConsulta()" style="flex:1;padding:8px;background:#e65100;color:#fff;border:none;border-radius:6px;cursor:pointer;font-size:13px" id="btn-edit-consulta">✏️ Editar (senha)</button>
</div>
</div>
`;
@@ -2543,27 +2456,26 @@ window.abrirFechamentoEdicao = function(full) {
alert('✅ Caixa carregado para edição. Verifique todos os valores antes de enviar.');
};
// Toggle modo de edição — pede senha admin via modal (não via prompt)
// Abre a tela de edição (modal separado) — requer senha admin
window.toggleEditConsulta = async function() {
if (window._editMode) {
// Cancela edição
window._editMode = false;
document.getElementById('edit-section').style.display = 'none';
document.getElementById('btn-salvar-consulta').style.display = 'none';
document.getElementById('btn-edit-consulta').textContent = '✏️ Editar (senha)';
return;
}
const full = window._currentConsulta;
if (!full) return;
// Se já está editando, apenas fecha
if (window._editModalOpen) { closeEditModal(); return; }
// Pede senha admin primeiro (se configurada)
const pw = config.admin_password;
if (!pw) {
window._editMode = true;
document.getElementById('edit-section').style.display = 'block';
document.getElementById('btn-salvar-consulta').style.display = 'block';
document.getElementById('btn-edit-consulta').textContent = '✕ Cancelar';
return;
if (pw) {
const ok = await askPassword();
if (!ok) return;
}
// Modal com senha oculta
openEditModal(full);
};
function askPassword() {
return new Promise(resolve => {
const overlay = document.createElement('div');
overlay.style.cssText = 'position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,0.5);z-index:999999;display:flex;align-items:center;justify-content:center;';
overlay.id = 'pw-modal';
@@ -2573,29 +2485,172 @@ window.toggleEditConsulta = async function() {
<input type="password" id="pw-input" placeholder="Digite a senha..." style="width:100%;padding:10px;font-size:14px;border:1px solid #ccc;border-radius:6px;box-sizing:border-box;margin-bottom:12px" />
<div id="pw-error" style="color:#c0272d;font-size:12px;margin-bottom:8px;display:none">Senha incorreta</div>
<div style="display:flex;gap:8px;justify-content:center">
<button onclick="document.getElementById('pw-modal').remove()" style="padding:8px 16px;background:#888;color:#fff;border:none;border-radius:6px;cursor:pointer">Cancelar</button>
<button onclick="document.getElementById('pw-modal').remove();window._pwResult=false;window._pwResolve&&window._pwResolve(false)" style="padding:8px 16px;background:#888;color:#fff;border:none;border-radius:6px;cursor:pointer">Cancelar</button>
<button id="pw-ok-btn" style="padding:8px 16px;background:#e65100;color:#fff;border:none;border-radius:6px;cursor:pointer">OK</button>
</div>
</div>`;
document.body.appendChild(overlay);
const inp = document.getElementById('pw-input');
inp.focus();
window._pwResolve = resolve;
inp.addEventListener('keydown', e => { if (e.key === 'Enter') document.getElementById('pw-ok-btn').click(); });
document.getElementById('pw-ok-btn').addEventListener('click', () => {
const val = document.getElementById('pw-input').value;
const err = document.getElementById('pw-error');
if (val === pw) {
document.getElementById('pw-modal').remove();
window._editMode = true;
document.getElementById('edit-section').style.display = 'block';
document.getElementById('btn-salvar-consulta').style.display = 'block';
document.getElementById('btn-edit-consulta').textContent = '✕ Cancelar';
window._pwResult = true;
window._pwResolve && window._pwResolve(true);
} else {
err.style.display = 'block';
document.getElementById('pw-error').style.display = 'block';
inp.value = '';
inp.focus();
}
});
});
}
// Modal de edição separado e compacto
function openEditModal(full) {
window._editModalOpen = true;
const dados = full.dados || {};
const fmtM = v => parseFloat(v||0).toFixed(2).replace('.', ',');
const fmtMR = v => 'R$ ' + fmtM(v);
const editedInfo = full.edited_at
? `<div style="background:#fff8e1;border-radius:4px;padding:6px 10px;font-size:11px;color:#666;margin-bottom:8px">
<strong>⚠️ Última edição:</strong> ${full.edited_at.replace('T',' ').substring(0,16)} por <strong>${full.edited_by||'?'}</strong>
</div>`
: '';
const troco = parseFloat(full.saldo_troco||0);
const credito = parseFloat(full.saldo_credito||0);
const debito = parseFloat(full.saldo_debito||0);
const alimentacao = parseFloat(full.saldo_alimentacao||0);
const vales = parseFloat(full.saldo_vales||0);
const pixcnpj = parseFloat(full.total_pixcnpj||0);
const areceber = parseFloat(full.saldo_areceber||0);
const clientes = dados.clientes ?? full.clientes ?? 0;
const frango = dados.frango ?? full.frango ?? 0;
const vendas = dados.vendas ?? full.vendas ?? 0;
const saldo_esperado = parseFloat(full.saldo_esperado||0);
const obs = full.observacoes||'';
const overlay = document.createElement('div');
overlay.id = 'modal-edit';
overlay.style.cssText = 'position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,0.6);z-index:99998;display:flex;align-items:center;justify-content:center;';
overlay.innerHTML = `
<div style="background:#fff;border-radius:12px;padding:16px;max-width:520px;width:95%;max-height:92vh;overflow-y:auto;font-size:13px">
<div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:10px">
<h2 style="margin:0;font-size:15px;color:#e65100">✏️ Editar Fechamento — ${full.loja||''} ${full.data||''}</h2>
<button onclick="closeEditModal()" style="background:none;border:none;font-size:18px;cursor:pointer">✕</button>
</div>
${editedInfo}
<div style="background:#f5f5f5;border-radius:6px;padding:8px;margin-bottom:10px;font-size:12px">
<div><strong>📅 Data:</strong> ${full.data||'?'} &nbsp; <strong>Turno:</strong> ${full.turno||'?'} &nbsp; <strong>Operador:</strong> ${full.operador||'?'}</div>
</div>
<input type="hidden" id="edit-id" value="${full.id||''}" />
<div style="display:grid;grid-template-columns:1fr 1fr 1fr;gap:6px;margin-bottom:8px">
<div><label style="font-size:10px;color:#555">Troco:</label><input type="text" id="edit-troco" value="${fmtMR(troco)}" style="width:100%;padding:5px;border:1px solid #ccc;border-radius:4px;font-size:13px;text-align:right" onblur="this.value=fmtBR(this)" /></div>
<div><label style="font-size:10px;color:#555">Crédito:</label><input type="text" id="edit-credito" value="${fmtMR(credito)}" style="width:100%;padding:5px;border:1px solid #ccc;border-radius:4px;font-size:13px;text-align:right" onblur="this.value=fmtBR(this)" /></div>
<div><label style="font-size:10px;color:#555">Débito:</label><input type="text" id="edit-debito" value="${fmtMR(debito)}" style="width:100%;padding:5px;border:1px solid #ccc;border-radius:4px;font-size:13px;text-align:right" onblur="this.value=fmtBR(this)" /></div>
<div><label style="font-size:10px;color:#555">Alimentação:</label><input type="text" id="edit-alimentacao" value="${fmtMR(alimentacao)}" style="width:100%;padding:5px;border:1px solid #ccc;border-radius:4px;font-size:13px;text-align:right" onblur="this.value=fmtBR(this)" /></div>
<div><label style="font-size:10px;color:#555">Vales:</label><input type="text" id="edit-vales" value="${fmtMR(vales)}" style="width:100%;padding:5px;border:1px solid #ccc;border-radius:4px;font-size:13px;text-align:right" onblur="this.value=fmtBR(this)" /></div>
<div><label style="font-size:10px;color:#555">PIX CNPJ:</label><input type="text" id="edit-pixcnpj" value="${fmtMR(pixcnpj)}" style="width:100%;padding:5px;border:1px solid #ccc;border-radius:4px;font-size:13px;text-align:right" onblur="this.value=fmtBR(this)" /></div>
<div><label style="font-size:10px;color:#555">À Receber:</label><input type="text" id="edit-areceber" value="${fmtMR(areceber)}" style="width:100%;padding:5px;border:1px solid #ccc;border-radius:4px;font-size:13px;text-align:right" onblur="this.value=fmtBR(this)" /></div>
<div><label style="font-size:10px;color:#555">Clientes:</label><input type="number" id="edit-clientes" value="${clientes}" min="0" style="width:100%;padding:5px;border:1px solid #ccc;border-radius:4px;font-size:13px" /></div>
<div><label style="font-size:10px;color:#555">Frango:</label><input type="number" id="edit-frango" value="${frango}" min="0" style="width:100%;padding:5px;border:1px solid #ccc;border-radius:4px;font-size:13px" /></div>
<div><label style="font-size:10px;color:#555">Vendas (R$):</label><input type="text" id="edit-vendas" value="${fmtMR(vendas)}" style="width:100%;padding:5px;border:1px solid #e65100;border-radius:4px;font-size:13px;text-align:right;font-weight:bold" onblur="this.value=fmtBR(this)" /></div>
</div>
<div style="display:grid;grid-template-columns:1fr 1fr 1fr;gap:6px;margin-bottom:8px">
<div><label style="font-size:10px;color:#555">Dinheiro Contado:</label><input type="text" id="edit-fd" value="${fmtMR(parseFloat(full.fechamento_dinheiro||0))}" style="width:100%;padding:5px;border:1px solid #ccc;border-radius:4px;font-size:13px;text-align:right" onblur="this.value=fmtBR(this)" /></div>
<div><label style="font-size:10px;color:#555">Cartões Contado:</label><input type="text" id="edit-fc" value="${fmtMR(parseFloat(full.fechamento_cartoes||0))}" style="width:100%;padding:5px;border:1px solid #ccc;border-radius:4px;font-size:13px;text-align:right" onblur="this.value=fmtBR(this)" /></div>
<div><label style="font-size:10px;color:#555">A Receber Contado:</label><input type="text" id="edit-fr" value="${fmtMR(parseFloat(full.fechamento_areceber||0))}" style="width:100%;padding:5px;border:1px solid #ccc;border-radius:4px;font-size:13px;text-align:right" onblur="this.value=fmtBR(this)" /></div>
<div><label style="font-size:10px;color:#555">Total Sangrias:</label><input type="text" id="edit-sangrias" value="${fmtMR(parseFloat(full.total_sangrias||0))}" style="width:100%;padding:5px;border:1px solid #ccc;border-radius:4px;font-size:13px;text-align:right" onblur="this.value=fmtBR(this)" /></div>
<div><label style="font-size:10px;color:#555">Total Despesas:</label><input type="text" id="edit-despesas" value="${fmtMR(parseFloat(full.total_despesas||0))}" style="width:100%;padding:5px;border:1px solid #ccc;border-radius:4px;font-size:13px;text-align:right" onblur="this.value=fmtBR(this)" /></div>
<div><label style="font-size:10px;color:#555">Saldo Esperado:</label><input type="text" id="edit-esperado" value="${fmtMR(saldo_esperado)}" style="width:100%;padding:5px;border:1px solid #e65100;border-radius:4px;font-size:13px;text-align:right;font-weight:bold" onblur="this.value=fmtBR(this)" /></div>
</div>
<div style="margin-bottom:8px">
<label style="font-size:10px;color:#555">Observações:</label>
<textarea id="edit-obs" style="width:100%;padding:5px;border:1px solid #ccc;border-radius:4px;font-size:13px;height:50px">${obs}</textarea>
</div>
<div style="display:flex;gap:8px;flex-wrap:wrap">
<button onclick="window.salvarEdicaoModal()" style="flex:1;padding:10px;background:#2e7d32;color:#fff;border:none;border-radius:6px;cursor:pointer;font-size:13px;font-weight:bold">💾 Salvar Alterações</button>
<button onclick="closeEditModal()" style="padding:10px 16px;background:#888;color:#fff;border:none;border-radius:6px;cursor:pointer;font-size:13px">Cancelar</button>
</div>
</div>`;
document.body.appendChild(overlay);
}
// Formata campo de dinheiro brasileiro
function fmtBR(inp) {
const v = parseNum(inp.value);
if (isNaN(v) || v === 0) return '';
return 'R$ ' + v.toLocaleString('pt-BR', { minimumFractionDigits: 2 });
}
// Fecha modal de edição
function closeEditModal() {
const m = document.getElementById('modal-edit');
if (m) document.body.removeChild(m);
window._editModalOpen = false;
}
// Salva edições do modal de edição separado
window.salvarEdicaoModal = async function() {
const full = window._currentConsulta;
if (!full) return;
const p = v => parseNum(v);
const inp = id => { const el = document.getElementById(id); return el ? el.value : ''; };
const now = new Date().toISOString();
const operador = estado.operador || full.operador || '';
const updates = {
saldo_troco: p(inp('edit-troco')),
saldo_credito: p(inp('edit-credito')),
saldo_debito: p(inp('edit-debito')),
saldo_alimentacao: p(inp('edit-alimentacao')),
saldo_vales: p(inp('edit-vales')),
total_pixcnpj: p(inp('edit-pixcnpj')),
saldo_areceber: p(inp('edit-areceber')),
fechamento_dinheiro: p(inp('edit-fd')),
fechamento_cartoes: p(inp('edit-fc')),
fechamento_areceber: p(inp('edit-fr')),
total_sangrias: p(inp('edit-sangrias')),
total_despesas: p(inp('edit-despesas')),
clientes: parseInt(inp('edit-clientes') || '0'),
frango: parseInt(inp('edit-frango') || '0'),
vendas: p(inp('edit-vendas')),
saldo_esperado: p(inp('edit-esperado')),
observacoes: inp('edit-obs'),
edited_at: now,
edited_by: operador,
};
const hasTauri = !!(window.__TAURI__ && window.__TAURI__.core);
if (!hasTauri) { alert('Tauri não disponível.'); return; }
try {
const id = document.getElementById('edit-id').value || full.id;
if (!id) { alert('ID do registro não encontrado.'); return; }
await window.__TAURI__.core.invoke('sb_atualizar_fechamento', { id, updates });
closeEditModal();
closeRelatorioModal();
alert('✅ Atualizado com sucesso!');
} catch(e) {
console.error('Erro ao salvar:', e);
alert('Erro ao salvar: ' + (e?.message || e));
}
};
// Salva edições de volta ao Supabase