filipe/fechamento-caixa
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 13 Wiki Activity

fix: cartoes do dados JSONB no print; listar_recentes com dados; table-layout fixed; modal conf font 14px
Build Fechamento de Caixa / build (macos-14, app) (push) Has been cancelled
Details
Build Fechamento de Caixa / build (ubuntu-22.04, deb) (push) Has been cancelled
Details
Build Fechamento de Caixa / build (windows-2022, msi) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
root
2026-06-30 20:00:07 +00:00
parent 3b3eb1a4cc
commit 6a8881d41d
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/plugins/supabase.rs
+1 -1
View File
@@ -279,7 +279,7 @@ impl SupabaseClient {
pub fn listar_recentes(&self, loja: &str, limite: i64) -> Result<Vec<Value>, SupabaseError> { pub fn listar_recentes(&self, loja: &str, limite: i64) -> Result<Vec<Value>, SupabaseError> {
let loja_normalized = sem_acento(&loja.to_lowercase()); let loja_normalized = sem_acento(&loja.to_lowercase());
let url = format!( let url = format!(
"{}/rest/v1/fechamentos_web?loja=eq.{}&order=data.desc,atualizado_em.desc&limit={}&select=id,id_fechamento,data,operador,turno,saldo_troco,saldo_esperado,fechamento_dinheiro,fechamento_cartoes,fechamento_areceber,diferenca,status_diferenca,observacoes,atualizado_em", "{}/rest/v1/fechamentos_web?loja=eq.{}&order=data.desc,atualizado_em.desc&limit={}&select=id,id_fechamento,data,operador,turno,saldo_troco,saldo_esperado,fechamento_dinheiro,fechamento_cartoes,fechamento_areceber,diferenca,status_diferenca,observacoes,atualizado_em,dados",
self.base_url, self.base_url,
urlencoding::encode(&loja_normalized), urlencoding::encode(&loja_normalized),
limite, limite,
src/index.html
+11 -11
View File
@@ -564,7 +564,7 @@
<p style="font-size:13px;color:#444;margin-bottom:14px"> <p style="font-size:13px;color:#444;margin-bottom:14px">
Tem certeza que deseja <strong>enviar este fechamento e encerrar o caixa?</strong> Tem certeza que deseja <strong>enviar este fechamento e encerrar o caixa?</strong>
</p> </p>
<div id="confirm-summary" style="border:1px solid #b3d9f7;border-radius:8px;padding:12px;background:#f0f7ff;font-size:12px;font-family:monospace"> <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> </div>
<p style="font-size:11px;color:#888;margin-top:10px"> <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. Após enviar, <strong>não dá pra editar este fechamento</strong> sem a senha do Filipe.
@@ -1394,8 +1394,8 @@ function buildConfirmHTML(data) {
.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: 14px; 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: 14px; font-weight: bold !important; }
.row.total-row { font-weight: bold !important; } .row.total-row { font-weight: bold !important; }
.cart-table { 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: 13px; margin-top: 4px; font-weight: bold !important; }
.cart-table th { font-weight: bold !important; border-bottom: 2px solid #000; padding: 3px; font-size: 13px; } .cart-table th { font-weight: bold !important; border-bottom: 2px solid #000; padding: 3px; font-size: 13px; width: 25%; }
.cart-table td { padding: 3px 5px; text-align: right; font-weight: bold !important; font-size: 13px; } .cart-table td { padding: 3px 5px; text-align: right; font-weight: bold !important; font-size: 13px; }
.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; }
@@ -1612,8 +1612,8 @@ function buildPrintHTML(data) {
.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: 14px; 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: 14px; font-weight: bold !important; }
.row.total-row { font-weight: bold !important; } .row.total-row { font-weight: bold !important; }
.cart-table { 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: 13px; margin-top: 4px; font-weight: bold !important; }
.cart-table th { font-weight: bold !important; border-bottom: 2px solid #000; padding: 3px; font-size: 13px; } .cart-table th { font-weight: bold !important; border-bottom: 2px solid #000; padding: 3px; font-size: 13px; width: 25%; }
.cart-table td { padding: 3px 5px; text-align: right; font-weight: bold !important; font-size: 13px; } .cart-table td { padding: 3px 5px; text-align: right; font-weight: bold !important; font-size: 13px; }
.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; }
@@ -3085,10 +3085,10 @@ function consultaToPrintData(full) {
const vales_arr = (dados.vales || []).map(v => ({ nome: v.nome || '', obs: v.obs || '', valor: parseFloat(v.valor || 0) })); const vales_arr = (dados.vales || []).map(v => ({ nome: v.nome || '', obs: v.obs || '', valor: parseFloat(v.valor || 0) }));
const receber_arr = (dados.receber || []).map(r => ({ nome: r.nome || '', valor: parseFloat(r.valor || 0) })); const receber_arr = (dados.receber || []).map(r => ({ nome: r.nome || '', valor: parseFloat(r.valor || 0) }));
const cancelamentos_arr = (dados.cancelamentos || []).map(c => ({ numero: c.numero || '', valor: parseFloat(c.valor || 0), motivo: c.motivo || '' })); const cancelamentos_arr = (dados.cancelamentos || []).map(c => ({ numero: c.numero || '', valor: parseFloat(c.valor || 0), motivo: c.motivo || '' }));
const cartoes_credito = (full.cartoes_credito || []).map(v => parseFloat(v || 0)); const cartoes_credito = (dados.cartoes?.credito || full.cartoes_credito || []).map(v => parseFloat(typeof v === 'object' ? (v.valor ?? 0) : (v || 0)));
const cartoes_debito = (full.cartoes_debito || []).map(v => parseFloat(v || 0)); const cartoes_debito = (dados.cartoes?.debito || full.cartoes_debito || []).map(v => parseFloat(typeof v === 'object' ? (v.valor ?? 0) : (v || 0)));
const cartoes_alimentacao = (full.cartoes_alimentacao || []).map(v => parseFloat(v || 0)); const cartoes_alimentacao = (dados.cartoes?.alimentacao || full.cartoes_alimentacao || []).map(v => parseFloat(typeof v === 'object' ? (v.valor ?? 0) : (v || 0)));
const cartoes_pix = (full.cartoes_pix || []).map(v => parseFloat(v || 0)); const cartoes_pix = (dados.cartoes?.pix || full.cartoes_pix || []).map(v => parseFloat(typeof v === 'object' ? (v.valor ?? 0) : (v || 0)));
const totalSangrias = sangrias_arr.reduce((s, r) => s + r.retirada + r.valor, 0); const totalSangrias = sangrias_arr.reduce((s, r) => s + r.retirada + r.valor, 0);
const totalDespesas = despesas_arr.reduce((s, r) => s + r.valor, 0); const totalDespesas = despesas_arr.reduce((s, r) => s + r.valor, 0);
const totalPixCnpj = pixcnpj_arr.reduce((s, r) => s + r.valor, 0); const totalPixCnpj = pixcnpj_arr.reduce((s, r) => s + r.valor, 0);
@@ -3170,8 +3170,8 @@ window.printRelatorio = function() {
.section-title { font-weight: bold; font-size: 14px; border-top: 2px solid #000; padding-top: 4px; margin-top: 8px; } .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; } .row { display: flex; justify-content: space-between; padding: 2px 0; font-size: 13px; font-weight: bold; }
.row.total-row { font-weight: bold; } .row.total-row { font-weight: bold; }
.cart-table { width: 100%; border-collapse: collapse; font-size: 12px; margin-top: 4px; font-weight: bold; } .cart-table { table-layout: fixed; width: 100%; border-collapse: collapse; font-size: 13px; margin-top: 4px; font-weight: bold; }
.cart-table th { font-weight: bold; border-bottom: 2px solid #000; padding: 2px; } .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 { padding: 2px 4px; text-align: right; font-weight: bold; }
.cart-table td:first-child { text-align: left; } .cart-table td:first-child { text-align: left; }
.cart-table tr.total-row { font-weight: bold; border-top: 2px solid #000; } .cart-table tr.total-row { font-weight: bold; border-top: 2px solid #000; }