* feat(rot-rut): match Skatteverket's payout against the begäran from the bank row A ROT/RUT invoice is stored with remaining_amount net of the deduction, so once the customer pays it flips to paid and drops out of the matchable set. Skatteverket's payout for the 1513 share then lands as an income row with no candidate: the only clearing path was a headless settle endpoint that never linked the bank row. The candidate is the payout request (one lump sum per begäran, possibly covering several invoices), modelled exactly like the supplier-invoice hint: - migration 20260904020000: transactions.potential_rot_rut_payout_request_id - pure matcher (exact amount vs decided_total ?? requested_total, boosted when Skatteverket is named, ambiguous when two requests share the amount) - hint written at bank ingest and by batch-match-invoices; cleared by the link and reconciliation paths and by clearSettledInvoiceSuggestions - shared settle service (lib/invoices/rot-rut-settle.ts) used by the existing settle route and the new POST /api/transactions/[id]/match-rot-rut-payout, which books debit 19xx / credit 1513 and links the row in one call - transactions inbox pill, own confirm dialog listing the covered invoices, manual fallback section in the invoice picker, worklist and Att göra rows Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HmEpYNMHycUPzSwBECEzZ5 Signed-off-by: Emil <emilmattsson14@gmail.com> * fix(rot-rut): cap the payout at the begäran, CAS on the request and on stale pointers Skeptic findings on 6aa7b2e5c: - a bank row larger than the begäran was booked in full, driving 1513 into a credit balance and rewriting decided_total to the bank amount: refuse amount > decided_total ?? requested_total in the service and block the dialog's confirm with the reason - two concurrent settles could both attach and credit 1513 twice: the request update now locks on settlement_journal_entry_id IS NULL and the loser returns ROT_RUT_SETTLE_RACE (409) with its orphan voucher id - a row with a stale (reversed) journal_entry_id passed the route guard but always lost the null-only link CAS: the route forwards the pointer it read and the service locks on that value, as link-journal-entry does - the pinned underlag on the bank row now propagates onto the voucher Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HmEpYNMHycUPzSwBECEzZ5 Signed-off-by: Emil <emilmattsson14@gmail.com> * fix(rot-rut): review round: SEK gate, voucher-less paid matchable, hint-write errors, one live voucher per begäran CodeRabbit findings on a93dc46b8, one batch: - picker and dialog only offer a begäran to SEK rows (the route refuses other currencies, so the manual flow no longer dead-ends) - a voucher-less `paid` request (beslut recorded via PATCH, money not yet booked) is matchable; settled means a settlement voucher exists - ingest and batch-match check the hint update's error before draining the pool or counting the match - the invoice.match_confirmed payload clears the payout hint like the row - migration 20260904021000: partial unique index on journal_entries (company_id, source_id) for live rot_rut_payout entries, so two racing settles cannot both book a voucher; pg test included Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HmEpYNMHycUPzSwBECEzZ5 Signed-off-by: Emil <emilmattsson14@gmail.com> --------- Signed-off-by: Emil <emilmattsson14@gmail.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
213 lines
9.1 KiB
TypeScript
213 lines
9.1 KiB
TypeScript
'use client'
|
|
|
|
import { useTranslations } from 'next-intl'
|
|
import { Button } from '@/components/ui/button'
|
|
import {
|
|
Dialog,
|
|
DialogContent,
|
|
DialogHeader,
|
|
DialogTitle,
|
|
DialogDescription,
|
|
DialogFooter,
|
|
} from '@/components/ui/dialog'
|
|
import { formatCurrency, formatDate } from '@/lib/utils'
|
|
import { roundOre } from '@/lib/money'
|
|
import {
|
|
expectedRotRutPayoutAmount,
|
|
getRotRutPayoutMatchTargetState,
|
|
} from '@/lib/invoices/rot-rut-payout-matching'
|
|
import { CheckCircle2, AlertTriangle } from 'lucide-react'
|
|
import type { TransactionWithInvoice } from './transaction-types'
|
|
|
|
interface RotRutPayoutMatchDialogProps {
|
|
open: boolean
|
|
onOpenChange: (open: boolean) => void
|
|
/** Row carrying `potential_rot_rut_payout`; the dialog renders nothing without it. */
|
|
transaction: TransactionWithInvoice | null
|
|
isConfirming: boolean
|
|
onConfirm: () => void
|
|
}
|
|
|
|
/**
|
|
* Confirm dialog for matching an income bank row to an open ROT/RUT begäran:
|
|
* Skatteverkets utbetalning clears the 1513 receivable (debit the row's cash
|
|
* account, credit 1513) and the row is linked to that voucher.
|
|
*
|
|
* Kept separate from InvoiceMatchDialog on purpose: no FX, no preview fetch,
|
|
* no editable lines. The entry has exactly two legs and the amount is the
|
|
* bank row's, so everything the user needs to approve is known up front.
|
|
*/
|
|
export default function RotRutPayoutMatchDialog({
|
|
open,
|
|
onOpenChange,
|
|
transaction,
|
|
isConfirming,
|
|
onConfirm,
|
|
}: RotRutPayoutMatchDialogProps) {
|
|
const t = useTranslations('tx_rot_rut_match')
|
|
const request = transaction?.potential_rot_rut_payout ?? null
|
|
|
|
const targetState = getRotRutPayoutMatchTargetState(request)
|
|
const targetBlocked = targetState !== 'matchable'
|
|
|
|
const txAmount = transaction ? roundOre(transaction.amount) : 0
|
|
const expected = request ? expectedRotRutPayoutAmount(request) : 0
|
|
const requestedTotal = request ? roundOre(Number(request.requested_total)) : 0
|
|
const diff = roundOre(Math.abs(txAmount - expected))
|
|
const amountsMatch = diff < 0.01
|
|
// The settle service refuses a payout below requested_total unless the
|
|
// beslut (decided_total) is recorded: say so here instead of letting the
|
|
// button fail.
|
|
const isPartial = request ? txAmount < requestedTotal - 0.005 : false
|
|
const partialBlocked = isPartial && request?.decided_total == null
|
|
// The service refuses more than Skatteverket can owe on this begäran: a
|
|
// larger row would drive 1513 negative. Block here too, with the reason.
|
|
const overBlocked = request ? txAmount > expected + 0.005 : false
|
|
// Skatteverket pays out in SEK only; the route refuses anything else.
|
|
const currencyBlocked = (transaction?.currency || 'SEK').toUpperCase() !== 'SEK'
|
|
const currency = transaction?.currency || 'SEK'
|
|
|
|
const typeLabel = request?.deduction_type === 'rut' ? 'RUT' : 'ROT'
|
|
|
|
return (
|
|
<Dialog open={open} onOpenChange={onOpenChange}>
|
|
<DialogContent className="max-w-2xl">
|
|
<DialogHeader>
|
|
<DialogTitle>{t('title')}</DialogTitle>
|
|
<DialogDescription>
|
|
{targetBlocked ? t('description_blocked') : t('description')}
|
|
</DialogDescription>
|
|
</DialogHeader>
|
|
|
|
{transaction && request && (
|
|
<div className="space-y-4">
|
|
<div className="rounded-lg border p-4 space-y-2">
|
|
<p className="text-sm font-medium text-muted-foreground">{t('transaction_label')}</p>
|
|
<p className="font-medium">{transaction.description}</p>
|
|
<div className="flex justify-between text-sm">
|
|
<span className="text-muted-foreground">{formatDate(transaction.date)}</span>
|
|
<span className="font-medium text-success">
|
|
+{formatCurrency(transaction.amount, currency)}
|
|
</span>
|
|
</div>
|
|
</div>
|
|
|
|
<div className="rounded-lg border p-4 space-y-2">
|
|
<p className="text-sm font-medium text-muted-foreground">{t('request_label')}</p>
|
|
<p className="font-medium">{t('request_name', { type: typeLabel, name: request.name })}</p>
|
|
<div className="flex justify-between text-sm">
|
|
<span className="text-muted-foreground">
|
|
{t('requested_total', { amount: formatCurrency(requestedTotal, 'SEK') })}
|
|
</span>
|
|
{request.decided_total != null && (
|
|
<span className="text-muted-foreground">
|
|
{t('decided_total', { amount: formatCurrency(Number(request.decided_total), 'SEK') })}
|
|
</span>
|
|
)}
|
|
</div>
|
|
{request.invoices.length > 0 && (
|
|
<div className="pt-2 border-t space-y-1">
|
|
<p className="text-xs font-medium text-muted-foreground">{t('invoices_title')}</p>
|
|
<ul className="text-sm space-y-0.5">
|
|
{request.invoices.map((inv, i) => (
|
|
<li key={`${inv.invoice_number ?? 'x'}-${i}`} className="flex justify-between">
|
|
<span>{t('invoice_row', { number: inv.invoice_number ?? '' })}</span>
|
|
<span className="tabular-nums text-muted-foreground">
|
|
{formatCurrency(Number(inv.requested_amount), 'SEK')}
|
|
</span>
|
|
</li>
|
|
))}
|
|
</ul>
|
|
</div>
|
|
)}
|
|
</div>
|
|
|
|
{targetBlocked ? (
|
|
<div className="flex items-start gap-2 p-3 rounded-lg bg-muted/30 text-attn">
|
|
<AlertTriangle className="h-4 w-4 flex-shrink-0 mt-0.5" />
|
|
<div className="text-sm">
|
|
<p className="font-medium">
|
|
{t(targetState === 'settled' ? 'target_settled_title' : 'target_not_open_title')}
|
|
</p>
|
|
<p>
|
|
{t(
|
|
targetState === 'settled'
|
|
? 'target_settled_description'
|
|
: 'target_not_open_description',
|
|
)}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
) : amountsMatch ? (
|
|
<div className="flex items-center gap-2 p-3 rounded-lg bg-success/10 text-success">
|
|
<CheckCircle2 className="h-4 w-4 flex-shrink-0" />
|
|
<p className="text-sm font-medium">{t('amounts_match')}</p>
|
|
</div>
|
|
) : (
|
|
<div className="flex items-start gap-2 p-3 rounded-lg bg-muted/30 text-attn">
|
|
<AlertTriangle className="h-4 w-4 flex-shrink-0 mt-0.5" />
|
|
<div className="text-sm">
|
|
<p className="font-medium">{t('amounts_differ')}</p>
|
|
<p>{t('amount_diff', { amount: formatCurrency(diff, currency) })}</p>
|
|
{overBlocked && <p className="mt-1">{t('over_payout_blocked')}</p>}
|
|
{partialBlocked && <p className="mt-1">{t('partial_requires_beslut')}</p>}
|
|
{isPartial && !partialBlocked && (
|
|
<p className="mt-1">{t('partial_with_beslut_note')}</p>
|
|
)}
|
|
</div>
|
|
</div>
|
|
)}
|
|
|
|
{!targetBlocked && (
|
|
<div className="rounded-lg border p-4 space-y-2">
|
|
<p className="text-sm font-medium">{t('booking_title')}</p>
|
|
<div className="text-sm space-y-1">
|
|
<div className="flex justify-between">
|
|
<span>
|
|
<span className="text-muted-foreground">{t('booking_debit')}</span>{' '}
|
|
{t('booking_bank_line')}
|
|
</span>
|
|
<span className="tabular-nums">{formatCurrency(txAmount, currency)}</span>
|
|
</div>
|
|
<div className="flex justify-between">
|
|
<span>
|
|
<span className="text-muted-foreground">{t('booking_credit')}</span>{' '}
|
|
{t('booking_receivable_line')}
|
|
</span>
|
|
<span className="tabular-nums">{formatCurrency(txAmount, currency)}</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
)}
|
|
|
|
{!targetBlocked && (
|
|
<div className="rounded-lg bg-muted/50 p-4 space-y-2">
|
|
<p className="text-sm font-medium">{t('on_confirm_title')}</p>
|
|
<ul className="text-sm text-muted-foreground space-y-1">
|
|
<li>• {t('on_confirm_link')}</li>
|
|
<li>• {t('on_confirm_request')}</li>
|
|
<li>• {t('on_confirm_voucher')}</li>
|
|
</ul>
|
|
</div>
|
|
)}
|
|
</div>
|
|
)}
|
|
|
|
<DialogFooter>
|
|
<Button variant="outline" onClick={() => onOpenChange(false)} disabled={isConfirming}>
|
|
{t('cancel')}
|
|
</Button>
|
|
<Button
|
|
onClick={onConfirm}
|
|
disabled={
|
|
isConfirming || !request || targetBlocked || partialBlocked || overBlocked || currencyBlocked
|
|
}
|
|
>
|
|
{isConfirming ? t('confirming') : t('confirm')}
|
|
</Button>
|
|
</DialogFooter>
|
|
</DialogContent>
|
|
</Dialog>
|
|
)
|
|
}
|