3c0bf3f584
* feat(deadlines): gate F-skatt reminders on debited preliminary tax, add durable dismissal The f_skatt deadline was gated on the F-skatt approval flag (DB default true), giving nearly every company 12 monthly payment reminders for a tax Skatteverket may not have debited at all (64% of all system deadline rows, one lifetime completion). Approval carries no recurring obligation; the monthly duty is payment of debiterad preliminarskatt and exists only while the debited amount is > 0 (SFL 62 kap. 4-5 par., 55 kap. 2 par.). - Gate the f_skatt deadline on preliminary_tax_monthly > 0 (field already collected at onboarding, previously unread) and retitle it as a payment. - Storforetag keep the 12th in August (January-only 17th, 62 kap. 3 par.). - Declare the prod-only preliminary_tax_monthly column in a migration so installs built purely from migrations stop failing tax-settings saves. - Add deadlines.dismissed_at: DELETE on a system deadline now soft-dismisses it durably (hard deletes were resurrected by the nightly backfill within 24h); generator, backfill, and every read surface respect it. - Prune upcoming f_skatt rows for companies with no debited amount. Closes part of #1028. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(deadlines): include dismissed_at in DeadlineForm payload The Deadline type gained the required dismissed_at field; the form's submit payload literal must carry it for the Omit<Deadline, ...> shape. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(deadlines): make system-deadline dismissal atomic Constrain the dismiss update to source='system' and verify a row was actually updated: a concurrent regeneration can delete the row between lookup and update, and the route must not report a phantom success. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
128 lines
3.5 KiB
TypeScript
128 lines
3.5 KiB
TypeScript
'use client'
|
|
|
|
import { useState, useEffect, useCallback } from 'react'
|
|
import { createClient } from '@/lib/supabase/client'
|
|
import { useToast } from '@/components/ui/use-toast'
|
|
import { PaymentCalendar } from '@/extensions/general/calendar/components/PaymentCalendar'
|
|
import type { WorkspaceComponentProps } from '@/lib/extensions/workspace-registry'
|
|
import type { Invoice, Deadline } from '@/types'
|
|
|
|
export default function CalendarWorkspace({ userId }: WorkspaceComponentProps) {
|
|
const [invoices, setInvoices] = useState<Invoice[]>([])
|
|
const [deadlines, setDeadlines] = useState<Deadline[]>([])
|
|
const [customers, setCustomers] = useState<{ id: string; name: string }[]>([])
|
|
const [isLoading, setIsLoading] = useState(true)
|
|
const { toast } = useToast()
|
|
const supabase = createClient()
|
|
|
|
const fetchData = useCallback(async () => {
|
|
setIsLoading(true)
|
|
|
|
try {
|
|
const { data: invoicesData, error: invoicesError } = await supabase
|
|
.from('invoices')
|
|
.select('*, customer:customers(name)')
|
|
.order('due_date', { ascending: true })
|
|
|
|
if (invoicesError) throw invoicesError
|
|
|
|
const { data: deadlinesData, error: deadlinesError } = await supabase
|
|
.from('deadlines')
|
|
.select('*, customer:customers(name)')
|
|
.is('dismissed_at', null)
|
|
.order('due_date', { ascending: true })
|
|
|
|
if (deadlinesError) throw deadlinesError
|
|
|
|
const { data: customersData, error: customersError } = await supabase
|
|
.from('customers')
|
|
.select('id, name')
|
|
.order('name', { ascending: true })
|
|
|
|
if (customersError) throw customersError
|
|
|
|
setInvoices(invoicesData || [])
|
|
setDeadlines(deadlinesData || [])
|
|
setCustomers(customersData || [])
|
|
} catch {
|
|
toast({
|
|
title: 'Kunde inte hämta data',
|
|
variant: 'destructive',
|
|
})
|
|
} finally {
|
|
setIsLoading(false)
|
|
}
|
|
}, [supabase, toast])
|
|
|
|
useEffect(() => {
|
|
fetchData()
|
|
}, [fetchData])
|
|
|
|
const handleDeadlineCreate = async (
|
|
data: Omit<Deadline, 'id' | 'user_id' | 'company_id' | 'created_at' | 'updated_at'>
|
|
) => {
|
|
try {
|
|
const { error } = await supabase.from('deadlines').insert([data])
|
|
|
|
if (error) throw error
|
|
|
|
toast({
|
|
title: 'Deadline skapad',
|
|
description: 'Din deadline har sparats',
|
|
})
|
|
|
|
fetchData()
|
|
} catch (error) {
|
|
toast({
|
|
title: 'Kunde inte skapa deadline',
|
|
variant: 'destructive',
|
|
})
|
|
throw error
|
|
}
|
|
}
|
|
|
|
const handleDeadlineToggle = async (deadline: Deadline) => {
|
|
try {
|
|
const { error } = await supabase
|
|
.from('deadlines')
|
|
.update({
|
|
is_completed: !deadline.is_completed,
|
|
completed_at: !deadline.is_completed ? new Date().toISOString() : null,
|
|
})
|
|
.eq('id', deadline.id)
|
|
|
|
if (error) throw error
|
|
|
|
toast({
|
|
title: deadline.is_completed ? 'Markerad som ej klar' : 'Markerad som klar',
|
|
})
|
|
|
|
fetchData()
|
|
} catch {
|
|
toast({
|
|
title: 'Kunde inte uppdatera deadline',
|
|
variant: 'destructive',
|
|
})
|
|
}
|
|
}
|
|
|
|
if (isLoading) {
|
|
return (
|
|
<div className="animate-pulse">
|
|
<div className="h-10 bg-muted rounded w-48 mb-4" />
|
|
<div className="h-96 bg-muted rounded" />
|
|
</div>
|
|
)
|
|
}
|
|
|
|
return (
|
|
<PaymentCalendar
|
|
invoices={invoices}
|
|
deadlines={deadlines}
|
|
customers={customers}
|
|
onDeadlineCreate={handleDeadlineCreate}
|
|
onDeadlineToggle={handleDeadlineToggle}
|
|
/>
|
|
)
|
|
}
|