feat(expenses): utlägg as an answer to "Vem betalade?" in Underlag, not a page (#2317)
An out-of-pocket purchase differs from any other receipt only in the credit account, so the Underlag pane now asks one question for an unmatched underlag (Företaget / Jag, privat / En anställd / Ingen ännu) and books a privately paid receipt in place through POST /api/expense-claims, replacing the "Andra sätt att bokföra" dropdown and the deep link into the two-step wizard. The verifikat editor stays reachable below as the escape hatch (BFL 5 kap 6-7 §). The person owed surfaces in Att göra under a new Betala band, one row per person (lib/worklist expense_payout, counted in the total and exposed to agents through the attention resource). The Utlägg nav row is gated on existing claims, the same hybrid gate as Körjournal, since the entry point for a new utlägg is now the Underlag pane. Claude-Session: https://claude.ai/code/session_01P8YsvPqjfGxGZUkGeBVUWQ Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
Jakob Wennberg
co-authored by
Jakob Wennberg
Claude Fable 5.1
Jakob Wennberg
Claude Fable 5.1
parent
bff44e5757
commit
cbe5580886
@@ -21,6 +21,7 @@ import {
|
||||
ChevronRight,
|
||||
Eye,
|
||||
FileWarning,
|
||||
HandCoins,
|
||||
Inbox,
|
||||
Landmark,
|
||||
Loader2,
|
||||
@@ -29,14 +30,15 @@ import {
|
||||
ShieldCheck,
|
||||
Stamp,
|
||||
} from 'lucide-react'
|
||||
import type { SuggestedMatch, WorklistCounts } from '@/lib/worklist/types'
|
||||
import type { ExpensePayoutDue, SuggestedMatch, WorklistCounts } from '@/lib/worklist/types'
|
||||
|
||||
/**
|
||||
* AttGoraSection: the dashboard's unified worklist ("Att göra").
|
||||
*
|
||||
* One flat ledger of everything actionable, grouped into three bands by
|
||||
* session intent: Bokför (the daily loop), Granska & komplettera (close the
|
||||
* gaps), Bevaka (time-driven). Every count comes from lib/worklist (the same
|
||||
* One flat ledger of everything actionable, grouped into four bands by
|
||||
* session intent: Bokför (the daily loop), Betala (money the company owes a
|
||||
* person for utlägg), Granska & komplettera (close the gaps), Bevaka
|
||||
* (time-driven). Every count comes from lib/worklist (the same
|
||||
* source as the sidebar badges) so the numbers can never disagree.
|
||||
*
|
||||
* Suggested transaction↔invoice matches render inline with one-click confirm:
|
||||
@@ -53,6 +55,8 @@ interface ExpiringBankConnection {
|
||||
interface AttGoraSectionProps {
|
||||
worklist: WorklistCounts
|
||||
suggestedMatches: SuggestedMatch[]
|
||||
/** People owed for registered, unpaid utlägg: one Betala row each. */
|
||||
expensePayouts?: ExpensePayoutDue[]
|
||||
expiringBankConnections?: ExpiringBankConnection[]
|
||||
/**
|
||||
* True while the setup checklist is open and the company has zero posted
|
||||
@@ -114,6 +118,7 @@ function BandHeader({ children }: { children: React.ReactNode }) {
|
||||
export default function AttGoraSection({
|
||||
worklist,
|
||||
suggestedMatches,
|
||||
expensePayouts = [],
|
||||
expiringBankConnections = [],
|
||||
emptyLedger = false,
|
||||
hasActiveBankConnection = true,
|
||||
@@ -209,6 +214,7 @@ export default function AttGoraSection({
|
||||
counts.book_skattekonto > 0 ||
|
||||
showInboxDocuments ||
|
||||
matches.length > 0
|
||||
const betalaRows = expensePayouts.length > 0
|
||||
const granskaRows =
|
||||
counts.supplier_invoice_approval > 0 ||
|
||||
counts.verifikat_missing_document > 0 ||
|
||||
@@ -218,7 +224,7 @@ export default function AttGoraSection({
|
||||
counts.deadline_action > 0 ||
|
||||
counts.reconciliation_due > 0 ||
|
||||
expiringBankConnections.length > 0
|
||||
const allClear = !bokforRows && !granskaRows && !bevakaRows
|
||||
const allClear = !bokforRows && !betalaRows && !granskaRows && !bevakaRows
|
||||
|
||||
// The header total must equal what the section actually shows, computed off
|
||||
// the same visibleWorklistTotal helper as the dashboard KPI tile so the two
|
||||
@@ -380,6 +386,36 @@ export default function AttGoraSection({
|
||||
</div>
|
||||
)}
|
||||
|
||||
{betalaRows && (
|
||||
<div>
|
||||
<BandHeader>{t('band_betala')}</BandHeader>
|
||||
<div>
|
||||
{expensePayouts.map((p) => (
|
||||
<WorklistRow
|
||||
key={p.key}
|
||||
href="/expenses"
|
||||
icon={HandCoins}
|
||||
label={t('row_expense_payout', { name: p.claimant_name })}
|
||||
detail={
|
||||
p.claim_count === 1
|
||||
? t('row_expense_payout_detail_one', { date: formatDate(p.oldest_expense_date) })
|
||||
: t('row_expense_payout_detail_other', {
|
||||
count: p.claim_count,
|
||||
date: formatDate(p.oldest_expense_date),
|
||||
})
|
||||
}
|
||||
count={p.claim_count}
|
||||
badge={
|
||||
<span className="text-xs tabular-nums text-muted-foreground">
|
||||
{formatCurrency(p.total_sek)}
|
||||
</span>
|
||||
}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{granskaRows && (
|
||||
<div>
|
||||
<BandHeader>{t('band_granska')}</BandHeader>
|
||||
|
||||
@@ -102,6 +102,10 @@ interface DashboardNavProps {
|
||||
// toggle OR existing mileage_trips rows (trips created via API/MCP must
|
||||
// stay reachable). Computed by the dashboard layout.
|
||||
hasMileage?: boolean
|
||||
// Whether the Utlägg row shows: existing expense_claims rows. New utlägg
|
||||
// start from the Underlag pane ("Vem betalade?"), so the page only earns a
|
||||
// rail row once there is a person to pay out. Computed by the layout.
|
||||
hasExpenseClaims?: boolean
|
||||
isSandbox?: boolean
|
||||
extensionNavItems?: ExtensionNavItem[]
|
||||
// Signed-in user's full name + email: drives the bottom-left account
|
||||
@@ -203,6 +207,9 @@ interface NavItem {
|
||||
// bookkeeping settings toggle (company_settings.mileage_enabled) or already
|
||||
// has trips. UI-visibility gate only; the page and APIs work regardless.
|
||||
requiresMileage?: boolean
|
||||
// Utlägg row: visible only when the company already has expense claims
|
||||
// (same "data stays reachable" gate as Körjournal). UI-visibility only.
|
||||
requiresExpenses?: boolean
|
||||
// Paywall surfaces: hidden unless the active company holds this paid
|
||||
// capability. Cosmetic only, the page and API gates are the real
|
||||
// enforcement; this just keeps the sidebar honest for non-payers.
|
||||
@@ -246,10 +253,12 @@ const navItems: NavItem[] = [
|
||||
// must still reach its already-imported orders (accounting underlag).
|
||||
{ href: '/orders', labelKey: 'webshop_orders', icon: ShoppingCart, group: 'arbeta', requiresWebshop: true, betaBadge: true },
|
||||
{ href: '/supplier-invoices', labelKey: 'supplier_invoices', icon: Wallet, group: 'arbeta' },
|
||||
// Utlägg: out-of-pocket purchases and their reimbursement batches. The
|
||||
// Utlägg: out-of-pocket purchases and their reimbursement batches. Hidden
|
||||
// until a claim exists: a receipt paid privately is registered from the
|
||||
// Underlag pane, and the person to pay out surfaces in Att göra. The
|
||||
// /expenses route previously redirected to supplier invoices; the nav key
|
||||
// has existed in the nav namespace since then.
|
||||
{ href: '/expenses', labelKey: 'expenses', icon: Receipt, group: 'arbeta' },
|
||||
{ href: '/expenses', labelKey: 'expenses', icon: Receipt, group: 'arbeta', requiresExpenses: true },
|
||||
{ href: '/salary', labelKey: 'salary', icon: HandCoins, group: 'arbeta', employerOnly: true },
|
||||
// Körjournal: hidden by default (most companies have no car); shows when
|
||||
// the settings toggle is on or trips already exist (hybrid gate, same
|
||||
@@ -347,7 +356,7 @@ const groupLabelKey: Record<Exclude<GroupKey, 'top'>, string> = {
|
||||
skatt: 'group_tax',
|
||||
}
|
||||
|
||||
export default function DashboardNav({ companyName: _companyName, entityType, paysSalaries = false, dimensionsEnabled = false, salesOrdersEnabled = false, hasWebshop = false, hasMileage = false, isSandbox = false, extensionNavItems = [], userName = null, userEmail = null, initialUiState }: DashboardNavProps) {
|
||||
export default function DashboardNav({ companyName: _companyName, entityType, paysSalaries = false, dimensionsEnabled = false, salesOrdersEnabled = false, hasWebshop = false, hasMileage = false, hasExpenseClaims = false, isSandbox = false, extensionNavItems = [], userName = null, userEmail = null, initialUiState }: DashboardNavProps) {
|
||||
const pathname = usePathname()
|
||||
const router = useRouter()
|
||||
const supabase = useRealtimeSupabase()
|
||||
@@ -608,6 +617,8 @@ export default function DashboardNav({ companyName: _companyName, entityType, pa
|
||||
// Körjournal is hidden until the company opts in via the bookkeeping
|
||||
// settings toggle (or trips already exist, e.g. created via MCP).
|
||||
if (item.requiresMileage && !hasMileage) return false
|
||||
// Utlägg is hidden until a claim exists (registered from Underlag).
|
||||
if (item.requiresExpenses && !hasExpenseClaims) return false
|
||||
// Paywalled surfaces (e.g. the AI-only Dokumentinkorg) are hidden unless
|
||||
// the active company holds the capability. The page + API gates enforce
|
||||
// the paywall; this keeps the sidebar from advertising a dead workspace.
|
||||
|
||||
Reference in New Issue
Block a user