Compare commits

...

17 Commits

Author SHA1 Message Date
root c7109b1017 fix: uuid/id restaurados ao editar dia anterior; calcAll→updateTotals; invoke usa id; senha sempre pedida
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 19:00:01 +00:00
root f45d1e8170 fix: somatório atualiza após add linha; saldo caixa só troco editável; printRelatorio fixed; salvamento via uuid; edited_at/by; totales completos
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:33:38 +00:00
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
root a8edab029d feat: modal edicao completo com todas as grades editaveis — cartoes, vales, despesas, sangrias, pixcnPJ, receber, cancelamentos
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:27:01 +00:00
root cbaef8772d fix: askPassword closure — pw declared inside function (was global 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:06:45 +00:00
root 80740afbf0 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
2026-06-30 13:57:03 +00:00
root 7134c85bb7 fix: carregar dia anterior - cartoes como numeros crus, NaN makeRow, campos sistema populados
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 13:35:13 +00:00
root 4a157d27cb fix: vendas no buildPrintHTML e consultaToPrintData, fmtMoneyInput R$, auto-migration no Rust
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 02:52:18 +00:00
root a0f2f91131 fix: IIFE closure no botao Editar caixa completo; feat: campo Vendas em todo lugar
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 00:33:58 +00:00
root 15f141c191 feat: botao Editar caixa completo - restaura todos os lancamentos detalhados
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-29 23:30:58 +00:00
root 96a84ec194 fix: parseNum bug, todos campos do caixa editaveis no modal
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-29 13:58:01 +00:00
root 7d0c416248 fix: id do registro em campo oculto, fallback chain no salvar
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-29 12:51:35 +00:00
root 60ec60bf29 fix: sb_atualizar_fechamento aceita id numerico ou UUID string
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-29 12:39:50 +00:00
root 6d9e28a6f2 fix: salvar usa _currentConsultaId (id numerico), nao full.id
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-29 12:06:32 +00:00
2 changed files with 798 additions and 122 deletions
+57 -9
View File
@@ -140,6 +140,7 @@ impl SupabaseClient {
"observacoes": estado.get("observacoes").and_then(|v| v.as_str()).unwrap_or(""),
"clientes": estado.get("clientes").and_then(|v| v.as_i64()).unwrap_or(0),
"frango": estado.get("frango").and_then(|v| v.as_i64()).unwrap_or(0),
"vendas": estado.get("vendas").and_then(|v| v.as_f64()).unwrap_or(0.0),
});
// Primeiro tenta INSERT (upsert via Prefer)
@@ -247,12 +248,14 @@ impl SupabaseClient {
}
}
/// Atualiza campos específicos de um fechamento pelo id numérico (PATCH).
pub fn atualizar_fechamento(&self, id: i64, updates: &serde_json::Value) -> Result<Value, SupabaseError> {
let url = format!(
"{}/rest/v1/fechamentos_web?id=eq.{}",
self.base_url, id
);
/// Atualiza campos específicos de um fechamento pelo id numérico (pk) ou UUID.
pub fn atualizar_fechamento(&self, id: Option<i64>, uuid: &str, updates: &serde_json::Value) -> Result<Value, SupabaseError> {
// Se temos id numerico, usa id=eq.; senao usa id=eq.UUID
let url = if let Some(num) = id {
format!("{}/rest/v1/fechamentos_web?id=eq.{}", self.base_url, num)
} else {
format!("{}/rest/v1/fechamentos_web?id=eq.{}", self.base_url, uuid)
};
let resp = self
.http
@@ -262,7 +265,7 @@ impl SupabaseClient {
.send()?;
if resp.status().is_success() {
Ok(serde_json::json!({ "ok": true, "id": id }))
Ok(serde_json::json!({ "ok": true, "id": id.unwrap_or(0) }))
} else {
let status = resp.status();
let body = resp.text().unwrap_or_default();
@@ -394,6 +397,48 @@ impl SupabaseClient {
}
}
/// Tenta forçar PostgREST a recarregar schema com novas colunas (vendas, edited_at, edited_by).
/// Estratégia: INSERT com novas colunas → se PGRST204, espera 1.5s → retry.
/// Fire-and-forget — falha não bloqueia.
pub fn run_migration(&self) {
let payload = serde_json::json!({
"id_fechamento": "_mig_probe_1900",
"loja": "_probe_",
"data": "1900-01-01",
"operador": "_probe_",
"vendas": 0,
"edited_at": null,
"edited_by": null
});
let r1 = self.http
.post(&format!("{}/rest/v1/fechamentos_web", self.base_url))
.headers(self.headers(true))
.header("Prefer", "resolution=merge-duplicates")
.json(&payload)
.send();
if let Ok(resp) = r1 {
if resp.status().as_u16() == 400 {
std::thread::sleep(std::time::Duration::from_millis(1500));
let _ = self.http
.post(&format!("{}/rest/v1/fechamentos_web", self.base_url))
.headers(self.headers(true))
.header("Prefer", "resolution=merge-duplicates")
.json(&serde_json::json!({
"id_fechamento": "_mig_probe_1900",
"vendas": 0,
"edited_at": null,
"edited_by": null
}))
.send();
}
}
// Limpa probe
let _ = self.http
.delete(&format!("{}/rest/v1/fechamentos_web?id_fechamento=eq._mig_probe_1900", self.base_url))
.headers(self.headers(true))
.send();
}
/// Verifica se está online.
pub fn health_check(&self) -> bool {
let url = format!("{}/rest/v1/?limit=0", self.base_url);
@@ -462,10 +507,13 @@ pub fn sb_buscar_por_id_fechamento(
#[tauri::command]
pub fn sb_atualizar_fechamento(
sb: State<'_, SupabaseClient>,
id: i64,
id: String,
updates: serde_json::Value,
) -> Result<serde_json::Value, SupabaseError> {
sb.atualizar_fechamento(id, &updates)
// Tenta primeiro como i64 (id numerico), depois como String (UUID)
let id_i64 = id.parse::<i64>().ok();
let id_str = &id;
sb.atualizar_fechamento(id_i64, id_str, &updates)
}
#[tauri::command]
+717 -89
View File
File diff suppressed because it is too large Load Diff