fix: cartoes do dados JSONB no print; listar_recentes com dados; table-layout fixed; modal conf font 14px

fix: fonte impressao 13→15px, cartoes 11→13px, tudo bold !important, bordas 1px dashed→2px solid
2026-06-30 20:00:07 +00:00 · 2026-06-30 19:30:42 +00:00
2 changed files with 44 additions and 44 deletions
@@ -279,7 +279,7 @@ impl SupabaseClient {
    pub fn listar_recentes(&self, loja: &str, limite: i64) -> Result<Vec<Value>, SupabaseError> {
        let loja_normalized = sem_acento(&loja.to_lowercase());
        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,
            urlencoding::encode(&loja_normalized),
            limite,
@@ -564,7 +564,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: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>
      <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.
@@ -1386,26 +1386,26 @@ function buildConfirmHTML(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; font-weight: bold; print-color-adjust: exact; -webkit-print-color-adjust: exact; }
+  body { font-family: 'Courier New', monospace; font-size: 15px; width: 80mm; margin: 0 auto; padding: 8px; font-weight: bold !important; 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; }
+  .header h1 { font-size: 20px; font-weight: bold !important; }
+  .header h2 { font-size: 16px; font-weight: bold !important; }
+  hr { border: none; border-top: 2px solid #000; margin: 6px 0; }
+  .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.total-row { 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; width: 25%; }
+  .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 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; } }
+  .cart-table tr.total-row { font-weight: bold !important; border-top: 2px solid #000; }
+  .subtotal { font-size: 13px; margin-top: 4px; }
+  .subtotal .row { padding: 1px 0; font-weight: bold !important; }
+  .diff-ok { color: #2e7d32; font-weight: bold !important; }
+  .diff-bad { color: #c0272d; font-weight: bold !important; }
+  .obs { font-size: 12px; color: #555; margin-top: 6px; white-space: pre-wrap; font-weight: bold !important; }
+  .footer { text-align: center; font-size: 12px; color: #555; margin-top: 8px; font-weight: bold !important; }
+  @media print { body { background: #fff; font-weight: bold !important; font-size: 15px !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; font-weight: bold; print-color-adjust: exact; -webkit-print-color-adjust: exact; }
+  body { font-family: 'Courier New', monospace; font-size: 15px; width: 80mm; margin: 0 auto; padding: 8px; font-weight: bold !important; 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; }
+  .header h1 { font-size: 20px; font-weight: bold !important; }
+  .header h2 { font-size: 16px; font-weight: bold !important; }
+  hr { border: none; border-top: 2px solid #000; margin: 6px 0; }
+  .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.total-row { 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; width: 25%; }
+  .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 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; } }
+  .cart-table tr.total-row { font-weight: bold !important; border-top: 2px solid #000; }
+  .subtotal { font-size: 13px; margin-top: 4px; }
+  .subtotal .row { padding: 1px 0; font-weight: bold !important; }
+  .diff-ok { color: #2e7d32; font-weight: bold !important; }
+  .diff-bad { color: #c0272d; font-weight: bold !important; }
+  .obs { font-size: 12px; color: #555; margin-top: 6px; white-space: pre-wrap; font-weight: bold !important; }
+  .footer { text-align: center; font-size: 12px; color: #555; margin-top: 8px; font-weight: bold !important; }
+  @media print { body { background: #fff; font-weight: bold !important; font-size: 15px !important; } }
 </style>
 </head><body>
 <div class="header">
@@ -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 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 cartoes_credito = (full.cartoes_credito || []).map(v => parseFloat(v || 0));
-  const cartoes_debito = (full.cartoes_debito || []).map(v => parseFloat(v || 0));
-  const cartoes_alimentacao = (full.cartoes_alimentacao || []).map(v => parseFloat(v || 0));
-  const cartoes_pix = (full.cartoes_pix || []).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 = (dados.cartoes?.debito || full.cartoes_debito || []).map(v => parseFloat(typeof v === 'object' ? (v.valor ?? 0) : (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 = (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 totalDespesas = despesas_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; }
  .row { display: flex; justify-content: space-between; padding: 2px 0; font-size: 13px; 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 th { font-weight: bold; border-bottom: 2px solid #000; padding: 2px; }
+  .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; 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; }
Author	SHA1	Message	Date
root	6a8881d41d	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	2026-06-30 20:00:07 +00:00
root	3b3eb1a4cc	fix: fonte impressao 13→15px, cartoes 11→13px, tudo bold !important, bordas 1px dashed→2px solid 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	2026-06-30 19:30:42 +00:00