ea1bf01f1e
* fix(dashboard): exclude ignored and already-triaged transactions from stale count The "Gamla transaktioner" widget counted transactions that had been ignored or already marked as is_business=true but not yet booked, so users saw a nag for a row they had already dealt with — and the /transactions inbox correctly hid it. Align the count with the inbox criterion (is_business IS NULL, is_ignored = false) so the widget clears when the row leaves the inbox. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(transactions): read entity_type from settings response wrapper The transactions page read entityRes.entity_type directly, but /api/settings returns { data: { entity_type, ... } }. The expression was always undefined, so setEntityType never fired and entityType stayed at its initial 'enskild_firma'. The template picker's entity_type filter then dropped every aktiebolag-tagged user template for AB customers — only entity_type='all' templates made it through. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * stale templates bank sync journal entry from transaction * fixed pr comments * fixed pr comment --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
116 lines
4.2 KiB
TypeScript
116 lines
4.2 KiB
TypeScript
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import { getLineItemAccount } from './account-mapping'
|
|
|
|
export interface CreateSalaryRunResult {
|
|
run: Record<string, unknown>
|
|
employeeCount: number
|
|
}
|
|
|
|
/**
|
|
* Create a draft salary run and seed a base line for every active employee.
|
|
*
|
|
* There is no single-statement RPC for this fan-out, so it is not atomic at the
|
|
* DB level. To avoid leaving a half-populated run behind on a mid-loop failure,
|
|
* we compensating-delete the parent run on any error — FK cascade
|
|
* (salary_run_employees → salary_runs, salary_line_items → salary_run_employees,
|
|
* both ON DELETE CASCADE) cleans up any children already inserted.
|
|
*
|
|
* Extracted so the MCP tool and any future route share one implementation.
|
|
*/
|
|
export async function createSalaryRunWithEmployees(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
userId: string,
|
|
params: { periodYear: number; periodMonth: number; paymentDate: string },
|
|
): Promise<CreateSalaryRunResult> {
|
|
const { data: run, error: runError } = await supabase
|
|
.from('salary_runs')
|
|
.insert({
|
|
company_id: companyId,
|
|
user_id: userId,
|
|
period_year: params.periodYear,
|
|
period_month: params.periodMonth,
|
|
payment_date: params.paymentDate,
|
|
})
|
|
.select()
|
|
.single()
|
|
if (runError || !run) {
|
|
throw new Error(
|
|
runError?.code === '23505'
|
|
? 'Salary run already exists for this period'
|
|
: (runError?.message ?? 'Failed to create salary run'),
|
|
)
|
|
}
|
|
|
|
try {
|
|
const { data: employees } = await supabase
|
|
.from('employees')
|
|
.select('*')
|
|
.eq('company_id', companyId)
|
|
.eq('is_active', true)
|
|
|
|
// Pay period bounds (inclusive) — used to skip employees whose employment
|
|
// does not overlap the run. employment_start is NOT NULL on employees;
|
|
// employment_end is nullable for ongoing employments.
|
|
const periodStart = `${params.periodYear}-${String(params.periodMonth).padStart(2, '0')}-01`
|
|
const periodEnd = new Date(Date.UTC(params.periodYear, params.periodMonth, 0))
|
|
.toISOString()
|
|
.slice(0, 10)
|
|
|
|
const eligibleEmployees = (employees || []).filter((emp) => {
|
|
if (emp.employment_start && emp.employment_start > periodEnd) return false
|
|
if (emp.employment_end && emp.employment_end < periodStart) return false
|
|
return true
|
|
})
|
|
|
|
for (const emp of eligibleEmployees) {
|
|
const baseAmount =
|
|
emp.salary_type === 'monthly'
|
|
? Math.round((emp.monthly_salary || 0) * (emp.employment_degree / 100) * 100) / 100
|
|
: 0
|
|
|
|
const { data: sre, error: sreErr } = await supabase
|
|
.from('salary_run_employees')
|
|
.insert({
|
|
salary_run_id: run.id,
|
|
employee_id: emp.id,
|
|
company_id: companyId,
|
|
employment_degree: emp.employment_degree,
|
|
monthly_salary: emp.monthly_salary || 0,
|
|
salary_type: emp.salary_type,
|
|
tax_table_number: emp.tax_table_number,
|
|
tax_column: emp.tax_column,
|
|
})
|
|
.select()
|
|
.single()
|
|
if (sreErr || !sre) {
|
|
throw new Error(`Failed to add employee ${emp.id}: ${sreErr?.message ?? 'unknown error'}`)
|
|
}
|
|
|
|
const itemType = emp.salary_type === 'monthly' ? 'monthly_salary' : 'hourly_salary'
|
|
const { error: liErr } = await supabase.from('salary_line_items').insert({
|
|
salary_run_employee_id: sre.id,
|
|
company_id: companyId,
|
|
item_type: itemType,
|
|
description: emp.salary_type === 'monthly' ? 'Grundlön' : 'Timlön',
|
|
amount: baseAmount,
|
|
is_taxable: true,
|
|
is_avgift_basis: true,
|
|
is_vacation_basis: true,
|
|
account_number: getLineItemAccount(itemType as never, emp.employment_type),
|
|
sort_order: 0,
|
|
})
|
|
if (liErr) {
|
|
throw new Error(`Failed to add base line for employee ${emp.id}: ${liErr.message}`)
|
|
}
|
|
}
|
|
|
|
return { run: run as Record<string, unknown>, employeeCount: eligibleEmployees.length }
|
|
} catch (err) {
|
|
// Compensating delete — never leave a half-populated run. Cascade removes
|
|
// any salary_run_employees / salary_line_items already inserted.
|
|
await supabase.from('salary_runs').delete().eq('id', run.id).eq('company_id', companyId)
|
|
throw err
|
|
}
|
|
}
|