* fix(enable-banking): read BBAN from AccountIdentification.other and store it on the account Enable Banking has no top-level `bban` key on AccountIdentification: a Swedish BBAN (clearing + account number) arrives as `other.identification` with `other.scheme_name = 'BBAN'`, or in `all_account_ids`. The client typed `bban?: string` and read `.bban`, so the value was always undefined: no connected account ever carried its clearing + account number, and domestic counterparty accounts on transactions were dropped. Type the identifiers per the OpenAPI spec, add extractBban() and pickAccountIdentifier(), read counterparty identifiers through the scheme list (IBAN, then BBAN/BGNR/PGNR, then anything), and store `bban` on StoredAccount from the OAuth callback. The external_id dedup scope stays IBAN-then-uid and is untouched. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * feat(invoices): named payee accounts on cash_accounts with a default per currency A company had exactly one set of payment instructions per invoice currency (company_settings.invoice_payment_accounts), picked by currency alone. A second SEK bank account, or a second bankgiro number, had nowhere to live. cash_accounts is already the per-company bank-account entity. Migration 20260903150000 adds the payee fields (bankgiro, plusgiro, clearing + account number, BBAN, BIC, Swish, foreign routing) plus invoice_payee, a small invoice_payee_defaults table (one default account per currency; one account may be the default for several currencies, a SEK account with an IBAN is the usual EUR payee), and a SECURITY DEFINER mirror that rewrites the legacy map and the SEK bank columns from the default accounts. Every existing reader (PDF, email, reminders, v1, MCP) keeps working; the three writers that only touched legacy columns (PUT /api/settings, v1 settings, MCP update_company_settings) now write through to the default account, so what an agent sets is what the PDF prints. Peppol PaymentMeans is built from the resolver instead of the raw legacy column. bg_pg is dropped (never read or written; NULL on every prod and staging row). Backfill lands only on existing cash accounts (primary, IBAN match, or the only enabled account in the currency). Entries with no target stay in the map as the resolver fallback and get an attach action in settings. New: POST /api/cash-accounts (manual bank account on the next free 19xx), PATCH /api/cash-accounts/[id] payee fields (owner/admin), GET/PUT /api/cash-accounts/payee-defaults. Settings page rewritten as an account list with per-currency defaults. Behandlingshistorik and the full archive cover the new table and columns. Verified on staging: migration applied (11 defaults landed), mirror trigger observed rewriting company_settings from a payee edit. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * feat(invoices): choose which bank account an invoice is paid to, frozen at issue Migration 20260903160000 adds invoices.payment_cash_account_id (FK to cash_accounts, SET NULL) and invoices.payment_details, the payee fields frozen when the account is chosen and refreshed at issue. Resolver: resolveInvoicePaymentAccount / companyWithInvoicePaymentAccount / assertInvoicePaymentAccountForRender take an optional override, and hasRequiredInvoicePaymentAccount reads it from the invoice row, so every surface (PDF, Swish QR, email, reminders, payment confirmation, Peppol, recurring, staged MCP send) prints the frozen payee when one exists and the company default per currency otherwise. Invoices that never chose an account behave exactly as before. Issue paths (mark-sent, send, v1 send, v1 mark-sent, Peppol send, recurring, MCP send and mark-sent) refresh the snapshot from the account as it is at issue; a chosen account that is disabled, un-flagged or unusable for the currency blocks with INVOICE_SEND_PAYMENT_ACCOUNT_INVALID. Writers: dashboard POST/PATCH, v1 create/update and MCP create_invoice accept payment_cash_account_id and validate it against the company's payee accounts (INVOICE_PAYEE_ACCOUNT_INVALID). Credit notes inherit the original's payee; copies carry the choice; preview-pdf renders the chosen account. The editor shows "Betalas till" under the currency when the company has two or more usable payee accounts for that currency. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * feat(invoices): book manual payments on the invoice's chosen bank account Manual mark-paid (dashboard, v1, MCP gnubok_mark_invoice_as_paid) and the booking dialog's proposed lines debited 1930 regardless of which bank account the invoice asked to be paid to. They now resolve the chosen payee account's ledger account (resolveInvoiceSettlementAccount) and fall back to 1930 only when no account was chosen or the row is gone. Bank-transaction matching keeps debiting the account the money landed on and does not filter by the chosen account; between equal-confidence candidates it prefers the invoice that asked to be paid to the landing account. Scores are untouched, so nothing new auto-matches. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * chore(invoices): keep the payload-size and phantom-column ceilings after the payee work Shorten the new gnubok_create_invoice argument description (tools/list payload was 29 bytes over the 60 kB budget), inline the cash-account payee UPDATE/INSERT payloads and the settings select strings as literals so the phantom-column scanner can read their columns, and reuse ACCOUNT_NUMBER_RE instead of a hand-rolled copy. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * fix(invoices): harden the payee model after review (admin-only payee columns, separate payee IBAN, company-scoped FK) Review findings from CodeRabbit, Superagent, the Swedish accounting review and three skeptic passes, resolved in one batch: Schema (both migrations are unshipped and edited in place): - cash_accounts.payee_iban: the printed IBAN is its own column. iban stays the bank identity written by every sync and used to re-pair on reconnect, so a sync can no longer rewrite an invoice instruction or resurrect a cleared IBAN. The backfill copies each currency entry verbatim onto the target account (IBAN match first, then primary), so every invoice keeps printing exactly what it printed before; the bank IBAN is never pushed onto invoices that did not carry one. - Payee columns are owner/admin-only at the database (BEFORE trigger, service role exempt): cash_accounts is member-writable for bank sync, and the SECURITY DEFINER mirror would otherwise have let a member rewrite where customers pay. - Revoking an account as payee or disabling it drops its defaults; deleting a default drops that currency from the map and clears the legacy SEK columns (an admin saying "nothing to print" must not keep printing a closed account). The mirror leaves the legacy SEK columns alone when the map has no SEK entry, so legacy-only companies are never wiped by a mirror run for another currency. - Audit and mirror triggers fire on the same column set; anon and authenticated can no longer execute the trigger-only definer functions. - invoices.payment_cash_account_id is a composite same-company FK with SET NULL scoped to the account column. Code: - Only 19xx bank accounts can be payee: PATCH, the defaults PUT (which now also requires enabled, payee-flagged and usable for the currency), resolveInvoicePayeeChoice, and the mark-paid settlement resolver (which also refuses disabled rows and logs every fallback to 1930). - createManualBankAccount excludes every ledger slot any row already holds (findFreeLedgerAccount treats a manual holder as free; this path inserts). - The legacy settings writers (PUT /api/settings, v1, MCP) write through to the account BEFORE updating company_settings and fail the request on error; the account is written before it is adopted as default so the mirror never sees an empty payee. - snapshotInvoicePayee: dry runs no longer persist; a failed snapshot write blocks issue (INVOICE_PAYEE_SNAPSHOT_FAILED). v1 mark-sent/mark-paid projections carry the payee columns; v1 create validates the payee before the dry-run return and echoes it in the preview. - pickAccountIdentifier: supplementary IBAN wins over a primary BBAN, and non-account schemes (card PANs) are never persisted. - Editor shows the payee select for a single usable account with no default; the booking dialog waits for cash accounts before proposing lines; a failed default write no longer hides a created account. - Behandlingshistorik names the account on created/deleted defaults. - Regenerated skills/accounted-api; MCP argument description trimmed under the tools/list payload ceiling. Declined: clearing legacy columns via a forward migration (the mirror now does it on delete); Swedish review's "show the debit account in the mark-paid UI" (the booking dialog already proposes and lets the user edit the debit line); manual ledger collision (UNIQUE exists, and the create path now rejects it with a clear error); Peppol aligning to the PDF value for companies whose legacy column had drifted from the map (the PDF is the customer-facing document; both now agree). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * fix(invoices): read NEW.invoice_payee only on the cash_accounts branch of the mirror trigger trg_mirror_invoice_payee_defaults fires for both tables; plpgsql resolves record fields per expression, so the combined condition failed with "record new has no field invoice_payee" whenever a default row changed, which took down every pg-real case on the payee tables. The revoke/disable check now sits inside its own TG_TABLE_NAME branch. The MCP settings executor test mocks the payee write-through like the settings route test already does. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * fix(invoices): keep member disables from revoking payee defaults, gate payee on 1920-1999, fit the MCP payload Cycle 3 of /resolve-pr on #2233. Superagent P1: the SECURITY DEFINER mirror trigger deleted an admin's invoice_payee_defaults rows whenever cash_accounts.enabled flipped to false, and enabled is member-writable (the bank picker's "Synkas ej"), so a member could undo an admin's payee decision. The trigger now drops defaults only on the admin-only invoice_payee true -> false revoke; the mirror trigger's WHEN no longer lists enabled. Disabled accounts stay out of the pick lists and the send gate already refuses an invoice that chose one. Applied to staging as the same function + trigger definition and probed inside a rolled-back block: disable keeps the default and the mirrored bankgiro, revoke clears both. pg-real: the admin-guard test ran three expectations inside one withUserContext transaction; the first raise aborted it and the next statement failed with "current transaction is aborted". One transaction per expectation now, and the member case also flips enabled to prove the column stays member-level. Swedish review: payee eligibility was /^19\d\d$/, which admits 1910 Kassa and the 1911-1919 tills. A customer pays to a giro or bank account, so isBankCashAccount, CreateCashAccountSchema.ledger_account and the PATCH route now require BAS 1920-1999; tests cover 1910 and 1919. Unit tests (3/4): the tools/list payload guard read 60 025, then 60 014 tokens after main merged #2166 and #2163 alongside this branch. The ceiling is not bumped and no read on this surface is a demotion candidate, so gnubok_create_invoice drops payment_cash_account_id; agent-created invoices print the per-currency default and v1 REST plus the editor keep the field. Recorded in DECISIONS.md. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * chore(migrations): move invoices_payment_cash_account to 20260903183000 after colliding with main's KPI migration origin/main merged 20260903160000_kpi_monthly_include_reversed_originals while this branch held the same version; identical versions abort the Supabase apply. Staging's schema_migrations row was moved to the new version with the file. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * fix(invoices): gate invoice_payee on BAS 1920-1999 at the database, and unblock the typecheck ratchet Cycle 4 of /resolve-pr on #2233, on Emil's go. Swedish review: the 1920-1999 payee rule lived only in the routes. The cash_accounts_payee_admin_only trigger now also refuses invoice_payee on any other ledger (INVOICE_PAYEE_ACCOUNT_INVALID, 23514), whoever writes it, and the backfill only targets giro/bank rows, so a company whose single enabled cash_accounts row is a Stripe clearing account keeps its legacy bankgiro in company_settings instead of landing it on 1686. pg test covers insert and update on 1686 and 1910; the function was applied to staging and probed. Typecheck ratchet: main is red from two merges that landed with failing Checks, and every branch that syncs it inherits the errors. - #2242 added POST(req) calls to the fiscal-periods route test without the route params argument withRouteContext handlers take (25 errors in the file, baseline 23). All 25 calls now pass createMockRouteParams({}). - #2247 made SyncResult.requestedFromDate and historyNarrowed required; the 13 mockedSync results in the enable-banking accounts-route test lacked them. They now carry a fixed date and historyNarrowed: false. Both files' tests pass unchanged in behaviour. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * chore(migrations): move invoices_payment_cash_account to 20260903193000 after colliding with main's party_promotion origin/main merged 20260903183000_party_promotion while this branch held the same version. Staging's schema_migrations row must follow (pending: the Supabase MCP was disconnected at the time of this commit). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
406 lines
15 KiB
TypeScript
406 lines
15 KiB
TypeScript
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import type {
|
|
CashAccount,
|
|
CashAccountPayeeFields,
|
|
Currency,
|
|
InvoicePayeeDefault,
|
|
InvoicePaymentAccount,
|
|
} from '@/types'
|
|
import { createLogger } from '@/lib/logger'
|
|
import { getBASReference } from '@/lib/bookkeeping/bas-reference'
|
|
import { syncMappedAccounts } from '@/lib/import/account-sync'
|
|
import {
|
|
hasUsableInvoicePaymentAccount,
|
|
isInvoicePaymentAccountCurrency,
|
|
normalizeInvoicePaymentAccount,
|
|
} from '@/lib/invoices/payment-accounts'
|
|
import { findFreeLedgerAccount } from '@/lib/cash-accounts/service'
|
|
|
|
const log = createLogger('cash-accounts/invoice-payee')
|
|
|
|
export const PAYEE_FIELDS: readonly (keyof CashAccountPayeeFields)[] = [
|
|
'bank_name',
|
|
'clearing_number',
|
|
'account_number',
|
|
'bankgiro',
|
|
'plusgiro',
|
|
'swish',
|
|
'iban',
|
|
'bic',
|
|
'bank_code',
|
|
'foreign_account_number',
|
|
]
|
|
|
|
/** A cash account's payee columns: the InvoicePaymentAccount keys, with the printed IBAN in payee_iban. */
|
|
export type CashAccountPayeeSource = Omit<CashAccountPayeeFields, 'iban'> & { payee_iban: string | null }
|
|
|
|
/**
|
|
* The payee fields of a cash account in the shape the invoice renderers read.
|
|
* The printed IBAN is payee_iban, never the bank-identity iban column.
|
|
*/
|
|
export function cashAccountPayee(account: CashAccountPayeeSource): InvoicePaymentAccount {
|
|
return normalizeInvoicePaymentAccount({
|
|
bank_name: account.bank_name,
|
|
clearing_number: account.clearing_number,
|
|
account_number: account.account_number,
|
|
bankgiro: account.bankgiro,
|
|
plusgiro: account.plusgiro,
|
|
swish: account.swish,
|
|
iban: account.payee_iban,
|
|
bic: account.bic,
|
|
bank_code: account.bank_code,
|
|
foreign_account_number: account.foreign_account_number,
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Whether the account can be printed on an invoice in `currency`: enabled,
|
|
* flagged as a payee, and carrying the identifiers that currency needs (an
|
|
* IBAN for anything but SEK, or the USD/GBP routing triple).
|
|
*/
|
|
export function isUsableInvoicePayee(account: CashAccount, currency: Currency): boolean {
|
|
return account.enabled
|
|
&& account.invoice_payee
|
|
&& hasUsableInvoicePaymentAccount(cashAccountPayee(account), currency)
|
|
}
|
|
|
|
/**
|
|
* Bank-type rows only: Stripe (1686), Woo (1680) and Shopify (1584) also live
|
|
* in cash_accounts, and so may a till (1910 Kassa, 1911-1919). A customer is
|
|
* paid to a giro or bank account (BAS 1920-1999), never to a cash till.
|
|
*/
|
|
export function isBankCashAccount(account: Pick<CashAccount, 'ledger_account'>): boolean {
|
|
return /^19[2-9]\d$/.test(account.ledger_account)
|
|
}
|
|
|
|
export interface InvoicePayeeState {
|
|
accounts: CashAccount[]
|
|
defaults: InvoicePayeeDefault[]
|
|
}
|
|
|
|
/**
|
|
* Every bank-type cash account of the company (payee or not: the settings
|
|
* page lets the user promote one) plus the per-currency defaults.
|
|
*/
|
|
export async function loadInvoicePayeeState(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
): Promise<InvoicePayeeState> {
|
|
const [accountsRes, defaultsRes] = await Promise.all([
|
|
supabase
|
|
.from('cash_accounts')
|
|
.select('*')
|
|
.eq('company_id', companyId)
|
|
.order('is_primary', { ascending: false })
|
|
.order('ledger_account', { ascending: true }),
|
|
supabase
|
|
.from('invoice_payee_defaults')
|
|
.select('*')
|
|
.eq('company_id', companyId),
|
|
])
|
|
if (accountsRes.error) {
|
|
throw new Error(`invoice payee accounts lookup failed: ${accountsRes.error.message}`)
|
|
}
|
|
if (defaultsRes.error) {
|
|
throw new Error(`invoice payee defaults lookup failed: ${defaultsRes.error.message}`)
|
|
}
|
|
return {
|
|
accounts: ((accountsRes.data ?? []) as CashAccount[]).filter(isBankCashAccount),
|
|
defaults: (defaultsRes.data ?? []) as InvoicePayeeDefault[],
|
|
}
|
|
}
|
|
|
|
/** The default payee account for `currency`, or null when none is configured. */
|
|
export async function getDefaultInvoicePayee(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
currency: Currency,
|
|
): Promise<CashAccount | null> {
|
|
const { data, error } = await supabase
|
|
.from('invoice_payee_defaults')
|
|
.select('cash_account:cash_accounts!invoice_payee_defaults_same_company(*)')
|
|
.eq('company_id', companyId)
|
|
.eq('currency', currency)
|
|
.maybeSingle()
|
|
if (error) {
|
|
log.warn('getDefaultInvoicePayee failed', { companyId, currency, error: error.message })
|
|
return null
|
|
}
|
|
const account = (data as { cash_account: CashAccount | CashAccount[] | null } | null)?.cash_account
|
|
if (!account) return null
|
|
return Array.isArray(account) ? account[0] ?? null : account
|
|
}
|
|
|
|
export type PayeeUpdate = Partial<CashAccountPayeeFields> & {
|
|
name?: string | null
|
|
invoice_payee?: boolean
|
|
}
|
|
|
|
/**
|
|
* Update payee fields on one of the company's cash accounts. Only supplied
|
|
* keys are written; explicit null clears. The mirror trigger rewrites
|
|
* company_settings from this row when it is a default for some currency.
|
|
*/
|
|
export async function updateCashAccountPayee(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
cashAccountId: string,
|
|
update: PayeeUpdate,
|
|
): Promise<CashAccount | null> {
|
|
// Literal payload (the phantom-column guard reads literal keys): a key the
|
|
// caller did not supply stays undefined and is dropped by supabase-js, so
|
|
// only supplied fields are written and explicit null still clears.
|
|
const has = (key: keyof PayeeUpdate) => key in update && update[key] !== undefined
|
|
if (!(Object.keys(update) as (keyof PayeeUpdate)[]).some(has)) {
|
|
const { data } = await supabase
|
|
.from('cash_accounts')
|
|
.select('*')
|
|
.eq('company_id', companyId)
|
|
.eq('id', cashAccountId)
|
|
.maybeSingle()
|
|
return (data as CashAccount | null) ?? null
|
|
}
|
|
const { data, error } = await supabase
|
|
.from('cash_accounts')
|
|
.update({
|
|
bank_name: has('bank_name') ? clean(update.bank_name) : undefined,
|
|
clearing_number: has('clearing_number') ? clean(update.clearing_number) : undefined,
|
|
account_number: has('account_number') ? clean(update.account_number) : undefined,
|
|
bankgiro: has('bankgiro') ? clean(update.bankgiro) : undefined,
|
|
plusgiro: has('plusgiro') ? clean(update.plusgiro) : undefined,
|
|
swish: has('swish') ? clean(update.swish) : undefined,
|
|
payee_iban: has('iban') ? compact(clean(update.iban), true) : undefined,
|
|
bic: has('bic') ? compact(clean(update.bic), true) : undefined,
|
|
bank_code: has('bank_code') ? clean(update.bank_code) : undefined,
|
|
foreign_account_number: has('foreign_account_number') ? clean(update.foreign_account_number) : undefined,
|
|
name: has('name') ? clean(update.name) : undefined,
|
|
invoice_payee: update.invoice_payee,
|
|
})
|
|
.eq('company_id', companyId)
|
|
.eq('id', cashAccountId)
|
|
.select('*')
|
|
.maybeSingle()
|
|
if (error) throw new Error(`cash_accounts payee update failed: ${error.message}`)
|
|
return (data as CashAccount | null) ?? null
|
|
}
|
|
|
|
/**
|
|
* Make `cashAccountId` the default payee for `currency`, or clear the
|
|
* default when null. The account must belong to the company: the composite
|
|
* FK rejects a foreign id and the caller sees the error.
|
|
*/
|
|
export async function setInvoicePayeeDefault(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
currency: Currency,
|
|
cashAccountId: string | null,
|
|
): Promise<void> {
|
|
if (cashAccountId === null) {
|
|
const { error } = await supabase
|
|
.from('invoice_payee_defaults')
|
|
.delete()
|
|
.eq('company_id', companyId)
|
|
.eq('currency', currency)
|
|
if (error) throw new Error(`invoice_payee_defaults delete failed: ${error.message}`)
|
|
return
|
|
}
|
|
const { error } = await supabase
|
|
.from('invoice_payee_defaults')
|
|
.upsert(
|
|
{ company_id: companyId, currency, cash_account_id: cashAccountId },
|
|
{ onConflict: 'company_id,currency' },
|
|
)
|
|
if (error) throw new Error(`invoice_payee_defaults upsert failed: ${error.message}`)
|
|
}
|
|
|
|
export interface CreateManualBankAccountInput {
|
|
name: string
|
|
currency: string
|
|
ledger_account?: string | null
|
|
payee?: Partial<CashAccountPayeeFields>
|
|
invoice_payee?: boolean
|
|
}
|
|
|
|
/**
|
|
* A bank account the user types in (no PSD2 connection). Allocates the next
|
|
* free 19xx slot for the currency unless one is given, and makes sure that
|
|
* number exists in the chart so bookings and pickers can see it.
|
|
*/
|
|
export async function createManualBankAccount(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
userId: string,
|
|
input: CreateManualBankAccountInput,
|
|
): Promise<CashAccount> {
|
|
const currency = input.currency.toUpperCase()
|
|
// findFreeLedgerAccount treats a slot held by a manual row as free (the
|
|
// PSD2 path promotes that row in place); this path INSERTS, so every slot
|
|
// any row holds is taken.
|
|
const { data: existing, error: existingError } = await supabase
|
|
.from('cash_accounts')
|
|
.select('ledger_account')
|
|
.eq('company_id', companyId)
|
|
if (existingError) throw new Error(`cash_accounts lookup failed: ${existingError.message}`)
|
|
const taken = new Set(((existing ?? []) as { ledger_account: string }[]).map((r) => r.ledger_account))
|
|
const requested = input.ledger_account?.trim()
|
|
if (requested && taken.has(requested)) {
|
|
throw new Error(`Ledger account ${requested} is already a cash account of this company`)
|
|
}
|
|
const ledger = requested || (await findFreeLedgerAccount(supabase, companyId, currency, taken))
|
|
if (!ledger) {
|
|
throw new Error('No free 19xx ledger account for a new bank account')
|
|
}
|
|
const chartName = getBASReference(ledger)?.account_name ?? `Bankkonto ${currency}`
|
|
const sync = await syncMappedAccounts(
|
|
supabase,
|
|
companyId,
|
|
userId,
|
|
[{
|
|
sourceAccount: ledger,
|
|
sourceName: chartName,
|
|
targetAccount: ledger,
|
|
targetName: chartName,
|
|
confidence: 1,
|
|
matchType: 'exact',
|
|
isOverride: false,
|
|
}],
|
|
false,
|
|
)
|
|
if (sync.error) {
|
|
throw new Error(`chart sync failed for ${ledger}: ${sync.error}`)
|
|
}
|
|
|
|
const payee = input.payee ?? {}
|
|
const { data, error } = await supabase
|
|
.from('cash_accounts')
|
|
.insert({
|
|
company_id: companyId,
|
|
ledger_account: ledger,
|
|
currency,
|
|
name: input.name.trim(),
|
|
enabled: true,
|
|
is_primary: false,
|
|
source: 'manual',
|
|
invoice_payee: input.invoice_payee ?? true,
|
|
bank_name: clean(payee.bank_name),
|
|
clearing_number: clean(payee.clearing_number),
|
|
account_number: clean(payee.account_number),
|
|
bankgiro: clean(payee.bankgiro),
|
|
plusgiro: clean(payee.plusgiro),
|
|
swish: clean(payee.swish),
|
|
// A typed account: the printed IBAN is also the account's identity, so
|
|
// a later bank connection with the same IBAN promotes this row in place.
|
|
iban: compact(clean(payee.iban), true),
|
|
payee_iban: compact(clean(payee.iban), true),
|
|
bic: compact(clean(payee.bic), true),
|
|
bank_code: clean(payee.bank_code),
|
|
foreign_account_number: clean(payee.foreign_account_number),
|
|
})
|
|
.select('*')
|
|
.single()
|
|
if (error) throw new Error(`cash_accounts insert failed: ${error.message}`)
|
|
return data as CashAccount
|
|
}
|
|
|
|
/**
|
|
* Legacy writers (PUT /api/settings, v1 settings, MCP update_company_settings)
|
|
* still send payment instructions as company_settings columns or as the
|
|
* per-currency map. Write them through to the default cash account for each
|
|
* currency so the account stays the truth; the mirror trigger then rewrites
|
|
* the map and legacy columns from the account, which is what the caller
|
|
* asked for. Currencies with no default account are left to the caller's
|
|
* own company_settings write (the resolver's fallback).
|
|
*
|
|
* Returns the currencies that were written through, so callers can decide
|
|
* whether their own company_settings write still needs those keys.
|
|
*/
|
|
export async function propagateLegacyPayeeWrite(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
changes: {
|
|
invoice_payment_accounts?: Partial<Record<string, Partial<InvoicePaymentAccount> | null | undefined>>
|
|
} & Partial<Record<keyof InvoicePaymentAccount, string | null | undefined>>,
|
|
): Promise<Currency[]> {
|
|
const entries = new Map<Currency, Partial<InvoicePaymentAccount>>()
|
|
const map = changes.invoice_payment_accounts
|
|
if (map) {
|
|
for (const [currency, account] of Object.entries(map)) {
|
|
if (!isInvoicePaymentAccountCurrency(currency) || !account) continue
|
|
entries.set(currency, account)
|
|
}
|
|
}
|
|
const legacyKeys: (keyof InvoicePaymentAccount)[] = [
|
|
'bank_name', 'clearing_number', 'account_number', 'bankgiro', 'plusgiro', 'swish', 'iban', 'bic',
|
|
]
|
|
if (!entries.has('SEK') && legacyKeys.some((key) => changes[key] !== undefined)) {
|
|
const partial: Partial<InvoicePaymentAccount> = {}
|
|
for (const key of legacyKeys) {
|
|
if (changes[key] !== undefined) partial[key] = changes[key] ?? null
|
|
}
|
|
entries.set('SEK', partial)
|
|
}
|
|
if (entries.size === 0) return []
|
|
|
|
const { data: defaultsData, error: defaultsError } = await supabase
|
|
.from('invoice_payee_defaults')
|
|
.select('currency, cash_account_id')
|
|
.eq('company_id', companyId)
|
|
if (defaultsError) {
|
|
throw new Error(`invoice_payee_defaults lookup failed: ${defaultsError.message}`)
|
|
}
|
|
const defaults = new Map(
|
|
((defaultsData ?? []) as { currency: string; cash_account_id: string }[])
|
|
.map((row) => [row.currency, row.cash_account_id] as const),
|
|
)
|
|
|
|
const written: Currency[] = []
|
|
for (const [currency, account] of entries) {
|
|
let target = defaults.get(currency) ?? null
|
|
let adopt = false
|
|
if (!target && currency === 'SEK') {
|
|
// Every company is seeded with a primary SEK account: adopt it as the
|
|
// SEK payee so a first-time bank-details save lands on an account.
|
|
const { data: primary } = await supabase
|
|
.from('cash_accounts')
|
|
.select('id, ledger_account')
|
|
.eq('company_id', companyId)
|
|
.eq('currency', 'SEK')
|
|
.eq('enabled', true)
|
|
.eq('is_primary', true)
|
|
.maybeSingle()
|
|
const row = primary as { id: string; ledger_account: string } | null
|
|
if (row && isBankCashAccount(row)) {
|
|
target = row.id
|
|
adopt = true
|
|
}
|
|
}
|
|
if (!target) continue
|
|
// A full map entry replaces the account's payee (the settings form sends
|
|
// every field); a partial legacy write only touches the supplied keys.
|
|
const update: PayeeUpdate = { invoice_payee: true }
|
|
const full = map?.[currency] !== undefined
|
|
for (const field of PAYEE_FIELDS) {
|
|
if (full || field in account) update[field] = account[field] ?? null
|
|
}
|
|
// Fields first, default second: the default insert fires the mirror, and
|
|
// it must see the filled account, never an empty one.
|
|
await updateCashAccountPayee(supabase, companyId, target, update)
|
|
if (adopt) await setInvoicePayeeDefault(supabase, companyId, 'SEK', target)
|
|
written.push(currency)
|
|
}
|
|
return written
|
|
}
|
|
|
|
function clean(value: string | null | undefined): string | null {
|
|
if (value === undefined || value === null) return null
|
|
const trimmed = value.trim()
|
|
return trimmed ? trimmed : null
|
|
}
|
|
|
|
/** Strip inner whitespace (IBAN, BIC), optionally upper-casing. */
|
|
function compact(value: string | null, upper = false): string | null {
|
|
if (value === null) return null
|
|
const stripped = value.replace(/\s/g, '')
|
|
return upper ? stripped.toUpperCase() : stripped
|
|
}
|