From 2e4bd2820a00041f5bbf78c1a422a8eb43655e07 Mon Sep 17 00:00:00 2001 From: Max Farrell Date: Sun, 15 Nov 2026 21:27:46 -0600 Subject: [PATCH 1/2] fix: reconcile rent statement balances and deposit labels --- .changeset/clear-statement-balances.md | 5 ++ src/lib/statement-totals.test.ts | 56 +++++++++++++++++++ src/lib/statement-totals.ts | 9 +++ src/routes/leases/[id]/statement/+page.svelte | 32 +++++++++-- 4 files changed, 97 insertions(+), 5 deletions(-) create mode 100644 .changeset/clear-statement-balances.md create mode 100644 src/lib/statement-totals.test.ts create mode 100644 src/lib/statement-totals.ts diff --git a/.changeset/clear-statement-balances.md b/.changeset/clear-statement-balances.md new file mode 100644 index 0000000..d74887a --- /dev/null +++ b/.changeset/clear-statement-balances.md @@ -0,0 +1,5 @@ +--- +'leroa': patch +--- + +Show a reconciling full-ledger balance separately from the current due-date balance on rent statements, and label contractual deposits without implying they have been received. diff --git a/src/lib/statement-totals.test.ts b/src/lib/statement-totals.test.ts new file mode 100644 index 0000000..d0c7001 --- /dev/null +++ b/src/lib/statement-totals.test.ts @@ -0,0 +1,56 @@ +import { describe, expect, it } from 'vitest'; +import { readFileSync } from 'node:fs'; +import { statementTotals } from './statement-totals.ts'; + +describe('rent statement ledger totals', () => { + it.each([ + { charges: [], payments: [], charged: 0, paid: 0, ledgerBalance: 0 }, + { + charges: [{ amount: 100000, dueDate: '2999-01-01' }], + payments: [], + charged: 100000, + paid: 0, + ledgerBalance: 100000 + }, + { + charges: [ + { amount: 100000, dueDate: '2000-01-01' }, + { amount: 50000, dueDate: '2999-01-01' } + ], + payments: [{ amount: 25000 }], + charged: 150000, + paid: 25000, + ledgerBalance: 125000 + }, + { + charges: [{ amount: 100000 }], + payments: [{ amount: 100000 }], + charged: 100000, + paid: 100000, + ledgerBalance: 0 + }, + { + charges: [{ amount: 100000 }], + payments: [{ amount: 125000 }], + charged: 100000, + paid: 125000, + ledgerBalance: -25000 + } + ])( + 'reconciles every listed charge and payment: %j', + ({ charges, payments, charged, paid, ledgerBalance }) => { + expect(statementTotals(charges, payments)).toEqual({ charged, paid, ledgerBalance }); + } + ); + it('keeps the current server balance distinct and never claims the contractual deposit was received', () => { + const source = readFileSync( + new URL('../routes/leases/[id]/statement/+page.svelte', import.meta.url), + 'utf8' + ); + expect(source).toContain('formatMoney(ledgerBalance, l.currency)'); + expect(source).toContain('formatMoney(l.balance, l.currency)'); + expect(source).toContain('Ledger balance includes future charges.'); + expect(source).toContain('Contractual deposit:'); + expect(source).not.toContain('Deposit held:'); + }); +}); diff --git a/src/lib/statement-totals.ts b/src/lib/statement-totals.ts new file mode 100644 index 0000000..535a192 --- /dev/null +++ b/src/lib/statement-totals.ts @@ -0,0 +1,9 @@ +/** Full-ledger totals, including future charges. Does not replace the server's due-date balance. */ +export function statementTotals( + charges: readonly { amount: number }[], + payments: readonly { amount: number }[] +) { + const charged = charges.reduce((sum, charge) => sum + charge.amount, 0); + const paid = payments.reduce((sum, payment) => sum + payment.amount, 0); + return { charged, paid, ledgerBalance: charged - paid }; +} diff --git a/src/routes/leases/[id]/statement/+page.svelte b/src/routes/leases/[id]/statement/+page.svelte index 28b81fe..54cf88c 100644 --- a/src/routes/leases/[id]/statement/+page.svelte +++ b/src/routes/leases/[id]/statement/+page.svelte @@ -1,4 +1,5 @@